diff options
Diffstat (limited to 'nixpkgs/pkgs')
921 files changed, 21976 insertions, 13352 deletions
diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix index 331ef6b92a4f..f597d6b6527c 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/default.nix @@ -2,8 +2,8 @@ , makeWrapper, makeDesktopItem , qtbase, qmake, qtmultimedia, qttools , qtgraphicaleffects, qtdeclarative -, qtlocation, qtquickcontrols2, qtwebchannel -, qtwebengine, qtx11extras, qtxmlpatterns +, qtlocation, qtquickcontrols, qtquickcontrols2 +, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq, pkgconfig , hidapi @@ -11,22 +11,35 @@ with stdenv.lib; +let + qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; + + qml2ImportPath = concatMapStringsSep ":" qmlPath [ + qtbase.bin qtmultimedia.bin qtgraphicaleffects + qtdeclarative.bin qtlocation.bin + qtquickcontrols qtquickcontrols2.bin + qtwebchannel.bin qtwebengine.bin qtxmlpatterns + ]; + +in + stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.4"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw"; + sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; }; nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtmultimedia qtgraphicaleffects - qtdeclarative qtlocation qtquickcontrols2 + qtdeclarative qtlocation + qtquickcontrols qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq @@ -81,6 +94,11 @@ stdenv.mkDerivation rec { cp $src/images/appicons/$size.png \ $out/share/icons/hicolor/$size/apps/monero.png done; + + # wrap runtime dependencies + wrapProgram $out/bin/monero-wallet-gui \ + --set QML2_IMPORT_PATH "${qml2ImportPath}" \ + --set QT_PLUGIN_PATH "${qtbase.bin}/${qtbase.qtPluginPrefix}" ''; meta = { diff --git a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 74f817d81350..ae733151622d 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/nixpkgs/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,15 +13,17 @@ index 79223c0..e80b317 100644 parser.addHelpOption(); parser.process(app); diff --git a/Logger.cpp b/Logger.cpp -index 660bafc..dae24d4 100644 +index 6b1daba..c357762 100644 --- a/Logger.cpp +++ b/Logger.cpp -@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; - #elif defined(Q_OS_MAC) - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; +@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; + static const QString appFolder = "Library/Logs"; #else // linux + bsd + //HomeLocation = "~" - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); +- static const QString appFolder = ".bitmonero"; + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); ++ static const QString appFolder = "bitmonero"; #endif - + diff --git a/nixpkgs/pkgs/applications/altcoins/monero/default.nix b/nixpkgs/pkgs/applications/altcoins/monero/default.nix index 3a962458632e..94c277f63eb0 100644 --- a/nixpkgs/pkgs/applications/altcoins/monero/default.nix +++ b/nixpkgs/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.4"; + version = "0.14.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d"; + sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/nixpkgs/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix index b3a0c6377214..1b0dfebe22c2 100644 --- a/nixpkgs/pkgs/applications/audio/clementine/default.nix +++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm -, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp +, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp , libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf , qca2, pkgconfig, sparsehash, config, makeWrapper, gst_plugins }: @@ -49,7 +49,6 @@ let protobuf qca2 qjson - qt4 sqlite taglib ] diff --git a/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix index f82ec7a4ea13..df0fcb0ee9cd 100644 --- a/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix @@ -1,19 +1,20 @@ -{ - stdenv, fetchurl, docbook_xsl, - docbook_xml_dtd_45, python, pygments, - libxslt +{ + stdenv, fetchFromGitHub, docbook_xsl, + docbook_xml_dtd_45, python, pygments, + libxslt }: stdenv.mkDerivation rec { - version = "6.12.0"; - name = "csound-manual-${version}"; - - src = fetchurl { - url = "https://github.com/csound/manual/archive/${version}.tar.gz"; - sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp"; + pname = "csound-manual"; + version = "unstable-2019-02-22"; + + src = fetchFromGitHub { + owner = "csound"; + repo = "manual"; + rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f"; + sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn"; }; - prePatch = '' substituteInPlace manual.xml \ --replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ @@ -41,4 +42,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/nixpkgs/pkgs/applications/audio/curseradio/default.nix b/nixpkgs/pkgs/applications/audio/curseradio/default.nix new file mode 100644 index 000000000000..1dd5f9ee5eb2 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/curseradio/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, substituteAll, python3Packages, mpv }: + +python3Packages.buildPythonApplication rec { + version = "0.2"; + pname = "curseradio"; + + src = fetchFromGitHub { + owner = "chronitis"; + repo = pname; + rev = "1bd4bd0faeec675e0647bac9a100b526cba19f8d"; + sha256 = "11bf0jnj8h2fxhpdp498189r4s6b47vy4wripv0z4nx7lxajl88i"; + }; + + propagatedBuildInputs = with python3Packages; [ + requests + lxml + pyxdg + ]; + + patches = [ + (substituteAll { + src = ./mpv.patch; + inherit mpv; + }) + ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Command line radio player"; + homepage = "https://github.com/chronitis/curseradio"; + license = licenses.mit; + maintainers = [ maintainers.eyjhb ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch b/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch new file mode 100644 index 000000000000..d085dc791099 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/curseradio/mpv.patch @@ -0,0 +1,11 @@ +--- a/curseradio/curseradio.py ++++ b/curseradio/curseradio.py +@@ -30,7 +30,7 @@ import re + + CONFIG_DEFAULT = { + 'opml': {'root': "http://opml.radiotime.com/"}, +- 'playback': {'command': '/usr/bin/mpv'}, ++ 'playback': {'command': '@mpv@/bin/mpv'}, + 'interface': {'keymap': 'default'}, + 'keymap.default': { + 'up': 'KEY_UP', diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 6c4818f869ff..3b850a27327b 100644 --- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.0"; + version = "1.0.3"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "00hjxpgmhzhyjjdpm92cbbxwnc17xdhhk8svk5ih3n18yk5655fs"; + sha256 = "1gjxcwl467h7011j9v4zy1j0fjlz480ibvk4akr6xwjg894jykbx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix b/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix index 669ffbb2688a..a2368017cc1e 100644 --- a/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix +++ b/nixpkgs/pkgs/applications/audio/meters_lv2/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, pkgconfig -, lv2, libGLU_combined, gtk2, cairo, pango, fftw }: +, lv2, libGLU_combined, gtk2, cairo, pango, fftwFloat, libjack2 }: let - version = "0.8.1"; + version = "0.9.10"; name = "meters.lv2-${version}"; # robtk submodule is pegged to this version - robtkVersion = "0.3.0"; + robtkVersion = "0.6.2"; robtkName = "robtk-${robtkVersion}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/x42/meters.lv2/archive/v${version}.tar.gz"; - sha256 = "142dg0j34mv5b0agajj2x1n9kgsmkfh08n1cjzk0j8n4xk2wb6ri"; + sha256 = "0yfyn7j8g50w671b1z7ph4ppjx8ddj5c6nx53syp5y5mfr1b94nx"; }; robtkSrc = fetchurl { name = "${robtkName}.tar.gz"; url = "https://github.com/x42/robtk/archive/v${robtkVersion}.tar.gz"; - sha256 = "1ny89i2sgga56k7fxskp9y8sb7pfhp6wgw5mni842p19z6q7h8rq"; + sha256 = "1v79xys1k2923wpivdjd44vand6c4agwvnrqi4c8kdv9r07b559v"; }; in @@ -26,15 +26,13 @@ stdenv.mkDerivation { inherit name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ]; + buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftwFloat libjack2 ]; srcs = [ src robtkSrc ]; sourceRoot = name; postUnpack = "mv ${robtkName}/* ${name}/robtk"; # */ - postPatch = "sed -i 's/fftw3f/fftw3/' Makefile"; - preConfigure = "makeFlagsArray=( PREFIX=$out )"; meter_VERSION = version; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 3e89101e0420..b8ae2d4a8998 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.5"; + version = "3.33.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn"; + sha256 = "0g00rjkmsnza4gjjdm0cwrpw3gqvmjj58157dvrh7f8k7j0gdvdm"; }; propagatedBuildInputs = [ @@ -14,14 +14,10 @@ pythonPackages.buildPythonApplication rec { mopidy-local-images ] ++ (with pythonPackages; [ configobj - pylast - spotipy - raven + requests tornado_4 ]); - postPatch = "sed -i /tornado/d setup.py"; - # no tests implemented doCheck = false; diff --git a/nixpkgs/pkgs/applications/audio/muse/default.nix b/nixpkgs/pkgs/applications/audio/muse/default.nix index 9687ff3106bd..b3efa82ead47 100644 --- a/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "muse-sequencer-${version}"; - version = "3.0.2"; + version = "3.1pre1"; meta = with stdenv.lib; { homepage = http://www.muse-sequencer.org; @@ -38,11 +38,16 @@ stdenv.mkDerivation rec { fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; - rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d"; - sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51"; + rev = "2167ae053c16a633d8377acdb1debaac10932838"; + sha256 = "0rsdx8lvcbz5bapnjvypw8h8bq587s9z8cf2znqrk6ah38s6fsrf"; }; + nativeBuildInputs = [ + pkgconfig + gitAndTools.gitFull + ]; + buildInputs = [ libjack2 qt5.qtsvg @@ -57,8 +62,6 @@ stdenv.mkDerivation rec { lash dssi liblo - pkgconfig - gitAndTools.gitFull ]; sourceRoot = "source/muse3"; diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix index 8ec4a342522d..9407a1c26882 100644 --- a/nixpkgs/pkgs/applications/audio/musescore/default.nix +++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "3.0.1"; + version = "3.0.5"; src = fetchzip { url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip"; - sha256 = "1l9djxq5hdfqiya2jwcag7qq4dhmb9qcv68y27dlza19imrnim80"; + sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/applications/audio/musly/default.nix b/nixpkgs/pkgs/applications/audio/musly/default.nix new file mode 100644 index 000000000000..47370d4bc2f7 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/musly/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +stdenv.mkDerivation rec { + pname = "musly"; + version = "unstable-2017-04-26"; + src = fetchFromGitHub { + owner = "dominikschnitzer"; + repo = "musly"; + rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6"; + sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + fixupPhase = if stdenv.isDarwin then '' + install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly + install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly + install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib + '' else ""; + + meta = with stdenv.lib; { + homepage = https://www.musly.org; + description = "A fast and high-quality audio music similarity library written in C/C++"; + longDescription = '' + Musly analyzes the the audio signal of music pieces to estimate their similarity. + No meta-data about the music piece is included in the similarity estimation. + To use Musly in your application, have a look at the library documentation + or try the command line application included in the package and start generating + some automatic music playlists right away. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ ggpeti ]; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 084487fd407a..5957a740f350 100644 --- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y"; + sha256 = "0cd1jfb3ynfrsbz8jwfsbvs5liyddxg4zghrvz931qkkqi117hbh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/nixpkgs/pkgs/applications/audio/paprefs/default.nix b/nixpkgs/pkgs/applications/audio/paprefs/default.nix index 23ba3582ce61..6ad931d4867a 100644 --- a/nixpkgs/pkgs/applications/audio/paprefs/default.nix +++ b/nixpkgs/pkgs/applications/audio/paprefs/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "paprefs-1.0"; + name = "paprefs-1.1"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; - sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md"; + sha256 = "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf"; }; nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/audio/parlatype/default.nix b/nixpkgs/pkgs/applications/audio/parlatype/default.nix index 3310bfdf3f03..87257f4920df 100644 --- a/nixpkgs/pkgs/applications/audio/parlatype/default.nix +++ b/nixpkgs/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk + gtk3 at-spi2-core dbus gst_all_1.gstreamer diff --git a/nixpkgs/pkgs/applications/audio/paulstretch/default.nix b/nixpkgs/pkgs/applications/audio/paulstretch/default.nix new file mode 100644 index 000000000000..b2c049c9eeeb --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/paulstretch/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat, +minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }: + +stdenv.mkDerivation { + pname = "paulstretch"; + version = "2.2-2"; + + src = fetchFromGitHub { + owner = "paulnasca"; + repo = "paulstretch_cpp"; + rev = "7f5c3993abe420661ea0b808304b0e2b4b0048c5"; + sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + audiofile + libvorbis + fltk + fftw + fftwFloat + minixml + libmad + libjack2 + portaudio + libsamplerate + ]; + + buildPhase = '' + bash compile_linux_fftw_jack.sh + ''; + + installPhase = '' + install -Dm555 ./paulstretch $out/bin/paulstretch + ''; + + meta = with stdenv.lib; { + description = "Produces high quality extreme sound stretching"; + longDescription = '' + This is a program for stretching the audio. It is suitable only for + extreme sound stretching of the audio (like 50x) and for applying + special effects by "spectral smoothing" the sounds. + It can transform any sound/music to a texture. + ''; + homepage = http://hypermammut.sourceforge.net/paulstretch/; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index 950b32a82013..b82dad05c31b 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { name = "pulseaudio-modules-bt-${version}"; - version = "unstable-2019-01-05"; + version = "unstable-2019-03-15"; src = fetchFromGitHub { owner = "EHfive"; repo = "pulseaudio-modules-bt"; - rev = "4b0cde160c96f40d860fef267a6ded49ae045be0"; - sha256 = "15jw5nf2dhqqdwzyh2x5kdkrq7f3qn140gw6gmspcai9kplhk24w"; + rev = "0b397c26eb4fd5dc611bd3e2baa79776de646856"; + sha256 = "09q0xh9iz0crik6xpln9lijirf62aljxa1jrds1i1zgflyfidd0z"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch index e500d1fb1333..3c498fe8af1b 100644 --- a/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch +++ b/nixpkgs/pkgs/applications/audio/pulseaudio-modules-bt/fix-install-path.patch @@ -1,20 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d869979..185144d 100644 +index 8d20dbf..63fe7ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -143,13 +143,13 @@ INSTALL(TARGETS +@@ -213,5 +213,4 @@ INSTALL(TARGETS module-bluez5-device module-bluetooth-discover module-bluetooth-policy - LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) +- + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) - - if(NOT ${HAVE_SYSTEM_LDAC}) - - INSTALL(TARGETS - ldacBT_enc - ldacBT_abr -- LIBRARY DESTINATION ${PulseAudio_modlibexecdir}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pulse-${PulseAudio_VERSION}/modules/) - - endif() diff --git a/nixpkgs/pkgs/applications/audio/qmmp/default.nix b/nixpkgs/pkgs/applications/audio/qmmp/default.nix index c10358eed1e4..eab498b96249 100644 --- a/nixpkgs/pkgs/applications/audio/qmmp/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.5"; + name = "qmmp-1.3.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx"; + sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw"; }; buildInputs = diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 26adc6394349..603ca8b36405 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -1,23 +1,17 @@ -{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }: +{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt5, autoconf, pkgconfig }: stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.2"; + version = "0.5.5"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv"; + sha256 = "08x7znvbwi9miavcarymi7dsv8njmxzwzma20dbmz8j2aswm53w5"; }; - # cmake is looking for qsynth.desktop.in and fails if it doesn't find it - # seems like a bug and can presumable go in the next version after 0.5.2 - postPatch = '' - mv src/qsynth.desktop src/qsynth.desktop.in - ''; + nativeBuildInputs = [ autoconf pkgconfig ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ]; + buildInputs = [ alsaLib fluidsynth libjack2 qt5.qtbase qt5.qttools qt5.qtx11extras ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index cabebb6f18e9..8e2b096672c1 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper , alsaLib, xorg -, gnome3, pango, gdk_pixbuf, cairo, glib, freetype +, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - gnome3.gtk + gtk3 ]; dontBuild = true; diff --git a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index eab50c904795..2162ddd79815 100644 --- a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -4,6 +4,7 @@ , perlPackages , gtk3 , intltool +, libpeas , libsoup , gnome3 , totem-pl-parser @@ -48,7 +49,7 @@ in stdenv.mkDerivation rec { json-glib gtk3 - gnome3.libpeas + libpeas totem-pl-parser gnome3.adwaita-icon-theme diff --git a/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix index 73f24e03e307..cba85aacfbb8 100644 --- a/nixpkgs/pkgs/applications/audio/samplv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld"; + sha256 = "0402rdr46za21w34m7ajzbwiiqcd1h0da3b0ldsr2z5g2mrkzxv8"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix index e44df51404a4..0918cf42830b 100644 --- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix +++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv"; + sha256 = "1b9w4cml3cmcg09kh852cahas6l9ks8wl3gzp1az8rzxz4229yg1"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; diff --git a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index 24c033001cb6..63bb966e3887 100644 --- a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.5.10.1"; + version = "1.5.10.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "02mmy17sa3dlwmjjahn8rfd6h67c5s0q3fvkf6ljrc2mbbpwc375"; + sha256 = "1rr99qkq80s8l2iv3x4ccxan07m15dvmd5s9b10386bfjbwbya01"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix index 1b3429f39d7f..b8cca7c72015 100644 --- a/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "1hfpiqdm337gl4ynkmmp2qss2m5z8mzqzjrbiyg6w1v4js7l9phi"; + sha256 = "18m4ax0x06y1hx4g2g3gf02v0bldkrrb5m7fsr5jlfp1kvjd2j1x"; }; buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; diff --git a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix index 7876ebc244b1..4f8e520cb9f2 100644 --- a/nixpkgs/pkgs/applications/backup/deja-dup/default.nix +++ b/nixpkgs/pkgs/applications/backup/deja-dup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext , gnome3, libnotify, itstool, glib, gtk3, libxml2 -, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook +, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libnotify gnome3.libpeas glib gtk3 libsecret + libnotify libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index 650bab334333..85687090721d 100644 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { pname = "lightdm"; version = "1.28.0"; - name = "${pname}-${version}"; - outputs = [ "out" "dev" ]; src = fetchFromGitHub { @@ -40,9 +38,9 @@ stdenv.mkDerivation rec { accountsservice audit glib + libXdmcp libgcrypt libxcb - libXdmcp libxklavier pam polkit @@ -50,7 +48,6 @@ stdenv.mkDerivation rec { ++ optional withQt5 qtbase; patches = [ - ./run-dir.patch # Adds option to disable writing dmrc files (fetchpatch { url = "https://src.fedoraproject.org/rpms/lightdm/raw/4cf0d2bed8d1c68970b0322ccd5dbbbb7a0b12bc/f/lightdm-1.25.1-disable_dmrc.patch"; diff --git a/nixpkgs/pkgs/applications/display-managers/lightdm/run-dir.patch b/nixpkgs/pkgs/applications/display-managers/lightdm/run-dir.patch deleted file mode 100644 index eb8e5a0f4d7e..000000000000 --- a/nixpkgs/pkgs/applications/display-managers/lightdm/run-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/lightdm.conf b/data/lightdm.conf -index 16b80f7..b3af435 100644 ---- a/data/lightdm.conf -+++ b/data/lightdm.conf -@@ -28,7 +28,7 @@ - #guest-account-script=guest-account - #logind-check-graphical=false - #log-directory=/var/log/lightdm --#run-directory=/var/run/lightdm -+run-directory=/run/lightdm - #cache-directory=/var/cache/lightdm - #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions - #remote-sessions-directory=/usr/share/lightdm/remote-sessions diff --git a/nixpkgs/pkgs/applications/editors/android-studio/common.nix b/nixpkgs/pkgs/applications/editors/android-studio/common.nix index a1465766f8bf..fdba9f7be774 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -39,11 +39,12 @@ let drvName = "android-studio-${channel}-${version}"; + archiveFormat = if builtins.elem channel [ "dev" "canary" ] then "tar.gz" else "zip"; androidStudio = stdenv.mkDerivation { name = drvName; src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.${archiveFormat}"; sha256 = sha256Hash; }; @@ -141,6 +142,9 @@ in runCommand ''; preferLocalBuild = true; allowSubstitutes = false; + passthru = { + unwrapped = androidStudio; + }; meta = with stdenv.lib; { description = "The Official IDE for Android (${channel} channel)"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index f3e5602a7996..e5e5e179b890 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "0smh3d3v8n0isxg7fkls20622gp52f58i2b6wa4a0g8wnvmd6mw2"; }; betaVersion = { - version = "3.4.0.16"; # "Android Studio 3.4 RC 2" - build = "183.5370308"; - sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9"; + version = "3.4.0.17"; # "Android Studio 3.4 RC 3" + build = "183.5400832"; + sha256Hash = "1v4apc73jdhavhzj8j46mzh15rw08w1hd9y9ykarj3b5q7i2vyq1"; }; latestVersion = { # canary & dev - version = "3.5.0.6"; # "Android Studio 3.5 Canary 7" - build = "183.5346365"; - sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0"; + version = "3.5.0.9"; # "Android Studio 3.5 Canary 10" + build = "191.5416148"; + sha256Hash = "03d2x6bqasw417dxc7b8y65rral73xm2ci512gprmsvwy42k3mqi"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/default.nix index 2f7a4233656c..fe77ffe84bb1 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +{ stdenv, lib, fetchpatch, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf , systemd ? null @@ -44,6 +44,13 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + + # should drop this at next package update + (fetchpatch { + name = "support-hunspell-1.7.0-in-ispell.el.patch"; + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584"; + sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11"; + }) ]; postPatch = lib.optionalString srcRepo '' @@ -123,7 +130,7 @@ stdenv.mkDerivation rec { let libPath = lib.makeLibraryPath [ libXcursor ]; - in lib.optionalString (withX && toolkit == "lucid") '' + in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' patchelf --set-rpath \ "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ "$out/bin/emacs" diff --git a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index 99b014adb023..38606bc4c296 100644 --- a/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -17,6 +17,7 @@ , json-glib , jsonrpc-glib , libdazzle +, libpeas , libxml2 , meson , ninja @@ -64,7 +65,7 @@ in stdenv.mkDerivation { flatpak gnome3.devhelp libgit2-glib - gnome3.libpeas + libpeas vte gspell gtk3 diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index c3d24b9776f6..584c12d5ff63 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1zglpw9vc3ybdmwymi0c2m6anhcmx9jcqi69gnn06n9f4x1v6gwn"; /* updated by script */ + sha256 = "1rlqnnv6b7lg18si31zd97ixnslwp8j6imkkjq0j5n9sydsr8xzj"; /* 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 = "2018.3.2"; /* updated by script */ + version = "2018.3.4"; /* 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 = "0vj1cgmg33626i38x9wmh5hqr1lf0x3m23gzq30rp4q4cbi38806"; /* updated by script */ + sha256 = "10sw41kkf2k60xjpwgc73i182y7px3dmqz2awnrl4gffdb9jgzmy"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "065z8084xkv6w8m7pq98rgls1avzrqm23mrxdq5172rs5p1c5r9f"; /* updated by script */ + sha256 = "0aq3x5aixh86h1zvvwrbr2f1nnqdpfvlsadd2ckmf5s5kghvg5r9"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0j5yc7n04jlyyghmwllpfvcd2g6k1syjp07xb1ljyx7rm4jcf8q6"; /* updated by script */ + sha256 = "0zyw88dd2v4igp080l99cyq6h0bmyri8a50fjp69ripiz9qaawx1"; /* 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 = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0s3r3h1zcwkfqhsfb224fgy62fdhnd4gjgk2h6pyhq1frnh3x5bg"; /* updated by script */ + url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; + sha256 = "0fsdf090cwwrsq3azknc9rpwwsl71cvsx4flivnqwfakb6rh4f1j"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0znhw83h46a3haspwcin5xjf3ask8ijxla778p9vdbi9xs0zqx39"; /* updated by script */ + sha256 = "1bv2a16wsc9j82w14qfrfjgszwkihk0jwp8bp8z9618q04c8vmgf"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "11kzzwkp206l466ii6vm6iqmhpx0s594vh37x2lwwsgmg6qzz6vq"; /* updated by script */ + sha256 = "173qm2g6pjga2jlw8sa59bxw543b56r56ikqwv2wp0jq5z61v26f"; /* 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 = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1m8lzghs6g57fwcv6bpmnf21d4w2k10gsmi0i2wv2j8ff4hcy7ij"; /* updated by script */ + sha256 = "0gjphdzdxgvflkzaakf3c1wnig86lxhxyx6xk6rg40yj6f2hzi47"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2018.3.2"; /* updated by script */ + version = "2018.3.4"; /* 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 = "1ffzbp2xca2z8g0wlkvmqr0j2f2dnqafpnvzk9zd5asfhhbyrhg5"; /* updated by script */ + sha256 = "1klmg8wgj3shp4s0n2nn7n39zsk1mch6g9ifhwn5cgywpbzgam4p"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.3.3"; /* updated by script */ + version = "2018.3.5"; /* 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 = "1zjcdsr91y07dhqmhqy2yq6c0rhsxg2m52fz14hhmphddlwvhzny"; /* updated by script */ + sha256 = "1gykag8fsfqxv0d6fipn18hhpdvn4qxva2kkb0v330vp73wm2i2w"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.3.4"; /* updated by script */ + version = "2019.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "11l39yy8qdrr89y9x3i9acp0am4xb86z6v7wg1kc9fd5p13jr2xs"; /* updated by script */ + sha256 = "0r6a9g8ydnxf805gn2wajnwkcyfn0xksbsrs8wq6j4ghipkhscxj"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/jucipp/default.nix b/nixpkgs/pkgs/applications/editors/jucipp/default.nix index 08918beb8d59..9547b82efa1f 100644 --- a/nixpkgs/pkgs/applications/editors/jucipp/default.nix +++ b/nixpkgs/pkgs/applications/editors/jucipp/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, gnome3, at-spi2-core, +{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, - libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, + libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { dbus openssl libxml2 - gnome3.gtksourceview + gtksourceview3 at-spi2-core pcre epoxy @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { aspell libgit2 libxkbcommon - gnome3.gtkmm3 + gtkmm3 libpthreadstubs - gnome3.gtksourceviewmm + gtksourceviewmm llvmPackages.clang.cc llvmPackages.lldb gnome3.dconf diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix index 532bb99e7d8e..1d9908a7cc00 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,14 +2,14 @@ let pname = "kdev-php"; - version = "5.3.1"; + version = "5.3.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix index be27e10f42a1..eda2da9f3daa 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,14 +2,14 @@ let pname = "kdev-python"; - version = "5.3.1"; + version = "5.3.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + sha256 = "0gqv1abzfpxkrf538rb62d2291lmlra8rghm9q9r3x8a46wh96zm"; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix index 98154b4a5eb5..23ec887ad621 100644 --- a/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/nixpkgs/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,7 +9,7 @@ let pname = "kdevelop"; - version = "5.3.1"; + version = "5.3.2"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; + sha256 = "0akgdnvrab6mbwnmvgzsplk0qh83k1hnm5xc06yxr1s1a5sxbk08"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix index d0367d7c3051..4fb8d51b9692 100644 --- a/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }: +{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: stdenv.mkDerivation rec { name = "mg-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ]; + makeFlags = [ "PKG_CONFIG=${buildPackages.pkgconfig}/bin/pkg-config" ]; installPhase = '' install -m 555 -Dt $out/bin mg diff --git a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix index cda45c2c739d..891fd32df70b 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.1.4"; + version = "2.1.5"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "1s438cbyyzgg96b6639wk1ny6d6p2ywcba41l3r027wzyl7wrn8v"; + sha256 = "1h05b68ka1ka217f6svq8yxvnscwf9sl5cx46c0b6ygcbz1vr3ba"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/nixpkgs/pkgs/applications/editors/okteta/default.nix b/nixpkgs/pkgs/applications/editors/okteta/default.nix index 3cc3b9143894..f2068eb30df0 100644 --- a/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "okteta-${version}"; - version = "0.25.5"; + version = "0.26.0"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz"; - sha256 = "1680hx4n36msz86gyjsdr5v7nf8rpybvzrvfw8y98l95hfq3l6g9"; + sha256 = "0rxvbllisz4zl687zgpb9jj2nbxgfhhf2bj8bnsfaab5jb6jpi2y"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/nixpkgs/pkgs/applications/editors/quilter/default.nix b/nixpkgs/pkgs/applications/editors/quilter/default.nix index 9cdaeb043c3f..8d973b19ff39 100644 --- a/nixpkgs/pkgs/applications/editors/quilter/default.nix +++ b/nixpkgs/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0czf6rm908pz6zwiaq2phci923q8xa8x7q7kvdk6s3km4i1rrgkn"; + sha256 = "0i8rvvc5g74bgfjgsmmgpj42xmhjaz14jjzl9s5nzwpy1fn7vv0p"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/editors/retext/default.nix b/nixpkgs/pkgs/applications/editors/retext/default.nix new file mode 100644 index 000000000000..3288b8e90adc --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts +# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries +# available. +, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] +}: + +let + version = "7.0.4"; + python = let + packageOverrides = self: super: { + markdown = super.markdown.overridePythonAttrs(old: rec { + src = super.fetchPypi { + version = "3.0.1"; + pname = "Markdown"; + sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"; + }; + }); + + chardet = super.chardet.overridePythonAttrs(old: rec { + src = super.fetchPypi { + version = "2.3.0"; + pname = "chardet"; + sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; + }; + }); + }; + in python3.override { inherit packageOverrides; }; + pythonEnv = python.withPackages (ps: with ps; [ + pyqt5 docutils pyenchant Markups markdown pygments chardet + ]); +in python.pkgs.buildPythonApplication { + inherit version; + pname = "retext"; + + src = fetchFromGitHub { + owner = "retext-project"; + repo = "retext"; + rev = "${version}"; + sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; + }; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ pythonEnv ]; + + postInstall = '' + mv $out/bin/retext $out/bin/.retext + makeWrapper "$out/bin/.retext" "$out/bin/retext" \ + --set ASPELL_CONF "dict-dir ${buildEnv { + name = "aspell-all-dicts"; + paths = map (path: "${path}/lib/aspell") enchantAspellDicts; + }}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/retext-project/retext/; + description = "Simple but powerful editor for Markdown and reStructuredText"; + license = licenses.gpl3; + maintainers = with maintainers; [ klntsky ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/common.nix b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix index 8f304524dffa..8b94b87e0505 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/common.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/common.nix @@ -1,6 +1,6 @@ {buildVersion, x32sha256, x64sha256, dev ? false}: -{ fetchurl, stdenv, glib, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, +{ fetchurl, stdenv, glib, glibcLocales, xorg, cairo, gtk2, gtk3, pango, makeWrapper, wrapGAppsHook, openssl, bzip2, runtimeShell, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, gksuSupport ? false, gksu, unzip, zip, bash, writeScript, common-updater-scripts, curl, gnugrep}: @@ -99,6 +99,7 @@ in let wrapProgram $out/sublime_text \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ + --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ ${stdenv.lib.optionalString (!legacy) ''"''${gappsWrapperArgs[@]}"''} # Without this, plugin_host crashes, even though it has the rpath diff --git a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix index eab51463f16f..9d7539b5b651 100644 --- a/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix +++ b/nixpkgs/pkgs/applications/editors/sublime/3/packages.nix @@ -5,10 +5,10 @@ let in rec { sublime3-dev = common { - buildVersion = "3184"; + buildVersion = "3203"; dev = true; - x32sha256 = "1b6f1fid75g5z247dbnyyj276lrlv99scrdk1vvfcr6vyws77vzr"; - x64sha256 = "03127jhfjr17ai96p3axh5b5940fds8jcw6vkid8y6dmvd2dpylz"; + x32sha256 = "004hnlm2dvcfagf3bkbfqxlnkgqk46jrm8w9yagpjwkpdy76mgyx"; + x64sha256 = "0dp4vi39s2gq5a7snz0byrf44i0csbzwq6hn7i2zqa6rpvfywa1d"; } {}; sublime3 = common { diff --git a/nixpkgs/pkgs/applications/editors/typora/default.nix b/nixpkgs/pkgs/applications/editors/typora/default.nix index ebd7c77f678c..deb4974a9b14 100644 --- a/nixpkgs/pkgs/applications/editors/typora/default.nix +++ b/nixpkgs/pkgs/applications/editors/typora/default.nix @@ -1,32 +1,44 @@ -{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, makeWrapper, electron_3, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.64"; + version = "0.9.68"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0dffydc11ys2i38gdy8080ph1xlbbzhcdcc06hyfv0dr0nf58a09"; + sha256 = "09hkmnh9avzb7nc8i67vhbv6nc1v90kk88aq01mpmyibpdqp03zp"; }; - nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ + dpkg + makeWrapper + wrapGAppsHook + ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas ]; + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; unpackPhase = "dpkg-deb -x $src ."; dontWrapGApps = true; installPhase = '' - mkdir -p $out/bin $out/share/typora + runHook preInstall + + mkdir -p $out/bin $out/share { cd usr - mv share/typora/resources/app/* $out/share/typora - mv share/applications $out/share - mv share/icons $out/share - mv share/doc $out/share + mv share/typora/resources/app $out/share/typora + mv share/{applications,icons,doc} $out/share/ } + runHook postInstall + ''; + + postFixup = '' makeWrapper ${electron_3}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ @@ -37,7 +49,7 @@ stdenv.mkDerivation rec { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; license = licenses.unfree; - maintainers = with maintainers; [ jensbin ]; + maintainers = with maintainers; [ jensbin worldofpeace ]; inherit (electron_3.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/vscode/default.nix b/nixpkgs/pkgs/applications/editors/vscode/default.nix index 07333a4b8032..ace5bd968cee 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/default.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/default.nix @@ -18,16 +18,16 @@ let }.${system}; sha256 = { - "i686-linux" = "1qll0hyqyn3vb0v35h9y8rk4l3r6zzc5bkra6pb23bnr4bna4y80"; - "x86_64-linux" = "1sfvv4g7kmvabqxasil41gasr7hsmgf8wwc4dl1940pb7x19fllq"; - "x86_64-darwin" = "0gjdppr59pyb2wawvf7yyk7357a5naxga74zf9gc7d9s1fz78hls"; + "i686-linux" = "0yfnsmixw3kh7lhb8npqhyihy146a31c1k90smn4kqvmlvm06jir"; + "x86_64-linux" = "002bbwj4hxr58lbhjc05s3l9aw37ak06kp98hs8fpmznjsa5x14y"; + "x86_64-darwin" = "1f9hkydlyjh2z5d99pwpsqg9yf05pgi5y0mbprgbxacayqcrq2nr"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.32.3"; + version = "1.33.0"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index f8753ecd1eb8..efbf5864faa8 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,7 +84,6 @@ stdenv.mkDerivation rec { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - broken = ghostscript != null; # https://github.com/NixOS/nixpkgs/issues/55118 maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index bc8f2c608693..f322c6442b84 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0fngj5hfinj66xpij2h3ag79mgmqcfrjpwynxdbjr5brch25ldwj"; + sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/nixpkgs/pkgs/applications/graphics/fondo/default.nix index 87c161b9aee8..af6eaa2904ae 100644 --- a/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc"; + sha256 = "0mh3s2726zf3va6nj7kj2nbmq5q65xrbnsllss3sqf8a838zqfn6"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile new file mode 100644 index 000000000000..d6a0f13a4c1a --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'image_optim' diff --git a/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile.lock b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile.lock new file mode 100644 index 000000000000..20c9772ce464 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + exifr (1.3.6) + fspath (3.1.0) + image_optim (0.26.3) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 3.0) + image_size (>= 1.5, < 3) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) + image_size (2.0.0) + in_threads (1.5.1) + progress (3.5.0) + +PLATFORMS + ruby + +DEPENDENCIES + image_optim + +BUNDLED WITH + 1.16.3 diff --git a/nixpkgs/pkgs/applications/graphics/image_optim/default.nix b/nixpkgs/pkgs/applications/graphics/image_optim/default.nix new file mode 100644 index 000000000000..d7f05381c62e --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/image_optim/default.nix @@ -0,0 +1,66 @@ +{ lib, bundlerApp, fetchurl, ruby, makeWrapper, + withPngcrush ? true, pngcrush ? null, + withPngout ? true, pngout ? null, + withAdvpng ? true, advancecomp ? null, + withOptipng ? true, optipng ? null, + withPngquant ? true, pngquant ? null, + withJhead ? true, jhead ? null, + withJpegoptim ? true, jpegoptim ? null, + withJpegrecompress ? true, jpeg-archive ? null, + withJpegtran ? true, libjpeg ? null, + withGifsicle ? true, gifsicle ? null, + withSvgo ? true, svgo ? null +}: + +assert withPngcrush -> pngcrush != null; +assert withPngout -> pngout != null; +assert withAdvpng -> advancecomp != null; +assert withOptipng -> optipng != null; +assert withPngquant -> pngquant != null; +assert withJhead -> jhead != null; +assert withJpegoptim -> jpegoptim != null; +assert withJpegrecompress -> jpeg-archive != null; +assert withJpegtran -> libjpeg != null; +assert withGifsicle -> gifsicle != null; +assert withSvgo -> svgo != null; + +with lib; + +let + optionalDepsPath = [] + ++ optional withPngcrush pngcrush + ++ optional withPngout pngout + ++ optional withAdvpng advancecomp + ++ optional withOptipng optipng + ++ optional withPngquant pngquant + ++ optional withJhead jhead + ++ optional withJpegoptim jpegoptim + ++ optional withJpegrecompress jpeg-archive + ++ optional withJpegtran libjpeg + ++ optional withGifsicle gifsicle + ++ optional withSvgo svgo; +in + +bundlerApp { + pname = "image_optim"; + gemdir = ./.; + + inherit ruby; + + exes = [ "image_optim" ]; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/image_optim \ + --prefix PATH : ${makeBinPath optionalDepsPath} + ''; + + meta = with lib; { + description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)"; + homepage = http://github.com/toy/image_optim; + license = licenses.mit; + maintainers = with maintainers; [ srghma ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix b/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix new file mode 100644 index 000000000000..6c9ec2de7457 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/image_optim/gemset.nix @@ -0,0 +1,51 @@ +{ + exifr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q2abhiyvgfv23i0izbskjxcqaxiw9bfg6s57qgn4li4yxqpwpfg"; + type = "gem"; + }; + version = "1.3.6"; + }; + fspath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vjn9sy4hklr2d5wxmj5x1ry31dfq3sjp779wyprb3nbbdmra1sc"; + type = "gem"; + }; + version = "3.1.0"; + }; + image_optim = { + dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "082w9qcyy9j6m6s2pknfdcik7l2qch4j48axs13m06l4s1hz0dmg"; + type = "gem"; + }; + version = "0.26.3"; + }; + image_size = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcn7nc6qix3w4sf7xd557lnsgjniqa7qvz7nnznx70m8qfbc7ig"; + type = "gem"; + }; + version = "2.0.0"; + }; + in_threads = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hqm59sgqi91ag187zwpgwi58xckjkk58m031ghkp0csl8l9mkx"; + type = "gem"; + }; + version = "1.5.1"; + }; + progress = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yrzq4v5sp7cg4nbgqh11k3d1czcllfz98dcdrxrsjxwq5ziiw0p"; + type = "gem"; + }; + version = "3.5.0"; + }; +} \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/graphics/image_optim/update.sh b/nixpkgs/pkgs/applications/graphics/image_optim/update.sh new file mode 100755 index 000000000000..8afd7f90436d --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/image_optim/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix bundler + +SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") + +cd $SCRIPT_DIR + +bundle lock --update +bundix diff --git a/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix new file mode 100644 index 000000000000..8002da557035 --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/jpeg-archive/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: + +stdenv.mkDerivation rec { + name = "jpeg-archive-${version}"; + version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 + + # update with + # nix-prefetch-git https://github.com/danielgtaylor/jpeg-archive + src = fetchFromGitHub { + owner = "danielgtaylor"; + repo = "jpeg-archive"; + rev = "8da4bf76b6c3c0e11e4941294bfc1857c119419b"; + sha256 = "1639y9qp2ls80fzimwmwds792q8rq5p6c14c0r4jswx4yp6dcs33"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mozjpeg ]; + + prePatch = '' + # allow override LIBJPEG + substituteInPlace Makefile --replace 'LIBJPEG =' 'LIBJPEG ?=' + ''; + + makeFlags = [ + "PREFIX=$(out)" + "MOZJPEG_PREFIX=${mozjpeg}" + "LIBJPEG=${mozjpeg}/lib/libjpeg.so" + ]; + + postInstall = '' + wrapProgram $out/bin/jpeg-archive \ + --set PATH "$out/bin:${coreutils}/bin:${parallel}/bin:${findutils}/bin" + ''; + + meta = with stdenv.lib; { + description = "Utilities for archiving photos for saving to long term storage or serving over the web"; + homepage = "https://github.com/danielgtaylor/jpeg-archive"; + # license = ...; # mixed? + maintainers = [ maintainers.srghma ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix index c9fdbd255d46..507cee548e09 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -5,27 +5,27 @@ , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras -, python3 +, python3Packages }: let major = "4.1"; -minor = "7"; -patch = "101"; +minor = "8"; +patch = null; in mkDerivation rec { name = "krita-${version}"; - version = "${major}.${minor}.${patch}"; + version = "${major}.${minor}"; src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; + sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons @@ -33,11 +33,17 @@ mkDerivation rec { boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras - python3 + python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + meta = with lib; { description = "A free and open source painting application"; homepage = https://krita.org/; diff --git a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix index 4b3a423a8ce2..25abcd9d41d7 100644 --- a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # lrelease command: LRELEASECOMMAND = lrelease # qcollectiongenerator command: - #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator + QCOLLECTIONGENERATORCOMMAND = qhelpgenerator # TikZ documentation default file path: TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz diff --git a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 3990d0989062..89828ff45d7c 100644 --- a/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , qtbase, qtx11extras, qtsvg, makeWrapper , vulkan-loader, xorg -, python36, bison, pcre, automake, autoconf +, python3, bison, pcre, automake, autoconf }: let custom_swig = fetchFromGitHub { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36 + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 ]; nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ]; diff --git a/nixpkgs/pkgs/applications/graphics/wings/default.nix b/nixpkgs/pkgs/applications/graphics/wings/default.nix index 891f3586fa59..0a4e9ada0787 100644 --- a/nixpkgs/pkgs/applications/graphics/wings/default.nix +++ b/nixpkgs/pkgs/applications/graphics/wings/default.nix @@ -1,10 +1,10 @@ { fetchurl, stdenv, erlang, cl, libGL, libGLU, runtimeShell }: stdenv.mkDerivation rec { - name = "wings-2.2.1"; + name = "wings-2.2.3"; src = fetchurl { url = "mirror://sourceforge/wings/${name}.tar.bz2"; - sha256 = "1adlq3wd9bz0hjznpzsgilxgsbhr0kk01f06872mq37v4cbw76bh"; + sha256 = "1b9xdmh0186xxs92i831vm9yq0il1hngi8bl9a1q7fs26wb8js1g"; }; ERL_LIBS = "${cl}/lib/erlang/lib"; diff --git a/nixpkgs/pkgs/applications/graphics/yed/default.nix b/nixpkgs/pkgs/applications/graphics/yed/default.nix index 7267e9bc4857..799ceef1beda 100644 --- a/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.18.2"; + version = "3.19"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${name}.zip"; - sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy"; + sha256 = "0l70pc7wl2ghfkjab9w2mbx7crwha7xwkrpmspsi5c6q56dw7s33"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch index 9fa3c8a14141..fcbbbbb72eb3 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/nixpkgs/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -31,10 +31,10 @@ index be1cc4afb..6d0c1d7e5 100644 } return true; diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp -index 8b057b459..3fa4548ad 100644 +index dfff6fc29..419e54a5b 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -82,7 +82,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -42,7 +42,7 @@ index 8b057b459..3fa4548ad 100644 QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -90,16 +89,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -51,38 +51,29 @@ index 8b057b459..3fa4548ad 100644 - defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE); - } -#endif -- const QStringList mysqldSearchPath = QStringList() -- << QStringLiteral("/usr/bin") -- << QStringLiteral("/usr/sbin") -- << QStringLiteral("/usr/local/sbin") -- << QStringLiteral("/usr/local/libexec") -- << QStringLiteral("/usr/libexec") -- << QStringLiteral("/opt/mysql/libexec") -- << QStringLiteral("/opt/local/lib/mysql5/bin") -- << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = findExecutable(QStringLiteral("mysqld")); - } - -- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); +- const QString mysqladminPath = findExecutable(QStringLiteral("mysqladmin")); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -109,10 +99,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = findExecutable(QStringLiteral("mysql_install_db")); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = findExecutable(QStringLiteral("mysqlcheck")); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -129,7 +119,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -91,7 +82,7 @@ index 8b057b459..3fa4548ad 100644 mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -139,9 +129,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -101,7 +92,7 @@ index 8b057b459..3fa4548ad 100644 qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) +@@ -150,9 +137,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -111,7 +102,7 @@ index 8b057b459..3fa4548ad 100644 settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() +@@ -206,7 +190,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file @@ -189,3 +180,6 @@ index 6b50ae50e..f94a8c5eb 100644 settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); +-- +2.18.1 + diff --git a/nixpkgs/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh index 6f6acd1e8bb8..e06c7f0d14aa 100644 --- a/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.12.1/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.12.3/ ) diff --git a/nixpkgs/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix index 1efdd3e61235..416273d719fe 100644 --- a/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/nixpkgs/pkgs/applications/kde/srcs.nix @@ -3,1723 +3,1723 @@ { akonadi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-18.12.1.tar.xz"; - sha256 = "141j1wicfl8lgwdgs8yh0mcs4gw004wz8ck21pz55xc1mi4yh9cx"; - name = "akonadi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-18.12.3.tar.xz"; + sha256 = "f930deaade1cac1488b8af05cc28f4a78a441c34dbe875b673af3423f8a14658"; + name = "akonadi-18.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-18.12.1.tar.xz"; - sha256 = "108ax9bpng5qp3cbn3f2x096l9jsv0x3d8xckcfvd4a3svgap1ri"; - name = "akonadi-calendar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-18.12.3.tar.xz"; + sha256 = "19f92642ba4d62dfccca19ac3ced94495e9137d60a77a672c5443585f30cdaee"; + name = "akonadi-calendar-18.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-calendar-tools-18.12.1.tar.xz"; - sha256 = "0a54jka0szi3d2dv4kr7s78lbm1sx6a47mccjzc2rp1w2x8dkagl"; - name = "akonadi-calendar-tools-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-calendar-tools-18.12.3.tar.xz"; + sha256 = "636ea364bea079cae0b899204add76b0d1d9a80d1955c914bc1dad3a6fc731ed"; + name = "akonadi-calendar-tools-18.12.3.tar.xz"; }; }; akonadiconsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadiconsole-18.12.1.tar.xz"; - sha256 = "06mhpk66ck37k6bfi83cmnjv39lwvm245m0climh1idfi6mn08wk"; - name = "akonadiconsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadiconsole-18.12.3.tar.xz"; + sha256 = "d052084ecc1665976f7db08d11a15609f017b0803dd30b71b5d1dccc60ac6ed0"; + name = "akonadiconsole-18.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-contacts-18.12.1.tar.xz"; - sha256 = "1lnqq2qalvzq6g4dwfnlgvrz9wpnl4g64is8ylrb6jf4bvfg3kvq"; - name = "akonadi-contacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-contacts-18.12.3.tar.xz"; + sha256 = "6ad8e352744c258b66a0c6155322681fa4ec50422c81fe4248414b0834e645cc"; + name = "akonadi-contacts-18.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-import-wizard-18.12.1.tar.xz"; - sha256 = "09r5nspv1l8i1ipjxn5xwi6swkggy10hsa8p5bj0qqclsf17ip5j"; - name = "akonadi-import-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-import-wizard-18.12.3.tar.xz"; + sha256 = "a74ca212ab05706d5beb94696a933cb46dfd83d5ebd6723de97f7ce4efbe6104"; + name = "akonadi-import-wizard-18.12.3.tar.xz"; }; }; akonadi-mime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-mime-18.12.1.tar.xz"; - sha256 = "0fyxls0qhvqcbhpw17vhr8m4h94s2d69c8bpf45k19f005gbb6dk"; - name = "akonadi-mime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-mime-18.12.3.tar.xz"; + sha256 = "ff7d91c77b629bba6b93ee6b15c0ebee08aa37368aa8bcae48ecbbacf64bc1b4"; + name = "akonadi-mime-18.12.3.tar.xz"; }; }; akonadi-notes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-notes-18.12.1.tar.xz"; - sha256 = "1m2v3qj06pbpdncxcb37131q6xhbsrwp6qv72rmlwlj0cj7xyfl4"; - name = "akonadi-notes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-notes-18.12.3.tar.xz"; + sha256 = "ac2f5ef0a3f4621d6af6fef028d641334212d940a1fc3ffc1e3cc6534ca6be60"; + name = "akonadi-notes-18.12.3.tar.xz"; }; }; akonadi-search = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akonadi-search-18.12.1.tar.xz"; - sha256 = "1wwv92kmk4kwr8dj7y34nb2337s80hwnjblnfz4kl3z3ka782gd6"; - name = "akonadi-search-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akonadi-search-18.12.3.tar.xz"; + sha256 = "6436a0f71229cf7917cb4f269f34a2046c24860ecfc03e7018b9d2a7f9e66346"; + name = "akonadi-search-18.12.3.tar.xz"; }; }; akregator = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/akregator-18.12.1.tar.xz"; - sha256 = "0zjc6vgf5pdbmj7b3kl15aqkamg5slaxd5n4092pf7nf3v3r74r9"; - name = "akregator-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/akregator-18.12.3.tar.xz"; + sha256 = "d3a4f0f4b677825d1b3e1461a020c17a36abe458d7e3ab40389627e2d8163ea1"; + name = "akregator-18.12.3.tar.xz"; }; }; analitza = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/analitza-18.12.1.tar.xz"; - sha256 = "0iwlkxcqj62l25ldpa325ymkvhim2mm152h3jqh3z1sc683hc1kv"; - name = "analitza-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/analitza-18.12.3.tar.xz"; + sha256 = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925"; + name = "analitza-18.12.3.tar.xz"; }; }; ark = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ark-18.12.1.tar.xz"; - sha256 = "1pcaaq8qdj3w15f0zqfwy7xwknpmb70yc7g4nmj4p48ahq5s2r86"; - name = "ark-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ark-18.12.3.tar.xz"; + sha256 = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722"; + name = "ark-18.12.3.tar.xz"; }; }; artikulate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/artikulate-18.12.1.tar.xz"; - sha256 = "17msfgq83iy5dfl5qkmj4f89aa2gbk7p00f7bwiz2fnlg642wyq1"; - name = "artikulate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/artikulate-18.12.3.tar.xz"; + sha256 = "f40cc532dd1093d53ab4f825716ea4f4f4d7f954ac6c58ef412b63323a76c278"; + name = "artikulate-18.12.3.tar.xz"; }; }; audiocd-kio = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/audiocd-kio-18.12.1.tar.xz"; - sha256 = "0kv03d2w0vf9fpp89ymnkizzyhckz9pjj8fcqwbacb78k6p52g6p"; - name = "audiocd-kio-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/audiocd-kio-18.12.3.tar.xz"; + sha256 = "c15ebda9330688c0304be36999f4900ccd7c0b1ce11e19c296975414dafe53c8"; + name = "audiocd-kio-18.12.3.tar.xz"; }; }; baloo-widgets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/baloo-widgets-18.12.1.tar.xz"; - sha256 = "0axgx1zrbaki20vh9j9bd0h3qvn0ws4cza8smlgvlzx7fkbidmw3"; - name = "baloo-widgets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/baloo-widgets-18.12.3.tar.xz"; + sha256 = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3"; + name = "baloo-widgets-18.12.3.tar.xz"; }; }; blinken = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/blinken-18.12.1.tar.xz"; - sha256 = "0ka47snqj1xwf8m1qqa1vxgjwm151dzlk22zg07yh987qgc6fbj2"; - name = "blinken-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/blinken-18.12.3.tar.xz"; + sha256 = "2b6a11fa56b8837618e157a4a974eb1dff956cfb8b93e6cb0601bda66a234579"; + name = "blinken-18.12.3.tar.xz"; }; }; bomber = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bomber-18.12.1.tar.xz"; - sha256 = "0a5vvb2ka08lyvybr12gm3lfgvfj3r99kqw1prhr9n97w7f8yc1d"; - name = "bomber-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bomber-18.12.3.tar.xz"; + sha256 = "5b8e24aba4fb14ffc72313f9754315d6a7d98a3e00ee118a2551ac3357ead771"; + name = "bomber-18.12.3.tar.xz"; }; }; bovo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/bovo-18.12.1.tar.xz"; - sha256 = "19w4xfqx6bxs8fr8vkma57ibl5b1jdqfjax240fg81qyqzkx4xsp"; - name = "bovo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/bovo-18.12.3.tar.xz"; + sha256 = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972"; + name = "bovo-18.12.3.tar.xz"; }; }; calendarsupport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/calendarsupport-18.12.1.tar.xz"; - sha256 = "0hpq85wh94dlmrfabh1k76xdc9xqavfccjnfy20i71q2ml92gx4p"; - name = "calendarsupport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/calendarsupport-18.12.3.tar.xz"; + sha256 = "e3c23c152a3e339628e79b168e56c22c5c2610600013f3aa8706168569cacfa5"; + name = "calendarsupport-18.12.3.tar.xz"; }; }; cantor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cantor-18.12.1.tar.xz"; - sha256 = "132zlpcqkbjdb1vrcy6innf6qmxlqibzpf0bgdi33q797vw63drc"; - name = "cantor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cantor-18.12.3.tar.xz"; + sha256 = "2537b8e8a9e5b72a2b3bf2b08d24c4978f52ef18ced61cdcfd2a09069f670398"; + name = "cantor-18.12.3.tar.xz"; }; }; cervisia = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/cervisia-18.12.1.tar.xz"; - sha256 = "02ka1crhkb3dka3qp82vs624fz3hcwydm559x5dq0cdbibdmhqx7"; - name = "cervisia-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/cervisia-18.12.3.tar.xz"; + sha256 = "a5e4034b0d1ee07c2efaef6e8eef17b48a340e9d046cd23efceaf67f07ab5a85"; + name = "cervisia-18.12.3.tar.xz"; }; }; dolphin = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-18.12.1.tar.xz"; - sha256 = "1d3m2h8czxqmgpd060lnj05f0r4bqirqibvbakrl1sv2xxafz8qq"; - name = "dolphin-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-18.12.3.tar.xz"; + sha256 = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1"; + name = "dolphin-18.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dolphin-plugins-18.12.1.tar.xz"; - sha256 = "0j2cj91732p2wh0g73xxjghbbivlva4mr91vdjrp6dkc4b2vjxh8"; - name = "dolphin-plugins-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dolphin-plugins-18.12.3.tar.xz"; + sha256 = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427"; + name = "dolphin-plugins-18.12.3.tar.xz"; }; }; dragon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/dragon-18.12.1.tar.xz"; - sha256 = "0ffxpl30xdm5vgrfc6b1k2gzfp3jwakn6my4zq0zfrrlf75hbgkm"; - name = "dragon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/dragon-18.12.3.tar.xz"; + sha256 = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3"; + name = "dragon-18.12.3.tar.xz"; }; }; eventviews = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/eventviews-18.12.1.tar.xz"; - sha256 = "0qvndqj8jhrn9p1g4d4p3l54d7hz9zzkkg92yfjcajcrnl2i0fn1"; - name = "eventviews-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/eventviews-18.12.3.tar.xz"; + sha256 = "994ddea6894fd73eeb851b04083bc886288e4531aa770c0b2e5d8e1740bbe4d0"; + name = "eventviews-18.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ffmpegthumbs-18.12.1.tar.xz"; - sha256 = "0j9vwqgsb9pz8hpacsmm4pxss25q7622fr7gq1n2dxf19f1zwxki"; - name = "ffmpegthumbs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ffmpegthumbs-18.12.3.tar.xz"; + sha256 = "4db8ab905d80863f898b6a3ea8cd0cc7baad91ad953d6b65df230079be04b338"; + name = "ffmpegthumbs-18.12.3.tar.xz"; }; }; filelight = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/filelight-18.12.1.tar.xz"; - sha256 = "1p9k1ajyjlb001mz8w8jli3ha84z91sc43721xdpngcshz7i8i6f"; - name = "filelight-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/filelight-18.12.3.tar.xz"; + sha256 = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a"; + name = "filelight-18.12.3.tar.xz"; }; }; granatier = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/granatier-18.12.1.tar.xz"; - sha256 = "02lmap2axki56d3kfhmx7h6ibqjnx5ga73vsvvx1w4fjikgzm2rn"; - name = "granatier-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/granatier-18.12.3.tar.xz"; + sha256 = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af"; + name = "granatier-18.12.3.tar.xz"; }; }; grantlee-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantlee-editor-18.12.1.tar.xz"; - sha256 = "0r85wirr4dcvja5cynjb0n51lmlijkffg35czqpjvnf2xv1claj4"; - name = "grantlee-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantlee-editor-18.12.3.tar.xz"; + sha256 = "d46831a589815581bce45c3954eb12fcbb1692fb407f566952a39e3e8c546b9c"; + name = "grantlee-editor-18.12.3.tar.xz"; }; }; grantleetheme = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/grantleetheme-18.12.1.tar.xz"; - sha256 = "1c4n27abzpynh6nykfw9z2rhxlmmicvvw0081gsm9h7w1r8n4flc"; - name = "grantleetheme-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/grantleetheme-18.12.3.tar.xz"; + sha256 = "7853075503f2a19713ce43ba077dde8036f892dee7f41e64ebc9af06b4005402"; + name = "grantleetheme-18.12.3.tar.xz"; }; }; gwenview = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/gwenview-18.12.1.tar.xz"; - sha256 = "01iraiynpsacp8hnmdc9cxlk6qakbbypdck939kcij6j7gm5l2fm"; - name = "gwenview-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/gwenview-18.12.3.tar.xz"; + sha256 = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35"; + name = "gwenview-18.12.3.tar.xz"; }; }; incidenceeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/incidenceeditor-18.12.1.tar.xz"; - sha256 = "1h1da8vg9x450hm9g936rms6n9d5ddqdl7jrwah3khbzihjpkgvz"; - name = "incidenceeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/incidenceeditor-18.12.3.tar.xz"; + sha256 = "b0fa13390b31a24a8bca99f20b132841849d95dba9de3b8a4c9ae979d226ec02"; + name = "incidenceeditor-18.12.3.tar.xz"; }; }; juk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/juk-18.12.1.tar.xz"; - sha256 = "14zlpac1z3gaym83d5vmr7vvqwdzxhfscydwb2qv4ng947lrrs1n"; - name = "juk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/juk-18.12.3.tar.xz"; + sha256 = "8755710f551b3173561ebfcc996f32b3fd8de78d5574584f8e37015541a9fdca"; + name = "juk-18.12.3.tar.xz"; }; }; k3b = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/k3b-18.12.1.tar.xz"; - sha256 = "1f5l8jyi30qm225nxp0sahm7lwdk9r2gqzbdrrzhadx6gfm80a4s"; - name = "k3b-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/k3b-18.12.3.tar.xz"; + sha256 = "cee825ff0c058cc1cbe3bf47a7acbe3889949460ba383ffae3756b67b418362e"; + name = "k3b-18.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-integration-18.12.1.tar.xz"; - sha256 = "1mb9rfp7vw9bkndlbwh5ayd9m3znwrl1i6kr0s5872sscmhx2giz"; - name = "kaccounts-integration-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-integration-18.12.3.tar.xz"; + sha256 = "6e7e4d7aac270f605a5fd4ec9efea8c13807ccb67c11fd3412c1d794ab09e6ce"; + name = "kaccounts-integration-18.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaccounts-providers-18.12.1.tar.xz"; - sha256 = "0pjk7wsqbgibx8racd4qikv3i1j4iqgnbp81mm5nss7hilrnv1vi"; - name = "kaccounts-providers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaccounts-providers-18.12.3.tar.xz"; + sha256 = "4d084ffdac10a8a8cc8b79a9b17116893c023288c9e29d1cbabe3d28cd0ba5f6"; + name = "kaccounts-providers-18.12.3.tar.xz"; }; }; kaddressbook = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kaddressbook-18.12.1.tar.xz"; - sha256 = "0n4abjcq2iana9xyzkghgrs6h9nr0k2vxqrxghnh5iqahn2766ak"; - name = "kaddressbook-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kaddressbook-18.12.3.tar.xz"; + sha256 = "81d3ba7d5e8ed14b0cc32825f1efbdccbf9f79ffe4e1f8c888179c3d04b5bd28"; + name = "kaddressbook-18.12.3.tar.xz"; }; }; kajongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kajongg-18.12.1.tar.xz"; - sha256 = "11c1iyfwqjqihyb3lqvnrb9jsrah0wl1kbrbm2lbmaqf0qnqqr8a"; - name = "kajongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kajongg-18.12.3.tar.xz"; + sha256 = "e3fba4ddb19e8dfd43f917d737bf13c2391a3042c6941181ab81f4bcd66096f9"; + name = "kajongg-18.12.3.tar.xz"; }; }; kalarm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarm-18.12.1.tar.xz"; - sha256 = "1z2rf30ad2rlkcc9ki09pkrvdd8b9f60vsjzvsqfgxx8i87z1lil"; - name = "kalarm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarm-18.12.3.tar.xz"; + sha256 = "5c116221e78755b8afd80287885cb50380c2136acd25aa615d3f6041cc0fbeb3"; + name = "kalarm-18.12.3.tar.xz"; }; }; kalarmcal = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalarmcal-18.12.1.tar.xz"; - sha256 = "0wykbg24llympx7m9bkf4aciv6pli359nnnzpli7rh4q58vbnfn7"; - name = "kalarmcal-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalarmcal-18.12.3.tar.xz"; + sha256 = "2658b2d8055558878cf84d50daf333a5f694a586800b9ccfd3eded3304af8ef8"; + name = "kalarmcal-18.12.3.tar.xz"; }; }; kalgebra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalgebra-18.12.1.tar.xz"; - sha256 = "09g4v4f2xlilqrf2aqsz7zbjqnnrndhhlkkwbrypn148gdnxngs4"; - name = "kalgebra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalgebra-18.12.3.tar.xz"; + sha256 = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5"; + name = "kalgebra-18.12.3.tar.xz"; }; }; kalzium = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kalzium-18.12.1.tar.xz"; - sha256 = "1c5li3dhrfiw7kpjv6kfby2c2pq22sraqb3vc0s4nz1h9jnjcah7"; - name = "kalzium-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kalzium-18.12.3.tar.xz"; + sha256 = "100f63b0c1624c10ce7bb54a6a8fa6dfaf6800f580bfc0889745e171fe135fef"; + name = "kalzium-18.12.3.tar.xz"; }; }; kamera = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamera-18.12.1.tar.xz"; - sha256 = "177lgyhc5klrpssbk2bsdwmg5hnk92mbjwb7s39kl9h53kw0jmzj"; - name = "kamera-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamera-18.12.3.tar.xz"; + sha256 = "5e0e5a710cffd95019279d68daa27fdd4fba1401450673efa757ffc8a7ca495f"; + name = "kamera-18.12.3.tar.xz"; }; }; kamoso = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kamoso-18.12.1.tar.xz"; - sha256 = "1j467cpga2shvibwx3df4vxksfkp5q1hp6az8kcky6gljcmxy06p"; - name = "kamoso-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kamoso-18.12.3.tar.xz"; + sha256 = "ed62bbdf8eeefb85605113c3a916b01eec16846825cffe9b0b0c1f5a4580feb3"; + name = "kamoso-18.12.3.tar.xz"; }; }; kanagram = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kanagram-18.12.1.tar.xz"; - sha256 = "0ybn3aal51p29g28daalwmpm85306ivgl8rkxhccq7pzfwaww1bx"; - name = "kanagram-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kanagram-18.12.3.tar.xz"; + sha256 = "dcc06543830ab06066f2f37eba6722f5cb0893355e30cee8d522085ed5fb2204"; + name = "kanagram-18.12.3.tar.xz"; }; }; kapman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapman-18.12.1.tar.xz"; - sha256 = "117fkqhn0mg3z14sl64vmkz26rclfrjarf7kvxicvbw0x8s3vsgj"; - name = "kapman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapman-18.12.3.tar.xz"; + sha256 = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c"; + name = "kapman-18.12.3.tar.xz"; }; }; kapptemplate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kapptemplate-18.12.1.tar.xz"; - sha256 = "1q52d30zz1ip6x8z56i25ll8hgzd6fp4pckfgr6byh82ymck8kxa"; - name = "kapptemplate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kapptemplate-18.12.3.tar.xz"; + sha256 = "dd4e34e1ed60f4cb03836576dfd5d306ec1890cd0fe583b516bf49c628f1078f"; + name = "kapptemplate-18.12.3.tar.xz"; }; }; kate = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kate-18.12.1.tar.xz"; - sha256 = "0p9j9r2ffqh6p5pdxhk1pi8km1ypdsjs1h0g4ncnzwpvkir1rhk7"; - name = "kate-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kate-18.12.3.tar.xz"; + sha256 = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1"; + name = "kate-18.12.3.tar.xz"; }; }; katomic = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/katomic-18.12.1.tar.xz"; - sha256 = "0pxj8vgx3ijvyznn5gvhv2scwbqhaqc2pmq2897b190vsx9mvkh6"; - name = "katomic-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/katomic-18.12.3.tar.xz"; + sha256 = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1"; + name = "katomic-18.12.3.tar.xz"; }; }; kbackup = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbackup-18.12.1.tar.xz"; - sha256 = "0x42d7zssddhxdsx7vpvk4630c69pvllpfz40dqk2n3hghx9xvsw"; - name = "kbackup-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbackup-18.12.3.tar.xz"; + sha256 = "7b42f7fff48f4cf735e27603d0e44ecd13d5c85474680f8d24850eaadd4f13bf"; + name = "kbackup-18.12.3.tar.xz"; }; }; kblackbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblackbox-18.12.1.tar.xz"; - sha256 = "1wlwdfh23h175gsflmfmr63myds9vz3cs5dp8gr2zlxssdhc2s1p"; - name = "kblackbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblackbox-18.12.3.tar.xz"; + sha256 = "d88b2906de45b129f1706b3d250b80f86acb0cc926a3cee679265b86c8934a9b"; + name = "kblackbox-18.12.3.tar.xz"; }; }; kblocks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblocks-18.12.1.tar.xz"; - sha256 = "1fzsyr8g536k54j3lgqr52a1cmcdmv85z11afhkz2186smnc63pa"; - name = "kblocks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblocks-18.12.3.tar.xz"; + sha256 = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332"; + name = "kblocks-18.12.3.tar.xz"; }; }; kblog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kblog-18.12.1.tar.xz"; - sha256 = "0zdqjgan05049md0483l4c27gfwqdzmmx7wv3bziy91kd9bmfv0x"; - name = "kblog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kblog-18.12.3.tar.xz"; + sha256 = "cd84b34312f6c5a9cf56322614caafcf434a800aeff66173a2c6f7cccc0fd2cc"; + name = "kblog-18.12.3.tar.xz"; }; }; kbounce = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbounce-18.12.1.tar.xz"; - sha256 = "1209x02jip17n63ilvbi5knz4584k16c6zbrp8rg982qcabny355"; - name = "kbounce-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbounce-18.12.3.tar.xz"; + sha256 = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343"; + name = "kbounce-18.12.3.tar.xz"; }; }; kbreakout = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbreakout-18.12.1.tar.xz"; - sha256 = "0myh4qncrvm2kd2gwvl7v2078cvv66czl9zsiava8lzq588wddwq"; - name = "kbreakout-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbreakout-18.12.3.tar.xz"; + sha256 = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af"; + name = "kbreakout-18.12.3.tar.xz"; }; }; kbruch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kbruch-18.12.1.tar.xz"; - sha256 = "0jlq08c6zjmdalhbgh2fy5qghj65l12jn7wvr0j2h0s6fqck1djh"; - name = "kbruch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kbruch-18.12.3.tar.xz"; + sha256 = "e98f79865c4d095d7682ab97b0e4e7d23715e402be676d66f184cfbe3eff598d"; + name = "kbruch-18.12.3.tar.xz"; }; }; kcachegrind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcachegrind-18.12.1.tar.xz"; - sha256 = "0w7fdsflqmkisap6mr805b6knf83nrjrr6bxi1snrl43ipy5ls29"; - name = "kcachegrind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcachegrind-18.12.3.tar.xz"; + sha256 = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf"; + name = "kcachegrind-18.12.3.tar.xz"; }; }; kcalc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalc-18.12.1.tar.xz"; - sha256 = "0ffafikh53yfwrsaiyxr4qxy01v8lv02y4xvj56qmhi429j9ax93"; - name = "kcalc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalc-18.12.3.tar.xz"; + sha256 = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f"; + name = "kcalc-18.12.3.tar.xz"; }; }; kcalcore = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalcore-18.12.1.tar.xz"; - sha256 = "1383zmpw8nzx1fs3d55k38f3znbdc7rs21yrka6fmymgh5c3jkki"; - name = "kcalcore-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalcore-18.12.3.tar.xz"; + sha256 = "d6d6ce1bbdea4eac352b74bcc4bee77da107fdbafab47440b6be5fc3f9d90452"; + name = "kcalcore-18.12.3.tar.xz"; }; }; kcalutils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcalutils-18.12.1.tar.xz"; - sha256 = "0w6kc39j3m5db8s47q4wh4wm0szl9vwr455i26d99vv8jay6mbpp"; - name = "kcalutils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcalutils-18.12.3.tar.xz"; + sha256 = "715c48c46cd62f773da4e804e66cdb97eae7c4832a7fe058db2fca61dc4111f9"; + name = "kcalutils-18.12.3.tar.xz"; }; }; kcharselect = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcharselect-18.12.1.tar.xz"; - sha256 = "1p4ap7vs1nd9gr4z71h6cx6fz99k1lliz28ibbky9a60wvnlfim6"; - name = "kcharselect-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcharselect-18.12.3.tar.xz"; + sha256 = "e24e0268c5810cd3cf733dd8fcc8a9e04a111b761d4c1351d9976b3888278dcb"; + name = "kcharselect-18.12.3.tar.xz"; }; }; kcolorchooser = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcolorchooser-18.12.1.tar.xz"; - sha256 = "1lhnnywpfb4v1hwlc8h71lrvb145pc7wcaz7f7wf2kyh5pjkfbzn"; - name = "kcolorchooser-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcolorchooser-18.12.3.tar.xz"; + sha256 = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228"; + name = "kcolorchooser-18.12.3.tar.xz"; }; }; kcontacts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcontacts-18.12.1.tar.xz"; - sha256 = "0d32l8hhggcy6dyyps5im74k0psnxrwxa6yni5bmj8m0z7f298ba"; - name = "kcontacts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcontacts-18.12.3.tar.xz"; + sha256 = "ba244937e36456065ec4c40fd1b44d011df487a940756ddc0ddd761f58454dd3"; + name = "kcontacts-18.12.3.tar.xz"; }; }; kcron = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kcron-18.12.1.tar.xz"; - sha256 = "0211xs7zwii5a93827rsnp1gkay78h2hs49lvdc2kah9ccsh0kzn"; - name = "kcron-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kcron-18.12.3.tar.xz"; + sha256 = "ba1d7e3ed5453a4867b4900deb957f1020f1533bdadfc36a1c6f83921bfd6ca3"; + name = "kcron-18.12.3.tar.xz"; }; }; kdav = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdav-18.12.1.tar.xz"; - sha256 = "0kr07p4gnxyzrgnbj7vkh93wmqwnvv8sc06i2yardr8qp6jhpg77"; - name = "kdav-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdav-18.12.3.tar.xz"; + sha256 = "3ce99c65573d6374e91abff50b3a738515da07371f07c1b6e4b1800069a77c23"; + name = "kdav-18.12.3.tar.xz"; }; }; kdebugsettings = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdebugsettings-18.12.1.tar.xz"; - sha256 = "1wbi0f82dwd7a8s6szg0yc2mraiinng9a5wjw8xjacgkyyjpqbr3"; - name = "kdebugsettings-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdebugsettings-18.12.3.tar.xz"; + sha256 = "680eeec77314d23ca3a40c803b4c22a1800dc982fa81cba9f44dbfa9222539f7"; + name = "kdebugsettings-18.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-scripts-18.12.1.tar.xz"; - sha256 = "1k0xjlwpmdl2qpj4x04q9x299wmva2ds4y2wpayah865knvx91j3"; - name = "kde-dev-scripts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-scripts-18.12.3.tar.xz"; + sha256 = "c62f05b86615a810beb2573ee2106bc68fc8be586b66bcdde62d3ba4e4c16fb4"; + name = "kde-dev-scripts-18.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kde-dev-utils-18.12.1.tar.xz"; - sha256 = "06k01z2ljkcsdzz4zsdp8hr3flss552h0jgy25qv7y1izggk05dj"; - name = "kde-dev-utils-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kde-dev-utils-18.12.3.tar.xz"; + sha256 = "f53b896b62b7d2267b78d23fb24cf495932c4c8b552d8bf56c722a49acc54be6"; + name = "kde-dev-utils-18.12.3.tar.xz"; }; }; kdeedu-data = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdeedu-data-18.12.1.tar.xz"; - sha256 = "1pnjydj3g768z5zxwbfwvxvlhdbg9rscr3vd1dw4srs338lp0maq"; - name = "kdeedu-data-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdeedu-data-18.12.3.tar.xz"; + sha256 = "cebaa135b21cba27015b1679e02a6625b9b444828ec7595e1a46f53dd7ae3999"; + name = "kdeedu-data-18.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-mobipocket-18.12.1.tar.xz"; - sha256 = "1bv3981nsy61m8shlwbry9yb37218s2q1k9fas3xgv1260rjmmfq"; - name = "kdegraphics-mobipocket-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-mobipocket-18.12.3.tar.xz"; + sha256 = "69ae8b6f45b8c9ec3a73e636f7a779257ebbd6f8016d24294bec844a51f2cc52"; + name = "kdegraphics-mobipocket-18.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdegraphics-thumbnailers-18.12.1.tar.xz"; - sha256 = "1rz578dz6nr3m23kd4njdcx01nmjgskxlla4zqgd33gg08kppmvj"; - name = "kdegraphics-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdegraphics-thumbnailers-18.12.3.tar.xz"; + sha256 = "9bc36ea2eb8a177899bf81b1cdc63a92b8e5dae12308f3e71046a63e58aafec0"; + name = "kdegraphics-thumbnailers-18.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenetwork-filesharing-18.12.1.tar.xz"; - sha256 = "1zxkbcdndbr3sygwpiiw70pxb71hil1x8zj7lgq2yyw968ianah4"; - name = "kdenetwork-filesharing-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenetwork-filesharing-18.12.3.tar.xz"; + sha256 = "296c71526de0e51b4385962c76c2870cfe344b9dafdd2f5f2fba81801350d503"; + name = "kdenetwork-filesharing-18.12.3.tar.xz"; }; }; kdenlive = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdenlive-18.12.1.tar.xz"; - sha256 = "189p0sqlmfkaxsdiy1mh0mmskw6ha4zi64fx99w7wnbid8x52bjf"; - name = "kdenlive-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdenlive-18.12.3.tar.xz"; + sha256 = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64"; + name = "kdenlive-18.12.3.tar.xz"; }; }; kdepim-addons = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-addons-18.12.1.tar.xz"; - sha256 = "1gz6rqg39vl2arzs64srpr7xn1syxxiznz58gdss40152gz0hlsp"; - name = "kdepim-addons-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-addons-18.12.3.tar.xz"; + sha256 = "450a3f257e998e733b69703a1a813abab93c571c602702cbb4d9ab4ac25e8ce5"; + name = "kdepim-addons-18.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-apps-libs-18.12.1.tar.xz"; - sha256 = "06q306m09666jh4cx3w0bif81x424hxlvsf31wjhfzdp737xfq3i"; - name = "kdepim-apps-libs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-apps-libs-18.12.3.tar.xz"; + sha256 = "40a6fb24fc262f5340fda4aed453c5d515976aea745765e83cf8053b44d60164"; + name = "kdepim-apps-libs-18.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdepim-runtime-18.12.1.tar.xz"; - sha256 = "1vb9rqzyjww7lkc3g2aw43ks7is1bg1nx2mbn8wvmc7cgga66nbc"; - name = "kdepim-runtime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdepim-runtime-18.12.3.tar.xz"; + sha256 = "f3a5da19bb0f60e148d071cf07fd9fd4e6ea116f6125567c767c03b98ea844c3"; + name = "kdepim-runtime-18.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-kioslaves-18.12.1.tar.xz"; - sha256 = "05bds4r70ys4mygmjl5x5hcrygds57mqqmzfv79zq9hcfp2b0g69"; - name = "kdesdk-kioslaves-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-kioslaves-18.12.3.tar.xz"; + sha256 = "1f1951eca1c4081277782e80ef6b7c6768b2bb5a7d1830d69954f2fec27462ad"; + name = "kdesdk-kioslaves-18.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdesdk-thumbnailers-18.12.1.tar.xz"; - sha256 = "1584qy2aa8q7zzgf2zxqw7p2h2l2xfgsa2mrmxaa36xaxbglcvkb"; - name = "kdesdk-thumbnailers-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdesdk-thumbnailers-18.12.3.tar.xz"; + sha256 = "a4694da94bd671a1395a32a527c919fb2207e8a959ceff32a11488e2015a784b"; + name = "kdesdk-thumbnailers-18.12.3.tar.xz"; }; }; kdf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdf-18.12.1.tar.xz"; - sha256 = "0zr6k8di9fvzmgvh4s8ji81zdynpkg5yrnddlc9mgid0w9czaw11"; - name = "kdf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdf-18.12.3.tar.xz"; + sha256 = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae"; + name = "kdf-18.12.3.tar.xz"; }; }; kdialog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdialog-18.12.1.tar.xz"; - sha256 = "0i4c2kjyp0dix12vxhj078h7vbylcqxgqx10hzwaszx3wlrycwa2"; - name = "kdialog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdialog-18.12.3.tar.xz"; + sha256 = "8b17013ced4b02ceaf89ed3d3fdcfa4fce06fac54d54041fb1e47169f2def212"; + name = "kdialog-18.12.3.tar.xz"; }; }; kdiamond = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kdiamond-18.12.1.tar.xz"; - sha256 = "0j5g1gh267q528k0947brc8nvgq81690hqp7mrf90wxg8qp4ysm4"; - name = "kdiamond-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kdiamond-18.12.3.tar.xz"; + sha256 = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500"; + name = "kdiamond-18.12.3.tar.xz"; }; }; keditbookmarks = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/keditbookmarks-18.12.1.tar.xz"; - sha256 = "0fnxmgfgnh8d6sg7g7ai53xywa22qv4pn4xxj503rjs4a3fsm3j1"; - name = "keditbookmarks-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/keditbookmarks-18.12.3.tar.xz"; + sha256 = "8d1f1a6ffa3b68d318ac6eb72707e5e5bb4f6f43ebb25c0475121469a71f6a8d"; + name = "keditbookmarks-18.12.3.tar.xz"; }; }; kfind = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfind-18.12.1.tar.xz"; - sha256 = "1vhi66syjhmc5i64ffgpilyxw9y10qb7633p3gx7vsnbjhvfx45b"; - name = "kfind-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfind-18.12.3.tar.xz"; + sha256 = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9"; + name = "kfind-18.12.3.tar.xz"; }; }; kfloppy = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfloppy-18.12.1.tar.xz"; - sha256 = "1fx40gb7h0z832qidn635jj7caipxcrzxmrbdfnj8ji2sczs1hyq"; - name = "kfloppy-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfloppy-18.12.3.tar.xz"; + sha256 = "d68af7c572591a1a297cc823c1cb16a8a15973983c31f2e598d75dcc09ae2363"; + name = "kfloppy-18.12.3.tar.xz"; }; }; kfourinline = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kfourinline-18.12.1.tar.xz"; - sha256 = "1dwa4nw6998ljbppr4bhwpdg201djk5rjrzjgfs5xv0pynamph0g"; - name = "kfourinline-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kfourinline-18.12.3.tar.xz"; + sha256 = "cd3c3129c50502d9fe35f2382fcb1a512519626eb1b776600fdac2190390b9ce"; + name = "kfourinline-18.12.3.tar.xz"; }; }; kgeography = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgeography-18.12.1.tar.xz"; - sha256 = "02xir13p0r67vx3csdra9nza82a25k807cjl3w2pq3dqcg9grrcf"; - name = "kgeography-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgeography-18.12.3.tar.xz"; + sha256 = "ae019c4fc6c2b52344466266a19c6047e5dc414a92461a21d0e9c003dd4433c9"; + name = "kgeography-18.12.3.tar.xz"; }; }; kget = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kget-18.12.1.tar.xz"; - sha256 = "0jlpih49rifpqzxzgjc4kv3hv7y42v6pcamyvrmk6q1768lqp7nb"; - name = "kget-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kget-18.12.3.tar.xz"; + sha256 = "3386c07c61f072df4259f83895be43c64559c059c24df1b31ca66c4f2b599f86"; + name = "kget-18.12.3.tar.xz"; }; }; kgoldrunner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgoldrunner-18.12.1.tar.xz"; - sha256 = "19qdw319lzfhmmmmawdpb0dlkz9k1iz6imkwf1qndfv89b6wklba"; - name = "kgoldrunner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgoldrunner-18.12.3.tar.xz"; + sha256 = "1d54b485ccb81106853d5229422c753a5b0bbd2f9239a17b1c44f737a32d93b6"; + name = "kgoldrunner-18.12.3.tar.xz"; }; }; kgpg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kgpg-18.12.1.tar.xz"; - sha256 = "1rar3hj3wc9vpxc81h0ly1mi87m9cdx17j58k9n02q91jqb8892y"; - name = "kgpg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kgpg-18.12.3.tar.xz"; + sha256 = "05d70923f4c9d068b339dc0a3d3f28890cafe1fbef9820dd6157c1f5fd8f19e8"; + name = "kgpg-18.12.3.tar.xz"; }; }; khangman = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khangman-18.12.1.tar.xz"; - sha256 = "10wk0xdrs6pldg8j5bnsbdx835isxrapb1gm9gx4vjj49riq062q"; - name = "khangman-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khangman-18.12.3.tar.xz"; + sha256 = "1a7cdd27abf229603965ff6b3392bd7935f7f5a2d6418b23f802cfae45f74013"; + name = "khangman-18.12.3.tar.xz"; }; }; khelpcenter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/khelpcenter-18.12.1.tar.xz"; - sha256 = "143f61ngvljm4046q4allwxhx6fis0hd92xdqk8955xwdf42fq6y"; - name = "khelpcenter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/khelpcenter-18.12.3.tar.xz"; + sha256 = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8"; + name = "khelpcenter-18.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kidentitymanagement-18.12.1.tar.xz"; - sha256 = "1pl8yzrhfvkxcxasywzklhpx2477whn662s13c5mp6yhpxyxl5xq"; - name = "kidentitymanagement-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kidentitymanagement-18.12.3.tar.xz"; + sha256 = "4e8cac86c2ecfe6325bbf8fb7e50a026f6af978be3809f327eddfed7b3aed662"; + name = "kidentitymanagement-18.12.3.tar.xz"; }; }; kig = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kig-18.12.1.tar.xz"; - sha256 = "0cc093gwq2cr4ir3rdfkhijjsjvjddw4n7hvrxbshv7pqmnbrjgc"; - name = "kig-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kig-18.12.3.tar.xz"; + sha256 = "abba87c3569e571e6d1761dc2e6c0e32969ea09eba6d9c0462cb4dc7bd62d7a2"; + name = "kig-18.12.3.tar.xz"; }; }; kigo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kigo-18.12.1.tar.xz"; - sha256 = "07m3p9r59c4qfwpgipb024mzxi4safiidpypm8gmx87vbsqc99f2"; - name = "kigo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kigo-18.12.3.tar.xz"; + sha256 = "fa767319c3ac3e2dea48a5b09284e47e5f0c5d1862af813258758773998d1484"; + name = "kigo-18.12.3.tar.xz"; }; }; killbots = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/killbots-18.12.1.tar.xz"; - sha256 = "12jbvqmi0cx5ma7lai67qamml7qig269vhvjrcvm7jwlg0qx8v43"; - name = "killbots-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/killbots-18.12.3.tar.xz"; + sha256 = "4efb4fcd4f34f1843b990a92e5b0309c196071f0778cdc8376eff5eef405deb9"; + name = "killbots-18.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimagemapeditor-18.12.1.tar.xz"; - sha256 = "1mqzd3ja27c4askz9cxfaf6g8wcwlasjka79h4dmvjrw4rkqs4y4"; - name = "kimagemapeditor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimagemapeditor-18.12.3.tar.xz"; + sha256 = "addaaf257c35e8169288a8e7a50a1628f3ceeb6a2a845c3d260dfe94662438c6"; + name = "kimagemapeditor-18.12.3.tar.xz"; }; }; kimap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kimap-18.12.1.tar.xz"; - sha256 = "1v1qd91pr4xx0wsvvqlg8pcsbyi0n7c90ki0pz8v8z2vay5fagnm"; - name = "kimap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kimap-18.12.3.tar.xz"; + sha256 = "00aed701a3bdcc218902998e63e7c587549f77a1aa0d1bd7dad4a1837adc9992"; + name = "kimap-18.12.3.tar.xz"; }; }; kio-extras = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kio-extras-18.12.1.tar.xz"; - sha256 = "17y5awdyck2zjrgb9l2s4rdyvp1pqc6jrdyjv5vhchjdkfb91vw3"; - name = "kio-extras-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kio-extras-18.12.3.tar.xz"; + sha256 = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2"; + name = "kio-extras-18.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kirigami-gallery-18.12.1.tar.xz"; - sha256 = "1wrvhpdg2qk6ri1hjhdbk6w6rzyxamn6hxfl4mjcaip9gamjlbr0"; - name = "kirigami-gallery-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kirigami-gallery-18.12.3.tar.xz"; + sha256 = "64da8da506718e6b7b62e04a9d2fc40ec73f909f9a6b5afd29b4c81c20053e39"; + name = "kirigami-gallery-18.12.3.tar.xz"; }; }; kiriki = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiriki-18.12.1.tar.xz"; - sha256 = "1sxn7qvhyaaf4681hx1hgv2mmfhn64qn6q0rad9vps69cb1rx7pz"; - name = "kiriki-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiriki-18.12.3.tar.xz"; + sha256 = "0b67b5069625fe04f6ffaa65d0d4abcf86f2f067483b4db15508d2b5ee9742ac"; + name = "kiriki-18.12.3.tar.xz"; }; }; kiten = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kiten-18.12.1.tar.xz"; - sha256 = "1d964cc7bkr1vgsbbnm9c8na2nls3kmfk9wfkrzdgnj2643dl947"; - name = "kiten-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kiten-18.12.3.tar.xz"; + sha256 = "0e0bc0b0b2609a7872b45647976c87ec92ccb068d05113b8dc58e43c6eb1facf"; + name = "kiten-18.12.3.tar.xz"; }; }; kitinerary = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kitinerary-18.12.1.tar.xz"; - sha256 = "14bkyi4xj00i8bzjq6z68y67iyylix0c1n8wr1nz0s05pmlg8sws"; - name = "kitinerary-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kitinerary-18.12.3.tar.xz"; + sha256 = "f45ef90cb3fb53d83a30837c304b9f7cfa5dbf2953421233d97c101d66a81f35"; + name = "kitinerary-18.12.3.tar.xz"; }; }; kjumpingcube = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kjumpingcube-18.12.1.tar.xz"; - sha256 = "0i7lj2qi3mdvghpxyhwiakivxsd85ahy427d418sdykh7dfmn9ih"; - name = "kjumpingcube-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kjumpingcube-18.12.3.tar.xz"; + sha256 = "6409a3bb398ab90959afc24fa42b01b6e544526b1dab6f36bb700703fa794993"; + name = "kjumpingcube-18.12.3.tar.xz"; }; }; kldap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kldap-18.12.1.tar.xz"; - sha256 = "117w3jk4i77p8a7dvj03kgxqlhgbkmhyl7w282gl38kxyr7z8hbn"; - name = "kldap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kldap-18.12.3.tar.xz"; + sha256 = "dc5c8f33aad9e82f0cee65c6fc530f6bd9b82ec9cc21d1ce904f0fe9bdf5140e"; + name = "kldap-18.12.3.tar.xz"; }; }; kleopatra = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kleopatra-18.12.1.tar.xz"; - sha256 = "1njgfigld774r9xyckip118svxrkylh0a5ib5y8976zb0v71m5mj"; - name = "kleopatra-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kleopatra-18.12.3.tar.xz"; + sha256 = "ea165519846d70206e951d8d904bc02d17ed724db100638e657f7c930c4c490b"; + name = "kleopatra-18.12.3.tar.xz"; }; }; klettres = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klettres-18.12.1.tar.xz"; - sha256 = "0xxrkx468wx2f3gb3d77i648xxmy6bq6q0nq121fk2apgdp2dzqk"; - name = "klettres-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klettres-18.12.3.tar.xz"; + sha256 = "4ca89a54858d1f8ac43e8cb485b80a3bb5ead501d39e7e30d8c9b6b8d2d7fd93"; + name = "klettres-18.12.3.tar.xz"; }; }; klickety = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klickety-18.12.1.tar.xz"; - sha256 = "14jvifvm47q0ca7jq7d152l53nswhbwggs0q067n3chmf07g2izy"; - name = "klickety-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klickety-18.12.3.tar.xz"; + sha256 = "45ed455fd9628aaf081bfa6b672199fbb6913c7dc5d5c04ad9df206a3bd962a5"; + name = "klickety-18.12.3.tar.xz"; }; }; klines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/klines-18.12.1.tar.xz"; - sha256 = "1bs7vaqs67232msmsrsfi9avbqrzvyjihsakzxpkn976xwql3zxf"; - name = "klines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/klines-18.12.3.tar.xz"; + sha256 = "6d93e5bee1135f4eeb67e7f845a4fd658be7e5fb33f42c0ad6320200bc86fd80"; + name = "klines-18.12.3.tar.xz"; }; }; kmag = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmag-18.12.1.tar.xz"; - sha256 = "1ig9fbnza2xvxvd1adh9riv3zmrdmm0km8jpqjmh124i8g416qpw"; - name = "kmag-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmag-18.12.3.tar.xz"; + sha256 = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba"; + name = "kmag-18.12.3.tar.xz"; }; }; kmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmahjongg-18.12.1.tar.xz"; - sha256 = "0ajml6xy4ljmrn5qbvy08mcf5v5jqzmclsbr6811rrxqxb5fqbqd"; - name = "kmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmahjongg-18.12.3.tar.xz"; + sha256 = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6"; + name = "kmahjongg-18.12.3.tar.xz"; }; }; kmail = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-18.12.1.tar.xz"; - sha256 = "1wakrrlxp3v0k93hx2c8p136a3hd746l8fxks0g3cwvhl1immxw7"; - name = "kmail-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-18.12.3.tar.xz"; + sha256 = "9dd9865d4a463ac552c25126ecaee662b83548091c5abef168bdc7a6d2fb5c76"; + name = "kmail-18.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmail-account-wizard-18.12.1.tar.xz"; - sha256 = "0v3lwgk3b30ggv6573r6k5z09lcpfzspp5znnsn4650fgrrzg2j3"; - name = "kmail-account-wizard-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmail-account-wizard-18.12.3.tar.xz"; + sha256 = "102a4170cb4f80c7a9ba3aec7a4d34a3e6a8ca18c975b5c0ea33cf7bac9e21df"; + name = "kmail-account-wizard-18.12.3.tar.xz"; }; }; kmailtransport = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmailtransport-18.12.1.tar.xz"; - sha256 = "1ybaps485ic2m8nfy63kw6x7f3l2l67lhyy5zsm7rjipbaqgi2vm"; - name = "kmailtransport-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmailtransport-18.12.3.tar.xz"; + sha256 = "8aaa6045f29195074c61fd58112ca7dfbe594df66cac91bac7b246ab2ab9fad1"; + name = "kmailtransport-18.12.3.tar.xz"; }; }; kmbox = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmbox-18.12.1.tar.xz"; - sha256 = "0anh25klbgb67ynl9mlcny2mrawsd98mzyffvgsd8xkback684zf"; - name = "kmbox-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmbox-18.12.3.tar.xz"; + sha256 = "13a88db1ab0d628a3053a0d6ab5d89cd2f6cbadb3082b52e5dc7048516a10841"; + name = "kmbox-18.12.3.tar.xz"; }; }; kmime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmime-18.12.1.tar.xz"; - sha256 = "05kjfqaadkflyh1vabzgbx33vr3c70sm2nkp8r9dsa7kg3wij0n2"; - name = "kmime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmime-18.12.3.tar.xz"; + sha256 = "a09b0757e6ba663bf52d9bb8f7f104f3f19f734a858f6d532a6a20888ebcd274"; + name = "kmime-18.12.3.tar.xz"; }; }; kmines = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmines-18.12.1.tar.xz"; - sha256 = "0dq1jirzb6ljhb7wdrrkyxvmlwg84xzhfikcn9v6nmz9f3pbliwi"; - name = "kmines-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmines-18.12.3.tar.xz"; + sha256 = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f"; + name = "kmines-18.12.3.tar.xz"; }; }; kmix = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmix-18.12.1.tar.xz"; - sha256 = "1ra7jmi5xlq9gbh7csv40sxr20lv8dz659m1jx4ixkzppcj42s73"; - name = "kmix-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmix-18.12.3.tar.xz"; + sha256 = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a"; + name = "kmix-18.12.3.tar.xz"; }; }; kmousetool = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmousetool-18.12.1.tar.xz"; - sha256 = "07ywyxkm510faaqzywp5rw0lr2x1djhyhkjwyv8l42iw7231bn8x"; - name = "kmousetool-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmousetool-18.12.3.tar.xz"; + sha256 = "34f6bb6f69c284e9cc88d8a31d59c16f003310c33e1e1affd5c363d18f8a91a8"; + name = "kmousetool-18.12.3.tar.xz"; }; }; kmouth = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmouth-18.12.1.tar.xz"; - sha256 = "1g82shlrfm70ddfy2zfv12gv8hwzavz47q4qsyblyzq329kwgww5"; - name = "kmouth-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmouth-18.12.3.tar.xz"; + sha256 = "89b83fb8b4a5eb3c7a6409cd25c730a8bc3be72983c1a75f5e3d3abf01064486"; + name = "kmouth-18.12.3.tar.xz"; }; }; kmplot = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kmplot-18.12.1.tar.xz"; - sha256 = "0xl913pajyrhadld2ij9y0ai2w558wa60qfx1y1xwsjfm8124qgf"; - name = "kmplot-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kmplot-18.12.3.tar.xz"; + sha256 = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b"; + name = "kmplot-18.12.3.tar.xz"; }; }; knavalbattle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knavalbattle-18.12.1.tar.xz"; - sha256 = "1p03c980w4d10mkmvm01imi7vg6cp3wqz0wvw2d5vz47i0jhm2w8"; - name = "knavalbattle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knavalbattle-18.12.3.tar.xz"; + sha256 = "bce9294830a55e96b234c93fa20eb7d7ae963223e724ab0211ec472c79d35fa3"; + name = "knavalbattle-18.12.3.tar.xz"; }; }; knetwalk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knetwalk-18.12.1.tar.xz"; - sha256 = "0x5794f91b84l4d8hgkqi33rdqa7s1plhprhmbfvsi4grpms6c0c"; - name = "knetwalk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knetwalk-18.12.3.tar.xz"; + sha256 = "75ed9859ebb0c40d4efadaf1724b50c1a0436a5d3cd7cb540031cf5535794e3f"; + name = "knetwalk-18.12.3.tar.xz"; }; }; knights = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knights-18.12.1.tar.xz"; - sha256 = "17n7zi100q62wjavfr87369yqp2mjxqz0lyqalagjp25d80z18l2"; - name = "knights-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knights-18.12.3.tar.xz"; + sha256 = "9472ffa7800bd79a84dd0c36e3058d3f6e0813b5695aeffeb73bccb801870990"; + name = "knights-18.12.3.tar.xz"; }; }; knotes = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/knotes-18.12.1.tar.xz"; - sha256 = "12n40znf9vczvbf5xfj4zsxwbj2rdj7l1iasmiiil2md8iyjs6dz"; - name = "knotes-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/knotes-18.12.3.tar.xz"; + sha256 = "4cd3a4e5064211f3df6ebf4711c2f4e01b09c77580493de9070c9ee842059578"; + name = "knotes-18.12.3.tar.xz"; }; }; kolf = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolf-18.12.1.tar.xz"; - sha256 = "072nmvsxm8ky1nz2pp6ri74ms3rql0qqg004mzbbq061dil4k63i"; - name = "kolf-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolf-18.12.3.tar.xz"; + sha256 = "330cd299702e282a8b248b81cd50ee7ff60a6f512967029730ab87bedb69652f"; + name = "kolf-18.12.3.tar.xz"; }; }; kollision = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kollision-18.12.1.tar.xz"; - sha256 = "0idjjfgj8fk0c0l5i6x80cg20p1rpq6kab8z9rh2izvg1v6h7qvl"; - name = "kollision-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kollision-18.12.3.tar.xz"; + sha256 = "17376f73da0ea5e05998a4f9f0ccb6c0e41461007b8815637ac1980673e9a856"; + name = "kollision-18.12.3.tar.xz"; }; }; kolourpaint = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kolourpaint-18.12.1.tar.xz"; - sha256 = "0h454h5rzk0wki8lbmz57xx3859c27sy9vk1mwawfj963785f2nd"; - name = "kolourpaint-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kolourpaint-18.12.3.tar.xz"; + sha256 = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98"; + name = "kolourpaint-18.12.3.tar.xz"; }; }; kompare = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kompare-18.12.1.tar.xz"; - sha256 = "099fkxmk7g19l07lf2v3hmqrgfd17fbsv4m5cxdjci8alizw8pp9"; - name = "kompare-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kompare-18.12.3.tar.xz"; + sha256 = "7a132a0aced98079fdec37188e9a46f5399e7584ab9d39801d7f0f8176623285"; + name = "kompare-18.12.3.tar.xz"; }; }; konqueror = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konqueror-18.12.1.tar.xz"; - sha256 = "08j4x2xi1iv5661gjpcakp2dmdhvhw3jad98kq3xj9989s7phpfy"; - name = "konqueror-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konqueror-18.12.3.tar.xz"; + sha256 = "d9eb2bb4cd121f9967c6d6e7275dfb56bd41aec03c2b9d903d543b330ca4666a"; + name = "konqueror-18.12.3.tar.xz"; }; }; konquest = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konquest-18.12.1.tar.xz"; - sha256 = "0mlk2vm53nc9dc7ca9ah3ly9qs94md24pi2gmv68pz1ysr51i483"; - name = "konquest-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konquest-18.12.3.tar.xz"; + sha256 = "3698253f8e873819680ed99f377a679bacf5351f3fadc92c07fbaa0f6b269172"; + name = "konquest-18.12.3.tar.xz"; }; }; konsole = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/konsole-18.12.1.tar.xz"; - sha256 = "15w1jizs4q6mivv7qjkf0gkqlz0jnrz7b2i59r3kx2fvwwwl18rg"; - name = "konsole-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/konsole-18.12.3.tar.xz"; + sha256 = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08"; + name = "konsole-18.12.3.tar.xz"; }; }; kontact = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontact-18.12.1.tar.xz"; - sha256 = "0bqn9vh75wpkks1l9hd2bm33k1im356x2091xlnnzs70m4gjxhag"; - name = "kontact-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontact-18.12.3.tar.xz"; + sha256 = "81426545a958d6d71210040f5ede6407048a16d320ea90c405318cdd7e8e9315"; + name = "kontact-18.12.3.tar.xz"; }; }; kontactinterface = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kontactinterface-18.12.1.tar.xz"; - sha256 = "0khba3wnpwji4mm5n56bcnffd1v9w4a1b1r7lhlz88dqkakqyb61"; - name = "kontactinterface-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kontactinterface-18.12.3.tar.xz"; + sha256 = "4895e884c93ebff36a721f5161386105e729925dbbbf6fafb94c75ba4b291e41"; + name = "kontactinterface-18.12.3.tar.xz"; }; }; kopete = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kopete-18.12.1.tar.xz"; - sha256 = "12q62nj287qc4gz8q66spk1d0xykrwkphwaxrh2i3sd07bjmyzqs"; - name = "kopete-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kopete-18.12.3.tar.xz"; + sha256 = "8ca7a41e39be23ca6802deade7b5edb88b7e3000bc8e6fb2f68efbc15c2c8d3b"; + name = "kopete-18.12.3.tar.xz"; }; }; korganizer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/korganizer-18.12.1.tar.xz"; - sha256 = "1g8wjrghzxgx9xhqf98z9xlq5svl2v931ifczsfkvs9d3smx2zsg"; - name = "korganizer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/korganizer-18.12.3.tar.xz"; + sha256 = "6a63e60b60af6cb95c78382da15e9e3cf04f936689ce12b62fe38968fad75a9c"; + name = "korganizer-18.12.3.tar.xz"; }; }; kpat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpat-18.12.1.tar.xz"; - sha256 = "1ami2bssnjm01k3i6bqqciszablkw6975hac2d8zzvg2bz8g4a2a"; - name = "kpat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpat-18.12.3.tar.xz"; + sha256 = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377"; + name = "kpat-18.12.3.tar.xz"; }; }; kpimtextedit = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpimtextedit-18.12.1.tar.xz"; - sha256 = "13ki9gjgakyqcxx4hvs0plqgw0rqx0z95dnyaqv1safqkwrr76hb"; - name = "kpimtextedit-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpimtextedit-18.12.3.tar.xz"; + sha256 = "54586fc97eb863eaa57e589d4461dd9cfbc4d12e58425afadcd22d64ba8a570d"; + name = "kpimtextedit-18.12.3.tar.xz"; }; }; kpkpass = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kpkpass-18.12.1.tar.xz"; - sha256 = "1sw3gpvai71lliq4y1snxrhzi9jhl1vxkimlxl2nmhg951nzd4xx"; - name = "kpkpass-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kpkpass-18.12.3.tar.xz"; + sha256 = "cd70809ab7a052e0ca2a18266ec5564bde16ac917988798290e3f01e428bd84f"; + name = "kpkpass-18.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kqtquickcharts-18.12.1.tar.xz"; - sha256 = "0i8qww267q797pxk3k66d09b0dp7ixbxf92p5bsqf7z4p2graayl"; - name = "kqtquickcharts-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kqtquickcharts-18.12.3.tar.xz"; + sha256 = "739859dc261856cf253ac67e2273b20dee476735b4107ece991d7146d45c1bbe"; + name = "kqtquickcharts-18.12.3.tar.xz"; }; }; krdc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krdc-18.12.1.tar.xz"; - sha256 = "1smdav92rfr92mxk8q7wcmmvrf746vn2xyw36hyszq561ycgwwrx"; - name = "krdc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krdc-18.12.3.tar.xz"; + sha256 = "c01896b73ab058a20f4c3d8997c28cbb81a7000f5aec346592a9315412c10666"; + name = "krdc-18.12.3.tar.xz"; }; }; kreversi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kreversi-18.12.1.tar.xz"; - sha256 = "171w76xv9dbhy7pxs9swq7xknrwkjk5ndgq4waj6m5dh0109qmx4"; - name = "kreversi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kreversi-18.12.3.tar.xz"; + sha256 = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc"; + name = "kreversi-18.12.3.tar.xz"; }; }; krfb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/krfb-18.12.1.tar.xz"; - sha256 = "0bhhlp4ask2xqzq9igw0akxr0gb0iilaljwqrcw91fx36sxq46p4"; - name = "krfb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/krfb-18.12.3.tar.xz"; + sha256 = "9596adfe7135930c6c9c8ecd05035e401d80a5e2cd532ba343b7d4c0f57a799b"; + name = "krfb-18.12.3.tar.xz"; }; }; kross-interpreters = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kross-interpreters-18.12.1.tar.xz"; - sha256 = "0k57qprmpspp9b8vb124h1whgyskmwd6q7l60vswqizc64xa2src"; - name = "kross-interpreters-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kross-interpreters-18.12.3.tar.xz"; + sha256 = "ce2231b2faa9accc6342a37024651b988eefbcb9b3968025ffa4752d0cbdc70c"; + name = "kross-interpreters-18.12.3.tar.xz"; }; }; kruler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kruler-18.12.1.tar.xz"; - sha256 = "1wfxapw6grx860wa6fyya8fnvlrpmdzsz64fnx64h0mky09j21r6"; - name = "kruler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kruler-18.12.3.tar.xz"; + sha256 = "1b347c552648caca99364a0524945d0849cd84b29e4d07f62ee518ec07a98e33"; + name = "kruler-18.12.3.tar.xz"; }; }; kshisen = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kshisen-18.12.1.tar.xz"; - sha256 = "0wz4jfrqqvzz2p5f6hwyj7rpijsnhbzmm2m7jhjrljjl5lfdqd3x"; - name = "kshisen-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kshisen-18.12.3.tar.xz"; + sha256 = "00c5de16c335262287bab37b07822b6fd2997abcec25a0ad0a7d1ece6769060f"; + name = "kshisen-18.12.3.tar.xz"; }; }; ksirk = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksirk-18.12.1.tar.xz"; - sha256 = "108bw284jsff3qgg98vzs93m6dl8wjfkmbrkjgij03w00jb47bqf"; - name = "ksirk-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksirk-18.12.3.tar.xz"; + sha256 = "cb8f3cc98fe861b0f4ebff77aeeffa12905b98b6db0c8800525f4fb052be4e7a"; + name = "ksirk-18.12.3.tar.xz"; }; }; ksmtp = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksmtp-18.12.1.tar.xz"; - sha256 = "0zj4gpfz2njrdnfbjy7s9xci0il7qmmzargkszgj9jdzpm5qlaas"; - name = "ksmtp-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksmtp-18.12.3.tar.xz"; + sha256 = "90578b1b3ac1ce14bf4f34799b1b400b06734c72f3fecd41f5f07aed37ed3b74"; + name = "ksmtp-18.12.3.tar.xz"; }; }; ksnakeduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksnakeduel-18.12.1.tar.xz"; - sha256 = "1l0gfh5vfcfnk3sdl8wsqbc2vcmsdf9frpngfacv4ndm4xc371ql"; - name = "ksnakeduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksnakeduel-18.12.3.tar.xz"; + sha256 = "5d55e4c11baecbd77b94dd004b490a7f73870a383e0bf3ad0381f22d36a27a36"; + name = "ksnakeduel-18.12.3.tar.xz"; }; }; kspaceduel = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kspaceduel-18.12.1.tar.xz"; - sha256 = "01pcnqpzbrnwxavmfpdib78kc44am9in711012j2621cccx2r9cw"; - name = "kspaceduel-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kspaceduel-18.12.3.tar.xz"; + sha256 = "f40d0a7c578f461875efaf9e25d2b061486a21f750ce8bc922db4aed6fed1f11"; + name = "kspaceduel-18.12.3.tar.xz"; }; }; ksquares = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksquares-18.12.1.tar.xz"; - sha256 = "1gyd7qipp821jzn94yrw4b0d46ays0hs26q17hxnbx07hyfj3kcb"; - name = "ksquares-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksquares-18.12.3.tar.xz"; + sha256 = "82a90b7fe5ca8e46950a0de1742783c522fcd85bbc3aabe5955834865bc36b7d"; + name = "ksquares-18.12.3.tar.xz"; }; }; ksudoku = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksudoku-18.12.1.tar.xz"; - sha256 = "1cm5r4fkc7ha0c3mbcank9h2fhym7qc8k1q69lpmzrbm9hw2kgrs"; - name = "ksudoku-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksudoku-18.12.3.tar.xz"; + sha256 = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1"; + name = "ksudoku-18.12.3.tar.xz"; }; }; ksystemlog = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ksystemlog-18.12.1.tar.xz"; - sha256 = "1s5b4j67q6nm7r4b1ibvypsd5z9la7cri7z1r7hzihv4nry8pk5c"; - name = "ksystemlog-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ksystemlog-18.12.3.tar.xz"; + sha256 = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52"; + name = "ksystemlog-18.12.3.tar.xz"; }; }; kteatime = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kteatime-18.12.1.tar.xz"; - sha256 = "01p4d61d16k2pppf51sz52y0w4qc1dyqnmhjlnr5w75rfmwvvivg"; - name = "kteatime-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kteatime-18.12.3.tar.xz"; + sha256 = "24b3e51edc9d6625ca5b3542bd5edd1d42d79142f2c30f886e1b9515dcdfac6d"; + name = "kteatime-18.12.3.tar.xz"; }; }; ktimer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktimer-18.12.1.tar.xz"; - sha256 = "0wqkfvbdcnwh1jzn2ac7k4pa8amr51ajhljc95mvps03m9d92rsf"; - name = "ktimer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktimer-18.12.3.tar.xz"; + sha256 = "b3808fa9821c3a624b880b9a5607c8e12287cd38418ff06dd9af8345f324fe7e"; + name = "ktimer-18.12.3.tar.xz"; }; }; ktnef = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktnef-18.12.1.tar.xz"; - sha256 = "0id7hkmgr5zc12zfrj5ydxyhgdrlx4ip1dsw301i27id104fqb69"; - name = "ktnef-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktnef-18.12.3.tar.xz"; + sha256 = "7633f86514d01a1e3709f6854b3b9c859fa1905043bb53240c1ae53f3b76a6ec"; + name = "ktnef-18.12.3.tar.xz"; }; }; ktouch = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktouch-18.12.1.tar.xz"; - sha256 = "0v3lhxx45l41bw14wi7n4k29d1c9xmacrscjyj84fmy09nlyyaa5"; - name = "ktouch-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktouch-18.12.3.tar.xz"; + sha256 = "194f308a114c89873ee88eb069ecda88d5d1e1ad97c150e2d61cf248719b4bb6"; + name = "ktouch-18.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-accounts-kcm-18.12.1.tar.xz"; - sha256 = "1aswmp7504kpwlb37rvxx514ac5256h5lhwj9xl479vyxgaazxsn"; - name = "ktp-accounts-kcm-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-accounts-kcm-18.12.3.tar.xz"; + sha256 = "ab6ab0f6cb438ec68b110158f7c6555572f04ad69da04f5e1d144cfc4a8ee8cb"; + name = "ktp-accounts-kcm-18.12.3.tar.xz"; }; }; ktp-approver = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-approver-18.12.1.tar.xz"; - sha256 = "1jr5kxlj2229rknxhi5jsgdjgx9n0n5jx7lc4aa2c96kd843n2ah"; - name = "ktp-approver-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-approver-18.12.3.tar.xz"; + sha256 = "0616fcad79fdeae5f2a58b167419f1745e94cea21950faa535e7b5a6c2e53cf6"; + name = "ktp-approver-18.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-auth-handler-18.12.1.tar.xz"; - sha256 = "1fwcibz8dh94xaprpyybn0dlh1fyd6rsx9zsx8cyxqhx96fq8v28"; - name = "ktp-auth-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-auth-handler-18.12.3.tar.xz"; + sha256 = "91d6e0148c9006117bc67969012f7a12405e186fc8ffd4011732dc3e7c16a4be"; + name = "ktp-auth-handler-18.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-call-ui-18.12.1.tar.xz"; - sha256 = "1f63w374d9smz7147lax9zqfvikqhl2hllvnlb03zl49kh13s8h3"; - name = "ktp-call-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-call-ui-18.12.3.tar.xz"; + sha256 = "3558b9ef7a2a000f6b49454c4477dcd9700168a1f2c060267b24c78725097571"; + name = "ktp-call-ui-18.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-common-internals-18.12.1.tar.xz"; - sha256 = "1frnzsql9mk78bjfc2kpwmsf8nkx1ybhm1snq125kkzayqipvdkp"; - name = "ktp-common-internals-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-common-internals-18.12.3.tar.xz"; + sha256 = "3913a515d98f74940e0db6b85fc5c6c128c68cffb427c93164052be437634740"; + name = "ktp-common-internals-18.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-list-18.12.1.tar.xz"; - sha256 = "13aiy156372qapwddr2i3nf1jkzbj9905rvd55akwpa8sy70m3kw"; - name = "ktp-contact-list-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-list-18.12.3.tar.xz"; + sha256 = "8f858371ec3760bc042dbf6f022ba834ca5b9ae43997e67bf395978df603d0c1"; + name = "ktp-contact-list-18.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-contact-runner-18.12.1.tar.xz"; - sha256 = "1grpgg3fgyzf97n60jmpjgviz5194awmrl6yfaal7hd1cdkfrs34"; - name = "ktp-contact-runner-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-contact-runner-18.12.3.tar.xz"; + sha256 = "886d561952ac1a8a5fa50ffdff8699358480d18d58cbaec217ed865d2047f0a9"; + name = "ktp-contact-runner-18.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-desktop-applets-18.12.1.tar.xz"; - sha256 = "0iikcp7rvvrn7189kdzj1i4qzhkgh06gzr8hm49gy29qxqk36ykn"; - name = "ktp-desktop-applets-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-desktop-applets-18.12.3.tar.xz"; + sha256 = "439dca1046beba0d2579918f2e409e6629e5063da6eeb1001bcd65ff3edb32c4"; + name = "ktp-desktop-applets-18.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-filetransfer-handler-18.12.1.tar.xz"; - sha256 = "04dnh7yb0jajs79xh1wyq9d48nklvldc7lnk1lp194iz8yydvylx"; - name = "ktp-filetransfer-handler-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-filetransfer-handler-18.12.3.tar.xz"; + sha256 = "898c7f4ffc8d8bec691cc9744fb356722cf7957f39d2d855138492b647542231"; + name = "ktp-filetransfer-handler-18.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-kded-module-18.12.1.tar.xz"; - sha256 = "0kmw8pifb4xry3zqpq671rh39ziaka8zx60p5xzs10rl17rmxwzs"; - name = "ktp-kded-module-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-kded-module-18.12.3.tar.xz"; + sha256 = "ebbd02a1441caf8e9ced851c8f814255ac4b9e75485a4bc59026f647d3fd4854"; + name = "ktp-kded-module-18.12.3.tar.xz"; }; }; ktp-send-file = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-send-file-18.12.1.tar.xz"; - sha256 = "01i059vsaydw410sv15vzwysgxcy2n9wm3qcnal4fx7wgw5xx163"; - name = "ktp-send-file-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-send-file-18.12.3.tar.xz"; + sha256 = "0015551c42d66f14ae508eee76f138584bbec3b77a4aff4a003255b52d8414f2"; + name = "ktp-send-file-18.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktp-text-ui-18.12.1.tar.xz"; - sha256 = "14smhdcvy0v1s1rbkss1g6jyzfm6y1nqjp8a9wcbygbzh88g0bjy"; - name = "ktp-text-ui-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktp-text-ui-18.12.3.tar.xz"; + sha256 = "6a37a26b0b226d5d30b298a4d6d85f8dcfe9f39cbc35e1b6322651678815a34e"; + name = "ktp-text-ui-18.12.3.tar.xz"; }; }; ktuberling = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/ktuberling-18.12.1.tar.xz"; - sha256 = "0h0w2knfs97bzxaja3dkc78fjfymic09b6zid41kxd4mi41lngkk"; - name = "ktuberling-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/ktuberling-18.12.3.tar.xz"; + sha256 = "b69815f3553f843c30ab9d026ca7da97e62e66b58851111d1e4d29e57d67bd04"; + name = "ktuberling-18.12.3.tar.xz"; }; }; kturtle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kturtle-18.12.1.tar.xz"; - sha256 = "0b2505gmys2p11ryj7bqr60zgh0ydp16xidhkv6hhykmrmp2bsm1"; - name = "kturtle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kturtle-18.12.3.tar.xz"; + sha256 = "4677335b4f8a3e363425652815d19ae13e9f8942b01051553b485100c4996253"; + name = "kturtle-18.12.3.tar.xz"; }; }; kubrick = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kubrick-18.12.1.tar.xz"; - sha256 = "0vq8djk5xc00cz4a2inbw62x9pigxxjcxi92h8qayigi7cf9xrll"; - name = "kubrick-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kubrick-18.12.3.tar.xz"; + sha256 = "0deb9022a028a6c068203e5bf20820b5561c92b5117735e8a58f212c2ba460e3"; + name = "kubrick-18.12.3.tar.xz"; }; }; kwalletmanager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwalletmanager-18.12.1.tar.xz"; - sha256 = "1d3kdxc53n2ss73r9ld6rr5w9zhvkglrcbw8whq2hsam79mh0vsn"; - name = "kwalletmanager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwalletmanager-18.12.3.tar.xz"; + sha256 = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478"; + name = "kwalletmanager-18.12.3.tar.xz"; }; }; kwave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwave-18.12.1.tar.xz"; - sha256 = "150lqffzzyb2ajyg97sprzbm6zq1iq4psl6vics51lw7sybwj4m3"; - name = "kwave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwave-18.12.3.tar.xz"; + sha256 = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48"; + name = "kwave-18.12.3.tar.xz"; }; }; kwordquiz = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/kwordquiz-18.12.1.tar.xz"; - sha256 = "1da9jjdk2avdmdm16s63h0hk5swml37afwdnsd777ilj2x8a5ndf"; - name = "kwordquiz-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/kwordquiz-18.12.3.tar.xz"; + sha256 = "e609d6b7f93abe0ca7ba844c51dff8d89d435daa9d0a6be68e789b70370459cc"; + name = "kwordquiz-18.12.3.tar.xz"; }; }; libgravatar = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libgravatar-18.12.1.tar.xz"; - sha256 = "1a7b46zqv5m7c9arfmcxhrcnrkcligz3ryygxv801zfa7277l8j6"; - name = "libgravatar-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libgravatar-18.12.3.tar.xz"; + sha256 = "c44c139fbaffda352f0fe461065622cff65b6f1cc13cee8a0137acb27de143ee"; + name = "libgravatar-18.12.3.tar.xz"; }; }; libkcddb = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcddb-18.12.1.tar.xz"; - sha256 = "1k9rbkf12g1hsn23nyhc65zrppkikk8xplm7l321kxpnq2prm155"; - name = "libkcddb-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcddb-18.12.3.tar.xz"; + sha256 = "38bffd551b82628a25b46bd598c257927855b77c6b6b73a9b69ac7bf538afc29"; + name = "libkcddb-18.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkcompactdisc-18.12.1.tar.xz"; - sha256 = "0v7fh9s9qbljgfjyi3bd9w7wp69y4qjg0jj8cmn11snrsd8zzaac"; - name = "libkcompactdisc-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkcompactdisc-18.12.3.tar.xz"; + sha256 = "a464ebfdd1a2834c2597e7ffd1b0d946ddfda348eea5ac8d1d42b46d6c478926"; + name = "libkcompactdisc-18.12.3.tar.xz"; }; }; libkdcraw = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdcraw-18.12.1.tar.xz"; - sha256 = "1g58cpzqzl6vl62lbrqd8fyscxspqypxq4lyj3d2k9b0b66hjc6c"; - name = "libkdcraw-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdcraw-18.12.3.tar.xz"; + sha256 = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99"; + name = "libkdcraw-18.12.3.tar.xz"; }; }; libkdegames = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdegames-18.12.1.tar.xz"; - sha256 = "0iksk5gnl860xcmpaj56wxaamhm9zhjnyszj4nssppssn8kr1r65"; - name = "libkdegames-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdegames-18.12.3.tar.xz"; + sha256 = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9"; + name = "libkdegames-18.12.3.tar.xz"; }; }; libkdepim = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkdepim-18.12.1.tar.xz"; - sha256 = "1qvzj68p630mzafwyv7f3q1fd615yca7amc0q7kp2cs08fnv67fp"; - name = "libkdepim-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkdepim-18.12.3.tar.xz"; + sha256 = "1c53148dd9f477b1ca2ea622b25100eab95531115e9798264d3e65d28183e640"; + name = "libkdepim-18.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkeduvocdocument-18.12.1.tar.xz"; - sha256 = "0zgl0dw8sb5lffzv580nql04i0n31ma8569wrhh75kg12qb5yd7w"; - name = "libkeduvocdocument-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkeduvocdocument-18.12.3.tar.xz"; + sha256 = "907076104f445f22fa31c2fa5ecfdabbb8b18faab52fc10c879a53d6245aaad4"; + name = "libkeduvocdocument-18.12.3.tar.xz"; }; }; libkexiv2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkexiv2-18.12.1.tar.xz"; - sha256 = "1jgk14dgf30czsah0mjrs7lsll0s4aks2075pfmvrnsl71vfbsj3"; - name = "libkexiv2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkexiv2-18.12.3.tar.xz"; + sha256 = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc"; + name = "libkexiv2-18.12.3.tar.xz"; }; }; libkgapi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgapi-18.12.1.tar.xz"; - sha256 = "1g5mzdw4mrlqhi9zby51m1sgkq1gjmkd7smja287kjf7whdx0sn3"; - name = "libkgapi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgapi-18.12.3.tar.xz"; + sha256 = "de0314fd83d8fa8f88e6a355c4725047d2e507e0d40f1950c8ae083c2bc21924"; + name = "libkgapi-18.12.3.tar.xz"; }; }; libkgeomap = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkgeomap-18.12.1.tar.xz"; - sha256 = "0ijf71ss8qirrgx45x4wnry049d2bllgnlzm8gll4mj1hv9jhjdz"; - name = "libkgeomap-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkgeomap-18.12.3.tar.xz"; + sha256 = "2c4459e61e471f0344d03cfa5f00fe2a1890cd2c1501323ceed26d522496c47b"; + name = "libkgeomap-18.12.3.tar.xz"; }; }; libkipi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkipi-18.12.1.tar.xz"; - sha256 = "1372kmqni0vb8bryv0h30pljikabjdq44v1fjpgg81f4v1n4pfxv"; - name = "libkipi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkipi-18.12.3.tar.xz"; + sha256 = "96abf4552d535cf101c76ff5b1cb0198eccfd4bdfb7dc192b66bf709af037a31"; + name = "libkipi-18.12.3.tar.xz"; }; }; libkleo = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkleo-18.12.1.tar.xz"; - sha256 = "1p1bw0wzwg2zccgkqs50j92rzkpvcspjdj85zanmryg568mz9r1x"; - name = "libkleo-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkleo-18.12.3.tar.xz"; + sha256 = "e528ed366352404d48313a8c154f56c672470bf06524ea7a150a726d3eb87d69"; + name = "libkleo-18.12.3.tar.xz"; }; }; libkmahjongg = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkmahjongg-18.12.1.tar.xz"; - sha256 = "1q590f7l10a1zjcg3dv3ns1003xrnr7zlmff03zg3a9zcqj11kwv"; - name = "libkmahjongg-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkmahjongg-18.12.3.tar.xz"; + sha256 = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4"; + name = "libkmahjongg-18.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libkomparediff2-18.12.1.tar.xz"; - sha256 = "0ik6bclbipp01gfy3zfkijvl5m0y3z2dfxr76jvzmi53ypm7g0xn"; - name = "libkomparediff2-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libkomparediff2-18.12.3.tar.xz"; + sha256 = "f70bf7470f67419a7071a4df23d929c4c4ed80d588b3096d48486ee0f27d890c"; + name = "libkomparediff2-18.12.3.tar.xz"; }; }; libksane = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksane-18.12.1.tar.xz"; - sha256 = "15dgc5dshs6yzv03wvc5xvqfz70gqy51a0r54qzbr5fc9s6pywr8"; - name = "libksane-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksane-18.12.3.tar.xz"; + sha256 = "40bf814cebac7ef00dc18fbdeabb2f9fd786c9144d787d5dc36a58fe18c33034"; + name = "libksane-18.12.3.tar.xz"; }; }; libksieve = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/libksieve-18.12.1.tar.xz"; - sha256 = "0kcg94bsww3vlc3vpybw20c4iax0bfkamicy7hwyyyzwgx38dvd1"; - name = "libksieve-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/libksieve-18.12.3.tar.xz"; + sha256 = "ce18756940d86dff8eafd77883d202ab90e3d8273f5248ffd97627b974211754"; + name = "libksieve-18.12.3.tar.xz"; }; }; lokalize = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lokalize-18.12.1.tar.xz"; - sha256 = "1spzi7zbckvxy3izmcqjnslmqf4vgr7zrwa0idmqi4q59dcsgw9g"; - name = "lokalize-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lokalize-18.12.3.tar.xz"; + sha256 = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed"; + name = "lokalize-18.12.3.tar.xz"; }; }; lskat = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/lskat-18.12.1.tar.xz"; - sha256 = "0603lxw1fxz9vpawy59z3qga0f1bvvgv9yqk29b16fmp5hf5qgxm"; - name = "lskat-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/lskat-18.12.3.tar.xz"; + sha256 = "d81d3af26b9f23abc40f1e2f97410d662c11d4641b67c32d427846a561f0b1e2"; + name = "lskat-18.12.3.tar.xz"; }; }; mailcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailcommon-18.12.1.tar.xz"; - sha256 = "0l1b115vnxfl2ykwnj09ikv7vlfa5bvfzlii6jj2znkmspi9y7r2"; - name = "mailcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailcommon-18.12.3.tar.xz"; + sha256 = "789d89fad58af80202dfcc41f7c7435871a60309d1d46f93cabcb37dd6ae97e1"; + name = "mailcommon-18.12.3.tar.xz"; }; }; mailimporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mailimporter-18.12.1.tar.xz"; - sha256 = "1k8gqjabcvafcvsqwclvz58r15k1bpz52wnnnbwcp0y27ab08a98"; - name = "mailimporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mailimporter-18.12.3.tar.xz"; + sha256 = "1c0e583fa36fc1b87154367cbe02cf1ec68d9f36d8a37bd6b220e9d9aadfcfa3"; + name = "mailimporter-18.12.3.tar.xz"; }; }; marble = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/marble-18.12.1.tar.xz"; - sha256 = "0hamj04ma9qycfisjv48myxj1427rz7g0lmw7pwanzghg610fgwy"; - name = "marble-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/marble-18.12.3.tar.xz"; + sha256 = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee"; + name = "marble-18.12.3.tar.xz"; }; }; mbox-importer = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/mbox-importer-18.12.1.tar.xz"; - sha256 = "1h2abj7v6v3rmvsv9bb1wj7sabhh9f35bx1yfk2hhfzf6l4r5f2n"; - name = "mbox-importer-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/mbox-importer-18.12.3.tar.xz"; + sha256 = "a220ca69dd6f78cf18c3d8cb1bb293dc2ab2ff45f2a25df72cad8df78f581201"; + name = "mbox-importer-18.12.3.tar.xz"; }; }; messagelib = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/messagelib-18.12.1.tar.xz"; - sha256 = "1hfk54w0dhp82fxa4q19d4224pjnw5f8m7ap4gwlrqdj350liqd8"; - name = "messagelib-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/messagelib-18.12.3.tar.xz"; + sha256 = "0064a8df62a08d0dfb06af28d4aff8a645a0e8bb01d91ab23647b3d26d3af7d8"; + name = "messagelib-18.12.3.tar.xz"; }; }; minuet = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/minuet-18.12.1.tar.xz"; - sha256 = "160wq3j7vcf1k0ayd8axg37ghj5ymn56g7znaz4gzc8ar1q5nccz"; - name = "minuet-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/minuet-18.12.3.tar.xz"; + sha256 = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009"; + name = "minuet-18.12.3.tar.xz"; }; }; okular = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/okular-18.12.1.tar.xz"; - sha256 = "1k1srr2434j665v6m89vl7x42361pqxaw45dc5b4bhw8q2xfipyl"; - name = "okular-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/okular-18.12.3.tar.xz"; + sha256 = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab"; + name = "okular-18.12.3.tar.xz"; }; }; palapeli = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/palapeli-18.12.1.tar.xz"; - sha256 = "0pwflnnnbfxf185m3r4vdw5jpd5jld0wm0qnwk2gl41v2ahb5pqd"; - name = "palapeli-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/palapeli-18.12.3.tar.xz"; + sha256 = "b28fa1cf7a763125a09baa8f4e7562e17892475444d3907e566281328502e593"; + name = "palapeli-18.12.3.tar.xz"; }; }; parley = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/parley-18.12.1.tar.xz"; - sha256 = "1yv4m9f4jhc36ffnrxd6rq5117rj163hs6835mkkzja7z13csn6z"; - name = "parley-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/parley-18.12.3.tar.xz"; + sha256 = "289bc5aa88d7a33fdf0d668b45412f163d74e86d3deb9492db53a11f7c6a7f75"; + name = "parley-18.12.3.tar.xz"; }; }; picmi = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/picmi-18.12.1.tar.xz"; - sha256 = "0dmhvxy0g4jjbxk53bz1g1r8vqdzhzbcwg0f1ck85gz7f5g67b7v"; - name = "picmi-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/picmi-18.12.3.tar.xz"; + sha256 = "0691c70d746aa9d444559970e002561a1123963d617b36ceef4a8c3ee4730f49"; + name = "picmi-18.12.3.tar.xz"; }; }; pimcommon = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pimcommon-18.12.1.tar.xz"; - sha256 = "09av3zdr463gjc877ipa5vz84yf4qpj2ixs9x4ajmfmsmb5m6w7z"; - name = "pimcommon-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pimcommon-18.12.3.tar.xz"; + sha256 = "f4a0bf8146d1140c0252a5315baa826651968352a828c004d91b06e0e98c6b9e"; + name = "pimcommon-18.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-data-exporter-18.12.1.tar.xz"; - sha256 = "111n4l9z3dazz7qhv67k00s88p515r8ai2sm419pbyfdn6wxpzmb"; - name = "pim-data-exporter-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-data-exporter-18.12.3.tar.xz"; + sha256 = "7deb5baf5a36b96f1414e0b67192cd1ad48f396fb3cb5f5eb2fc90a312d74941"; + name = "pim-data-exporter-18.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/pim-sieve-editor-18.12.1.tar.xz"; - sha256 = "0i0jrmz4cyjcpapga89ixfqx7xg0nyk3r75ymfzw891fyhm7ns67"; - name = "pim-sieve-editor-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/pim-sieve-editor-18.12.3.tar.xz"; + sha256 = "6e755ec258b0a75e4e83adb82551c1779c2ab7766aef26d2f1c9c00f3809deb5"; + name = "pim-sieve-editor-18.12.3.tar.xz"; }; }; poxml = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/poxml-18.12.1.tar.xz"; - sha256 = "0hrpvpsy3mbyrikj68lr2af9m162w3nzhcpdqgrhsv5ji3j0bpqb"; - name = "poxml-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/poxml-18.12.3.tar.xz"; + sha256 = "6714e371957d175b859894149a3791acb3b8ef62b653b7b09f34819e92c8eaf7"; + name = "poxml-18.12.3.tar.xz"; }; }; print-manager = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/print-manager-18.12.1.tar.xz"; - sha256 = "01kk592gi2rrqwaxmfd1fycnya0rvjafxxv6lrk3rs0nm4g9phxr"; - name = "print-manager-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/print-manager-18.12.3.tar.xz"; + sha256 = "917ea500bcd11d2ca3cc1e7de1b38d7ef72f1d397182aaac2c6a31cd338f387d"; + name = "print-manager-18.12.3.tar.xz"; }; }; rocs = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/rocs-18.12.1.tar.xz"; - sha256 = "0d34bv8ya5lrdrbqqlc927x4cdfjwyr8q2xbmx4c1vaw8w29glw9"; - name = "rocs-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/rocs-18.12.3.tar.xz"; + sha256 = "6b007b0b11a8128787c316f055a99dde83619dd35287e04867949e84661c2b11"; + name = "rocs-18.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/signon-kwallet-extension-18.12.1.tar.xz"; - sha256 = "018vyzd3rspfsqansxfbv4q0izgj7dfpmzjj04x8pffg1w0x902n"; - name = "signon-kwallet-extension-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/signon-kwallet-extension-18.12.3.tar.xz"; + sha256 = "9a6c25cf19a382cbfd219c043838ad691c4c53ae8c3bc9f4b59f9f6f98bd3a4f"; + name = "signon-kwallet-extension-18.12.3.tar.xz"; }; }; spectacle = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/spectacle-18.12.1.tar.xz"; - sha256 = "1r9iapwi1lp1p7x0dimblpmsizv1ys9708vdlzrk8q4m8rwn7ld9"; - name = "spectacle-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/spectacle-18.12.3.tar.xz"; + sha256 = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e"; + name = "spectacle-18.12.3.tar.xz"; }; }; step = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/step-18.12.1.tar.xz"; - sha256 = "1gn8l09r5rllz1mypsw2wfjhijy0i0bi4lspp271dinms6ryx6p4"; - name = "step-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/step-18.12.3.tar.xz"; + sha256 = "35abaf0a4597e141f4db08ad91ebcefafe43609b986a93a11e5f3ec19165c755"; + name = "step-18.12.3.tar.xz"; }; }; svgpart = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/svgpart-18.12.1.tar.xz"; - sha256 = "06rvbav94ysifha47lp52pvpc77y33p4zq4yfbmyh1pqkiw5db2s"; - name = "svgpart-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/svgpart-18.12.3.tar.xz"; + sha256 = "675ab3b652b0d2619abb305ce7c00beb8a80067416e4ea7e216cfa201a7ff8ef"; + name = "svgpart-18.12.3.tar.xz"; }; }; sweeper = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/sweeper-18.12.1.tar.xz"; - sha256 = "0bp0my9gf4n5p7v3g0q390lf9q4lh42mg2zngwadqcvrsi2w4av4"; - name = "sweeper-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/sweeper-18.12.3.tar.xz"; + sha256 = "8007da0f4d835e376fb049d539ca9fd6840ef7196f25b62cf652374a645fc6e0"; + name = "sweeper-18.12.3.tar.xz"; }; }; umbrello = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/umbrello-18.12.1.tar.xz"; - sha256 = "12kk04frx8fxcih22nv5c1765wawlf7wpiscaqmzlmrpa611x65r"; - name = "umbrello-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/umbrello-18.12.3.tar.xz"; + sha256 = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7"; + name = "umbrello-18.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.12.1"; + version = "18.12.3"; src = fetchurl { - url = "${mirror}/stable/applications/18.12.1/src/zeroconf-ioslave-18.12.1.tar.xz"; - sha256 = "1gzr50kqlwd2d47yc2k6yz2v0w2gp10c7glhb61jpdzsqy7r7cvp"; - name = "zeroconf-ioslave-18.12.1.tar.xz"; + url = "${mirror}/stable/applications/18.12.3/src/zeroconf-ioslave-18.12.3.tar.xz"; + sha256 = "b3adcaec0ebd89ddaf839954fb387e59791683d98f93da0c3dacb0266cd02a12"; + name = "zeroconf-ioslave-18.12.3.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/applications/misc/cura/default.nix b/nixpkgs/pkgs/applications/misc/cura/default.nix index f7907746d107..d570a2570d1c 100644 --- a/nixpkgs/pkgs/applications/misc/cura/default.nix +++ b/nixpkgs/pkgs/applications/misc/cura/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }: +{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, qtgraphicaleffects, curaengine }: mkDerivation rec { name = "cura-${version}"; - version = "3.6.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0wzkbqdd1670smw1vnq634rkpcjwnhwcvimhvjq904gy2fylgr90"; + sha256 = "18pxlmrw8m2mir177f0j9bma7rk29vam91gd86c0d458nw21q2qf"; }; materials = fetchFromGitHub { @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "0g2dkph0ll7d9109n17vmfwb4fpc8lhyb1z1q68j8vblyvg08d12"; }; - buildInputs = [ qtbase qtquickcontrols2 ]; + buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf ]; @@ -27,6 +27,12 @@ mkDerivation rec { cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" "-DCURA_VERSION=${version}" + + # see https://github.com/Ultimaker/Cura/issues/5142 + "-DCURA_SDK_VERSION=6.0.0" + + # remove after 4.0.0, see https://github.com/void-linux/void-packages/pull/9880#issuecomment-475453025 + "-DCURA_CLOUD_API_VERSION=1" ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/curaengine/default.nix b/nixpkgs/pkgs/applications/misc/curaengine/default.nix index ac0f9d542dde..9188e461e519 100644 --- a/nixpkgs/pkgs/applications/misc/curaengine/default.nix +++ b/nixpkgs/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curaengine-${version}"; - version = "3.6.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1iwmblvs3qw57698i8bbazyxha18bj9irnkcscdb0596g8q93fcm"; + sha256 = "0p4zcckrlrpyp5xdqgvp0phmawyh4cy8vipim9fvgsfcin4vhrv7"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/deco/default.nix b/nixpkgs/pkgs/applications/misc/deco/default.nix index e5dc011d5531..7f4629100d5d 100644 --- a/nixpkgs/pkgs/applications/misc/deco/default.nix +++ b/nixpkgs/pkgs/applications/misc/deco/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "deco"; - version = "0.0.1"; + version = "0.0.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "ebzzry"; repo = pname; - rev = "037f473ae4bdce5d3e2f76891785f0f7479cca75"; - sha256 = "1fv15nc9zqbn3c51vnm50yidj5ivpi61zg55cs46x3gi2x79x43q"; + rev = "49cded5ad123b0169f47cd0dc0f5420f4b581837"; + sha256 = "19rvqhw0blwga8ck86yy8hj7j1l9hriphlld6yrfd3yip4jprjzz"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix index 75783805fa3b..e0fd33d5e612 100644 --- a/nixpkgs/pkgs/applications/misc/gImageReader/default.nix +++ b/nixpkgs/pkgs/applications/misc/gImageReader/default.nix @@ -7,7 +7,7 @@ # Gtk deps # upstream gImagereader supports Qt too , gtk3, gobject-introspection, wrapGAppsHook -, gnome3, gtkspell3, gtkspellmm, cairomm +, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm }: let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { poppler # Gtk specific - gnome3.gtkmm + gtkmm3 gtkspell3 gtkspellmm - gnome3.gtksourceview - gnome3.gtksourceviewmm + gtksourceview3 + gtksourceviewmm cairomm json-glib ]; diff --git a/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock index e6c66cba1e06..4490ff60a5b9 100644 --- a/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock +++ b/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock @@ -29,15 +29,15 @@ GEM sanitize (~> 2.1.1, >= 2.1.1) stringex (~> 2.6) twitter-text (= 1.14.7) - json (2.1.0) + json (2.2.0) kramdown (1.9.0) mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mime-types-data (3.2019.0331) + mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) rack (1.6.11) rack-protection (1.5.5) @@ -49,8 +49,8 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.8.4) - tilt (2.0.8) + stringex (2.8.5) + tilt (2.0.9) twitter-text (1.14.7) unf (~> 0.1.0) unf (0.1.4) @@ -65,4 +65,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index bb105805ca8e..bef80a95bbb5 100644 --- a/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/nixpkgs/pkgs/applications/misc/gollum/gemset.nix @@ -1,5 +1,7 @@ { charlock_holmes = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; @@ -8,6 +10,8 @@ version = "0.7.6"; }; diff-lcs = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; @@ -17,6 +21,8 @@ }; gemojione = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; @@ -25,6 +31,8 @@ version = "3.3.0"; }; github-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; @@ -34,6 +42,8 @@ }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; @@ -43,6 +53,8 @@ }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7"; @@ -52,6 +64,8 @@ }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; @@ -61,6 +75,8 @@ }; gollum-lib = { dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf"; @@ -69,14 +85,18 @@ version = "4.2.10"; }; json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; kramdown = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; @@ -86,6 +106,8 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; @@ -94,22 +116,28 @@ version = "3.2.2"; }; mime-types-data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; type = "gem"; }; - version = "3.2018.0812"; + version = "3.2019.0331"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; mustache = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; @@ -119,14 +147,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; + sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2"; type = "gem"; }; - version = "1.8.4"; + version = "1.10.2"; }; posix-spawn = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; @@ -135,6 +167,8 @@ version = "0.3.13"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -144,6 +178,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; @@ -152,6 +188,8 @@ version = "1.5.5"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; @@ -161,6 +199,8 @@ }; sanitize = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898"; @@ -170,6 +210,8 @@ }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -178,23 +220,29 @@ version = "1.4.8"; }; stringex = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; + sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; type = "gem"; }; - version = "2.0.8"; + version = "2.0.9"; }; twitter-text = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; @@ -204,6 +252,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -212,6 +262,8 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; @@ -220,6 +272,8 @@ version = "0.0.7.5"; }; useragent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p"; diff --git a/nixpkgs/pkgs/applications/misc/googler/default.nix b/nixpkgs/pkgs/applications/misc/googler/default.nix index 4b5c17d8e51b..7ff7f6f811f7 100644 --- a/nixpkgs/pkgs/applications/misc/googler/default.nix +++ b/nixpkgs/pkgs/applications/misc/googler/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, python}: stdenv.mkDerivation rec { - version = "3.7.1"; + version = "3.8"; name = "googler-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "googler"; rev = "v${version}"; - sha256 = "0dcszpz85h3yjnr55ixf8mzsdv46w3g27frhgcsl5zlsgk6vl8kw"; + sha256 = "0f15rivjdj8r7wwrckcsaxxx129yh41fj4rhz4cbvbsb5f0f2daj"; }; propagatedBuildInputs = [ python ]; diff --git a/nixpkgs/pkgs/applications/misc/gphoto2/default.nix b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix index 5131e0739e73..9313199efb82 100644 --- a/nixpkgs/pkgs/applications/misc/gphoto2/default.nix +++ b/nixpkgs/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.17"; + name = "gphoto2-2.5.20"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa"; + sha256 = "1xj80abkzvqrd6g1j1q946lhbp03gyapyxdwbhc0y14g1ash6vx3"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; diff --git a/nixpkgs/pkgs/applications/misc/gramps/default.nix b/nixpkgs/pkgs/applications/misc/gramps/default.nix index db18ff73412c..e9026ded4702 100644 --- a/nixpkgs/pkgs/applications/misc/gramps/default.nix +++ b/nixpkgs/pkgs/applications/misc/gramps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool, gnome3, - pango, gobject-introspection, wrapGAppsHook, + pango, gobject-introspection, wrapGAppsHook, gettext, # Optional packages: enableOSM ? true, osm-gps-map, enableGraphviz ? true, graphviz, @@ -12,7 +12,7 @@ in buildPythonApplication rec { version = "5.0.1"; name = "gramps-${version}"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gettext ]; buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map diff --git a/nixpkgs/pkgs/applications/misc/gxmessage/default.nix b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix index 8401386ead49..a9e6d905c284 100644 --- a/nixpkgs/pkgs/applications/misc/gxmessage/default.nix +++ b/nixpkgs/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: +{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 9adb1f60b334..0aed767675e1 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "01grfbr3kpd4qf5cbcmzc6yfq34cm0nkak4pqzgrn46r254y0ymv"; }; - modSha256 = "0fqmxmhbzkd5617gch836l7clqbxx8b1mxx09v3v2c4jjxcm85cm"; + modSha256 = "01gni3ksw9whf388c6cj0vcbpsyhdrwfl8cyw85kjx8r56dv88y5"; buildFlags = "-tags extended"; diff --git a/nixpkgs/pkgs/applications/misc/iterm2/default.nix b/nixpkgs/pkgs/applications/misc/iterm2/default.nix index fa2ac38d383b..e493226be60a 100644 --- a/nixpkgs/pkgs/applications/misc/iterm2/default.nix +++ b/nixpkgs/pkgs/applications/misc/iterm2/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj ''; + preConfigure = "LD=$CC"; makeFlagsArray = ["Deployment"]; installPhase = '' mkdir -p "$out/Applications" diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix new file mode 100644 index 000000000000..aa49f0e3d751 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -0,0 +1,41 @@ +{ stdenv, appimage-run, fetchurl }: + +let + version = "1.0.140"; + sha256 = "1114v141jayqhvkkxf7dr864j09nf5nz002c7z0pprzr00fifqzx"; +in + stdenv.mkDerivation rec { + name = "joplin-${version}"; + + src = fetchurl { + url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; + inherit sha256; + }; + + buildInputs = [ appimage-run ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp $src $out/share/joplin.AppImage + echo "#!/bin/sh" > $out/bin/joplin-desktop + echo "${appimage-run}/bin/appimage-run $out/share/joplin.AppImage" >> $out/bin/joplin-desktop + chmod +x $out/bin/joplin-desktop $out/share/joplin.AppImage + ''; + + meta = with stdenv.lib; { + description = "An open source note taking and to-do application with synchronisation capabilities"; + longDescription = '' + Joplin is a free, open source note taking and to-do application, which can + handle a large number of notes organised into notebooks. The notes are + searchable, can be copied, tagged and modified either from the + applications directly or from your own text editor. The notes are in + Markdown format. + ''; + homepage = https://joplin.cozic.net/; + license = licenses.mit; + maintainers = with maintainers; [ rafaelgg raquelgb ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/josm/default.nix b/nixpkgs/pkgs/applications/misc/josm/default.nix index 8fab25fbce02..32d10712b763 100644 --- a/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { categories = "Education;Geoscience;Maps;"; }; + # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar makeWrapper ${jdk11}/bin/java $out/bin/josm \ - --add-flags "-jar $out/share/java/josm.jar" + --add-flags "-jar $out/share/java/josm.jar" \ + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications diff --git a/nixpkgs/pkgs/applications/misc/khal/default.nix b/nixpkgs/pkgs/applications/misc/khal/default.nix index da0c8c38e73d..2e32bbd611a1 100644 --- a/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -2,18 +2,17 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.9.10"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4"; + sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"; }; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ atomicwrites click + click-log configobj dateutil icalendar @@ -27,15 +26,14 @@ with python3.pkgs; buildPythonApplication rec { pkginfo freezegun ]; - nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ]; + nativeBuildInputs = [ setuptools_scm ]; checkInputs = [ pytest ]; postInstall = '' install -D misc/__khal $out/share/zsh/site-functions/__khal ''; - # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3 - doCheck = false; + doCheck = !stdenv.isAarch64; checkPhase = '' py.test diff --git a/nixpkgs/pkgs/applications/misc/kitty/default.nix b/nixpkgs/pkgs/applications/misc/kitty/default.nix index 58b6ae9aae83..3edb48cc489b 100644 --- a/nixpkgs/pkgs/applications/misc/kitty/default.nix +++ b/nixpkgs/pkgs/applications/misc/kitty/default.nix @@ -2,7 +2,20 @@ harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel, libstartup_notification, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, - which, dbus + which, dbus, + Cocoa, + CoreGraphics, + Foundation, + IOKit, + Kernel, + OpenGL, + cf-private, + libicns, + libpng, + librsvg, + optipng, + python3, + zlib, }: with python3Packages; @@ -19,12 +32,32 @@ buildPythonApplication rec { }; buildInputs = [ - fontconfig glfw ncurses libunistring harfbuzz libX11 + ncurses harfbuzz + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + Cocoa + CoreGraphics + Foundation + IOKit + Kernel + OpenGL + cf-private + libpng + python3 + zlib + ] ++ stdenv.lib.optionals stdenv.isLinux [ + fontconfig glfw libunistring libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus ]; - nativeBuildInputs = [ pkgconfig which sphinx ncurses ]; + nativeBuildInputs = [ + pkgconfig which sphinx ncurses + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + imagemagick + libicns # For the png2icns tool. + librsvg + optipng + ]; outputs = [ "out" "terminfo" ]; @@ -33,16 +66,30 @@ buildPythonApplication rec { src = ./fix-paths.patch; libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ./macos-10.11.patch + ./no-lto.patch + ./no-werror.patch + ./png2icns.patch ]; - buildPhase = '' + buildPhase = if stdenv.isDarwin then '' + make app + '' else '' ${python.interpreter} setup.py linux-package ''; installPhase = '' runHook preInstall mkdir -p $out + ${if stdenv.isDarwin then '' + mkdir "$out/bin" + ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" + mkdir "$out/Applications" + cp -r kitty.app "$out/Applications/kitty.app" + '' else '' cp -r linux-package/{bin,share,lib} $out + ''} wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ]}" runHook postInstall @@ -54,8 +101,13 @@ buildPythonApplication rec { ''; postInstall = '' + terminfo_src=${if stdenv.isDarwin then + ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' + else + "$out/share/terminfo"} + mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo + mv "$terminfo_src" $terminfo/share/terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages @@ -65,7 +117,7 @@ buildPythonApplication rec { homepage = https://github.com/kovidgoyal/kitty; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/kitty/macos-10.11.patch b/nixpkgs/pkgs/applications/misc/kitty/macos-10.11.patch new file mode 100644 index 000000000000..c8bf46839e8a --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/kitty/macos-10.11.patch @@ -0,0 +1,116 @@ +commit 749772b8b8179eb3b71e542fd9ed5621feb578f5 +Author: Matthew Glazar <strager.nds@gmail.com> +Date: Thu Feb 28 22:01:32 2019 -0800 + + Support macOS 10.11 + + Allow Kitty to run on macOS 10.11 El Capitan. + +diff --git a/glfw/cocoa_init.m b/glfw/cocoa_init.m +index 1e719d2e..05a680e4 100644 +--- a/glfw/cocoa_init.m ++++ b/glfw/cocoa_init.m +@@ -30,6 +30,10 @@ + #define NSEventMaskKeyUp NSKeyUpMask + #define NSEventMaskKeyDown NSKeyDownMask + #define NSEventModifierFlagCommand NSCommandKeyMask ++ #define NSEventModifierFlagControl NSControlKeyMask ++ #define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask ++ #define NSEventModifierFlagShift NSShiftKeyMask ++ #define NSEventTypeApplicationDefined NSApplicationDefined + #endif + + // Change to our application bundle's resources directory, if present +diff --git a/glfw/cocoa_window.m b/glfw/cocoa_window.m +index 1ce79b56..fd2255fc 100644 +--- a/glfw/cocoa_window.m ++++ b/glfw/cocoa_window.m +@@ -41,6 +41,7 @@ + #define NSWindowStyleMaskTitled NSTitledWindowMask + #define NSEventModifierFlagCommand NSCommandKeyMask + #define NSEventModifierFlagControl NSControlKeyMask ++ #define NSEventModifierFlagNumericPad NSNumericPadKeyMask + #define NSEventModifierFlagOption NSAlternateKeyMask + #define NSEventModifierFlagShift NSShiftKeyMask + #define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask +diff --git a/kitty/cocoa_window.m b/kitty/cocoa_window.m +index 5e9252ba..99eb3352 100644 +--- a/kitty/cocoa_window.m ++++ b/kitty/cocoa_window.m +@@ -15,6 +15,9 @@ + #include <objc/runtime.h> + + #if (MAC_OS_X_VERSION_MAX_ALLOWED < 101200) ++typedef NSUInteger NSWindowStyleMask; ++#define NSWindowStyleMaskBorderless NSBorderlessWindowMask ++#define NSWindowStyleMaskFullScreen NSFullScreenWindowMask + #define NSWindowStyleMaskResizable NSResizableWindowMask + #define NSEventModifierFlagOption NSAlternateKeyMask + #define NSEventModifierFlagCommand NSCommandKeyMask +diff --git a/kitty/logging.c b/kitty/logging.c +index 45c88174..1ec9f1b0 100644 +--- a/kitty/logging.c ++++ b/kitty/logging.c +@@ -5,12 +5,21 @@ + * Distributed under terms of the GPL3 license. + */ + ++#ifdef __APPLE__ ++#include <AvailabilityMacros.h> ++#endif ++#if defined(__APPLE__) && defined(MAC_OS_X_VERSION_10_12) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12 ++#define USE_APPLE_OS_LOG 1 ++#else ++#define USE_APPLE_OS_LOG 0 ++#endif ++ + #include "data-types.h" + #include <stdlib.h> + #include <stdarg.h> + #include <time.h> + #include <sys/time.h> +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + #include <os/log.h> + #endif + +@@ -21,7 +30,7 @@ void + log_error(const char *fmt, ...) { + va_list ar; + struct timeval tv; +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + // Apple does not provide a varargs style os_logv + char logbuf[16 * 1024] = {0}; + #else +@@ -44,7 +53,7 @@ log_error(const char *fmt, ...) { + if (use_os_log) { bufprint(vsnprintf, fmt, ar); } + else vfprintf(stderr, fmt, ar); + va_end(ar); +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + if (use_os_log) os_log(OS_LOG_DEFAULT, "%{public}s", logbuf); + #endif + if (!use_os_log) fprintf(stderr, "\n"); +@@ -66,7 +75,7 @@ static PyMethodDef module_methods[] = { + bool + init_logging(PyObject *module) { + if (PyModule_AddFunctions(module, module_methods) != 0) return false; +-#ifdef __APPLE__ ++#if USE_APPLE_OS_LOG + if (getenv("KITTY_LAUNCHED_BY_LAUNCH_SERVICES") != NULL) use_os_log = true; + #endif + return true; +diff --git a/setup.py b/setup.py +index f8643fce..55a96e73 100755 +--- a/setup.py ++++ b/setup.py +@@ -711,7 +711,7 @@ Categories=System;TerminalEmulator; + CFBundlePackageType='APPL', + CFBundleSignature='????', + CFBundleExecutable=appname, +- LSMinimumSystemVersion='10.12.0', ++ LSMinimumSystemVersion='10.11.0', + LSRequiresNativeExecution=True, + NSAppleScriptEnabled=False, + # Needed for dark mode in Mojave when linking against older SDKs diff --git a/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch new file mode 100644 index 000000000000..c5fdeb7ddc03 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/kitty/no-lto.patch @@ -0,0 +1,12 @@ +--- a/setup.py ++++ b/setup.py +@@ -223,9 +223,6 @@ def init_env( + cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) + cflags += shlex.split(os.environ.get('CFLAGS', '')) + ldflags += shlex.split(os.environ.get('LDFLAGS', '')) +- if not debug and not sanitize: +- # See https://github.com/google/sanitizers/issues/647 +- cflags.append('-flto'), ldflags.append('-flto') + + if profile: + cppflags.append('-DWITH_PROFILER') diff --git a/nixpkgs/pkgs/applications/misc/kitty/no-werror.patch b/nixpkgs/pkgs/applications/misc/kitty/no-werror.patch new file mode 100644 index 000000000000..c9b6dcd6b694 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/kitty/no-werror.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -202,7 +202,7 @@ def init_env( + cflags = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra -Wno-missing-field-initializers -Wall -std=c11' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ++ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ).format( + optimize, + ' '.join(sanitize_args), diff --git a/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch b/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch new file mode 100644 index 000000000000..d2d0806c862f --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/kitty/png2icns.patch @@ -0,0 +1,19 @@ +--- a/setup.py ++++ b/setup.py +@@ -744,9 +744,15 @@ Categories=System;TerminalEmulator; + if not os.path.exists(logo_dir): + raise SystemExit('The kitty logo has not been generated, you need to run logo/make.py') + subprocess.check_call([ +- 'iconutil', '-c', 'icns', logo_dir, '-o', ++ 'png2icns', + os.path.join('Resources', os.path.basename(logo_dir).partition('.')[0] + '.icns') +- ]) ++ ] + [os.path.join(logo_dir, logo) for logo in ( ++ 'icon_128x128.png', ++ 'icon_16x16.png', ++ 'icon_256x256.png', ++ 'icon_32x32.png', ++ 'icon_512x512.png', ++ )]) + # }}} + # }}} diff --git a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index 2928d271efcf..928a1bae108a 100644 --- a/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.2.20"; + version = "5.3.22"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m"; + sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index e173f6d0d7d5..76a0a5748081 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -19,6 +19,9 @@ let (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi") (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + + # https://github.com/NixOS/nixpkgs/pull/58179#issuecomment-478605134 + (mkOverride "werkzeug" "0.14.1" "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c") ]); }; diff --git a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix index 82468e1bf9f0..11c643fac2c3 100644 --- a/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/nixpkgs/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.12.0"; + version = "1.13.10"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "058pl54mkbvcjyjmdz81r0ibk1qkc3798pkkdw1kp2cbg16qkfyh"; + sha256 = "1bxcyf6n2m5x1z8ic6kzskinyyc6lh6nj0bycbwc524n6ms5j99p"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/qtpass/default.nix b/nixpkgs/pkgs/applications/misc/qtpass/default.nix index e03dd65b9eb3..15cd426f1b3f 100644 --- a/nixpkgs/pkgs/applications/misc/qtpass/default.nix +++ b/nixpkgs/pkgs/applications/misc/qtpass/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: stdenv.mkDerivation rec { - name = "qtpass-${version}"; - version = "1.2.1"; + pname = "qtpass"; + version = "1.2.3"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; + sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; }; - patches = [ ./hidpi.patch ]; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - postPatch = '' - substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" - substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" - ''; + enableParallelBuilding = true; postInstall = '' install -D qtpass.desktop $out/share/applications/qtpass.desktop diff --git a/nixpkgs/pkgs/applications/misc/qtpass/hidpi.patch b/nixpkgs/pkgs/applications/misc/qtpass/hidpi.patch deleted file mode 100644 index 629bcbb5baca..000000000000 --- a/nixpkgs/pkgs/applications/misc/qtpass/hidpi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/main/main.cpp b/main/main.cpp -index 8a18409c..1cddd911 100644 ---- a/main/main.cpp -+++ b/main/main.cpp -@@ -35,7 +35,7 @@ - * @return - */ - int main(int argc, char *argv[]) { -- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); -+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QString text = ""; - for (int i = 1; i < argc; ++i) { - if (i > 1) diff --git a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index f4918565f353..de1e7a093d5a 100644 --- a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -6,12 +6,12 @@ let inherit (python3Packages) python buildPythonApplication fetchPypi; in buildPythonApplication rec { name = "${pname}-${version}"; pname = "safeeyes"; - version = "2.0.8.1"; + version = "2.0.9"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1x52ym8n4r6h38n4mcydxkvz71hhrd9wbiq4gzvwrai0xzl6qqsq"; + sha256 = "13q06jv8hm0dynmr3g5pf1m4j3w9iabrpz1nhpl02f7x0d90whg2"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 96049b395ea5..f7f4b8985f0b 100644 --- a/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkgconfig, pantheon, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils +, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }: let - version = "0.6.7"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; }; in stdenv.mkDerivation rec { - name = "sequeler-${version}"; + pname = "sequeler"; + version = "0.6.8"; src = fetchFromGitHub { owner = "Alecaddd"; - repo = "sequeler"; + repo = pname; rev = "v${version}"; - sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p"; + sha256 = "1rx8h3bi86vk8j7c447pwm590z061js4w45nzrp66r41v0rnh5vk"; }; - nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ]; diff --git a/nixpkgs/pkgs/applications/misc/solaar/default.nix b/nixpkgs/pkgs/applications/misc/solaar/default.nix index 1928da18681f..cb2cd3f1e62f 100644 --- a/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -1,5 +1,9 @@ -{fetchFromGitHub, stdenv, gtk3, pythonPackages, gobject-introspection}: -pythonPackages.buildPythonApplication rec { +{ 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 rec { pname = "solaar-unstable"; version = "2019-01-30"; @@ -10,7 +14,8 @@ pythonPackages.buildPythonApplication rec { sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr"; }; - propagatedBuildInputs = [pythonPackages.pygobject3 pythonPackages.pyudev gobject-introspection gtk3]; + propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; + postInstall = '' wrapProgram "$out/bin/solaar" \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -19,12 +24,12 @@ pythonPackages.buildPythonApplication rec { --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - mkdir -p $out/lib/udev/rules.d - cp rules.d/*.rules $out/lib/udev/rules.d/ + install -Dm644 -t $out/etc/udev/rules.d rules.d/*.rules ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + + meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' Solaar is a Linux device manager for Logitech’s Unifying Receiver @@ -40,6 +45,6 @@ pythonPackages.buildPythonApplication rec { license = licenses.gpl2; homepage = https://pwr.github.io/Solaar/; platforms = platforms.linux; - maintainers = [maintainers.spinus maintainers.ysndr]; + maintainers = with maintainers; [ spinus ysndr ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix index 483fb9cf95a0..1fc96e551ac7 100644 --- a/nixpkgs/pkgs/applications/misc/stupidterm/default.nix +++ b/nixpkgs/pkgs/applications/misc/stupidterm/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: stdenv.mkDerivation rec { - name = "stupidterm-2018-09-25"; + pname = "stupidterm"; + version = "2019-03-26"; nativeBuildInputs = [ pkgconfig ]; @@ -10,17 +11,19 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esmil"; repo = "stupidterm"; - rev = "d1bc020797330df83d427e361d3620e346a4e792"; - sha256 = "1yh2vhq3d0qbh0dh2h9yc7s9gkffgkb987vvwz2bdnvlskrjmmdj"; + rev = "f824e41c2ca9016db73556c5d2f5a2861e235c8e"; + sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; installPhase = '' - mkdir -p $out/bin $out/share/applications $out/share/stupidterm - cp stupidterm $out/bin - substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop - substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini + install -D stupidterm $out/bin/stupidterm + install -D -m 644 stupidterm.desktop $out/share/applications/stupidterm.desktop + install -D -m 644 stupidterm.ini $out/share/stupidterm/stupidterm.ini + + substituteInPlace $out/share/applications/stupidterm.desktop \ + --replace "Exec=st" "Exec=$out/bin/stupidterm" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/stupidterm/stupidterm.desktop b/nixpkgs/pkgs/applications/misc/stupidterm/stupidterm.desktop deleted file mode 100644 index c26d46060183..000000000000 --- a/nixpkgs/pkgs/applications/misc/stupidterm/stupidterm.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=20170315 -Name=stupidterm -Comment=VTE based terminal emulator -Exec=stupidterm -Icon=utilities-terminal -Terminal=false -Type=Application -Categories=System;TerminalEmulator; diff --git a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index 825b52cda7f8..293f6aaa3c6f 100644 --- a/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -74,15 +74,15 @@ let in rec { application = mkSweetHome3D rec { - version = "6.0"; + version = "6.1.2"; module = "SweetHome3D"; name = stdenv.lib.toLower module + "-application-" + version; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "1l4kc1c2iwkggmcdb2wksb4vrh97ll804vc51yawhdlq9g567ky9"; - rev = "6647"; + sha256 = "14svi112kml175dblzcdjzhlfwbp1cy6rki49mqb3632hwmif6ya"; + rev = "6750"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index 2ae86c5d5102..bdbea571790e 100644 --- a/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; }; - modSha256 = "0ymqhrkgk94z4f2p3c6v75g2h8qlqzdi7byivqzxzmdczmq9zq2s"; + modSha256 = "01i8fim9z2l8rpdgfaih9ldvbap7gcx5767a15miv8q7sxpr90cp"; meta = with stdenv.lib; { description = "Shows colorful, animated party parrot in your terminial"; diff --git a/nixpkgs/pkgs/applications/misc/terminator/default.nix b/nixpkgs/pkgs/applications/misc/terminator/default.nix index 4a6ad4e5ea38..80dffe6d93f2 100644 --- a/nixpkgs/pkgs/applications/misc/terminator/default.nix +++ b/nixpkgs/pkgs/applications/misc/terminator/default.nix @@ -12,7 +12,9 @@ python2.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 vte libnotify keybinder3 ]; + buildInputs = [ gtk3 vte libnotify keybinder3 + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/tilix/default.nix b/nixpkgs/pkgs/applications/misc/tilix/default.nix index ab6ef3294700..ed9ae5ade9ff 100644 --- a/nixpkgs/pkgs/applications/misc/tilix/default.nix +++ b/nixpkgs/pkgs/applications/misc/tilix/default.nix @@ -4,19 +4,20 @@ stdenv.mkDerivation rec { pname = "tilix"; - version = "1.8.9"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = version; - sha256 = "1l1ib3g01mxiywbwjxc2522qgjy3ymjzy8bxl42k0hprpp95rw9d"; + sha256 = "1k8hqpq6bzmn06b4s8c257n37ghgp3fl7l9g6fy0giwk1x0ix735"; }; nativeBuildInputs = [ autoreconfHook dmd desktop-file-utils perlPackages.Po4a pkgconfig xdg_utils wrapGAppsHook ]; + buildInputs = [ gnome3.dconf gettext gsettings-desktop-schemas gtkd dbus libsecret ]; preBuild = '' @@ -34,7 +35,10 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \ --replace "Exec=tilix" "Exec=$out/bin/tilix" - sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop + + # TODO: Won't be needed after the switch to Meson + substituteInPlace $out/share/dbus-1/services/com.gexperts.Tilix.service \ + --replace "/usr/bin/tilix" "$out/bin/tilix" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/misc/todoist/default.nix b/nixpkgs/pkgs/applications/misc/todoist/default.nix index 31901bf5616b..d4735c0baf5f 100644 --- a/nixpkgs/pkgs/applications/misc/todoist/default.nix +++ b/nixpkgs/pkgs/applications/misc/todoist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc"; }; - modSha256 = "0ng1paw2mizhs4g28ypxz0ryh43l90qw8qsq46sshsiiswvrpl0k"; + modSha256 = "09n6abyaqwz4zcdz8934rvpbxhp4v2nmm5v739kkcc98c3h93i64"; meta = { homepage = https://github.com/sachaos/todoist; diff --git a/nixpkgs/pkgs/applications/misc/toot/default.nix b/nixpkgs/pkgs/applications/misc/toot/default.nix index 127d9f21d998..6079c8807dc1 100644 --- a/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.20.0"; + version = "0.21.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "0s5i6fjip5kvvyb59yndi2rhgn962lr0g9b0pi5w2aqnv1mwjbfh"; + sha256 = "03s81i9rz7dn33r13p7j2c7yw874hkm64x7myddiqw9lc21fyzql"; }; checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future ]; + [ requests beautifulsoup4 future wcwidth ]; checkPhase = '' py.test diff --git a/nixpkgs/pkgs/applications/misc/waybar/default.nix b/nixpkgs/pkgs/applications/misc/waybar/default.nix new file mode 100644 index 000000000000..ab1e0b5dda26 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt +, traySupport ? true, libdbusmenu-gtk3 +, pulseSupport ? false, libpulseaudio +, nlSupport ? true, libnl +, udevSupport ? true, udev +, swaySupport ? true, sway +}: + stdenv.mkDerivation rec { + name = "waybar-${version}"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Alexays"; + repo = "Waybar"; + rev = version; + sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + ]; + + buildInputs = with stdenv.lib; + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt ] + ++ optional traySupport libdbusmenu-gtk3 + ++ optional pulseSupport libpulseaudio + ++ optional nlSupport libnl + ++ optional udevSupport udev + ++ optional swaySupport sway; + + mesonFlags = [ + "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" + "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" + "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" + "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" + "-Dout=${placeholder "out"}" + ]; + + meta = with stdenv.lib; { + description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen minijackson ]; + platforms = platforms.unix; + }; + } diff --git a/nixpkgs/pkgs/applications/misc/workrave/default.nix b/nixpkgs/pkgs/applications/misc/workrave/default.nix index 7e54f943856a..1547d2962116 100644 --- a/nixpkgs/pkgs/applications/misc/workrave/default.nix +++ b/nixpkgs/pkgs/applications/misc/workrave/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "workrave-${version}"; - version = "1.10.23"; + version = "1.10.31"; src = let in fetchFromGitHub { - sha256 = "1qhlwfhwk5agv4904d6bsf83k9k89q7bms6agg967vsca4905vcw"; + sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; rev = with stdenv.lib; "v" + concatStringsSep "_" (splitString "." version); repo = "workrave"; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 22ababbca3be..ff0555eb9657 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.13.1"; + version = "2.14.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160"; + sha256 = "0pc3ssmnn36xs3jgznx36q4z3qh06fkbz8md3p3rk6rpvly929pn"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 2df0cdafdc4b..6040b60707a2 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.11.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1jjcgnpkxdafsdsxndsvzd84i6mwk7ix4vvgs3k1dla9ll9nwq5j"; + sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix index f3e743b5528c..21f95c65fa56 100644 --- a/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix +++ b/nixpkgs/pkgs/applications/misc/xtermcontrol/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.7"; name = "xtermcontrol-${version}"; src = fetchurl { url = "https://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz"; - sha256 = "01bwgxya6qh4br2lx3v98p7j1b99skgr6c1frw5kdkxy57qlpgkz"; + sha256 = "04m12ddaps5sdbqvkwkp6lh81i8vh5ya5gzcxkrkilsga3m6qff2"; }; meta = { diff --git a/nixpkgs/pkgs/applications/misc/zola/default.nix b/nixpkgs/pkgs/applications/misc/zola/default.nix index d4afe4ea9e14..6fc7de1d4d57 100644 --- a/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { - name = "zola-${version}"; - version = "0.5.1"; + pname = "zola"; + version = "0.6.0"; src = fetchFromGitHub { owner = "getzola"; - repo = "zola"; + repo = pname; rev = "v${version}"; - sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; + sha256 = "11y5gb6lx040ax4b16fr3whkj4vmv8hlkvb50h58gs77payglf6l"; }; - cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; + cargoSha256 = "19hqkj27dbsy4pi0i8mjjlhi4351yifvc6zln6scc2nd60p251h6"; - nativeBuildInputs = [ cmake pkgconfig openssl ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' install -D -m 444 completions/zola.bash \ diff --git a/nixpkgs/pkgs/applications/networking/brig/default.nix b/nixpkgs/pkgs/applications/networking/brig/default.nix new file mode 100644 index 000000000000..b86cb7d3dd92 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "brig-${version}"; + version = "0.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/sahib/brig"; + subPackages = ["."]; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "brig"; + inherit rev; + sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy"; + }; + + meta = with stdenv.lib; { + description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; + homepage = https://github.com/sahib/brig; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 36576df4b732..49426a8af3b2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,10 +20,12 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi # package customization , enableNaCl ? false , enableWideVine ? false +, useVaapi ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -126,6 +128,7 @@ let ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "72") jdk.jre; @@ -143,6 +146,9 @@ let # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) [ + # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi + ./patches/chromium-vaapi.patch ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) ] ++ optional stdenv.isAarch64 @@ -260,6 +266,8 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 4b9a747811f8..68aee1f98d76 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,7 @@ { newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7 , makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas +, libva ? null # package customization , channel ? "stable" @@ -10,6 +11,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false +, useVaapi ? false # test video on radeon, before enabling this , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -32,6 +34,7 @@ in let mkChromiumDerivation = callPackage ./common.nix { inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport + useVaapi enableWideVine; }; @@ -92,6 +95,10 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + libPath = stdenv.lib.makeLibraryPath ([] + ++ stdenv.lib.optional useVaapi libva + ); + in with stdenv.lib; '' mkdir -p "$out/bin" @@ -109,6 +116,8 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:${libPath}" + # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch new file mode 100644 index 000000000000..38d77e215516 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch @@ -0,0 +1,117 @@ +From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001 +From: Akarshan Biswas <akarshan.biswas@gmail.com> +Date: Thu, 24 Jan 2019 12:45:29 +0530 +Subject: [PATCH] Enable mojo with VDA2 on Linux + +--- + chrome/browser/about_flags.cc | 8 ++++---- + chrome/browser/flag_descriptions.cc | 9 +++++++-- + chrome/browser/flag_descriptions.h | 10 ++++++++-- + gpu/config/software_rendering_list.json | 3 ++- + media/media_options.gni | 9 ++++++--- + media/mojo/services/gpu_mojo_media_client.cc | 4 ++-- + 6 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +index 0a84c6ac1..be2aa1d8b 100644 +--- a/chrome/browser/about_flags.cc ++++ b/chrome/browser/about_flags.cc +@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = { + "disable-accelerated-video-decode", + flag_descriptions::kAcceleratedVideoDecodeName, + flag_descriptions::kAcceleratedVideoDecodeDescription, +- kOsMac | kOsWin | kOsCrOS | kOsAndroid, ++ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, + #if defined(OS_WIN) +@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)}, + #endif // ENABLE_ISOLATED_XR_SERVICE + #endif // ENABLE_VR +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) + {"disable-accelerated-mjpeg-decode", + flag_descriptions::kAcceleratedMjpegDecodeName, +- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, ++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, +-#endif // OS_CHROMEOS ++#endif // OS_CHROMEOS // OS_LINUX + {"v8-cache-options", flag_descriptions::kV8CacheOptionsName, + flag_descriptions::kV8CacheOptionsDescription, kOsAll, + MULTI_VALUE_TYPE(kV8CacheOptionsChoices)}, +diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc +index 62637e092..86f89fc6e 100644 +--- a/chrome/browser/flag_descriptions.cc ++++ b/chrome/browser/flag_descriptions.cc +@@ -3085,15 +3085,20 @@ const char kTextSuggestionsTouchBarDescription[] = + + #endif + +-// Chrome OS ------------------------------------------------------------------- ++// Chrome OS Linux------------------------------------------------------------------- + +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) + + const char kAcceleratedMjpegDecodeName[] = + "Hardware-accelerated mjpeg decode for captured frame"; + const char kAcceleratedMjpegDecodeDescription[] = + "Enable hardware-accelerated mjpeg decode for captured frame where " + "available."; ++#endif ++ ++// Chrome OS -------------------------------------------------- ++ ++#if defined(OS_CHROMEOS) + + const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click"; + const char kAllowTouchpadThreeFingerClickDescription[] = +diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h +index 5dac660bb..6cc4115da 100644 +--- a/chrome/browser/flag_descriptions.h ++++ b/chrome/browser/flag_descriptions.h +@@ -1846,13 +1846,19 @@ extern const char kPermissionPromptPersistenceToggleDescription[]; + + #endif // defined(OS_MACOSX) + +-// Chrome OS ------------------------------------------------------------------ ++// Chrome OS and Linux ------------------------------------------------------------------ + +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) + + extern const char kAcceleratedMjpegDecodeName[]; + extern const char kAcceleratedMjpegDecodeDescription[]; + ++#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++ ++// Chrome OS ------------------------------------------------------------------------ ++ ++#if defined(OS_CHROMEOS) ++ + extern const char kAllowTouchpadThreeFingerClickName[]; + extern const char kAllowTouchpadThreeFingerClickDescription[]; + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 65f37b3f1..ae8a1718f 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -371,11 +371,12 @@ + }, + { + "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", ++ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms", + "cr_bugs": [137247], + "os": { + "type": "linux" + }, ++ "vendor_id": "0x10de", + "features": [ + "accelerated_video_decode" + ] +-- +2.20.1 + diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix index 277ad29abe29..2334dc6a71e4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/update.nix @@ -97,13 +97,13 @@ in rec { builtins.tryEval (builtins.fetchurl url) - ... except that tryEval on fetchurl isn't working and doesn't catch errors - for fetchurl, so we go for a different approach. + ... except that tryEval on fetchurl isn't working and doesn't catch + errors for fetchurl, so we go for a different approach. We only have fixed-output derivations that can have networking access, so - we abuse MD5 and its weaknesses to forge a fixed-output derivation which + we abuse SHA1 and its weaknesses to forge a fixed-output derivation which is not so fixed, because it emits different contents that have the same - MD5 hash. + SHA1 hash. Using this method, we can distinguish whether the URL is available or whether it's not based on the actual content. @@ -111,25 +111,50 @@ in rec { So let's use tryEval as soon as it's working with fetchurl in Nix. */ tryFetch = url: let - mkBin = b: runCommand "binary-blurb" { inherit b; } '' - h="$(echo "$b" | sed -e ':r;N;$!br;s/[^ \n][^ \n]/\\x&/g;s/[ \n]//g')" - echo -ne "$h" > "$out" - ''; - - # Both MD5 hash collision examples are from: - # https://en.wikipedia.org/wiki/MD5#Collision_vulnerabilities - hashCollTrue = mkBin '' - d131dd02c5e6eec4 693d9a0698aff95c 2fcab58712467eab 4004583eb8fb7f89 - 55ad340609f4b302 83e488832571415a 085125e8f7cdc99f d91dbdf280373c5b - d8823e3156348f5b ae6dacd436c919c6 dd53e2b487da03fd 02396306d248cda0 - e99f33420f577ee8 ce54b67080a80d1e c69821bcb6a88393 96f9652b6ff72a70 - ''; - - hashCollFalse = mkBin '' - d131dd02c5e6eec4 693d9a0698aff95c 2fcab50712467eab 4004583eb8fb7f89 - 55ad340609f4b302 83e4888325f1415a 085125e8f7cdc99f d91dbd7280373c5b - d8823e3156348f5b ae6dacd436c919c6 dd53e23487da03fd 02396306d248cda0 - e99f33420f577ee8 ce54b67080280d1e c69821bcb6a88393 96f965ab6ff72a70 + # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: + collisions = runCommand "sha1-collisions" { + outputs = [ "out" "good" "bad" ]; + base64 = '' + QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 + Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 + MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk + 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN + GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp + o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ + qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH + MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B + mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 + S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC + Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc + upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu + renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ + yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL + StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 + wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE + JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW + lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU + pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 + rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE + sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P + i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl + 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen + r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ + YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw + l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM + sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp + V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh + t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt + Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 + i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p + y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW + 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k + NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== + ''; + } '' + echo "$base64" | base64 -d | tar xj + mv good.pdf "$good" + mv bad.pdf "$bad" + touch "$out" ''; cacheVal = let @@ -137,31 +162,40 @@ in rec { timeSlice = builtins.currentTime / 600; in "${urlHash}-${toString timeSlice}"; - successBin = stdenv.mkDerivation { - name = "tryfetch-${cacheVal}"; - inherit url; - - outputHash = "79054025255fb1a26e4bc422aef54eb4"; - outputHashMode = "flat"; - outputHashAlgo = "md5"; - - nativeBuildInputs = [ curl ]; - preferLocalBuild = true; - - buildCommand = '' - if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ - curl -s -L -f -I "$url" > /dev/null; then - cat "${hashCollTrue}" > "$out" - else - cat "${hashCollFalse}" > "$out" - fi - ''; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - in { - success = builtins.readFile successBin == builtins.readFile hashCollTrue; + success = import (runCommand "check-success" { + result = stdenv.mkDerivation { + name = "tryfetch-${cacheVal}"; + inherit url; + + outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; + outputHashMode = "flat"; + outputHashAlgo = "sha1"; + + nativeBuildInputs = [ curl ]; + preferLocalBuild = true; + + inherit (collisions) good bad; + + buildCommand = '' + if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ + curl -s -L -f -I "$url" > /dev/null; then + cp "$good" "$out" + else + cp "$bad" "$out" + fi + ''; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + }; + inherit (collisions) good; + } '' + if cmp -s "$result" "$good"; then + echo true > "$out" + else + echo false > "$out" + fi + ''); value = builtins.fetchurl url; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index cc54db0a38ae..de83e0e0646c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/nixpkgs/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 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; - sha256bin64 = "0pv5aafwdwcp1ssijgx19ba1ap40j6ayv15ynxvv8fsh51ara1vp"; - version = "73.0.3683.75"; + sha256 = "1lpgkf292f6v6v19zjp1si6vvizixk9192yjx76pq1d790678qrb"; + sha256bin64 = "028c3gjh5zbxr53wkk3s5jvgwc2fz9cnvnyr58q4la91vyrbjslm"; + version = "74.0.3729.61"; }; dev = { - sha256 = "19fwzxnsd1parqghv4b2mif3cj1k1m5hzqnjsnglkgv6xnqny98g"; - sha256bin64 = "1aag76dgcnwga1q4jdgm3ziqvxs1qvrsyqfd7bbsi7axz6qi135v"; - version = "74.0.3724.8"; + sha256 = "15197r2gbx4h7dsasvgz0vcl7mqmj0glc4sip99dw145drwdpmsq"; + sha256bin64 = "1qf089l5k7l69msrn49z5lkg932n1rgnzgr9yg5ja89arcgynacv"; + version = "75.0.3753.4"; }; stable = { - sha256 = "0z6m7l76qzqsf5d54k331cl7cx1f0lh4x13269mjk7664q382143"; - sha256bin64 = "10j93186f3ipynyw6nb6bx4haav33gzvmc72sl9ybz6zljd88dpq"; - version = "73.0.3683.75"; + sha256 = "1bskjr7yiwvdab1b5mp36y6964xqpgks6dqazm4qifwqvqcw80pb"; + sha256bin64 = "00ndrqhmnk567sw6xj22m84126qvivq0jzfx0v46ya3kq6ln22gr"; + version = "73.0.3683.103"; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix index 5b3e8d727d0c..e067f3f15eb5 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/eolie/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "eolie"; - version = "0.9.45"; + version = "0.9.60"; 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 = "0x6f2qqqxpjf28mqxs4jlrz2z8wa9nvb9h24nf8qwmzavjjbraqg"; + sha256 = "1mhl7p8pwp8lqx5z15r0lx1y4mb2c1gjwy3w6041cyc4hyb91693"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix index ff16ddb90f69..c721a61591a1 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "falkon-${version}"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41"; + sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 256d2e39cded..ca295183e221 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0b7"; + version = "67.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ach/firefox-67.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b654e75351d83ad81df615c9a3f3ce90cc7d033b43162be78cef88bdfa4f730c6f457e09f7a3d7f6f4253407dac6c65106f5af3f3422de4eb14e982fecd06367"; + sha512 = "4f640887e38c4c6fd30f8c6bb3d296336a73c9c039c9ebcd0b26080528d5ee2f9ae3e041d107d4dfb2fdc9fbbe50669e8f4332adb02f01e700b24afeb918b0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/af/firefox-67.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "97f7c12034384ef37db8a30b31e345caa578ed9e1720bdb4555f29a82397f009d2cb771946e1d05d8aaa67e2dcc6081829977201ab78303dccb98cd0084b0d49"; + sha512 = "75e2d8b31e3a4cfa43893d22d3d6cb274834daebfcc1ac27a7e77cf5404f5ac521362e9b57de7977c9117a6a5d4e1a975403c55d7bd61d5e06aae9d2957bfeba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/an/firefox-67.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cc9822f0a07a490a2fc5e3138e0320b01e395eb648724c33d177230aba51e50bb3dc30630065e66d54b3f0aac8339a23393cb07e3eae15aeeb9d60b0ca8866f1"; + sha512 = "4018b692d2bad85bb7e2d90416f6ff1b3a61bcb2d352b8d3a6b9771348434b624f923185015bd3bb32786fa83f8ce184a3464a91a80e17dc94113805fdf386ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ar/firefox-67.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "335d84de77df91f4fbdb545d8762d38a64743c1001a88133c64e09b05c5728134ab5bc6d9eb44795a797ac3299094f24fa3a00971bf030511c09c5c5bea708b5"; + sha512 = "9459917b266241cde076463d100d29bfda4f2da401d261fb2baa87fddffe86a983a5f873983aab5db8a16704d36850608a670da12d9fb93792bdeda7864bdded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/as/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/as/firefox-67.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "df7c4e094243a4ecaa3a269a3e22c15c6756b8df4a970284b98c8db3132e2b552c86c0c39241c58522d5263abd011f16f5d2f27e2f23dd191e98930801c52c70"; + sha512 = "78cfd264f164400e76bf1a2935daa97c1e43b65bf057eb1287de07e148238205dfb72c3412437ad42948b9e9d47bc2a2c2f2360ac9255b2f834cc1a62c282678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ast/firefox-67.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5b81a7dd3d969336ebd8f88f88f42c2008ccebacca5ee90db6f406b3b3803c3ee5c0932dd0528d42197a9e44a4f23aea738c789221339dcd99ae2fe3be6a1920"; + sha512 = "ec2ab27cbf93854c995d3d2fafcbd3e121224aac344a058e6c8113a3fedf62650037054967987fde6d035013366f7c5ebd4b179ab37b7c8a8a2fe95490cf80ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/az/firefox-67.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "e88448e4c5dd8ffbd626a3c215165cbd1a6f57880bc0574e93cc1573a208c8c329fd684e50099f0512f177a809314f9e2a8a7e27bc4b37eac618a786202cb851"; + sha512 = "a86a3475738ad39c05db2ec9084032c7b3141882348870ab29e0940a1da0098e548175257d2b656332c23ae0db224a9f12d0c630985c25c0a0ff8d84d00db6df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/be/firefox-67.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d88e247de3ad2079852cd12135dafac94fbc491bd2ed974aa6891f30719568f29b7f85449ed3d236f52f7b376ae976fcf94cb15d91144789a837b71cee8fbc26"; + sha512 = "5d997969f984fb9e9bf5dfbf64b66bf604abab0a4c1d2e53b82990197dd233b7605f3ae294053428a0f8509f0c640771b203d865e2e655fdb9449bdfa9454a97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bg/firefox-67.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "41bc5b53dc193c38042b585d1c667ab6bb946a6479c7b64fe2bb160cdae559e59770c0c067249723d96f80993b358b0925c6d4f4e685e7f5bce50aafd7a6ba7b"; + sha512 = "930794602f594588382b959ef54d4ff05cb8ba71d39ecc23934d29e8820bbad8204708392c28185fd97b2eff7cd1a93a7156736675ceb072c4b820cc78be6efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bn-BD/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bn-BD/firefox-67.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5fa6ccff9c96760ee5fcbb1a5a23a42412a5a3d54d61810eaa5b5670ff35715c20ba8ef449a922cbbb2fa5fc8d8817c64dcafb2f4d6945e8630141559a45da0e"; + sha512 = "f186acacbe502a620f8b2dbc1ed6fb3d978128af749b8f55efa122cff6ba3702c21361e47fd5a4af33b533a7961ccc13dcb0ed19e2617b244a87c82295f491a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bn-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bn-IN/firefox-67.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "5912e3889444159c2ce5fa0e74feffd48119f9658f0f7f7c83cdd2b67b7694dbac908fab4daa91c34bd154d274a8fee4a9106709a5cadc1f75cdb033847b7f38"; + sha512 = "fbc97c4a4fa81edeb8b6af71accae9155f7efab2e79a724a671a07adcfa5f0f252faac3a3ec63db452126aa0ac87b2943657e9d18094274ce72995f3f7ea3f35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/br/firefox-67.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "868742b065866557a6e128dd1d55122567df1385c83c83a69775abdf74b4c1dd46f7fa4c1cffdb0775e3cb3e1d50e1c767d3d6147a5d4f088608940c6c6ad232"; + sha512 = "ded74968f5cb4b9794d1a200fcf378698c5d31bace8b0e39e1c6710d665b7152e77fd565cdd694b8e556857d9415dc6af912c5c44bd5c937baf52cacb33d399d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/bs/firefox-67.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "edc9c5bf8570a778458987f714819fe29202d34c7f36702bc52c28d92ecc990a3cb5defbc1cf7e6de8c9cb5417a0511958a9b158b08e174bdf2fa461c5fbac3d"; + sha512 = "b98385274bc71ce17144adbb164e9d42fbac318ea953fd994468cf6066fa0dd5aced6d737da3be21f0e0bdcf30507ecf29f2865941df8b6a6334dcbd4394cfa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ca/firefox-67.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "c2afeefc651e088ed37a432c1ea41243bb104f46e811776a00fc16b8d167084fe2a3f89846439dd0c7f996761a998e6f2d9c858d956d77c2d889bf7604f66446"; + sha512 = "497a623b9e39035337ca67bee7d04399f38eadba23ecb9c354ee848c969746655c693c3fbc00ad5e826ea0d5140dd0ac6ace029c35b56fe3cccf79c8612de68c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cak/firefox-67.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "89738c8a65cc4f9916f9176dcdd724633af75eaf4ebab91dcee001c84b2a66d213b02e070653b9695b53f5f1b8201cd9e06f51d77bbe1d03635021b7aea86b2a"; + sha512 = "55ed818b0b3acee7416615ddb606f0695f948fa633b44889e1881acd091ac514a57a8678d8830a91bc7097282a2df30396e3f27a0df225b7fb6de458cc5ff832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cs/firefox-67.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "eb43b421ea50f6bf7d5f5299cd8aebc56e610cfc83947246805c786f096bc4624c9f39c3fbef149c40b778450f3c4ff5f5b0cfbd30eb80ebaca28055045ef2e3"; + sha512 = "a79c77cf3fad65437e20dc4f086778daac9bd403228ac0efbc1aa5b69216b6aaa91488f5691bd9cb9e27a44b7107342ff3cbe03be73a83a9f449eeb777afcfba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/cy/firefox-67.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "3dda2c134eac43b9fc091a34c3ca39715be0fdcf6ed1a39c8a7c6895656cffd6b3321de05eeee15396b4ebc7300ed2a5b8b3f311b379a434369ee9239a063404"; + sha512 = "da13683201a46d15bb6f6c4ed871459a83894a8d883a743637a978ed202001dda2bf0812f02c193f178023a1229357b394d69e6e902cf76afb27f4929fc6829b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/da/firefox-67.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e22dcee97ecf12846bfb1e130b47a666b7b414db32397f1f1e8c26287d9068f4590d730a31dc79d2752fd4b9ab5ced01a8ae0435775625a737d2638480eb64ce"; + sha512 = "9694ffc20872aa9e033255a8c5f8c98b4dad2159aa3dc2bd841240b2c462b519831c5d938d3ba7470c738f3c587ed211367ca1f7a00e225a90744ca330d97e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/de/firefox-67.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2c1f121bd69d0fd3cc54e5c6dd90ee67cfae72a237df4ad733e380626f234d8404bfb066f77d918e6b369eb8d0382dd1e93d3c9ac8300e889d0ead88362c3201"; + sha512 = "0fc81d549c2636d2e58b8f4e9923e6d5d691a64bf2909107735eff9aee6bba0de4d967066fa6937f237939391c86ccca55ae03b8e55513600108bd86ed200899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/dsb/firefox-67.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ab2580a816b8bc7bd8d34538240f1cb3761a3330f14dc9219e422ffa01813d6b8f77c858fca1fdf3e41b8624d80055faef943e51328f551d4e6a99690a4b35f0"; + sha512 = "ddff938d5a79e9253c6815846b9951d8b64618d5308d8fde620e21492cc4979bb56d88d716861661a50d01f0f020eb1cd6baeeff83436e584b94f80b3e93eb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/el/firefox-67.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6f53270119cd749172c8a766e293117877e0f62801b4d45e9e6448cf3d781c746ba0a9ef5f26ffb8ccdd31db5ef773220a22ca019ee298e2484badbc3c785931"; + sha512 = "099ea9058e26600be8ea8a82cda49a3a76585cb6078bc221a653cc385022ff7991f8b9e02cb7caf7a6562bcc84c00cd7a69c01678d31fa1dc89f2c2659347de3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-CA/firefox-67.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ff54928066083a535795c591abdddfa5a08ba9393f121fc98ea0c92e42860bec0e604562639dec6d79b04f906b2e7b7bd40259752b168835d7ff79b67068290c"; + sha512 = "6ebb2c19ed3705834a29f64d79fe8d0cd4c8b5e17ee957e30e11f63399c887491e354a641df37743de9d3a9e4b864efe4b6a2481a029ed545f06932a49da26c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-GB/firefox-67.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "370312880d10268a8e7963e9ae7e07849c4a8dff6c80690c44fc33a234c2466c8c0b71d906c5edb44aa07a27ad2dd93137d4afa1429d796039ae6cf89d7eae80"; + sha512 = "924da12dcde359bb0576f14b75d2114808f495e98903762a960f508ce939b36f35a02f4858042b9be99305c4f505dc7e4427bbe5258c5315efb91c13e9125e3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-US/firefox-67.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "a4c27d076b2314149f7c60fe43489f5d19dfa3de1f349f52d00c342771789345d7c41d4c488803beb496fc405d9d7743bd7ea5fc9f8d8397191706bad459953b"; + sha512 = "d85347fc794383b2c9ce848ec064010e3255cbf471187952d4adaa2f3ae461befd8515b95601a5d7c6c86281c956601408829bb161dbcc6c259686e73eaa7773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/en-ZA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/en-ZA/firefox-67.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "a4328cdd79b1c0c35d71cb2a5f8870ff2b340ae0859cf0d32d132794aa119deadb9ea185ea5852fea7d2aaffe788dd58cda7ae05bdc4d5f4d6c28f3379c27100"; + sha512 = "6c843b8069e7f375d42ffdf7898a1331a9f847676dd0e13f6cec0701ae4ce8c70b415da314889781208d49696af4e291b078bce0d64721010fb269cdbd321bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/eo/firefox-67.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "6052d64d0694e6d7f4ea2b0e3d6de656f26dc12651bbca7cb5325fc1c8c2482a9c68d6dec34abd28db46b381a036f3a3acc9067eecf258311af41e36058962ce"; + sha512 = "dd6e0d4d343c479cdcdcaba4947994c45618116f6943f0e9b0c2654de6bb1ab849a99679bd2a5a646ea0f6e0bc7b392f67de2766701bf9151c99d59bec5e2ba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-AR/firefox-67.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "cb0e4ef918b2dd1848d09b80e2bca2b0b9fe81f87374da2b5e8596ad8c3beae0a75e9dd911b7fa686ab130bbcc7159cae087b7683a2e3e1938a695cdb25c8341"; + sha512 = "4defc2bd2a7831081ac70b29915087e94eed6659dcb23e961b7200cc6b89feda2c0442fc969fcfee57c537ad487fce6edebca2ac62f356b3c387e1a7d1790d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-CL/firefox-67.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "256cc9ec86dffc9247b09ea55d07a48d474dd57199972d36a24d95c043bc465d495eae45c8c8a7415884977997ce649e7d634330ce9a789d8fb76ff76ffdf9bb"; + sha512 = "c0494964c5bf6d0938dbd78d5b801e000fa6c850d95f629a375e8ea69d58fb7bce8cc38d32b456fb8341230b13eb4eb34b31b59e46b32941281a6283e9d52e7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-ES/firefox-67.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "fd767bbe55ce1a905c6dafa8297dcc481457726e4db1fd796f0974f9b06becd64c695cd258448692db45e4d168858f8cb529c74ce88a06fbfd94d9c1dc5d126f"; + sha512 = "a4a7f4fd7552ef57c3fec732cf48f6d442ce34cdccf6cd01f713b1468522d33d61c3307b6919df4ea38ba4ab2b1a237147586dbe4052e7084f03ae0f71848389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/es-MX/firefox-67.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "9ee47247450b5435920a87baf878e90517d8b6e3cf6120696ad465b882e41294599a10646b27688f1f1b51aa34669a82931d9c5d028d7221ebf2f124808575c0"; + sha512 = "6de76564a94bd0a61834ca2957ff4e969551d7fe74716d80975c5249f85aeaeb7e0f40d0ed8a5653a237eabaa527de234192b97df1525043148c2eb3246799ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/et/firefox-67.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b8f20f70399727bc6a737e44cd5c29d96cd82cf5066f1cbcac4b1d1e4bd81fc2674e44447d8c1b304251c54cf827279a64b8d487597b5d2d4733019bbeb10843"; + sha512 = "3406361c8358703e6166bfe19cf690a3b03083e043d9215a88ee9cf923f82064217232622da0286b44b0cd3f9b6ce570e73f06b2f8558096d2c0f97089fbc691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/eu/firefox-67.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b052c683646d706e2feccd6a1c936445fa9f29539d7602c23886bb338138f0329b27d04106fd13c9ced843b50ba20a2f3087f93f77386129dbf8e976b2370403"; + sha512 = "e1e3858a11982c22aa2d592343365db0fdf4acf5ae5d366e9f862d550a0e90e383182d6e20a1e85b5af62746f3750ab97269037973575edc8eb2f7e12e8231da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fa/firefox-67.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "ef92ff55bc96e28dc710fd060b6852a236b1c27c059ff1b3b543229bddfd4b992adb8c4a1deac49ae90eb944d1d0629b20436f69ca2aee29c261b6e371bd97cd"; + sha512 = "e4171bc5e5bfd699eb0a99fc7f7f3783fbbd8c888d506e7cd76bffd1c053056713729c41990cb6cb4433c1f9f964bf00449e682fa953995a21ba2b41e781ed01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ff/firefox-67.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c9b5cdebe25269aca9041fe361a3984e30cebc7b6ffcafce4b4ee3777489fd135829899d4ca028e667f3b0e5b007c4b985d8bb962a364a5b4e695ae647220fcf"; + sha512 = "c7dd25f2dd80913eb688ed7eb3e485f3f320e3fedc71bd65ed54b63c48952de065110d084db3e32bb22c9bb315f353280d5a9f396f025464d0b6114f1ce3c4fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fi/firefox-67.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7a2945e59385ac1b9d9db373f9855f704d6a6a82a8f1a66d1068cf7643b3bb5c80b29561329675823b827e67387c0496ce9af46dfe20ecfc8c9ea31b20582aab"; + sha512 = "d8303e66241a4371717ca390a295c16140f6917e8f013e4bcf2e4f21127544ee12989d8e1befe5b907b7bea51ae6b20922b1f68dd645c0677c2c68ce0bc90295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fr/firefox-67.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "953f03192c33c066b48b47fa4eabe72c93d92540117f4c6060681da272c2f09600ffb58b679ae63c2e9b1f7540701bdda5d184bfa962799a284a27ec305ae3a9"; + sha512 = "a5454f58aa2f5f04e730504d17500d8e5edba8e3f9828d4e9aa07eed872d7f25e8156a337fe384ae523e51a74f86d6e8b306e1184fd8fd8cca71bc6dc5423d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/fy-NL/firefox-67.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "df18f0c7f6c45da62b876ace7a9aab2699883c64356381fabd1886a810451f65c2a95f2df594ddb945a997090d917acdbd543a052f9baed6900bb88e4fb27188"; + sha512 = "83bbe2d56ff8a6ba2b2bdc5550c0d0621bc2f938b2977feb23627be0c38b9f43ed1eec4eb96ca875441fce5d5e0a00bb8ae3c5f6630ad93cf3e4683baf2d7090"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ga-IE/firefox-67.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ae7952ab62b70cc5e22b45e0686702736ed88439a8b3e193db416ff6cdc0cd07ba9e9763d9a1cbda93503e5a2d25bbd0ad4f540e497cfd99d380f93571f7c7a5"; + sha512 = "9be4bd1576733024fb7374e9b343c200c6a2ada0961ee12b3217413407564d61749707613b5542c5a20d47ec4c9b505aac86a6587f70213e78df5f77cac3c2e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gd/firefox-67.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7afe9eb5815568c450b1ffb41f55f0321dfe18e3837deaeed5a13cf0eb1569ea30f6a67ab7fa9599875c7020428e3cdfc115f38687f9b75450afc556f96d5c92"; + sha512 = "77ec579a29ae1ff35565311b38a4f09f0bc37aef54d0287a93dbf757ccef8beaa2cfd736a319b73bdfc6f48f942c9e885a8302a70a9a7844955e8147cd9afb4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gl/firefox-67.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e6f6b1c690e55f74cd770e044e20bb6c8aee5032b8bbcd4a44ce9100d7718e9651e5e259e11541e2750a8ab4fb05d53d903ec6c8bb4fb07aa98a1156c41b73a7"; + sha512 = "2e047ae403ac4d043b063387c02fd17e47ead72737caaaa93a04b326b500c1e25b4f3a7d6ae2127b628dff86b31e49f0e500b3685bd945fb223598a584116dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gn/firefox-67.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "13f9b91e9ac3fba5eb6a6dacd98c3da82cdbb7da8a39b0b7fbd43ddacdead0f994b9ea8e703910eb46c65ea31ca5ae3b03e534defc1fa1605135e2d4d7e5eaf9"; + sha512 = "6372fc7499b7a1ee418d267c73ae05f68e03307a647fa90d5f66e3d3fa80bacbaef78b276446855bf3aa5b7979072c69fcfa5f7a07d91bc56f39493c549c3bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/gu-IN/firefox-67.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "db2da1f38a47fef2dd9f1dbac3ac946ffd93fab83aa152644116a66161fe9546f38b4e05e54d41ea41802c26c313b5fbfdaf339559001fd1580dbec2e1009cc5"; + sha512 = "5bda58c9d0f14ab1484f8821cc7231186ac11eb610f021df398120d38ed4b0bfd7c2c3b8bacad75f2b35e8ee8d34f95cb56e816c4db8f2f79acca5ec76e02a18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/he/firefox-67.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7b93849512bc9e0dba46577df75bb5db9d01d1b039e31efc714443d4a372c76cf9a8a61d782c3345aca9d8c31028e483dfa47c3a488eabff0a59b6edded46737"; + sha512 = "558b5f326e87df3c668458488a6fc6261cc84915d9bf90451c8a426fb973b048279f1e0d2755e4c9bc081df52351e8b70dabf5a8113e07b9fd7e9bfdcc8914fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hi-IN/firefox-67.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8608b5f2d5a15c4d044c392689019abd3771151ec7746a2f7b8f23f759dea195938cc39a61be2282153820928fb3d937d0f8a17238929455898ad69897d3eecc"; + sha512 = "30abd8a9ab1c410f3293c4d70895b98cd0921d95ef8b986f30ffdc0cc273d7b10dd038ffae2658ae209f8625ee4493b467e4cc4b737fbc4a1a1f8ff5341843a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hr/firefox-67.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b4037d0941610b5bcfdffd725621127b0b5e78aa66ee2df8de4c00303dc87c39a2d07b452520461f4e4dd9f2d092f6f1a483fafd1ea122ece67660a1c69aabf5"; + sha512 = "052277cdecbda15e260ad9cfbc9ce4e4efaf0391f301cc4870ccdb37320a9829284c41cdf09f908aac13fd745437d8b08bc4d5665aadb72e9af8cd648514271e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hsb/firefox-67.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "624ced9f602692396b62f835f5f3576fbad76128599c18c5d40f7bf20f9fb9be61cc1049262455de4545c83d3d97ddc434e9cf2fccbd3111b8fcd49e4c0bff00"; + sha512 = "d3641686918b38a41eeb3d20d583f4d2a7ae31e40a3c5dcb74acb268eeb5d6a37eee86fe7262277649ebb406d2ff7ed35e20fc8e261a0f7ec230f08b8440f629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hu/firefox-67.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "8a15e2ebf546d3e6346952c57e1a939c977699957a1ec31a95c0624db17fb6c06395a1e72510a821a9d22b8c95f30f0423aa764068e264293b934f10a4c8618e"; + sha512 = "6b986fbbe8722aa8fe50e0f5bad42d75d7ea11bfec33ff3cae417bb98bda64994e6f7ddadf2e7645d8d2b313908221f68cb1be91957b2542f35355750b408e81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/hy-AM/firefox-67.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "395c7e7b1aa62439178053a2cda82c15daf5ab489cd5c461deafaa6045898805124260dd8c6186ebac96ee59d9f1e307ae81e1c52fc3075e21cf14082b91dae0"; + sha512 = "4f49a55aa4a3f84c3d4d0d21cb59b42d27530baf8df8697b7baf2b3e2bcbd07a80f94ba462d63caab57ffdbcc2bceec6598778e942be353953de28c912ffced5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ia/firefox-67.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "fa8041532a262807fdf0e132d062a502f290cb8474af161080ef8db0e574dd8d4a50d730d07a9f9c94352812ab4f0af7a0c281778fcbeaa15c90193f0c31036d"; + sha512 = "66cd918c709013c519210cfd7d9e0e7f4f8124de1c39b0f101076d8e75e30e593efa0401c145dcf1591ef86ee78713b83fa32429c9ea3fe2c4190a0ee88bff73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/id/firefox-67.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a8a5f3b772fc75a82efde0f5f72de8d38a6529efa176eae302ec32dfa93a239822b229171a2b88eb7e3adc3a94362118aff1af6731d1af1c7821febd824fc8ea"; + sha512 = "93dac59182acde7c59e9e3c762a4e981652cda78e042849cd3bf5e5d7de4a3f435350c633384b0908ca53210d33974e19dd36d22977094914828f1bb8327b6d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/is/firefox-67.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d8afee72c442176d471ed62e2e97ce643d3b5efc9dcfdf4ddfe0a0a434e5e1202dbc4a8a71948859c150981e6445ded7d43c45ac984a63ba03ddbcb6ae677148"; + sha512 = "a1020a3f594bb43050120df62faf3fab7c03619b5432f4027eec368fb559f692b9eb25d4eb2f953617db5414a1ad24c7409c963950d03dd1df4d084b66764248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/it/firefox-67.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4568864e61228f2a6fd13061d74526512eaea7591efe1947d0e72c4eafe89337d052c3ddb9b76b476cbeedab2cf55c6a48e9b46f0430f95fcd46281d249ec184"; + sha512 = "ccfeaead66f61caf73b7c37ced5c7dabe688e1b5994386ee44d740b9e1fde2956b697f638ee7eedb5761bf35a94d82530543f1588b88720e5c07c3d6e10f82bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ja/firefox-67.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "734ff5a6d08a1a711c63cf58c1a9e6ca2e6b93aeefcf4df165df5cfede8aeb2945c71d1fcb37dc62523115c298f653a2fb28a7024740c2890027091ad5c07994"; + sha512 = "e3048bcc92ce62fd5622cdfa96b75abdb35bbbc8e17411bcd7c1d8cf64de9e073989fe2b6f86bb1f56c4c6b398479f1f946a1cdcb563be9cdf1aae63e36e153a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ka/firefox-67.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0292eeb31ae71bb405b72cab8cf008f4a535806f62bc9e397d312197ae5279c9415c879cb8607c6cf28b0df643b737c7f4bff3dfd72c8c8d69882752b6fb9fc4"; + sha512 = "20a66af34848ebcfb266fe5dd8c7a8d663aa8aef543988a5b06e33e4ca8cd9636dac8cc8dd219471e49bb596013d42664fcef4c4e2588e36c4e40ebcba947fdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kab/firefox-67.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8630af1ce9a4c2a83bb4fd8796907ddb9498cb489ad297782d4c0d6f419af77ce7974987e12fdd7bf12189636ea8f0bd669bc77dcea9f609745a59646ca6c654"; + sha512 = "619787bcc7b1a0ca6daccf6e5a555be342c09d7fb6f55c2fea3ca340a1852faab87bfb2af9f6828dd51fb94cc3a799d577f5b0b3561b7039e8fc177ae1bb8df4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kk/firefox-67.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "dd8e5dcea7005e0d3a713396f42375a6d75bae349df6e6f58be105a83127696487da2fe8f701ba41439dafc3172f8181f5ea26374865f7797a6755790b5d32d3"; + sha512 = "74478792242cb29304c37c7aafcb17783da6c7d7ae75e4307f20640104bb4a9e232c709082d30747a66c4bda87fac4020f9672c99b6858b9b08765f9253b4b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/km/firefox-67.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "bdc102126ad2b3d44c8a24fec8e62340b72171890e59fbb7177d47f0515042bcbdea4ba7a56a22f09613b3dafafa1c9db7327dd233c58badb0082784e681e604"; + sha512 = "8c62ada471c71c98344ba08e83593e78c6de6a4f95016fe48e444bb4bb36c727475268ad58adda8212f37229cc1f785df78f3b843e8b55905c661bfdb2a3f334"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/kn/firefox-67.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "0f222b303dcbe8e0c275f3cf92c53e68eb252963b9bded6ed4f9436f0e440fae7fc0e0b21f4e41a24643defd6a9a89d306aac481ecd69e4e4fc4fd3c74c5da9b"; + sha512 = "77f8b91894a9c94672f71375bc83692a40771beacffa66ae76624cac2633138280e9a0ca5bd1f9b91373a7c31e26ff7fcc1eb0cd148c8b881890ee374a9dbb67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ko/firefox-67.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "004f01005ecaf537fa515cc1703d95a8cf7bb23bab302b3050d29318c461b452dcf432a5c25bc0b7f85699e0074866c5f403b35c6d6009efeaa81d8bedf392a7"; + sha512 = "ba8129e14fedc719ee60dc382dccec57f6d6bbf010da46d7853d99cf60b2f8cb8f685f2551e8e32e052745de4cdef214f3fce1fad5ecc73e4eb81253f4ae72e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lij/firefox-67.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "b751989f6154f7ad94fd4a54e5cef4b0342a6457b7e742d7e7231faf428fe1a17fc1c16bc16d55b32b7ad01487b0d59737acacb2b27097452cd100b163e09421"; + sha512 = "c8f093d027bc7ad7b5cc92b4a756ff0fa216607a27e6bff28545d140a8d4730cdb32c4e222ef0998ce3ca3a20c2a11c83d66a88858fc9614dcb65b77926ab89a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lt/firefox-67.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3415c6daef10b4495cd4e569e813a6c9d98714ad2b531d32188b5a567dd40cd3e18f6645e9cbd327946c65edff368737dc7e49864bad52b36ea57e13351881fb"; + sha512 = "51088c7053b8f0654202b508442f808c0d66498aa80f7bbaa92b4084115ef71f250afdbad1e5957e1c5798ec164f5d86c0d61e7a99dbfd2a1cf2df17f3ad3da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/lv/firefox-67.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "28380c325117855bb056fba5b02cfc62242cafa36f026c1827cb814097790b29e20e8a3c3c466b7a138577f38a11dcd2bf10b76e3415db14462c97db7701018f"; + sha512 = "7fce010fcade668aeda3a322376e3753f1bffb853559a76c573babd2cd553e032fccc0cc9a71ddb437b8aed87560ff1bdf3458e39d2d81bdc8bc916e8716e9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mai/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mai/firefox-67.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "199fbc8729127797add6bbf29dca22e8c9b091f985a060cb0bdb5c573028ab71aa53d3290254610db9272cf08bdeb23bb5b4ccf4fd956848b805f808f3819985"; + sha512 = "8b641a43ec2633ee07c065e33681f81dc36805b13f3221485d1fc4bdb1ffeee4df79d378d1f50720943679030662f89dae42e005a01ab9281aed090c994b0cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mk/firefox-67.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "372cbe55cf84351ece90347fa093f19a30c92768d0c63e84c9a436b2e6616da74bc20514208fd23a9b78a81f70274292d23d2bfca24d3aa095c344930e068e37"; + sha512 = "2fa98f6d1f35419ae526f062f6742be138daa4715f501d49b5ee2bb7ef63edacee8283245fc2ab81d484b0625a39e58fccc2aa9e255f56f980d37bde86fa57ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ml/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ml/firefox-67.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "f45a09a86f05ab0b0268105ee5edcb620b53ea097a4523d7e5a5f2148dffe226aa25e42d2132314b2f8df9a94868cf1fbb523b345acb4c9a4bea3f5ff0097184"; + sha512 = "cdda564dce2c6178f33fb79f26d007fb96b544de3c4d0b5fc67d689cdea1c5b99dceb91f3ab9922c00c725ca8b15eb555c7ec7c661981a2159f7ac1af78474d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/mr/firefox-67.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bf3cbe6de2574c0bb7a1856a97376363e1db88897877602cce2c07eed7a5793b0042c0ca0b6af034fefd9ec998c4cce3621018445f8837ab4d9f53c8af6459ce"; + sha512 = "264be2bd1a0e73a84485419bf80fe04b3ebfe60de588ae6b2b7130ef5867139f285fee577d8bd50b5b161a040ab7d90d3cfc37dc26cd5461d412c667302128b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ms/firefox-67.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c8a415408847bdc7a0ef2348c3faac2ddc2389e608e536ab98da3ba502dbb7d424f67ea5bac9aa373a1dbfb50e075cb16f525c5203d85522c4c79028b1511686"; + sha512 = "b33d82fdb3c566060553986d796f5e3d405d748029efc814af8c412328522d52c5cfbcc52071c75db6453bc4097d7fad8c40ac897822ba7f3b1237c14735e81c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/my/firefox-67.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6a3a74266284857e6b016fe93aa00a0c149c087166fb8a242186e0eba1998df1c96fea3c6fedd0ee65638a5372dd2e3d49d0abc45c60d933b03328346caee568"; + sha512 = "696a6e013b998b7525b06d6247ebcf658276eb23fbf82a6beed6264a8ed754df367242ad6b70e36e76f84c86116b8186819ece9c4db8964a531f225e84ccc9fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nb-NO/firefox-67.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4276088362d3142f751a3a88e4bc435b82055a86041084f1a056b2b9bf12c3d2d657808ea8802484a1880e1162734f13b809f246125c83374941e4283cd00060"; + sha512 = "7871bb5bb005d8cda4bc8f37029fee266b303335791fef063dacd5b6146631ba50f7396ef7f2874bb90d21c738fe88f8ea470636e229914888a2d9b3f87af228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ne-NP/firefox-67.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "680151304f1156ff0a2e05942f4c1b78966c9ea9dc8b23fd5e17cceb36fe1808be23eb83a21c6a93a42e5f13c2d2c12d81e6572dafb982569c0c74b0ded69e65"; + sha512 = "79b2f7d885b2e06a6a3b66cff07c2f5004494e54fb251631ccf774bc95bd1e006e77f0ebace97401a4137742b3f6664abe8e63ef31b3221ce70ef81a91544d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nl/firefox-67.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "dfe9e2fd0907602927b07fd7f300bdef8ee495762d1006852074af0d968e3d3910d0ab0385173742fbb40ec6c2abf951f56a467ec77bdaae996ef21902bcdf92"; + sha512 = "cb889ade72f02ed026d5363c4ce3858856c2c472b9116f89add41fcc54086deef0c95e16c5cb4dd984534e18167a48330738a2701beb07ab7a316e58fe9e71c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/nn-NO/firefox-67.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "a98cf7be210e1bd87accc2ad676ec42e69764b0c8ab0c767a2d532c8348f42a8bf773ab7211c4988095e3de86070e5dbe43a62514871e4765d211faa90ebfb99"; + sha512 = "1969741dda5c2637f6b11eb0d15c3b49b425f440dc37a688d33292b1f4e5742de45c22df0f1097265e0b68b1769405a25f3338519e14284749dac1aedfb455ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/oc/firefox-67.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "acba5537fed9e25a657363c362df74ebeb74574db96e187e6ec952f0a43d67e4ce4ca33fd74f000be66d3b47f30792ba8d04f3ab7b0ac895e7e8dd79807444dc"; + sha512 = "ffe7886c6a79dfc496e9a60ccb939b9d3641152ec93036a13eb1e3939d1e497a030b4c0332868673b81fcaf7a1a84ce52ed7f2aa656aff9bcc18fc00bceeeee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/or/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/or/firefox-67.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "359be0716f8ce0cffe983d0c716960ca860ba7321497ece3726b4dc86166ecb31727412b11335c56f2db1d64900a46049eaac1f87a57e7c05bc9a28c5b287ced"; + sha512 = "227875a863199d30d1a64432249cc9c2692edabec3bf04fccb747f10ba3e4874e1fe8d3ff7164c2d58ae4d49071672082a82b554aaa9da18f0e491dbf7886bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pa-IN/firefox-67.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ecabb157083f7d423b0b07a2ec8ef906e0eb6c36c14f46c64e90e7fcf9e889955758b062440f6fafcf0dd84f733cc36b63600a50865dae11dd4c66e7b7d7ecbc"; + sha512 = "127685a93f4ca5c073c480ba2f3ff84d5d5a063671e325feb8620255978121aaf391c4ab759a3ea013847d9e416420bb3a7ef74cd4087f6ff3a6bb16a97e219d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pl/firefox-67.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "47e3e5345143a1638d9c57575fb0e9b2bcd579195cfa90086355abac54c043e311e136a8ddf51bb86b1b613ecfa44f775871aa3d9e2ccc83a8e14494640eef7d"; + sha512 = "f8166b5258ef763c91cbe5b917b12405d57dec0d905a35acf534ce6554fb43f08e8c86ee9db012464a11ffd76688c5b0c2b4343367ebf071d1e68aa3ce147891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pt-BR/firefox-67.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "78345b4ad5097dbea9f8598fe48da9cd44716bb301216959741ee3b0da648802e439f718f464b5c0522439419cc0fb2d007c3f476a688d196afad97a66a5543e"; + sha512 = "ba05cebc862fff1764a8cb2a2d3fcdf542c42e5ed453df7605733750318b8257754a20e9a3aef12e8740d647e7aaf7451e6507beb30abc6b87714d8307c0b777"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/pt-PT/firefox-67.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "f52f3418536860424e158458e91e8332675beb49aab8e39b00591d1aaf55fe6ee9c095de6500e793d23c5e6518c3bce44124d85cb8ce535b7e5c44fb078544f2"; + sha512 = "7d76b136ede93cdc4d06a9afc645ca74f06eb56d63be7914a696e6f9d1282eb9da5be72535e46a48007115d37334d5bc3a5b4ac954c486a5af8cf94e9bfe1352"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/rm/firefox-67.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "70a34fd05f3b03d2021527934055e35f7b7b1c55619b69386d32ef23568fcbdd19393b1b7c093d6f2424566d41b5735763befeb09bc41775c059bd77c8a6931d"; + sha512 = "83ea66dfa3c4674c7f58d18125ff0886d4526740c6c697ff049eb4953179904b868065a053c15ff72308c822513dc523e4706fbd0bfde30eda7fa6802c9f9be9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ro/firefox-67.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "4f9fb2882c5a79037b95c11da8b23a581593cca27b6fe943eccefa11caeb94f35e3335b20145c8252cf7275df73d40bce164dfe316396bff978a5305eca1173d"; + sha512 = "c00bb8c7e6d1c39d5ceb7d33f967eb1d63f28baca1da07190f4b422049c1f3a4d7162abbbce99d9f5b353e3e04b856e919d438ebaea4be664ce74e92cd0c58fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ru/firefox-67.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "036a47c7d6c86a658422f43d8b5875b01e24478ecd2511b90965c505c2e3153d6fd64861606d89d34e678ecb05ca90e2a034c79ca9359399c91d4d142810439e"; + sha512 = "c8d26a7ebe38cf9b9d7d3d212100bae71f33db180ed864d342f2446998b0362a7626b704792e76ebabb70f00fb204629585fd30125fff257087dd81e7ac34312"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/si/firefox-67.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9afc826ab7b577119bb8accdb99b444bdb9d365910944914f2b1fef89015ad2db010c2a76b70d3b45fe4c35cf892d8d47b13e6fe0e15faa9b64f4db85b493d42"; + sha512 = "f0cff6dce739353091fc49d20a38c7c8d911e4870aa56688b67a81315d7e2c7802affd333604f2b6bce3d3422e915f74b66e92ab6c3a9bfda91fa06d6dc9fd7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sk/firefox-67.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f20734297f0a74161dbad53607e5b41d893a1256f066ebfec944e8cea2f6ec0b3825e76d971f3956275c4ead151cd6c93c85f8db520745e5972b78ba59134f22"; + sha512 = "ad6039a84f9951a96df13a4fb1210d068d8e9d83aaaaaf4ce5af70641273be598c42be5d7dc04de3ceff19bb821ee0c2e6799aa81fc77b093decbd2342f91afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sl/firefox-67.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "93802f825030a9f4da4f3e1a334c154e323644a73b9ab33d9e4ca57636d2b26dbff2111f897dbe4f6e52867f90a0c8ccf079d81eba3ecbc50a30fbb4a81e9e4e"; + sha512 = "243dd384fc56462e0b9b03ee1e9d128a207482d58c4b86fa5f5cecf103e2f5ee97c6b211f073c57946594a5528182ba2495cf21791272a2cc66ece7059954492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/son/firefox-67.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "de7f5063e7662c16f84b792ca2f3d8312627d5530997637b7b10021b90f3f2d56365d58f9d7dbf5fd39cf3031e6596f37d2b37c7fe572cd033d7de03c9879b95"; + sha512 = "bc929d4d699b382f7452daec9028b2fa25668621a6001a0ab5cc668c582996f6f490ab399d068b3cbda679ca10d416cd6b73ae08352f30e6f8a10586ee4a3433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sq/firefox-67.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f9d482c2e572228dd916fc10c27250c1d6b69e2a3f7ff8bc9a03ac48aeef4387c5cddfc6509999819cddcef2c1d03b25fb6646d1402e73ab84df0114a7648d0e"; + sha512 = "b9700033307e7aabcb54fb198af0119d576de3bcb774338d2cbea8e88c53f8b7031395bc72d5713d5b4268fa5adddd9c00bb010e816064c98371cf0a65d7f9c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sr/firefox-67.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "98b75fb820d8ee4109b59029e1e9c411875d37fd85ebd993c8d77e11325a810a96d50a4f0346e9e8fd9f69d58497dc7ad7c7121631909b33cefc427fe6733bff"; + sha512 = "543df36ac28a266f45f75889227534145803f65b3701d134fb62e507743320fe8f56b078d4f42d193b65b51a06d00f2bb6c9de9599bb66572f0e014d6dbd8b56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/sv-SE/firefox-67.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "9d8dd14d7ec016d7605938c0730bca378bd7a16c7a342e1efd0a6d28bc0561265426bf9d9748feef778c6d806cdfc347b723ff2534089caf5be9424f747d769a"; + sha512 = "cac64975be8c887b065bba9fe127d25d298893947a8ee957a75ba316ea8695001c498d7e942949f25b3323c7519c163c275710d635b173a75d8dff3ea38879f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ta/firefox-67.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "0e2fffcf0724395e4dc1808a569ccc244f560e736f7219fe550fef4109ef695f41d17621d42049f20cf5eb9abf1806b08526f7c6861f345f9c210aa25687e6ae"; + sha512 = "f7e744a20394315e5d5eca04b152546db49546ba8b13e6b99f61f248ed762c207ded2747e89ba73e84b63330d42b006f5c200417ac931f1c46694784eec8d76b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/te/firefox-67.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e05c49be0770f6901164ef37762d24bfff1aef3de20e991d48e9e065ea449d5fa794fac4f50fb638a2b90b9537c316bff8fe77c3a4a5f2a4f89ba83a91857f4b"; + sha512 = "1f6580c3744c3aa87e5c0b82d84d97081a6de8db07f6cfb458187f332d7d509a9a3177c51644ccd7a093ead843c92ec371b2e3b01602d7c751415c5b8d8711dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/th/firefox-67.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cdd1e25b5b3f4344835707ed3cd0601ba0f87cfdc8f01324d14fdf765b7c2f4e1cbaf6b0aaf280a17a13d4c72d382da58290819cdbecbcdaa000af2d8af2a007"; + sha512 = "653b3aa5d1e62c1ff8d131d657474527da4711203c45a85e219f85107456d528e6fdba7124c5c303858c8274d585fb555883a5edd60aac58f4504ab69e906f7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/tr/firefox-67.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "6b270e7fed5a02e403ac4bc3b744a051a9a3d90f709fcfd7bf6cc72a213b803ed65e5a03c1513ab1d756dca0ef600c794355923948f8bac986c4f9163bdd4270"; + sha512 = "6b797effabdfe357eb35efbd3631260032d732a7dbc8ebe2963e8e27b2c5db07f55e0e23738eed4f14479b5a0e26abc549843a11cec41297ffc78c2baffacd1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/uk/firefox-67.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "23c90ca3ee790f760b804b3dbdaab61a154826f5c58c2a24e1e358782b621c82a61a5ce7562b957e5b8599fa3aeef73ef8b50afca0e9e20ac852c70c47d1ddd1"; + sha512 = "e8d0c9271d81cb416e3ddc78e6cdfcb326cdf42baab0beeb938ebc94b469b1071e66497d1f30693b7b90b03dcfa3e0e9826c93c37559cf417303108f540f0b2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/ur/firefox-67.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b7237e418bfe05a80f289eef07756b095fd6320ccf8cd3acf6403d6325c10cc8b37877f1be19208f7124d3c0c23c610b990b0ccfa5076a9c9e25a37dc865d3fa"; + sha512 = "4a19ce739f4c3afef097123ffb8491ed3f433a661ea06c908c9ccd4f2e06af1e6a599ce4fcb58ed02876bd45ae00c23f8ea3fb28786cb6456b1d2399b6acc70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/uz/firefox-67.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30d9291609e2163fc24f9a084ef4a76ee533eda3f2a3b51e95264e86841cef0b95351c875a428a5cc701da4dbf6f6e5e0d5416a1274cf01e9594017efd22f816"; + sha512 = "b768bb27409f056818543ff0491f50fd954ccb22a2a17a2eaddcd5f4a5295c0c6d510050659283e70bdfdbcfe145776624111f4ae17c4b28a95b12f98fc31665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/vi/firefox-67.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "02a7c16ffd23241b621a0dc6144a7a99f68dcdd3ee88c17c9c1c2ae92c9f1c01241db7fac0d57d80c1d0acc12435e7f2ae4102934345ddab51f975bd1539a7f0"; + sha512 = "664e3ca40e13489fc66824639616a605f0a5227ddf4f1f9191204e95a323a64ba9ba1e025787ac669c6eb11ed61c3a70eac686f8a36aedadbd4a8199dcf5380d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/xh/firefox-67.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1f3a3e14c14a5914fafe52eca1dd85869b6bb301279bf248206ebbe66614029e30a470457d7165eeafd998a79dc92325096d3f161572e0ef694836fce986debe"; + sha512 = "06e70c70539d568814f1bbbe76932d19baa02b4e449566a2c9cda8c67d24305debe01e98b95d8dfa8fee47d1f93dbf4d875dfee0bb20f006a18b2c4689312875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/zh-CN/firefox-67.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "fe701c8ea2ebc9b18f530470a1babf0e5d3202cf3f97f738b032d6a2356704c8725910e921b6ca7b40b809f7fdce41ea5b168ed1c2d2f0e6f3a5a6efbc463f88"; + sha512 = "e167ae10b29a0313ffe6e2c0f9e832b11a4563a0a848d8ce3f3d74d99d0b6060b3d947e8f7779ca9ce93418bb59cc84dddf0183baa295e83a59789e029be7d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-x86_64/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-x86_64/zh-TW/firefox-67.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "593cd1a610047033ef770c8c3e9b469ced7c501ea4ad687e6cf72ab734e9877a8b5f762e6b2b0a1f1706d1205babe92d662a8c0dc41c096f5d6ec7555c25f354"; + sha512 = "e1213d631b1e7f061829860e468ee57b0188cd5b33cf64c0c3a60ea0ecf2efe041ea0081008883aa15f5a204c78d0e764b84bc76e2f43c85d6710fbc87162dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ach/firefox-67.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "c047bfb9e3f62a0bea8d0f1352c8d1780850835d156f442f35a911f677cd877896cde1c4ad6f49fedaa780bbcc7b46c434b26b6b3598d66dd3e2da118f2b0b6f"; + sha512 = "cc6670bf09ab557ee746e750718871082cd3a2e1bd29d01612edd2e1cf5efcd2314fd806c78f3caf4c22407f8b89dbab014349570e40e20a5707559284fe2b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/af/firefox-67.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "19daf8339c6082dff06c82cd1d2a7e7344df6f6174d8c7b22fd75d74f2cf64fedb38ae420016024317d4ea0ca85739d561a7e2dbf258e1ffff26e00d12cf0ed8"; + sha512 = "af7c92690c6b6c4f060fa0fb6e07a079e30cfd9cec8776ba10e7486eb58f5beddcb80fee5eca56ca683c1f600f55d49792a0a6251a15d37bb9e032aa7af1fb96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/an/firefox-67.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6ed3e6e89f6b5a4bf8a21f910ecaeb152d090d49273ae600c3cc7e97e71699309825b2dca870d536a19cdf00b30c68defc540b901d8f34801580a94847d084c3"; + sha512 = "941f9395026952442df31e69f3c343e27f5b9cabf8bbffb440f0bd9467559f3a725ec7419533191fded2e166f18b140a9eb36fa65fac588f71f8c0e533e2efcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ar/firefox-67.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e9ac54884e9b9c53a97f38214436f3379f64657edfe9fdd133f5e61a67f4d28ed1859270312accdfcb5a1748a9240f5561583eb37319d0011d60d062e9826168"; + sha512 = "613c2736af5a0ab9f9033a50353286538578c1414f908832e20df51f07e308fbbd5dd6705f60bbe39fe7d945542d0b76d902517b7b56f99bdc28e58f50f7bdfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/as/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/as/firefox-67.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "527a9f5155cd75294209db47bd59254b2a57649b055b5982de926ec5411dcde56f02fdd33afba2b38392c32f8558df9fb97f5c845810db1bfd55fa73ae5ffee2"; + sha512 = "04adae89682be2eb9a6f93e65878a80916c572e24b0fc53ac0896272878cce0e8d1395257410cb088d5a20129c76479aaa6387d6f502e7253c16fa765624fcc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ast/firefox-67.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ba440780d470fbec02750d8298ee718907766dc0f97374a07f0a8b1e728cc8a99e41430461cbf3b6fd70f01af8a05e63df709908003dcb4b9225bc6cf47738d1"; + sha512 = "b169f44b0e7f6361d1181fa6124218949839d43c6b110803b09bbe38a82276f96954e36eb0d8f90d528746f7916b260ed0b0bde45b7c1b372875bc95887b4f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/az/firefox-67.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "28f0b46f1270a57e28002401360dd2c0c074e912d1fe71edbedb5f590b44b0966ae22fc7615fa2509262ac2bea1a28a11e769fc2970bfe68c73f0929530604cc"; + sha512 = "1e4b74ed6102b7ba8e8e6f40f3de36788a9654e98b9f56cc0d5a84a83d67909a85c29d93f941cab572687186dec43bda24ee37d46c008b8d21d6760c658184f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/be/firefox-67.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "85c7470c4def8f05a9216c0d6cc41137bb97db1b75f0baef6168612d8848afe65bc30dbe1e528140ad09b87196c431bcc3566cef3401a1c41aa1c9c6ca448035"; + sha512 = "cb6a52927341c5c10bc34126ffcfd40e60201254c18d0a05212c5202eb0e44e31fa19826f635f75280ad310a6a61a0a7c764e4bb84dcc7ff31ffb534797875c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bg/firefox-67.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "167734fe15a4aad537eab4cef3eefe403df2f72be1969bd6f599f9a355457862a794a74984d8480ebcb88230a471230a09f9cfbc44a05835869cf2f693cbda5d"; + sha512 = "4c7a5083a7b656182fce99238f52c8f197d108d33b40cfdf97ffe477963547a08b8bcc295464adf8ffc40df2f4b5feaa28d25ad294a4a9e7fc0759fb2ab9db7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bn-BD/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bn-BD/firefox-67.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "e33df73b8917aa7b3b0dc3d9600d7082943d595b8e3442944aa2570dfd3bd755f596c21b7f06d46e6e4b462e54a5092e0f503e6c5a5838968e9ee5975d431784"; + sha512 = "5626d60a4369b7ba31c2c860c5eb050af60724ece57cd4a1d5b9483660787fb11ec76ba8e4bef78de42850dfd90a44fe36d43f48a738ff271f2fd35a295680ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bn-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bn-IN/firefox-67.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "468360b5d13a3a43eb3df625685028c4b3077d1ba31332e994ce26f8f88c65c2458426fbeb7ea0e7657e7f1c5b43b8be772609d44c615fd1ea248e276ca7f90d"; + sha512 = "d0dcbece3d24ff4c56a7df33414f7795a7fb7b991e26c552340e969349e0b5a3519e95c8465f4ff5dc5a7b9a11dd13b7e730b43130e34afca766912cf6a4a36a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/br/firefox-67.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "90c2eff0f21f6f4424dfe2a054007d9e2a052c33edf18ac24dd4ffde071abcfc90cd48372eb8ae0e2bfa7d2aaf7d84832786dc05f33f1ba61d0eb08f439f7d98"; + sha512 = "d8d424953af0c782e7c4b17bec49a9dd663d8a0da92cadc8010344c079f81b120573ff64cedbaccb4eb85826e6d7feec12b7e2bc5ec3b508997729fba13c18ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/bs/firefox-67.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d4e04a8a6dac7d2c01342d80c6cc3194581f67a6a428f7316e6f96424e2b33fdf10e280f299c547920910e38d1c5323914c18eda735d23d038ac1a6dddd21f83"; + sha512 = "4da5029faf08b6fdeeb1eac89ebe49f59748c06e77a1ef13d503eb71e33b5362c74474a35f7a907f528dc0f59b78f989df45d8c35e83e6ef971c425fbdb3a0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ca/firefox-67.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cc3bed4f93634caad8dbdeab570c67a09a64ea1ca4ef3e26797bc27ac63f41ed9487eb11d339cd7be06cc5a77d64c83297847f7d39c5f043b384f0ee6b89602e"; + sha512 = "f990b67201656b18109c6827853bf064d7726fbccde19e5058c7860b2e4b993eccf1925d2a77d4b1c4ef4c3b3fa4f2368c49ee0e67da0405b762ad39edd91f94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cak/firefox-67.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "31e7f7cc51f31ca19f9d8ed1facf6019ae863a9d3ab61c60b7817576571ab4ef65249867bda776f416a1fe5051840220b125edf05666a02bdb29c20f898ffa08"; + sha512 = "f0e6446b82a011513a603e903b910838686db5b771215deb5620c476f51cc27e2f7ec115f876cd710a1255e4edc1bf888afd9f1b370bc8fd5d4a40c3fe99cf3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cs/firefox-67.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "d906eb97754aafcf4378b6be23569c346e4c7ee8c041701affca50ab75e69e0af5fc2f9f0a2e1f5877e6328a2c9b420d43f19871125b6b26483834db3a8ceac8"; + sha512 = "9a0246263397595b5aaf23b0d73921cd25d57db315717bde934b67aea0ff917869948efdaa25465185f8352ad9e7b1e8f784cbd3d79c04c0f5ab9d34428ceb77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/cy/firefox-67.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "e02310f5b2819179d4e759119285b62cfab8d83e1ade570c0cfbabf24d216a3a815e89bbcc5f7d9d843f86f1295e755c9d823ee282e33fbeaa9790585b1f6433"; + sha512 = "34f72078d377157739b407f685e9c6835539c9e2f535bb52e12141c94b993ac1e389b251f316bc1a3a6d5682c7de9f2484b18e48cc6c39a18add56eff17df0c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/da/firefox-67.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "fe2f29a915872ccda6265e29dcd83795ef5443be305ec249219dc0c6b3b15a7a7a8eb8f697842f2d6b25285c22da93489dc7039793ffc4cb097c79d1ea8885f2"; + sha512 = "5743b79c209e89dbc9c902dd7609581577765719d1e0148373f85ebcfd3b5a2f225c758033583455353af22314651a7ddbd447b65de7c637b4ccf5eef4401a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/de/firefox-67.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "dd317c8fc5487058a81af3f743b6b3ef57a3493504fdfa6a0dad46bdfb34b6f4becf9311c71354d4a354633d973d42f9da5471ce2e9aa97a00e558c4f635172f"; + sha512 = "4f22bf0fa90f9fb4156815fb9cbe0e8380b7b36347f548e34709a38c2b02beb324645f0084148c2b054e2610d8ea0029e68db174cbfff95531d8f339c153bd7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/dsb/firefox-67.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "51b0432f68ea4d1443bf9c47cf4db826b3f36b0d2bee50fc62a66cfa17c76bd7ac91a3ab590e7def5a16db3ab90bc426aaf49d7a2f30279369123f3e9601bdd4"; + sha512 = "3cbf358e86490dc3c466fdf69a9bb6bb2bbbf56059a81bc2e1d551998ec07c319d7e9d467bad61e6e73f06fe2235254fbe7b2690c9f8c426d4e332851ae18f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/el/firefox-67.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "2fa2c1ac31e61db5bc3a737c07ae681672b33b214acebbd30f74d21857421e2b8e845ab108f303f102694d945a1471e68c7dabf419418daabe774602aaa84932"; + sha512 = "fe632688fcfbf523e9ba3c1c7adb134631900f37dea6381fb41c4a7fce67034c0033417b5ef8c87cb33b303712fc309620844614f8719dfc440ae634c1dc18a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-CA/firefox-67.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6c35875aabd1d18a3110ed00390433fac5d5fbbfb35b07e66f942fc59bf7397ecd18fe6745632c0165d66b620ebe4ca22b328e13d632dab2e54736af4e59108b"; + sha512 = "15a26c6a0ec18625708b0779f00d6831146f5146f7ca0bfe35b00808ce45a3ebf29f129dcaea5d2799feeb1ce7b0055f76f704f448b884a36a354df4467adfbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-GB/firefox-67.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4625f5eda39a7a58f0d3769cbe6f56bad4d214635cbbc67b1d7ea006bd62c639e665ba50e71e52ca81c3f7a82c4a0b9250a2b3e886ce309afdd025dafd34f760"; + sha512 = "5b756fca80fc72c6f3925bf1df427da4a118753bf30641b266c6c392705ec87834c1fc46ac08c1d54d032ddd4abd6fc35a71f47fc89d04c766c094d863daba1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-US/firefox-67.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "c55cbf26d6c9da91f2b6a3f1c881f30752053850ce47d899ad9e3b82f5494aa26fb5c95e7d76a0ff03e97c7a18480ee764643866366c611bac8acb9eaa063324"; + sha512 = "00f3682c17fa8276e7f79ffea28b80a59b20063f6a945fe7b81265966cfcd526bf10272cc174aa600e4393c6e5b894b90673dbe170fe571f03412d403dfd630f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/en-ZA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/en-ZA/firefox-67.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "194284f7a878d8190420c4642aa4d83a6ee9b41926e1225bd83c63906cad99581a5ea3049e004064efd2ff9c1219bb31b08fc806f5a072a54f39d9e3e9e5ff4a"; + sha512 = "8fcbc170bb6efa955b577c7071e1c78fdde129508bb47ae2a266d6b79e980f82fb3c615a7453f3eec6db3f9352a4809fff2656c65a64f5bbc4afaf75fbb225d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/eo/firefox-67.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "4aa88cff2f27f92f922acc7dc30e68a2a58f6ebfe1c023c6911e3ecac84bab8ad88f62d2c04a6f85bb4cb292e30a78b0bba4cb664375e68ec57621e2c816c166"; + sha512 = "05915f7e7f38fd0ccb9926ef96fe2641efcd42073d8acd18875a18fe3c63603fabbb66bfd83a24111678f1b38f8ef172c2524afd2a0e4632b8920853ed381751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-AR/firefox-67.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d3e60c167deef4da8740b7c7750d91fe74513553876fe95e654b7c9625b0920fafc974253c800595a409da65e36073a574aafb136d9ea8f3e3667e94a64517fb"; + sha512 = "bb88d6801b9416b9767488ede19c52d9e9802d895dbfe2bb5408169ef43732e06696243126099e46619a08d8d705df4d66a6cf87ab58ce3cc8dc99fd8949b4cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-CL/firefox-67.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "5a72e02d820205e15bc0f366f0593cc0305b35be45f23679c84f320bb952b5356c490ad2e627eef69cd836afe3ed53769dce535e3a727b6b7345d3ba02b0c0de"; + sha512 = "495c588e1059ed5d212c707ed5aa74a3aad8a372d11fed0da2f810928d645fee0d7d9aa28f1185ebd9aaa99baf14b1a0fe41e34b9e5aa7e00ecf46f9bc7b78be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-ES/firefox-67.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "19418e1fb052d32e50aa6b5d3469c2da254786560e63d5e1fcad3ef8d6ad13e77d243725bc3a4e543ab8b1593bb2e9bd8a00deb0168dc0bd55034abb18bd8c39"; + sha512 = "4be53b2d2fbef3ae7f1601b8869cbc57075a998c9847c8ed333ce9def39c3f23b9ebda61f14fb6382fe2aef5bf0a253f43da4d07d8f51080c0505c7c2cfb9e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/es-MX/firefox-67.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "659d34590b1b68b308f67c978c1ddea6aedd7e58b95e3b502ebf0c71143f4ab1979f833ed0d56354c7cc7f65d01b63aa1f5d4b772fce66c9ce1873d2ab608a9e"; + sha512 = "090166a767ba1df247d74116fabaaf90f751c27cf7cf55282cea650e1f10747966aa84e813ae79c891041c3adcc44e165bbccf723d77aa8b9abb6e3957602a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/et/firefox-67.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b391737b359ca832c604a25fe18b32365e479d83005cd37f8a0fd8ed2a5423b4f3f517529450d8be99170e0d73a6e10c446566772adc54975d0c364eea229ded"; + sha512 = "56f84137cd9643211ec1de4891261621eeb033aff71704318e69a39d034fe1ded0b3a78a1d98a90878b841e5ea4eceec7e3a3848dc6743a121c8616d216a18ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/eu/firefox-67.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "00dde956127620922165476a61690712806bb39ac49a6cb365255dcecffcafe5c12a9d00d7f2125a583db56576d9ef716a43b71f5ca8eeadfe4c1ae875924c88"; + sha512 = "91457da7072aa989bb18a35541f85a902cec6d425e583ea907c4ba31a65bfbb5991baae4357e0c1edab5696ec68c79c73e5033aa6fd14f2cf60940133c5eb245"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fa/firefox-67.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "0d2ef108c14e709478656935f78a2e3ac0d1420c0162fb44a8dbc44bb7d49b4f870888c0999a99991a85ad7da8106539b5893313fa2ff5b4275b9f46197bb1d6"; + sha512 = "3b29bb2e12c17773d18a157c8c4ef602d80b0e25c9bc399d4d803daa6bbbede64929064ea5daf4f0b0a514b4032801ba3fa8ad8d0dd45ee98a824c2daa852364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ff/firefox-67.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6f6efadce4a5582d2b38e350dfb3895a39f5f0603954b5368379d885fe83b994272fc832acbc9047570d5dd9d30c79f0e931440c533466d2dd4b3b26b0c161a5"; + sha512 = "411b8a922893fb37c05358c5da39b63c4cb8d1697667738bdc139fe2b2ac6f0ddf9b94ad7214a323cab69748990dd3a45effb336352c48eea92f48710ee6c40c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fi/firefox-67.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d3404e2f12ee101a1807feb52f219a52832a2bf2d6160d1a7dc982e937f5ec5a9090604e1891c1d5e87ee12975639bde6076730f47129aedb6fb82c6e9550fc1"; + sha512 = "526884ed9354b13eb3d2385d597eb43d2ec40ca8f0c106503f3e84a110c00c5da5422124aae2cc05c3e75999d4d50598909bb057a4dcaa389ab6dca726b3c378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fr/firefox-67.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "d89858ed2c5c9d3a7db44e14dcf7d2cdf69f53c4691ce2778c129478d855d6607436455f9113c903578d8ac551dd86914e3b449a02ebba827fcdad7d2a18201b"; + sha512 = "fafcf0501a1624f145ba02b08c4e5e4d160af0fd3d9dd13c22726ddd8b40108eda1bbd3322ba84dc2fcf7ceb39593cb85c614efe5833ec32fae767cafad28c0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/fy-NL/firefox-67.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "ac2c69cff8e27e5dd722b2f12357fd3182d2c7e80e9c70adb2eca060be65cc04cbfe19c524d940eaf0faa5ad2305da3cdd0a1ab383c18781083d5d93c7e82e70"; + sha512 = "e6d12c42dee42740087121eeaf961d279e121e41ac79187e18fae5bba136ab27888b3b35b6db4899a8a77debdc785dab78c4b4fad08746e0e752b1082978e18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ga-IE/firefox-67.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d026e125cae037d60f573282d351eee3cba26051e495d668ca26262a13fa62cae895827630d8137e1ad0e7ece1d4e78def691b057a83795723d1aff2b23115c0"; + sha512 = "44db77514fe972772b8331e9c502eb3417a810046046cb8ae48a1eda0984e299a58058a685d81c408b0a72f3172b24bdb57db70d595a2da93b90581d01a5b401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gd/firefox-67.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2390e38235251ffdbbaab15c582a1abd6011c44b3122b0a9aee4f80a2c6604ea51ab66e1ad6366e78feeff74737fcb0e0e5f87eb42e2cf27e3dfdbc535bfe58b"; + sha512 = "2b65bc81c0c9476b3196f5489eaf2f24502fb4abd585c0b1d9046a63a2bdb0f16a05e928369204ea028cb215a40a68a459c1c5f988c5d6882aa15d1e0a7b5b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gl/firefox-67.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "9e97967e89b226460ab6253ef2f5e516b3977869d3290e99bcdb40b2bfe6589bd416395d3302a88f85ea9a2ae6922ab4a0350c9159d26aacce380e27c42618fe"; + sha512 = "8d4fa0b6177b7926eb9f16c08e4b5f0e430add37622d712d77a2099c63e0fdc21ed9e2b7a72457868d968c1af42b3aa83b22c8f55cc913ce1d5eb913b12d1b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gn/firefox-67.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "763929a79725ec5b8bad8b77a5fac4a452d008af67e51ca6574cfa13f4fb33fbc6f095c14ceec57fe942f514f4550c94a691597c5a0378a2e63d84999c6eaf01"; + sha512 = "1bf077f3282702124bbb968057942e2f701157de1b1e678cb55a0280907337952a0c3118ec874d0ca2ec26dc2063769b4cc2a2045e703c1761076e45e6c061cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/gu-IN/firefox-67.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "75813a07a1aa83eb010d7856c447644723f4c05e8a9d1c68a09e49c6f40d8504956a3b8a72af4b3c28ca84357e1cde3ac075447a41c73ef681cf9e4770744a90"; + sha512 = "405a61a2c70c26569059bcbbd1723ce378a9d6a40d5373e294c1e5064b503e5b68a42c77bd023920348bbcfc05309605e9ac102a3b1627525fb3ec3fbbc58be9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/he/firefox-67.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d9c9285e8ffca75a9ecb0d4de2eb7471e523dbf47f1061bf5cea4b2ba363aed4f5a506a822f390f46b4cab8e24a848ed6a3ab5b25e94c56a80bda86020e6cdf8"; + sha512 = "09d8d4a4eb70ba7da3a7d90d61ebe23f3943b4bd2f06d356b1745e7d9297f1c2160312ed1c8077ddeb88f6ae27c675a5bb5f1f81e19d16c6675a5cf2385ebe0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hi-IN/firefox-67.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "8181d6ef8b24a9e2fdd59aedd1d091d22950ea48a9bd8061376b0d835f949322fbc66016e79729d27a7ca70fc3378a9d50ed78f51a5b69ce005b8ac7166eea9e"; + sha512 = "c8c65bda9d1582df1b015425466d6806b41a09f4bf6e0146cc07932abc3e827db4fc89083711102b0716f6325e563d8e7a0a3c25af4f8e8f9bf31bc33a33345e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hr/firefox-67.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1d229abfff336c50e234735ed806ee2e02288391d80a037f9c680754e268e66f60b8c4d18b0d52bdb097ce1283bc57957f512dc0ed117a67e8e1b8f758f2241d"; + sha512 = "2beffc8293f955476c10de22c8fe45a46ab7769ea8ae85f611ea23c3171ff01dcc2df50907ca876f5d13b299d5b0959d3f1cdfa5153427e116a84a08c05fb144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hsb/firefox-67.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d3a70aea9fd43cff0bd91e028e07a54c503d749ee303426d416ad39edacd99a7ad35e724030c804e2224dca13112c9eeb98bf35906290897740bb2137e1eae6"; + sha512 = "87efee6e2c24a0891193a1e745ab34f397e3c557b8c2e9491d2c935eb24bd221fa562b3f22eff71c1647ab55d87374e70541df0696a12830596dfe8aba23c6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hu/firefox-67.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b6dd499516c6887f68172cfd686bce8e5eeb8ec84c9b4397b8c1c3fc8ff9763bb62d08d642bebc2055df6cd7e03b03cb6bc1fb9f58ae253c5192e71621144e76"; + sha512 = "87732b73fbf821a8912a45cf873d4917dde729cd731d53c0c843d681d92681d395981152f93c1ea8fc415a93053974905fb03fcd6a4f71a7e07b12e0ea1ff9bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/hy-AM/firefox-67.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "dc33180a6b2b1e873f5d6958b62181d793b109f38db24daa09e588143bf67b9aed7c3e0f3597960fe3c8311400bdb3a38c0c3456d85b0b1dc6aa80d0c65f8355"; + sha512 = "7dcc8bd376fdf4227ac74b1d24965d70b274975800fbde94682a24de3c1ef8348581be3ad9d0715f16c0c9d8ff4995c31e4d38d99d8aa72a50acbaf8d4888e61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ia/firefox-67.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e3a21cbb03a1deb06ede565e267e6e5a47d4a41b2c6f140205aa314d7d20252b8d73bf71997829aeb6d2b105b379320678a7f43cc9a039c7285073e126102f1d"; + sha512 = "806b578c4005107896f6455e53987ab23785c737169a4f553d4e152345f4e77a7014f38a27407a4310288c0e2d08674b349f9f54bcd02c2b3fc7b30b27fc0a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/id/firefox-67.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9cd48d1b6e28dce9efbdc418ff7bc2c4e823cbf93dcd7933321b093c86e412c505cb3fb17861602d428cfd847549e6afe28b1ae270b9aa03a4a1ab3b6f61b4d0"; + sha512 = "3c054ce894b6c61bde78f447095dda8352593da1879572234e10f0edb49fe89a0049f84404d45c6dea0e6e2aa75fd96a606e943260cd83166d447e65ecc435ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/is/firefox-67.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e5dd3bcbc28c4733916e047645c87dd410193d5c14da5589d5e80cb19fc16185c6bf68607c8618c83dbfc791efe2b821c0272e59a724afc9437964ad6e5d1476"; + sha512 = "3e0bc49ba210a864cf083ade56b89d1c78f93b2776cd3d71a1c3c649ecb5053942e9eda9a2d6eab97250268c9177bbb8d81c764860e5fa1a4ccf41f5e540fc0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/it/firefox-67.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "5693617b3b5096ff21d2c0a96300d352f86055b4c1c7ae4b44e852f424e749548cda6201629686dada48070f53cc39af92f4f6660e7d3322acc11ddb8bb1d13d"; + sha512 = "f410dfa055193d5ec70807a9374b9c9ec92a9f5484d52f241ea15c35ea60be58e72442949036e153e4adaa0a56c0ef0070fcac13258561b35c6d09c5dc1b3b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ja/firefox-67.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9e009f04907f7ffbf9babc1bcdf4d7f3c6f9af832b5e9704ff3f15c62c4952b9027cdf839163cfb941d1192960ac996f13663c93ce04afe3bf3e555dab3d4384"; + sha512 = "b0dd90d9a944cf99d76ac5b2f68c81d90d2dfa4fd544f0bcdf239bf091ae0dc96d5a5b4d190531fe90f38bf0d810bbb75057f70ae8cc090416535821f3630794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ka/firefox-67.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "52bca3487e3eb6c1c91771cc839249592cd8e8dc500b21daefb26bbc2423a29278545e9f4f6e825dbe4a7de488bffb09f9cb223f6a70dc095e250cf5f284a73e"; + sha512 = "d7d91f22ed6d4ac25fe67685aaa947fcee5a624b4e501954809d9f2ac3abd150e19aac283636a10456f5d18b20f4a50084ace34bd8eba7a82ddfc0176efe8a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kab/firefox-67.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "20a7814436c99cb63f2c0337c69d199c34e005661d37c47d86bbdb03d0ddaccb9b6a25fc6fe59e3690263bf0134ccd9a2d876a649f2d3c9df8792a0a78bf08dd"; + sha512 = "825c0a1d1dcfe3206567bf24072c27a62e3a90ff839a59ff9402fb669df77a0879ed2d47904081c6c5315d5c8079f7fe4ba0468d8ee10e5f98539fa349e4709e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kk/firefox-67.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "72e4ccce43dac6aa2cacf4f6b6209d902c3f3ac15be76cc0e5c3ab8f5fb95f9c4003b0cf7993b322faf09a7b5c8bed8dbe0759c21138b7e22df461821a9256f1"; + sha512 = "662f37a871ac7b8b897428324ef31752bbe3fe64f319525e77a42d873497decde5153a8ede2de135e79f9e107f0ca014502d27cf11e1d94ccd7e63fb0e7d1da9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/km/firefox-67.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b24c9581df3426c1259d6126838b4b70844fc94de35be5e0c2203d471e5cd0d29102652679dc67fb475598452fb871bd0a76b5c470fb044828db4fadd8f46e31"; + sha512 = "ef722c12393f16945fbeea506f3463b37feb555db84558b2a193d810d4eaba0b94380784a2f1f0e8385c1e182a3137d5c11683bf6aa3525805b0383f1da70509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/kn/firefox-67.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "e09094576ad84fb0a063a4343b9f6f379c3f1902d7fb6eba7146f41fbfd6c02ac54a655f8541bed8daefbbb1232c0c270bb4447c249aa5f248c2cbc0631585c2"; + sha512 = "0b17f9793835559512f779e2939344775e8c29e8ff760fb3521e3425e8b306b6dee8de993837f894f55eff57e82756a9335acd35e26ddd5125540ba3037ef8a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ko/firefox-67.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7dc27aed444efea1d6e78dff3228ac46e8cba2cb8294cd8354af5da7f7339abe38315ed25ab8cae6fcda8973aeffceb4b4c0db63e7bd055d2e9d670968e0dc09"; + sha512 = "62e694465b436294aa52919e3184257e096300759da93cbad3cca823c64a6102b7221bbca36dda9eefc4459eb70969dd1141449d4118d5955abc45fcb1b84315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lij/firefox-67.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "379bc462dfd6aa153d4ce76a857f19860c3f45884469674cc8bc1dabdf4e5a56e8bfde838fc080ba7c67f585ce05907c235222b43df4007323e798f660a18dd8"; + sha512 = "b86473816e14f0af2e916678c0dcfac61c315f8686194f25422d5a0179d7a741b1dd9e53f95ad09b9e59781e0dc179bc3ae598fd763c96811ecb8317903de980"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lt/firefox-67.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7dfa7d62501ad083ed6c3f14239326aa09de62bf7ca1c216fbedcd642c038c4a988afae1b4da505e7e17d82a346e15df9274ea5614833ee8640590ac85993e43"; + sha512 = "c98e0f2c5270454817688aca95efb7af028ab46835e242348a0977bd6eb350d1cab8583829647d226b149a24ad2c8125b2ccff88f1c29046cef6e05e3081db9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/lv/firefox-67.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bb5dd1aca7d817e47da0ee039bd9dd664a71fd08b88b231c587421b4a020ade5e89f0e3af30406cf7b7130ac113bfdbccde97e6a93675aad43afe30d7b629417"; + sha512 = "bbc568daccced664a217d962aaedf48123bc123243fa3920c346bab6f85f4ea19ed3664d60a9179797c2089baf15e3dbfc8e2d84e56d2bc40a54f4ecdea2d032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mai/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mai/firefox-67.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "ff7412e45c891809358d35806fa79f74cb39dc71b30f6dd1e84d12f445b8c50544cdd57325fff18fff809710382a51d1fc4630e4a7e26de79a0b0a6517f7cd92"; + sha512 = "10ff02bd9503c422692f39e27256d7a6cb2c1cd3b2188e493cac9b0158775c7f1c36e733433933b8290a7807ce6d6ae57c9c0ff46e6908300d0fb6e5b8c7f39e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mk/firefox-67.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "f0c8d41591e081f48b31fcf27bbcb97f96ae09583718da00466f9d85f7ff95ca6444e8839fb95373787263596b4593e1be408e563df5d15cb1385eb845079cc7"; + sha512 = "dc5438604cd8cec32aee799f03e7776f97ec03f50d473f19ca468fc7bee9c11ff5b92a8b14fbaad218b44c106b39a4dc7ebb63355c80cda4e925694b7635aa17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ml/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ml/firefox-67.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "98fd5e485411ecb42cb2701b5a51c8079502f466ddb3931b98ed0c650f81d8b4e0036f339bcd84cd7cf102db22b2556a764ee75029f34d9857ff3a8b3e4cfc21"; + sha512 = "b6de0d78c6202e2677aadcb0792989277585c5626d41d12bc48b982566879b5cf35ad44d8ad05cc6d09b1ee0e063685c87ffe768b6791375505b192016fb328e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/mr/firefox-67.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4f2f7810b152f26acff3b3d65f0029bef82619156f5b77a165a2978ee6662d0b8bb2242e6257e170df29a5caa7098f4e934d9ecaaff0270da7c1b5239daf7fc0"; + sha512 = "f8660c94c8316de8ba94f9d5aad35ab3ecca57cb307bb49f5ee5867e3fee12405c210f982f617fceba69b4b8e4ff2c49767d28a00b1ae5643172ec5475512316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ms/firefox-67.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "cd861c3ee3f0d6ebf4d98142a9a916c19523813f9e2d907854f6498f592e96a2fcd29fef253d6f62650e3d0ee0ea31555dccd2bcd19a10f788e13bff14497421"; + sha512 = "b11a9c2ec0abc8c623e3d1a13eeae1b184f2b2ff5ad9f8db62a4e5da118da2ea9dc02113d2f1a54246a07c7fc1e041942cdff4e44056e5584815fe0e4d0ad99b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/my/firefox-67.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "58cd04852458b5c3ac904b9815805edc64fea182b028ea93aa940d1ec12d05d3d25bd63078a600255c18aa0f6c85208d3e1356fc3bfa556d26a0098418218098"; + sha512 = "08aab48716713a02d779ea41a1fe7396a199336a84b79c97a4bd8da3201e71e5c1afb48acf731fc9653316b05d53cce0f85a1777fbb7e2f02de7452e137d2727"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nb-NO/firefox-67.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e8eb0c3712fb1d9d35a3db2117497fca0bc8410acbae841a1fed73f08bcce57d1b19287a76702d059b5e1755900068cb2cea48c56ad0f3ae17579ebe82828a53"; + sha512 = "38e7e2153151f40c69712ace80bf9fa23aadc1024a2da2e8b54bc304e97f9cf3f0b93779e194ca7d352ca58234eb056cd9bbc81537f666bd4c406057c88ffdce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ne-NP/firefox-67.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c8643be9cfdf53f04cc33b612bb9d29d7013ab3f65bb66400cc4b7f80345b96c495ff13e9647eacf29dcaa1f8e6890056cc66a1af3f39418f1cc035657be8800"; + sha512 = "802a0832d0767ef3618690da5a30117b9d41bcc0aeacca32657ecc57c39db1fb495ecbe211a47976803f50f6a314df08ffe7e1b17c436786d98e31e2ff4423f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nl/firefox-67.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3c7c1fac98556ff0c4d87c8c4706b71e1dc4230a4cd2359352204b20670fcbc5cb5c7b844558f6d09629277e9e0fe6ae7015176d41dffaf1929c800c3d24fc3e"; + sha512 = "56616e78daa5c44a2e7cddb64e50cffe0daaba8a245f12d842e6d7657dc22ac030ff98630d2cd1693454fb9859bb62fcd3119affb9cc950ce7d06a1eab123cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/nn-NO/firefox-67.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5b671dc02e1624a998b3b081b190660cfcc2e24502d84b19be32067252f62aad547ed978bd06cc3a7df39eabd3b92d47d8d70534bd1f5cd1e05329f4136f4496"; + sha512 = "245d00bd0517f8b7cfbdc60a04fe37ce491dec9106824c2efeba8ea401e502a1d49c9d5e88ca3b0c712dc74beded5c19b4115922662373ccc3e185802547e7fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/oc/firefox-67.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8fb54d582b493a89568b4b4b4c0f03d72684fa700dfe484171eb3cfdfdc2847add46611908a6fb3e01ce027a1292b64beff565088298b926f715d23a060580ff"; + sha512 = "b18dce7f515d26ad694370888a9b78710d5ae75e99eff6274ea29bbba7e9c8959013eeef8a20cc2709c318c9cc054b4722ccf0f13bc583963e1b50df84eb4d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/or/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/or/firefox-67.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e1f8d44bb89a23fa1cfc073508adbf459397d71251aad780378e95537dd4c29aaecc19d65f7db60f4fb647f544eec1e471b52cd6aec24db77ec873448c51ca81"; + sha512 = "c4ace90090a9473dbbb14575980e8598f998bbec64db3d9d9f77730ead00698b63f0992b95d82b21e73d0797278a87890a485862df19f0c1c972c31b97a70857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pa-IN/firefox-67.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ce51ebe527bc47f32063cd236ca34e9da433a4c22353b1893806b3e61095ef8a6b6f6c37e7345a46f92f3fbcfc9bcdba13c100f9f6d31dcee1bb04e5b70ae971"; + sha512 = "3a25e29cc1e05ca625a2f420fb4d027532999fab675ada891d8b8b54c502ad40bad408fda7f8ec9a3269e25948e8a42424b8a2cc7b1e228825106c8da5a34099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pl/firefox-67.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "59707508b21d35ef00b865e79aa817b051a7818907c25a11232425aa514e20eca5e61d900710fdd86a3e56e793cb780f355ba054b07f84a08430bcd53b73acfd"; + sha512 = "cb6631f1dc737157ea0d17552437f2ed5cadc36e390d485390aeaff85fabd11780d3a5d1d9217e2129a53fce30668ca20e68f32470766712c2e767e8a26defb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pt-BR/firefox-67.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e62438de6765a25718a02e51ce25c18f936df07e8a77ae64c2f109a852e7d50a9d5ea8bbb1a6b1d0437f77b29502495556bb6e7ec2b670ea04bfee1239da5359"; + sha512 = "f50a5a71514fdd0c82f9cca78ac67cc984772abd5f9109f60270db64f81f3832e8612ed3b6c23e91642017da9b16eda825fe783ee28eacb29edfa23b1e6c3d04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/pt-PT/firefox-67.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c10d12c00be906fc50031cf93a0ef9ec4c76004c26e8a79607a96095a0374a5fc12e015bc7e34cc9814cba5194296d557c50eea111a925357a2fd87ada21d63b"; + sha512 = "dd99864a07358442c3e97cc889e1a891df6db469f6238c13b36acd6fef38063de5bb307319fdcfd82c91a66a9f67f6170b0a6379f6435020fe30e69884829076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/rm/firefox-67.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3b0d125070342dd38b068abaacc5ed9218c7a6dd6d455bdc1c5db03ecf4022457fe71f9dc1b5ae19b0d4361e3f4ac4f9f5ef08381e75b31d9c72e6e9469ab198"; + sha512 = "2d8f8a8c4d9398d02adcc9d827b76352b761235ed5c43ea0c4ee5798d19d611e3aeb9fe4f44df874a96a1905bc7c5e9d7f16b85606c62bd4508e5120fb5787e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ro/firefox-67.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5bfaa08c609eed99207b39c3ac2a802a4877a9d578019ae62bfdd5f725b2158e784a005f285b125e3d87e5bf1a9ffc83422205bdc9a57b56df0fb867305d35d2"; + sha512 = "513698be75508cd4f59da1fa8f81b5954b5082c402cde9a263a58dfaca9e27f7aa5dc87eb0d4cf6f15facc2834c6ad121cfb89744c1b00c19181a2f05c31cc1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ru/firefox-67.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "e0ff1343f2ac31d27f9aedc57c78710e1c807d33d0cb8c569bc5bb36fcf5b698e955cfe0cb7af371ba48d68b007a73cb5a87085d5da039ebb049d13968304232"; + sha512 = "c4cfdf7a472bba06ab3035845c996b54a3e08f5f4cc380fdf8752b5d57aa3dcedd9248aa1e0f92655762e2efed8e8ab1901968d65b66ae565b60404fffd654de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/si/firefox-67.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "29f28d18b80e73f984673b298a479811dce3acd4b7626347d422085774b9c6504cc481be7b31d54347bce2f6252b7718e7b34feebbd8056910f0477e715da041"; + sha512 = "ba8bef7194359cbe9a1a52af4ea5e8615a3e3688cc0d575c76fda5319684aa336c59e2492ecaf65ecc68939996243fc07f910e3a2c4a36de876130abe100dba0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sk/firefox-67.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3833b21823608dba1943d55fd49827fce477df0b2550d52eb1b7fc9b7a327fb2b70fe034db655d51b7dcb686566b8c1c41f325f1923b3591e3f08a53b722103a"; + sha512 = "afed2ee53d88d86bf45923cbf00952914c01b6b70909079a25fede7db3cb221433c5957788875a00e5788cf83a24f771399c8ca77661d042fa58de967b8fec55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sl/firefox-67.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "d29704974cf907552aab16eb4ca94113db6e8594da4cc53cb97a2af0363de56b65bd3a708d235b46919e08bb5b46de8dfe0898213454bfb44adb44fa956add34"; + sha512 = "5482c61f33923473af23ac5819e6fe379c497ee4dbf205fd1df14903bb59c74fa41f2aca9a98116383675848748a992a11cb0fafbfb227b41fd168c071810586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/son/firefox-67.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "2a4015a2f7b2aae26c36e31fa1cf509ff0439fd4b91697ac8195ba025ebd51b4ee5e83351486c367be342bddfcde980801d154f8aef5197a9b01ce8c4ac307e2"; + sha512 = "6b5dc673099a66390dfb9307a93f9852ff8c2e6f4ad42e3ca3988fd53b5bc2fc03f51bd91d1b93cfb4fa7d6f481681182e961e08c84558e14cc19f181189fd60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sq/firefox-67.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "3bcd37367086952dea966b2e201dfbedc22c1d3865d242350fc9c019b3186b5bc77b267994355b6a5554740d0baef67e6994283b900cf83adccf218312f3c387"; + sha512 = "ef584e79c07fce073e188ff5ad24138c59b764b144a5eb80847142887ac007d47336338e75ef69f1c27063294e2d65cfcf7c49a25ca59b294481463f6add1b9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sr/firefox-67.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "6a669d5a22f459a6745a57d6a329c08ea4f77573e675f2a27ab7f43afa75280f98becd69a7b136bb4fc28e44e1b60555e7e2f654d6ca2f7a5faf16f2bc81fadd"; + sha512 = "9ba0eb04dfd9355163baaf446d3b62be4ddaedae82558b5207fcb4ee08c315d1f86606cd917451fc6d2bf1dd33693ded40f66e17aa399a0f33187b038fb0a04e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/sv-SE/firefox-67.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6a9ce6a980a1baa00fa59faac21f6710f92bdccdd51ed3943a26247c2d52a1c24b5faa82c14359d6cfb3af80696a7ae8f53ebbcbf48592b942a36aeffb0b5b33"; + sha512 = "4a764e632fff6ebe332e02473a17038ae6fbcff261bfd8ccc109751208002864bbdd9040a0ed706862f57f217b4dbe2e771982837ace14bc11177624d396452a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ta/firefox-67.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2a8ce8f2f62b700ae31aeb17f00838aea7ba8d2b4368d49ea495a8436dadd551e80b1d6a07001cc6f6fdd6d65503cfbdde9c59fd1689e0b3130f2ff7761575b5"; + sha512 = "b15916fe4d9fd6fc634c98da18de4ab970b52bafa1cda862ad81fbea2713ae40e11a2e472e88dab813cf6e26158cd2bbad118b8bf48061360ce0cd6f3ab8c669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/te/firefox-67.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "67b204b26754134f2398b196f7f8631b965936e25ba2fa786c8fbaa1482d5a6ff0569345da544f14568a9c17ce5a907a6edb80f7e4714460adafef2eabc326c6"; + sha512 = "4f25e30a084e2308739a60513ccbcc4eef516cc61879cb75411b150237164c0093d0fa6edbcdaf4e96815fdb4f7e87e4ea2cee8d60cfd488002b6459530eb682"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/th/firefox-67.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0a1bdcb4c7a876d96d70a7a93f72cbdd87bc081f67e4f5eb5538fec347484296dca9958289c1fa4326e7320f2a2d4ffe14bc8ce9c3add24ebb58dbf04d750161"; + sha512 = "0245154e664a10a646fdbb6cea2c565a4830a34caf4ce6eb86508bd96d7c6e95de447d4b023ea28f5937d6506b439f137580e059b9cc149f01b8d7d112caad39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/tr/firefox-67.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3896c5c882b2162b9e465b500c8f6c9f067a99c7ef70f0ffc4e8cff59f80e0fef4a12389d71b82abd512769d9fd58a6f93eb2bb318d26e1a8969187dafb20c5e"; + sha512 = "ffc35c836068960c96bbaaf1561c0d7260a190bf01f37c4f256d360747b52cc28d980c9fe63dd2f2a282f148620adcb9b37783e217ae0de10edfae3b08093366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/uk/firefox-67.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "191af410dde229aaf24dfd10e3d21e6b0fc9f2e383eae99fd09c23a49c177c4b2e644c244ef4f4bc22003769e3bc0716550f53a1b1480b7224128bac0616242a"; + sha512 = "ebca303ac7b6b276596421788e72bea9b473810b5de4c9c6aad1a4631db560e4dbf34f1a938aeafe318c93f2d511ff7330a9400f032e9fcfc04be30baf99cb42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/ur/firefox-67.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e7f93ec854315d719702b8f0f90089d2a3b33465f5a809618de69b4b5b322cdf68924338b058df30aacefd4d7842f4df4c728a75dbe2893445fdf30b083d36be"; + sha512 = "09462bea4096bea32afb94f79e9f20bb5c41f02b35a4429103389d3e8ff898c18ccfddb13db33dda4af8315b6acf76b24008b70bf0d3c8331e6e812fd924290e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/uz/firefox-67.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "01ccc5bd6cad0efde5ad49cd24cc41a1b33ec5bd7abf77f1bcc7994b2faa8e16841da7a8df34f3b9143586b522bbe5971e580638290e1c3d6600156391cd2b68"; + sha512 = "267c646d61be23f11e4139365b463c746b0adfc5ee7f3248c8f48c093e1706b468e187e574fd12330a8cb5bd062940eb383c9c6d42d0159f12b3eff6933c3a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/vi/firefox-67.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "07819858db4bde6390cd60c004eadccb2e5a8287855532789f408643cdd2d3f3e71808c09cdb26874433af80914f83b93ccb76486ab8f32c60d3881bdf849d39"; + sha512 = "4f4aad99ab5ac6ea231f0dd3384487c5577f9025d3e83e6960146435767e3133267495d781b04112c4a4734548d643310c6bcc7b97fa57c917798dc127f8a5a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/xh/firefox-67.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "390bae062fdb539a2871b83f31ac854da63a9adc75061dd3c27250d549eeb9ed6657275af4be691f9f5e7bf27ac6c748e7caf4a78f36a0f9cf735680b3cdad24"; + sha512 = "3c422d7a1089ac4405bea8268d48a56bfffa1c15fcc1362bad00f045200f2deac14bb31985cca2476a226998a55f2f6ffdc27c17a1fb7e28d667770102147fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/zh-CN/firefox-67.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "3f00515d1bc2b8de0fbc77a809419e87110ea4715cfcae7f524d5a7e887939dd52149d8be2216d82e0ad6653b5f0459fdb291837fb80a4e09cfdea320f911d72"; + sha512 = "b7d06b17e5a652c87a2b644be00c3ee6eded4b6a7daf79e7663d6452b7c7e5506971b819296b7c251a17055747e6b310e60ead1ca08490bba8d056df7424942d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0b7/linux-i686/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/67.0b7/linux-i686/zh-TW/firefox-67.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8dd0a7dc10c00c0f7fb9d3c4046aa6b42c260541862cad7a9374798fe9dc4c7565cf8218399fe16128c73843c5c7467ad4639cf1eebdd62d9beec4b164c5e062"; + sha512 = "a5ef8efc618641fe7af9fd645388a6942ceabdd6f239c37af7776f753e3703802f707c64925e7a151d4e80acb2a720c4bfd1f8969db053a708616e0191bafa4f"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index fab98ad2e2b5..4262609c66ba 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -50,6 +50,7 @@ , gnupg , ffmpeg , runtimeShell +, systemLocale ? config.i18n.defaultLocale or "en-US" }: let @@ -69,8 +70,6 @@ let sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch; - systemLocale = config.i18n.defaultLocale or "en-US"; - policies = { DisableAppUpdate = true; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b49d20c1e656..8f1817627bad 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0b7"; + version = "67.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ach/firefox-67.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "49a937a5cbdb2f7f42326dd3908c2272f6db08060639fd4221017354623fffb5363c95269fdb9b2886a4e880a8521cba907f31643c51667b0f37f85c6a66c3d4"; + sha512 = "065f94cf555016d4a4cf87ab48c93ac5dfddf3fe55769b46b008df89a6b8525705e3d1d42f1378b01c4fd84c0c6330fe213a8bbeb968b2062ecfb7fd0d99da14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/af/firefox-67.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ca316614b43f05fb22ba332c5ee93e682537add0ad74ff57b49ce27cddbf162b0d2dde4303958630c2ad59b8213ecf3bbe20f0e4f5e4e9cbc020aeaae1df776d"; + sha512 = "f41ea86f9d0247f861a3f2f336dfb480706e114beadfd95d907335b6eededea46d4252e8b5f711b73e73dab2af4f189dcd1bc6b5f0430fb65a35b4df6e58b801"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/an/firefox-67.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c5bfb6eb3791ac71bf53c0fdafc1f966d153112de6defb5cb3480d0515c9e729e20011130d1f9822ba3e010d01a52445fbacc4cbd01a848c4be427014a98c275"; + sha512 = "f22157f1c04b359dab1cd87e3f18cf2dcaa5bdb8bef504f4492b9be87288a6002a31997885303216572f2000018c4951998a68f9314862b2ea7c4ce7be943085"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ar/firefox-67.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b222564c9a831e8852e72f9309e33ad5d20c4593a43dfd43bbf3997a2998af4084b6e1c95d14ce88dcefa6d53a4ef8c8a8c56baf3004df04a257ea38663cc789"; + sha512 = "51ba06d4ca42fca5d5eb706ce3ec166c08967282d3b66802b11f41814058164ec71f28f8e4dac37affab15179c4e411b8634b42a5cf4693e9fa5186cbf0440f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/as/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/as/firefox-67.0b7.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "3f6c8f17b4329a43d572f252cf8d6d1945ee6b24bcf6b33684257ee5557469dfc79dfb61038acf9b067a38ffb994e4b2f18026acecdb95f31f8fdfdefb46cf4f"; + sha512 = "461afa6427e234f64fd95f8d6901fa4ad6e1a7aca08ac60205f3e27a8af55b0735fa50b0ae460460e842273f4488662133c1ef9d72bd14bbe69450f1c8c13bb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ast/firefox-67.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "59d712544c565eddacfc8d75dba5aaa4b1a87eb8faccdc164f0bd7e20345f8a5525b231ccaac460b3596543791848d7ce3a01483db876c6e09bd1492ceafa748"; + sha512 = "45bfaa2fccf2b2441a71ca3c23846e6cc03398e5a48202dd9f2912cca8f9c4623a1cfbe315d81952dcec4e8cda491d9b455a19743c32b278f2641828e0cd82fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/az/firefox-67.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5ecb1c35288a0c9aa2bdade2ccc74bff12241d9737c2f8d78cc2a9b8364065c8f875e3f7d3a3671c152f7ea6fc8eeb324bd19cb1e2bed74f2a0ac48d1afc8b06"; + sha512 = "a12c0ee9516e78479413c5e79a43e149632648a83dc88e87b443a4163aae98f554ceac48b456845e881db575a87d9c8d0772546c844ff567d7ea6be1c51597b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/be/firefox-67.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dcc11dd9254c51ea0ffc7f2e0d1d26b49d7e543991245d84ce1ef7ab7a8ea6b4f1fbdb3f08e263565971069f74267ca4aa7797139385e3e8bb4d7bfed5434278"; + sha512 = "756723c6774e76f62f2447724f4c2ca350e94f81dfb9d3e4b64381d3d0e34cc81a7b56868aef1996e97ae13c15f192e83cbfd30a7b171a7536731d9ab9035eef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bg/firefox-67.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ee8431d249f533268a11d7dc983cd541119156e5914d728a6d363721e15025a75fc31fcecc74049d0ae866afec0ee11546967db997703e8eb5cf0131df574019"; + sha512 = "6b548c459ad6d0933733a571f800050b6e416618a0d465acbe251e8899ccb5b3d4b3eef7f46982c9f4f888f2a21aca4f9fcc990615345a6868fa45797f843ad8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bn-BD/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-BD/firefox-67.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "c0fa1c00cffdb723263879974de005f7f62b661744f246d78d4aae152da1ec4b72cb4085c4956d57d594054720d99b8a7c0254620ce8bc481a83ac43a1bd31b0"; + sha512 = "7a97d2daef6459cf2eafc7c7469c827c0fbc3fe241aa2a08865ce3b83b4e667f59371d33fb96e834ad1e6de29040146324359473dcca3c6acd2dd892e4aade64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bn-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bn-IN/firefox-67.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "9591940be5d6864041384bccfc321043b2bb09462506cc41142f378e423e0aa0a2d0dcf137ecd0331974809cf1f3ef80c30926b9f8565c08f505922bb01bd015"; + sha512 = "6545354d98ef743017e1b7b951df4f1d7149b9918a2b0e242c10c886cf193a542a8c94f3c98f491b3e5b21ce860cd14cb066a9688b375f435e01aa4b5d9692b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/br/firefox-67.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "340e665430104e43eb30590423d07488d75618da28e3a2aee2e7fe0579cc0947959122869ce8b6c551e8108bcf5cf19856fd895d3a07fc7d0cc90b6d81b46dca"; + sha512 = "85095550969c5708df47a9f0c67245273fd0c81bf831707ea99d07fd9e679d4ae4c12416b764599826f08329dfe7460c4c4109b21887fe416aec638e6730ca62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/bs/firefox-67.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fd8c39b1e21c7bcb169b569f059549130f47bce20a68941ef0c3c5dd6d331db5022683148e2653fac2f0d088792194ac09b6654ded66dbac8ca6ad86d0c64611"; + sha512 = "3eddbcfd63cbf85f74a8f24b7cd1b47390369ffe4f89663178b6bf893fd5feb040c521814b2033a79cfb75ddd0201fce2bc3993715c50eb1a39c6889fe515a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ca/firefox-67.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "89945169277a9dcb3f2491db6560204aaad7feda9f61cee0d85852440b3c69c4adf4eaef0db9fde54af2058b3d213d24b0a932d217a5e60ff365315955219f8b"; + sha512 = "ce4e8b99648dea33ed485aa364e99aa2b76afab2119a375c0b1beb6acba52bea6386beccc00db84692817ebbc7cda54bfd39755430ad195f4a409d24b6f9cdde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cak/firefox-67.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6fedaa1020e3c3d1cb15d4f18f7fa5af719ef61392b97586b3e194efdca859dfab17215f7882595d781128a073b066637cdaa9d2e1a133d97ea0b36fa94da753"; + sha512 = "1cb2eaa6c83bb7c8552094f2b40a710b9e00b48fcc9d76b95ae650834e8f4e33b898fd1e3fddf3e4c90997ee9560e1876acee2a763719bdaa2b98913d62bb073"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cs/firefox-67.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "4b0eb239fb44a7246582326ab999230339af4c2c45fab4e4159134dfcc3f526ca1e0ee544050ec8e699575540c780b1b09da7cbcff21253f4ca7cce121abb9be"; + sha512 = "b4212d47a104fa1a1905036886285973250c6b7b253c7b8f1d75a02561af2f7a127edc153ee47f1ca386f198d0a79106ae27c4abdfdbad05fcaac5b179aa64a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/cy/firefox-67.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "d3c72a27fd09aa473284b8e370b781a591d6a4885ad25b74659347c4df10f01456d0f06078cde8c7b345357eabf30a757df1b6680197de292f081a79a47d680f"; + sha512 = "6238a0f598da4b323a245c7f025e0e67e511c8b07f7f6fa2dee5d7fc232fc9eb21d4a0c00d3b5d9a4912cdbe5fc3f50ed8c4125e7e6cee5337d21580491a31b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/da/firefox-67.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "395cd4ed11f1a14fc05d79583501df1aad15956bf34cc63bfc71e42d55fa51cf7f8ebaed15122c7bdae7437d5e564d804b23df9e68004576c843833c9aed7d7d"; + sha512 = "f3e5b994100272063fa50ce90edafc913333902431ac24050b10ad96f686516efca6501260e2201d6fd8a8b835efaa3f478e29a8337040f5274056bca1e4b893"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/de/firefox-67.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "08299f65c133c93912d3e3a2e9da07ea6b5282b18dd0cce0ee54c301455a13bf1d2b9f086bd305a60ed82e0adb0f07fef08d7932d10541dcd213c3c97960c362"; + sha512 = "b85685a7119e9b77325cbd3091f447b1ec2a65781b398fdfa0b8ce6c0bee0b40acb67b8922626fe3ded23838e4d760a61b9382671f99ab3d97b2cbeabc180759"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/dsb/firefox-67.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8eab1f1c998e552f60ce120f38cd408fe22e067cb04112847bea33aff803fa0e42ab095b39a12281ed124672add455f06d57f1bd246976f071ed5c7f6a2aa47d"; + sha512 = "16c488a16b880441e8f24f0dce65a4e311a68fa6f1c6bc137283213be938518371963f2bc4e04d56adac25bee86223018d8701372187a8db81d88f24fa32c26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/el/firefox-67.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "933d8698b55abd1364d7de8d13982dadaed4dd09f0f0b796ea5c60ef556b557c9d854c62cf023e5a391a31644899a8df8832a086a44355af491d5f020fb1da8b"; + sha512 = "8bb987cc8f2d0cd5528319530cbdb8efbdf8ccae4164c376ac08dae9e3f94460e73c9295fc7da0a0f88f4bc39f8b9e576e3462edf15c4b794f48571975c9442a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-CA/firefox-67.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "58e861fcd6364b9cdde2805fe218d6e88517572c59ae562148fc5fe48b9f46a94ba2657a133db71c91d508e139fb25c01c19c0b2bc9e451de99cb51620aad4dc"; + sha512 = "b615236a7c24d4d45bdb7286c820df4a96829ad2afea2d2f3ef9f539f5841b5fceb90790226d61db393e7c3b7e626ed0c4898e146dfcbe35d468fef8f18953d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-GB/firefox-67.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "545a5d7e2a3adc8f9b448e4f06bc33a412cf3a7e25e29d26ccfd7bd74c6bbaa6517143264a127742cc483d57c0fa4d0d9380bcf52babbfec2e38fc6f03225c7b"; + sha512 = "d658c78001a8dcb6ed58d63205b9a845b55a668299e514fd948245341b2aaf02da7721e7312e763b38b02e8375d20a98abf3d3714f75236fb0bbd3074e08a3ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-US/firefox-67.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "19d194a4c066b310c6115ffd252999102e7ad8cb37b6bec63a36b53550973be2d80ef91ceaa5630d314f05fce4ac460b170901a77cf4587d4a255cad386b80b6"; + sha512 = "b1911ac01ee72cf64ada7e8b8d983514446f174785927f20c88e15e4394f4aa57f50fa916295e5223cd67cca0c3c8e13488242c10491ff05d66e1439ed38486d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/en-ZA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/en-ZA/firefox-67.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "43642d4af03a0621c20b938b1503a03abace13700768219cb8e377a0eb9f8ce19ce99e06e173976b80abb11cc74bc08e9cbcde3680de58428a98a0bc48aa4f79"; + sha512 = "390815b14e35134377cee24bd5731914cf4ae08f12206f2a3502d12c3e97322763c6c5a9d05a5b0b7f8e85247d5d61999f499c513fa8c3033aa6eb0f22b0eff6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eo/firefox-67.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "d2d026eb8ec3485063be6c9fb5f92615a3ada2f706037656b62461bb471d02006c624752ead7e868a536546d188c73f5af6fb734033e44f7d010b1de0718436c"; + sha512 = "b80d91463d9be96e29eab4d15ec76952e7c664e30934de1b14d165864962c4aacc2725f08b6e301487c55e386f324a3072c3969bc4f474d7120f2c723d9e76f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-AR/firefox-67.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f444e763b604e7cf283b885259e640624d4b3c450b3682ce5a4feef7ea91bf4fd0ed84c634ae8dc8193871b41b75bad604a6794c2dfe32508d27d318395a782e"; + sha512 = "03558cb0909a4f8fb2076b36be023cc768a84de64b3113d9c795e763cb762b68378826d1fc8c30b77f3c0e55d6f3ed6ca2d023b531084548b24c4a9bdd4d41da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-CL/firefox-67.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fceafb790aa66429a94b79755d1afd4640f222e8b3cfba0eb423495e1851da3247e9fc06d2db63a9fbbc01bc18037d823d9a0685473659d250bc757f2e75c521"; + sha512 = "45d5284a78cc6f985d3fb68888f9a03b155f924549f43e4364deb87e0dd0c2f9c532e8a0b8062db8d265c810230956533c6b7477d66f5adbce82779f6e55d0df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-ES/firefox-67.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c48f5b32f93f8411b1f9de645fe2913f6294c7d07d7c102378ff8acb724142aed9c5b7eac21503154e5f71bcf79531d0cc1cc103449c6fd0862098f62b244866"; + sha512 = "650c869a200ba5891be7b377030e32ea8e5c5e1bacfbd9028ad6d5909651aca8da7c82b399ad5491b071cebab168cd7ef3f14b00b8af562a02ee5696dd29c249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/es-MX/firefox-67.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "186982ccdb3fc9b43ee614c958c76e6a8d41673d7f28e6f959f969f5fcd8777122da3955b0c67971c6bceb2a3075ad481ab5e433cf29c36005357dfabd42e643"; + sha512 = "4fe0d5ee804dcbfd9b99f658af522be71acce6e9a9bf96ecb47bfe8e8327d1bdefe20c70ae474cab3ef7b1007ab339f6ad4ab4250e9f985e885147a039daa83f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/et/firefox-67.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e5fd680a09945ef88bd5532d4f55fbb007e1238138a04dbe25fda21cac1b278b5b46594332f6ca819c1fef6cb05acf03c5ab07167c6d223741995f0f0817f0e0"; + sha512 = "d3df04eacdc53b02f2a78314f086588983b9ada6855604337e82a5ed1e0046210e2cfd37153570c46dad632ac066bc87e19794898144ee5d78cea0ecef1193e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/eu/firefox-67.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "ae8f4813d9c1f5eb60e5bd55a21ea4dc3863cc98118c5e723c4af21e1cda8b444d646cbdb96848306261f73373c82b315e44ecba705e7a3df4d57fd310cdebaf"; + sha512 = "b0bb4cabb709ea6dd66fcacfe0536e03d9615bf94ede192bb4aa6f84592b94206be039909f46ba37397d9d396b08f8cecea8e07c6b64d8578280026d89dbc6df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fa/firefox-67.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "940e45f21fb3085296fc823695e22578d948881bb8abd5b6baf51548daf17e7be9936765373d3d3104b637e8a9fa21190fca790bdaa941e8b290fc65e228754d"; + sha512 = "6dc15ce8ffa1839df3a9aebc160022cb3be335fca06b41ee87190bc4fb8fb78be4b220855b0bee75efc771d1ecab3080116b3440b225f2e15f20536f84f2b111"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ff/firefox-67.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c52c5623fcd31636ed8f1ec3b97aacb876294d32fd7e42c4cd91ffa5b3b8d426fa3138e4049cf8c7c1dad3df7d7f48c751cc9198ec929d255362819993b186c8"; + sha512 = "367edbbb90d98216d3d5ea457b101e4a0d682e36961c87477be887ae1f7b0dd5efeddd81e12298cab2e9c2e7a9ab1560288263857e79ee7f561a84bec3eadeab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fi/firefox-67.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "00b1784ab2a13ea39c4548e7315413f0f707ac6679b931f0fe7bcfa0c0f05a0157aa166e859ddcb2a61aceb2f57477e9f1df09896882593cc1003c2ecea4bdf2"; + sha512 = "3a2ba7291fb2efb95663dc01e488fed254045b9d23f84c896a29273c825cf5f1ec5883aa66d2afa0dbaba3ff6cc9b87f14e845010073d897b8dc275a47260ac3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fr/firefox-67.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bcd6c691503c1402ccfeb4498b15b1ffee3af680c404c0774e8195842ecab03606714332a48564e8baf6e83e2757bcfc03951f2553238b01d1bc1d99990806b4"; + sha512 = "8aec13533118aab96aef3b7e7e23b65a651d5211346c1769f649128a50ae13b2e5827ed6195ce265584dd3f63e956b28689b60f807ceaf63d7bc558d5c5300ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/fy-NL/firefox-67.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0c083a9874e07c285829803b37d596d5d3bd3eea84ef385e1a4254f98a301aad0f6f886dec44b479f03d003a880adc1fdbd1516ec09f4a610d974abd983e31c0"; + sha512 = "593f36d08d2af14243779f8ca8223b9e00809330f4012ede586917e98c875d39fed9aa856caf32f8afc6bf14c47ca6e5db0e0a8c9897767c97e9edd60558d229"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ga-IE/firefox-67.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0ff915cb817d5a9e0e918c57fe09e80c462275536032afe94ed88026d90a8a9976bbe0a837dba536b35a29cbcbd643bf9008b3bc8185a975a24d05cbc7477d5c"; + sha512 = "a272716be03895e1562373ab93abd0c4eb2ac3e8ad5caa1b868607faf125167157aeb22a652d2edf4148c9096178acecdaaff7dcc13e993914e4e8ba899f31bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gd/firefox-67.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f67037b5e635f0089b93e67d8fb1ddead8bd1f2d49bcad15a96ad7431de8bd7242d3c2203a328586c380ec33bde5d38fa7305153afe1688d4137587a0bc4a90d"; + sha512 = "3eb05e39c33873a7323cfe966c31cf1ac073edcb37b6aa37e71b58d29e3dea87db8a4d5cddf9bd64e618e2cb2a3a2314ac9e9a5cd23f099fe391dff9bf7d5bd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gl/firefox-67.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "5de39628d4498e216034c53cabd16e8c06eb0dd63a164081caa1bcc3511768e3d62abd3deb80840bbf76e4d93c45b82163f98b9bf81ce1232c7a7ef1e4c38654"; + sha512 = "078113798dde9058778c334b428247c83c95030c35b4964bc1a3b70aeba9d6967338c84f0b88873bc95e2d9cc123eed669dc7cd5345ce81e0ad021ff0e432a49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gn/firefox-67.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "826881fa594838408dde3b5b4f6a07110edfc80e34865621234e88c0761fc52f8ec93bad9597ec830975935a6a79aa8d6def255a64b47a020d89a40fc0dc35c0"; + sha512 = "9c5ca6da7eab1cec26ff66649f005b77523ddf325869236a166545c7e0b50522d9023883f831dbc6520396a146e415a458e3528cc96e12d357ae5286dbcc932c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/gu-IN/firefox-67.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "85a9574e6ab11ede5727303ac9c7d23c49a26f8686b20cc2b9dccbd42e108d46cccd563e57cb9d7db6e5e35b5e814c6b3f59ddecc996a376e95813fb68881dd6"; + sha512 = "1074f26748385576f096927f230f4363fb28ee21da467392c23f26b912c6bbdea39d0d816ce60c8bae724b294e979f01662e25f9de9d9801c815bf3363bbce8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/he/firefox-67.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "08b21c8ccf0d214270fa555964858bf6499f602c8a1317261f780ba350acf37281bde109af03eb22539300ea3bf9f58221fdeb92644e2f01c63f035add3abc51"; + sha512 = "9533939e4705ea4ab9b111fe4940c1e875824ac53b1856ad18c4a412f9f8d60d1befb3ce363ae128fb74ad1328504e7a34c20906862ff30e3b83f18535a49e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hi-IN/firefox-67.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "497a3ca0c5cbcaa6a2f850d1906872f8a2d61dea602bab06ed9a2150134c67f624077f2acc918176231ab594d88e186dbf9b4fc35738d881f476e75870a09587"; + sha512 = "af50bc6a8951e51babc5e9c5426205f218dca19833ce65baa6b7898a5b469c41129499d094ef8dc0759f34b09dbf25861dd32d97de934548c2713a81f8c253b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hr/firefox-67.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2dd83d6441d00026a01af5be810940c547f0a8ccd9d06129c057fbe401dcdccbc43c02847a878523e389cb8ae89a9f09af8f299c439c0448b321c0e653262769"; + sha512 = "dec21b5d230caf1c1be6e712bd926ed1eb6b74825ae0f07f7c6f39545d0419b71b57c404ecb897d11d9f54f08cebd236dd5d77d9ee1a64a900914fd9158cf4e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hsb/firefox-67.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "537a41c29d81bd7e340296d8ba291a7715b95c32f4f1af15e2e5c014a355541059acbbffcdff36855e27dbc52caa67ddfc5ecb2a0e0d09ed5cfa650edc8a4bdd"; + sha512 = "023bde601d59f9daf8daefa1f9894ec43fbb96a7ebe5b31776a288c07105b3ee10b5972c5a676e04062acc81e8d850424b8e7aec6b8ac8d9194284641768934d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hu/firefox-67.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d443c9bfd3cab6006e2261df811935cd03ff3a6f8ed9245a4014d18f95d100b832c5fada0963452c9e34109f6d9187f51fdb7afd16761a0ab37305655b617759"; + sha512 = "d4fdad7244ba456012e36b64149ef5f3d52b5d139bee585b57a138556ef1f541908a24cd97a1bbd2ef2044852b9c3e7abcf0f634cfcc18a0b44765a3c78126ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/hy-AM/firefox-67.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "70d880f20cee438dd1e25febb34d9dec08af65615065dd8983f4d1333863e574b1275c46ed3f19802e78d69edd41f1bfe0f2fff5008f589b7e5c903e798d470e"; + sha512 = "4443c51211b8d2874e4cc8dff770c87db4291465ac615d087a9852c81b256e47599fe1e87d24d2e3b0145d68e47e8f128158f89bb0d6bd9baa92615e3b79656c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ia/firefox-67.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "767b5d06ea9a0e987a57f7d256e228b46a3b2ece4cd0e42f2be97299c5d4f78a5ebebe5a8e7fb8a8df64312d2ef95989785392c72bd44b35690ba25200e284bd"; + sha512 = "589f94f2b4c873fa43896b57148ca1a7e16038b71476050754a0a0374bf0abe97d9d8ca0208f0101568f9fc1cf441e439817106cc3d68f10a0a075fdd455f89b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/id/firefox-67.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d4fafc3600a217883bf65071b3f3b41f52f6a22eae31d4560774080567d03fd114670064fda0070ba769960cd7de4822333d7794ee5c4722dc7c1abcd33d5775"; + sha512 = "602f2fc520a61267f3b8ffe011d50b2e3c1abd4af0e805fdd7a1ace4adda69ce00cdc6b0feb26a46360711e6bf49c83bb33e01b0af5222a71456234119cdde5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/is/firefox-67.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "c12a28941afe1eae9108f0b4da4ab05d729b48b66d93e17f4ba3b93f65e91d5442dc61b5f1f56f5408ff0bbfa91797e9f7f0b55bba486e7f47dc7733134235f6"; + sha512 = "162b3fa20530f59fe80e347f068bbd8d7d370a23ee2b3f4582c181ace473cdee06e9655ef08dd6bf514df728cd79935368bfab245110b6d143634be252f84e8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/it/firefox-67.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "404639dcf651ad07c5e72f44dcca28c3811c2b404cc1b4ece0979180cb7f12a9bd29d1d0b7f545a38e2c649bba5e20f2f8b927f72e15ee8efb4cefaa63ea5651"; + sha512 = "6887b97e91954598c0ac214b5c072ccb5669a200b5a38875b6dd1ea546b14de7dad9639c64b4b49d3039fddbae22ae7f58b0cd4f3e243c780a1a65ea831181a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ja/firefox-67.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "932f783c299862bee50fb1efb3166093feae34221627793dae2d3d29118481d99f51c6ee0099c4c44c3ce688aa38d66270c229ca3c239f8dc8790db0e396c328"; + sha512 = "194911f101d7eba5a7ec2325a4b4accd27cc26c990255e73d9aaac9a281d40b6bc38091cf7cb138a6ff3ec083639a41b0aa2b005c39f1f89da79526ab3ff2349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ka/firefox-67.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "94d3454b5a3b6f15ee135fa4f23850ced0f8a375111a13c119d2445842f8e1b306a34a9ce9b9a47f9c5fe9b288b6caba91f7e48db6391f9bf5d41c9f59bb06df"; + sha512 = "d8804f06b2dfbd57f316695d5dd5350e3057fcb2da4e3831b86b6aeef2e9b558d791f00ada3578ae1c7e51432643814c0394922e128fa8fe9da1604edc84ee1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kab/firefox-67.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e05e1a181f20c69247fd65fe52970abb6446cd35b7f4b0a0d90cba88a3288cd5b759e3f00a630e0a17bd09265bef69f641aa929c8d41c7406cabc987da2cb3c0"; + sha512 = "ee49177da5ff8b91458b1de3940494d7ac503b7c1b752fcea2b4d2f66d4bd8dcdcabfc5b898a34528ff02ae170adac3b48db4aed164d955c4e146df9275fe682"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kk/firefox-67.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0ace59fd99235a4c434bac7d32dd021c75554ccea931de1da0631dfac97e43d112baa2016732c20b780e8aaf1dfca61b4f0fc04d57d9386efc38486a6697bcbd"; + sha512 = "04db9af4da7b10129d28d9a67dcbb233e2a77815f3bee3a8ab9f139020c0876c99c856b460ebeda07e3a5228e9c3943f75e22ce4f1d8a61ae20c143f7263862c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/km/firefox-67.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "4f333c635155b28038ff6d6a0a1e8261af33040b0abc774e0e9d5a59869cee102b9bd5013f059fb702574ac47cddad5845f9bc901c2fd613ca0174b976207eaa"; + sha512 = "2fdb978f01b44f81041bb3a829504634ddeef593568dc31bfba712d79b96c43d4d4aa95d8a989312cf758d72f54086cfbb0e6a4b1ed705c666b6da2e5b54dc7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/kn/firefox-67.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "7d54dbd9396fd2751d8ab4e256f830e536da56ee20ba938d010847765a32f5b99b17f1ff853faaebca996212b0d120a181f0c412d10d5c06be1aaf884ce10aa0"; + sha512 = "04686a8b7ff088f1f65087c02c1dddd05005134a6d96d69b649364e4a93db2ae2ab0c1512d37141099d6aa41d6ed51aa26faa942c95cdb3cfb2eeb279d12e99a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ko/firefox-67.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2042322f72df7b3165051312d5e35cdc668f2b76185e38bf17e6e9589421ad411709868a808c66cc275fbdac02e163d9af0f89cf3710c312b956d0be51cce10d"; + sha512 = "a798b80f716300ea8211470db9583e326029eb46da217f9862d7deceb3c8f418f09e9a3a355a7ef0b8da3f502d6714571b7a3a0f0177fa5afc565d3df47b6cfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lij/firefox-67.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "69ee300a781792ef200c89a79d973a6231450865d5f0681be28f862c33cd71c1097750242f49f28afdd309de363bcc6072fae2ae101ff7a7af5d81b3f913c7eb"; + sha512 = "693ed9d8c28b7401606de9f2c45c93988861f1cd606b5d0d1f9bbff31f367c603f8761b24508ce3d1d5b533a6bd9555a33827b531859262201e6e187e60d5209"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lt/firefox-67.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "107b5df8fe4064a9db680d6e2e7fd1638b2e1347166e78fc3f89942dd455914ad94d9330676c874df0ba0a62413e654ea83c49de11362fb6e442dadc1f985e50"; + sha512 = "291dea291f6bf2c9c0373f8c342e000cadd70ae2d4725c833e63bd99a5e0de5b8ced26d445787900086e55201123503ce850f9f3d481dd1fd05dccd5c66153e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/lv/firefox-67.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "da6d4ba83c0c2ade76f72b66ada5f3777fe7336a9035c9788adbda052378c634a925cbaeb6b8c4f8fbb5d16c99529519ddd36abf71244dec377eb1b3850ddaf2"; + sha512 = "dca344e94c86ee0ede7f993696484eb576b54a71da7151be9ee40540d9c8c740d399840a5c024156660f2b9d6a73c6f086691df9e3b59dddd653d5a25a8ce1ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mai/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mai/firefox-67.0b7.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4b014fa50026a8ee87f137c058cd2f5513ac6ae27e2e3d236b6891419754d40ddafb910ce71a9ddf7f10f535ec064aa9e62d19ad784e92d84ae73abe314ee7f7"; + sha512 = "ceb2a05d4c051e31fe1969787f4d2ac0e73714e45c233cf40045cd35ad751d84c064afab14ac58bb976140976a29b9da5d40c91c1bacd965624667c5fc62294d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mk/firefox-67.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f8e2d4c11410fb5b32a935917562735a8b031277b62fdfa15c58aea7f4455703795e80ef7d44d5ec18c1039461c8c2e43855d5c99c873f476412b7da13ebc05c"; + sha512 = "ee1fa59d256e279c08a4110ec0f14e64f80dd2ca02ff01033bb29f0336e49118c07ec93b0ca8bc318356dc62fd05d9bf3201d9491ac278a8b5a836cf6310fe04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ml/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ml/firefox-67.0b7.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "fe98f048980c4382672fa65544c4724f0037afd613dc73def69f0791a2b922781527da4d2918697085c878f4a9f3830e12b0aec1a7c56b5ae9097f147216fc4b"; + sha512 = "477d66f1c875c53e678ccd64a666b64fafabb8b9cfc6cbb11dc33a14707d7a90758f8a42a855020f650e59b1f55373208c3cc96b69ecafc7ac3937eeca00c7ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/mr/firefox-67.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "cfe3f8d4d5e5e4f390e39ea5d1aa7b97f5697b1a5d1f37025e4da0015514d1cd22642d64e2e8e949601b06c9770fc8a463ec7bd6d4b738e5d4a7957057d8935e"; + sha512 = "06cfe20c7756d6786a7cd94677f83aa82fb1cbe83245412d087f7ff06372af3dc9ce5d2f5017838d74cfce864e0405c5abec417924feb26fb9b9dd7298f833d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ms/firefox-67.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b048b21da4befa8d842b33cbfd0992e93483ab5f4fb32b15bce4d6ab58aac1f686362c0a5b757b9a4709c8b0b5612038fd009968c6390d7ad471bc16881ddee3"; + sha512 = "d0bbe9e5d7dae906dd7140725873126d4583c7e31f3bf4a3d0a7716f5af46f5b5eb65aef3aee32e010e1a82ef59e279febfafb08458c43fe9e8751dd1ff68e81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/my/firefox-67.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "8012f108fde34c1e50a8b703e62577d188684c9c9aeb2ec0aeb49f67c6e1eed6c45d787c29b2181e127b54ae6ea6cb980c791c4b1d544e8b767861c808f6beb7"; + sha512 = "073aae70db0f59630c16e13c91db7c2a7fdb8a11ccf56843fabe4d666751e27d369e1d57118a1e385b8586d3024ffb3c90f8f61d7bade807aedd6f74e92640b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nb-NO/firefox-67.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ae37189e92951d51377574bbe73881493fecce2a4f5e60a72a86f00cf3ff806f35147663c7b2c67b74523ef42fac483e3aa1bd27f78d1390d10ce9345b8f9d82"; + sha512 = "bf4c6affece8d031da249dfd113f1c2f7507a8b4473e03daf5a44e7c0ce71fe6caa4759f78ca954761f90bee06402f7f5b5a9f785c1785f973feb1294947e0d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ne-NP/firefox-67.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c33298836f9b491f6b127f6451a25941fbb09c392aa76c6f5f1f342c74660e5163967e797fd1c23e9a19f2e8350f50067fda8ff8ac89c93edf4570e06b7f471a"; + sha512 = "16902e80be172af3bc8a2f02821d9e738864f593951619159a0c362cebf0a5827b1f3be9063c1429db8b1ad52aad8923db8053b6367d21bc97333ceda0899d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nl/firefox-67.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "62b5472f7a77c5deb3e998a23ece98097b4234b56972179c53faf3c58a15d0779d846c46728f517854db45a175bce6261b3062908e0bd3334855fdd56887b08b"; + sha512 = "1ba6650ba4140d4f32391f7e05577379a43ca5ddf064ac86c93c633bc1d78c6c84e6d5c4227577dbbaef4d5bae9173861295805e1cf559ac25fea434db2df578"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/nn-NO/firefox-67.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87a25f1e0f19b03d4844e2850406534414a70ed5954badc22e4960cd2d13d3254c6bca8f126e8fc3225435c80bce20468822e8729379d0c99fdd4ebb3ecbc8e3"; + sha512 = "860030e55b0c514ec4219ec295a02f2ab344bb87e31292ca4ad11501c02e9eec3f1b82720b7c3d69c043ddc0a53fb9ff3e83b38d4e0443d57849d68bf98b0e05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/oc/firefox-67.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f37fb299bb2b56884a6c1f46b316e1fbe8f557b728c5ed4ac2830ef5128ae7adaeac8b20489cf5cbbdbb26914ea60f64e5653fad2b57efc0fc32e609f1833067"; + sha512 = "33de39c5c495d0ceb5e1b65fe96458887d0a918681504c7c6a561359e29b82a7026673516a5afaf67717ecc0aedffa8acebc92b4002d160924e87d401e963ca3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/or/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/or/firefox-67.0b7.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "5d833da17f2b6c88ef237ddbe303743b8e6301595aa5eed254a9f6d87b9b8106ace055795e2565958fe9662345010a5b6e90e08ab32d6ceeac80dab3e9aafd0e"; + sha512 = "a1deaf9593ba66eb3e2e1a019ccc8a3b5c7455b0cd250d6be3708971406148404a3e10f3d67ca5ba39a25c92d27006d1196e11e12f8b8c5cca518d748b5c7841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pa-IN/firefox-67.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d2e0a191707847f74f638a3e1ef32d5dca865b20c6da99554eebbcf3e1633c87fa57160f8f161c73e8785e234aa82cce1cb7b937cee343bcae01b334491449c1"; + sha512 = "35df203d2c9a892b5cc4c9d12c10e7203f466c949f382074f550a45df54f670168713ac096ec085cb835f51f0790c9af2a88786d474a0dbcd6c8041d2a1a1244"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pl/firefox-67.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "dfda2a10dadb6233bceb7c6e41079ee3da612f0034cfe7e759d9f347954b7107e3406b63a985c57fe3ffb9c7dc04416393a66d549f844ae03e1e0172da691312"; + sha512 = "81b08e3cc5e2b7dba6110ebd455431fc04df6a9bd54e15f5ccac9792b80133d9c8ca4b59746189d5dd752b48e4053ddb30dbfb01f3467617349eff8dd7de35f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-BR/firefox-67.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0fe3234983eaef964d6c043970d4dbb441fd31c3434f39ebc8223bc1dc55bcd45d86a6a691711dfebe67ebc19c7a6b243ed7d69fde80df8046c821384f8ed64a"; + sha512 = "821bdd23cb73437898dc2fe570ff5a108a2a862b2cfd97d1427cd235761c5d24f6db33dffc32c0080576c72a9f1b2def8c7d398bd3ee354d5097b58731d74ae5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/pt-PT/firefox-67.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "08fe35b658c5148467d7cb00899791dbac27d2e01cc4a00532f67bfc3df0bd47dbe6acdae8d46ef3ddcae5ab87ba26c7ed1bc4df64a89f91df783aabe8de6fe4"; + sha512 = "611b13950d89e3c21a95c726afba58201f4be46bed6c16bf3c732400b15cea50860cbcefd98ad83ee864b8bad9e89e42b2bd075f448ee8d8eed352fdebe176d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/rm/firefox-67.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "52591ea07542285893ede3c3f74bb831a0eb40f797f33736f35a76e9a920606ed7b140bcafeae9976bf51b452fda95e1125b4ee52985a21c74cc784fe17aa5c2"; + sha512 = "53cc28912e17b5302489f0f4a89fc4ab53edc319a8702158ee7ab0a0943b4c619ddb022a5549a0c4ee2912a98f5b695117a991bfde2f10a9036196298334a208"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ro/firefox-67.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f5932a3f0a41b1808620ba46f90222b2e092ae35aa5af127f80f38231afd1cde9c7545ca313d20d91862c65e926a4f76dd7d05013f9b081a1fa607844750c53e"; + sha512 = "50c753c9cd79bfe6d9b8564f64d275958b7e44823e4fa5575bbd784ce4cb4f7b1c3c71fa962a8a26f1ecbd1f2a12f108fc7505659be08063d0246ea29488a440"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ru/firefox-67.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "707453059fdc344cc27c52244be171f2e92c60e4698129f3d184637d936c50f1313821c483ff05a77e484c8347837082f98120b5e15f0c1520912360788a935c"; + sha512 = "d739ceef1bc6328ee17187e54e3910e1746d516f2e21f03319863a3d564be6ea348c87a8ea9f302b692c99b16c242578af15788082e121b857a1a089ef0c7549"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/si/firefox-67.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a05c5b0a63353d6e05860f16e0ea6b1f1c7f5f7b334094b60ee1fccfff2a3170e3421c706da6110ca5838dd217849417a6328409815d8c76cede2b9be8725a1b"; + sha512 = "35a4cd2e1e324a0d8e78b679dc5b55b1bbbe2e73a9b37a65cdb24209d9eee5d52de59b3656f2fb65b6f2513fe4ef70027cfe5e9268a103df95510dc673eedbe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sk/firefox-67.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1baf83a04ed4f6dca9cd221c375540dcb3f1c9fe7b902c7bb3eb819ec45db8899da4139c38863573f0f03242d0bb069fb1b0036bea8b4e7939f74d5cc64137dd"; + sha512 = "4ce6acf4dbf83010c726988eef0ba90fc1b54aa4213e4c335446d632dc99a4f9646954f45e4ed143a132802f10db8a68a6335ee4f855c65c4adfb02dbeca4443"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sl/firefox-67.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "316ec5af2d0bd56b6da75412fff22b72daf414877677c72ab1b9c5ccb7a5abbf2a50d2655a2076d8995cbf0723b588ea2add7c45db81ca19485cb52df16ef07c"; + sha512 = "097dadda67b70b58244020b4a747dfb6a9a638552b2387ac3dec1130fab79e156bfbe0e4dc913e1669420dac827ef0efcb639560fd5366f8829e94456b2afb74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/son/firefox-67.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6ee37f4008590826fb69fc5c05d27164e4b396f6e13521f7f1a0bc7d5f4ff20fc6ca8dc2fd01d2818f96a8be4ba8015b332540d8a7224c5de61705fd0d49ff39"; + sha512 = "c01e0d7d45bdc5eea290c939a906efe18720e4f1fc60dd33afb5252f59c90bf40e227f1392212cfb272efdda6c1ffda14ab617d02332610d0f890f886d053f0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sq/firefox-67.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c05457e9b6749bbe99938bb408f02b939205b8848fc29fc32071577410c8998c093542c48e5fa7b28e1bc9bc95aefad14d8a1d21b8628350e033599cb5c8a49b"; + sha512 = "68020ac5ad6035fef3d58990718f14cb4175a2962b850b8ba98cb5832a169cb72c4eab9036da693b93faeb601ac0f35ae23b80d748be0dfe4d0414b51571f6e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sr/firefox-67.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "fbc657cdecc9b8d6158bcc64c3b2c988870a8ad57d6bf63acd99a0d036b18303e827fe6c4ef9f878f4e6d56f0d4d98cbb73abe0d9c12b4d03cb709aabdda9873"; + sha512 = "ce18d0ba989949e79cda33eb4ac26a3d7588acbd511e57c9c31ef3a3f8011b7f669cff02e4b0405bb2615c18e600d75824fbd556519dcd09616fe27181f87748"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/sv-SE/firefox-67.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "4724bb642e71ac4924eaecae6c0270e696f297f6cef71b696f2aa490a4bb08bcc803f92cb501e26b8f4fd4bb5c3c2b5429ee48523a38b25c3eaf02da115680e4"; + sha512 = "96008e9c2ec4b8cc3bc646185a502cf26622d3f4f2d9b23ad02a963c5e4e5a1b98c1bc2bba342b0979c4b9e079c22a9130ab322d27d0d469afc02a41e8f3888c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ta/firefox-67.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5180d7f3ee75c8991b676c5d59e55cec516083dad194015a2d9977d5d47e87f6cb86a71634679d12bbe42339acfe19403304b704574fc1b2393e29f195e9b354"; + sha512 = "e90c1bcb5326d3823ac6e8c0bbc1d3e98a5911f870d791af42a7f6aa539c95e267eca1248df03567f7e09853178c40c428b3cc04bbaf15553f1cdc028194c60d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/te/firefox-67.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "862b77c26d086456e4f5cd454105befceb354991780d6f7e3ab4c44d318b0260c5a08cf1909b2297aa259b2ec054babc6e62f10485aef8aed8db25426429825a"; + sha512 = "a5a04abacc8afec69e4d865ed89f0f029b623cf24cf05d275ae79dd292d28e5fa000ee9fde4325144e2a7727d0be5929c9f7c30194eb802b35efcb2101422e84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/th/firefox-67.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "0636cfba363d88db83db6098766313ccd45c36389a2d971dfb7181cd63715d3438eb8e49813fb610f57e5c5bd025c17cba1aff571db0b8e09e26872dd3dba803"; + sha512 = "1bfa1ee19141416707afd13594ad94da0e5ad5bf71ffe098109dd093624531a438df3dc3d4da603821d29e139a007923e367ce6ef55837169b49469ee030e752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/tr/firefox-67.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "05069f7f4d2bc86b5a0fe0152c52c95511e688806571eae0730360799ca491f702f8b2ea8912f450c62ad7be6947105d3a83b90356a2137979b1594a0c343b2e"; + sha512 = "d89513130852096ec1bd685cf5072456035024e951dc9b6cace23ac8d9d51fba47465c3b76d96810bfbbb651188bc9a5ff082ec58771bacc6c9b1eb46d99ae37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uk/firefox-67.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c3a617f20cf33e469156e146d958daca5310001765559a0224d62699c9a8744e0c9d684c550f68f0332c6c6840d41235bf0034cece35f15f8993ea4c3cab86f4"; + sha512 = "382b333159efaa048cfa73d7e11874a00e4f34c48ab38c4263f49184d00e3f35a71cc21d11cb09b0e68c04e714d086aad30b346d91955fcbaeaadd968c29fba6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/ur/firefox-67.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "48e99e02626fd2aa0c58170c9b7704ae23a8548154f1675d4493b70aa66d12ab0b76cd85532055726e59c380d439dafe304150409e5dc416542920e064d27d88"; + sha512 = "a620241d89b926eb1b42646a1d52e75f049191b711cca724ea1b6335ebf8c0773ffebe97cbc355396b21c16b7c322c8346029a64355ebdea2a5eef1e5329754c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/uz/firefox-67.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4cd72af0588b154d863e47dc25f00b9dfa2b0f04aabdd445482673e8011c4bad8bf8a50fc69f35b20bdce2e1110b4a86d73f0d0d402ca53ad61454e55c7c5de7"; + sha512 = "d392eb81144e93fa11b7c85c6defab5eaba7585a93f5fa475531d2be73a65c546f3f88b24cd3370bf301c4f780e60a53bf68bdd480fd4a6785e9c1583e71da47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/vi/firefox-67.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "444ae520a5b21af082c8beb4ef81ff23b7661b731f71af2227b74c1b7f68025071ce62dc9f02ba14e419617bdd2898ecd4f821a71a7e12c66e1082a8530e612e"; + sha512 = "7b4686deba1dd981e398f1bb6f192f828cb1cecccce6715c81cdbf5e89b4727cec214784a1920382e14c1091b20bff0919f74e1da8bfbb1a3568309801bf7a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/xh/firefox-67.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "3f541ef8ba26859ef629d0d293367fec7ab8b8d930f19b222e06683cc8d3fe1e520aef0ef6a8e76a0c6e3a401551da9c7fc78c43070c87eb8b1016c6e1a97f2b"; + sha512 = "63cc7b999aae85c46cc60b2cc0747a25e1d0663756938c329fc539a3e8ae04e43224051e066cd05bb38ba351f1ddf868d1651da94c0064d9715e5019b78496e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-CN/firefox-67.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "2a426dc720a0bc1fc4ff621349c61b53e011f3cc61bc2bdb8ed8400f5ec824051ba3292115d94180f227bdaffc65bcdc1c9ee009b6ba2d19727110623f2da8d0"; + sha512 = "1d902bbc7a703e7b541669c7f12427cbc74c01d784383409def1babd9907a93c53c32ee6c52d4c237b79bee69d005226580387a08e3ed51c1d685853637c34b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-x86_64/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-x86_64/zh-TW/firefox-67.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ab9ba389a3a9d01b9dbc56b5d4577bcb82b3531b2933c343adbdcf38992f2813dd59641f46593dd6af44c167ba9f9ee2613a34ecd33e683ee73d012730b93898"; + sha512 = "cf8133b5330c4badbdbca14681226a3298e4bf4844ca2be6208f4fd7d3d209f4215b4a3a1b599d59b449e3c76808d71eec1705bec47c964b219212d4032ba1ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ach/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ach/firefox-67.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "e0dd9ca35d2ba79bd5180dacd374309638e3406e48ec313f04c730b4772f6234dd64ade42bcf03a98cf1640ba4b29afb32d1a51098eac4d58c41004035e760df"; + sha512 = "c285920aa77f311451f3eb36991118072afd9d5fe863d88a49fecfb56549f1bada5ac364d457e7158a2c600b216cd5672775f87d85f3aaeb8fe648d19c8b7086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/af/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/af/firefox-67.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "be289577eb2c24e51f49fb70b50dcafd9fbfe7a1dea9fc41af39feaa090db981a71d6159b2624bab7a6cb71c84b6d39b4655ce5f0f3a6a51329e1cd55396e187"; + sha512 = "335452fc21c6b25775b93ccdc1ada7ee9430ba9f4b6b8f6760a00477fc00a2bc1e68f318c0260cb3386dfb6ff5f1780293393f9f700f15b2013186d60735d789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/an/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/an/firefox-67.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "4be89a6cc0642c741d2100e13893edd5cbce321acd5fdff37194c77f28886231e66f8d98d50234c44fc010621d73ed330bf7ab136ad4c7acc1d4ab465c71635a"; + sha512 = "548e723fad381a772e48d8a60a2bbbf11fce50ca187fbf052d9fe153fe9c6c592769fdba4eb3c4b423ed9775497add0abc1ccf378e13ee4f069531fd0cc03e29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ar/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ar/firefox-67.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "bb2b1b2dbe12e02809b91c44590eaf1fa9f178f3f2964dbc7fb8e63591659781734cde00fae060dce46cf0b25295ac93be7ddaca089fd790c80b9d8e7f5dcbb5"; + sha512 = "08834c2b950ec4fe06fe1fc3eb65e4701c01c08fdd91e59195053ae7638bf807a20346460ac9938590c5625e3e6845bab4205321e8d5e312fca69250eccf8303"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/as/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/as/firefox-67.0b7.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "8dfb82603e6ecbeec446bd0f5c6ed954b44ed4335794ab1f61dfccec797376c634c6d5ccee691c2933a5a2a7ac98fe202c39bb184ab1150168863c1c5230064b"; + sha512 = "9573895c11a55f34ea6e43e0f072119873a28c85478b144ad4822ce6632b09d2290a87db67957b3c306668ffae0bf2c5703d4e3ecdaf1ae77170dc9e28ffb2e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ast/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ast/firefox-67.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "dd0def909ffaf8012cf50618a87f55e09df1351c73c50e68b7ac5932b11df2cfa836cad601190be71d9dde254d4427c466da600dbd3ce017ae430b8e5b200883"; + sha512 = "be780b51079ed16aa62b00e0d116d8507f4cb858a22a5fba1e95d5f38c087b56b66e37a3ae50f4e2b5e5db6a5162762dc6cae94e9c07d263e38c480fabab50dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/az/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/az/firefox-67.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "1303ea9a24dd45980ae09f15c088fe4ee618e63d5a72ba70acbff576459987919811ede25e1379c1a686ddb3de3b3fa999274750224f2d552650258f72dc3e98"; + sha512 = "11c28539d558882835eae2c70e1dd72019eeea8892bc0062467e77b6a87208ad8d9ec3ce8b6e58037013f92e495db1bf611ab8e64ac69102c832952a021d018e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/be/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/be/firefox-67.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ba9f9d688b5c6f1f38442b06eb8c83ef66ec6280a64ec94180510e0ba5949b6176fdb477c0d975a0611a7bab6aea9a53cfafad9d733b57f0be37de36d7885d2f"; + sha512 = "2ba110389b2f416aad2d62e0b85ef2b99494be3add97908b8687243968cb44a6ac0057f0ffdb815ad7e93ea1d84e718163fb14839819efd9a4a38375595a9be1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bg/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bg/firefox-67.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "682396cdc83656289299a3dab12595c52067a3b53feebff0e372d99b7382bcf99987b3c88acb92ebd3621e40b50929d7cbb8fb8a856d64c9f2b263383de553bd"; + sha512 = "e5793f784fa49d07714f9984a884dcf9685431e37453525f67c0263d991edf380fcd96e956f9d715dc4d32c790b5996ff23d7e759ba5849b91777e20cfea97fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bn-BD/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-BD/firefox-67.0b7.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "3e0bfd57662e6dbe3ac5d8296235e851602c028ffc02d89bd597345938f9d873913ddb2ddd81037b1fb4b067c52c6f8b8457f369d27964a43ea41765df57f9c0"; + sha512 = "80670cf579eaa7f7788a90ac4fea4e85a433324eb258d6d922a85585a9bf8fd8e3955343e4707a06e98f1c6ebf7881b0dabf4a9e4a3a8b503c2cb779d7a60c4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bn-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bn-IN/firefox-67.0b7.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a762f317a36ed7bf900f12f5f0a25e8d6412bd7983aad4d701228c086cd4a0d14cab69b14cab6aa738fe501abbe941f4b061b87c9cb3843f5b33b7e832f9cf95"; + sha512 = "bfdcb672b4bae1bb140867e82f3ec1ee8a431d076d337ebd44ba17bf532506672ed6631ee54d80dbfa0b7814b77099fed2de345620a94e14d63e7c59578ee01e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/br/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/br/firefox-67.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "55954c0569d37e9bbcbcdfda921e4a19172b7a992ce65a7a84360cd401d9a420cc26f7775d0efeec2f87113cd820f1129a92cb5ad7ead45de94be69a90e8e7ca"; + sha512 = "275b32a715d433027b9a7132624358e47d35ac7f81cb43aab21d646aa7938ca7ee26aa67839fecabb556badf5a8bdf6656ff3df5fe9311452b9aa37aee34f98f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/bs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/bs/firefox-67.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4266d7973eef40651745071951ecd6b71a57e5af10939d10cbf61379fa2a63c470d26b0516e737c890aadeb309d64956ce28fb28166ff3f0e7be1f629e8845ad"; + sha512 = "2684ad81e644ff26985c938fe88433b70e5f007b0fb767e361070376ce10cd81d179c96c500209316e5cd5dc239fb68080fccef04988014ee79caf4d7c480197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ca/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ca/firefox-67.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a7efde7b54d4e5f8a3a65584a83f0f1a0f5116ae3c70b498995f078920144ebbb06f78b5fc28a1f9f471fc8b58460f732acb79b7e9b11d5f7840a17258a24925"; + sha512 = "6cee8b8cf26e38e785387200d84792a01081981b3c2934d2f9d06ef50b26967d0098e1429b1af7cd819618f5079af2a7533060a886be5ff10db0bb108fecc68e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cak/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cak/firefox-67.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e782bda3d10ddc740125f934dc8fc1c956df27f681cddf7c951a633cff0a40be56b842462da157b92c33da26c9c9a7deabbe9502e5322df1b22b6baf0472af02"; + sha512 = "a7f3963b020a074006fb6e367ad25b632899d14b915d35e64613a39fd0c185425063e92717bcbcd3138c05ff73e7734a84833c0065ad8655166a50aaee845946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cs/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cs/firefox-67.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "7bbeb4d7198d03a943bf9f09569aafde8005e123a99533ca59e5d20ee42d125200f3e34c8d5f18867341ef9a48b5e703fc0545c8aa64b094d4fa876ebb953716"; + sha512 = "7ecce91b3fd5986aa58b51e24c46d3c689050a41e95bab3136589b660db1ea4509c93cab7bcfaf13b93ff533ddbc584fcdfde60a0b8d4485b937cfab9e98e64c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/cy/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/cy/firefox-67.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7402cb6005f8370a0b9ff18fec2a66cb027d48c9a603e00b87c5b1df3233a8a60177c3a2327929b5d1f973dba64d206787a6eee099cb242d9e03936aa9c78581"; + sha512 = "2f402c190177ed0aaf52923d003fe886403ed086d6ffcb0ccde9d0e9384168712da5aa7d7ddcd0730a0d6387a079c699226e039494667affb66d911882f20892"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/da/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/da/firefox-67.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a527357f0f71bff9ab57e009ebd7aa51b3df122e52ef41be23d6cd93f9bc4914cc4905f53fbf2373c693d5ea30c7ba64e10b09054ec147e9d7a418cb9aa5b593"; + sha512 = "7235f4293b950fa26aebf81726b00420db83e423a2d423569ed4d7754aee7fcbeae50b442ea831052220d9ed4c84d922b5a4658bb92a5bc6c27f57c4c0fecdb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/de/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/de/firefox-67.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "630dcc0907c3f07956733d77b1c27323dd143ccb9deccaecabbf457ee5081d529383460e70935be38f5c1da39b779dd44fe9cb4caa12f89383d46c5495a40aa5"; + sha512 = "472bd0c3013a9e5b1ef96b30b1f5738a8c9bb63e76673bed6a45aa4c28dde3f1e5ed3cce16d18b47448c92f6129ebe22479480f24b9fa277f1b4ba1155ed11e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/dsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/dsb/firefox-67.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e30b241555dec9d02e14d0b269bebeff3101404108df894fc5d212960dcf4f64a5cf09b167ea8d32d29cb0acc99835b4fdc4b273ea7a33a6757ca86f63a37a2b"; + sha512 = "b4c8001347555317bf5cbd89e29174700c025eb8f309a472126c572dd5b6c85384263264ed7a8ecda404faf632b9b2a3973a1b948f30c3e3b205bc42d6b17bcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/el/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/el/firefox-67.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "607be30a0675f688cdd597c3a2a6e6f6e49051dfc48556f5f922bdf5d71b9eeedb666c3501ccbcd63b7519ceec1af81c82d0c02166699b3a093da8f146c91495"; + sha512 = "de37aa7776c31e28c670fae321d7bde7d4be5024bf5e5494688aae1aae909ffd034b46004b0d816988cfcf03ce9ffa326a503882eebc6ed05a67df0bb3d89d68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-CA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-CA/firefox-67.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "82bf1fc4992291bace80f5182ed267bf25f6dea6ef912d0fd922a9c0ab664923c7dcf45e32f45a1663d397a123d4561ef9ea7304889557230163eec1b2cc3103"; + sha512 = "95cbe469dbaa9627163fb989e6b366324a4005ddcddc5255735c95825c6cf116a6af12bbe4d44d1c6b55c824ae00e8b122020f261cd3f9e450cef25147b2bf15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-GB/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-GB/firefox-67.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4ec223ec031ffe58f4c1423ce8b0beaf0fe7fe3c894df7c0562b582dd07f31eb3ce6bde8fac3242a3c4c697ce16a4c5b5a920998a5df3f8a71c7cc7756f51c91"; + sha512 = "cbb468eb20d7bc4dfcfa229dc45e0fdbceed9d97830baa000642d7e740f1f28605de57112b54b75b1e08fcdb2a4e03cd7a7fcb3fbeaa4fae84ad57c1e564c506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-US/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-US/firefox-67.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4cae702c8f20d51e6674c20f18091ff06982622a6987ff372e226be4f9c4c38a19a427079236f97869360b6e5f3182291cf8b426323367c4616aad9757a3f982"; + sha512 = "2ae29e73ab8f8dd068b5e09ed78b2473294f0791643adac77e1aa565149138b3e01b605f20f6b2e02a242d44e67bb5e036305631bcebdf2a15fbaf9931f011d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/en-ZA/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/en-ZA/firefox-67.0b7.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a610c7d5a6c7179da502fa6b6be2ca367fc7f6c8479273be18eda8cd26c28540d2c8c7412646442d628a4d298d41051d4b755de375825dc4199672387f71853f"; + sha512 = "b91e664151d3b2cffba5cf23be229540a72e1499b1329818f416f9437a3141a98de20b5ce17b2ee2b8c7f540e589a4f1bd9a949f03bfcdd8a8c00fe92b0f6cf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/eo/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eo/firefox-67.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a0e1b507bd4c8ad2e0b609d0fcc0da2c53ba4aa9f53f7d1caa73e255130243352a090f2af7a393136c197cd6b3c4b41af8ad974b478249e706b349c1f8340669"; + sha512 = "09eadcf32183d49b388d8c8aa1535349814ba42068f8325aa34351b6b4a51ec7e31d070ac836519e9d531bd29981913f5998cd83427b308b68f026cd27ba5fb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-AR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-AR/firefox-67.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "7addfc66cdbbcb6ec2f0efd0bb550b673bab3695cdc6e17315600620d5252a87395d2f405da67219dbe2faa3dd616fc4b5c2a5b819a0bb3f8f09eb1bf9977b15"; + sha512 = "792b7c4934e4e9cd0ebac9586919bd65a142230c0e88da7eb5e848c05b7a8e5d82a906815f448a4c618f0b068d3512c7170cf0e409cf0111b24a87eb1039dd47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-CL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-CL/firefox-67.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "50344f4516bf905ffa1fa94af6dc7765b0a2f3bb08259769cb5a2d82e20f101ca6ec0b2e929e78ae6a94c158dea1ba8f04be0209bb29795e54e7f81bd1798d7b"; + sha512 = "7729ac7e668023838ebb5790e0fe482f20926308e7701c51d010bc0680605967e7918ff572fd50961d749522fc15d8b48524b6f3b532428f2ad1bb3c341e0369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-ES/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-ES/firefox-67.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f17b79ab5fbe18c2b821df290a7891795ae126af408f1bdba360272c7d26a3ba9f5554c05855fb94ad7d7f4d9c64d3b58104c121d1df84251b47bda9268d705d"; + sha512 = "14cc974cf9cb588d35c9a426b38d747cdef83334a0f46de482588263e0c4dae0179821dc6dbe938ccf5c17ff8d2952665522e77b9dc7ce5a8a65ff8c2d2b8f12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/es-MX/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/es-MX/firefox-67.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "276df9ba273da666b8cc7f5245c31454d3dd124770d9f52f5f071d273c30e39de78102e6a14c51cc058706ff143cd2a041590e5d31d50453e8f0afbf327529e1"; + sha512 = "0eda6a4240bf8645af0d1f7396155cdf13d73091c5599c76876ecbc45972c3cdc6685d694aba41d42a7f50d49fcf4910a382f1afd210e88bd8b1e219cdf954c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/et/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/et/firefox-67.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "09898b1834303b29c27ce1fd1cb7570f9fdc0dcd77a1d82bf257e56d0f4e872b2e840113a2eef6926d7a5d324ae86698d4c1a057ee5b254e01fa367741f4e432"; + sha512 = "6ef2f06a3549fb58bee6ac59f45b7758f40c3b76a16aebf2d2ad2bf602e4510883d0c28c941162e96d3694dff44628770f62682c5278bb09af30933442ac5baf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/eu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/eu/firefox-67.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "60af1ba10467e18f690131a976d15c9feff130b875ffc8c774e2716badb3161e333b25b5bc6b09a8a4560c7ab8b707391356c2282da7158f9fb4b4b42d20ed37"; + sha512 = "38b323bdb16931abc8ee01b1e3e19e893d2eb830f55775e52e22cf8975b44eb67420d4b703fdb24cd221728c728b6b8f55d6476c9fb4a22324b9acf422d03d23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fa/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fa/firefox-67.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a0d424538b55514dd202dab66fdb3cb76836ca64934d5e5ca356250ee9e25716195615f60573cdaacf720c8e2f979319ddc34c38fc5642655b9ac8814b17fbaa"; + sha512 = "3211681e01a02745e800be7e7744b25c12c6c774efc2eb9e9167eb13e55a25512c6f8e9d5203967851310c38b9304d1c4556673ae305b782d274c2e8eec13d8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ff/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ff/firefox-67.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "88319a298ac8872e6e94210135c99d7c956b7865d2302267f98e4e6e18655d89f2726dd4af76949f21660c3b3f4cdc55f836263e4b8a87d6c50bdace2dfecf5a"; + sha512 = "17a867cf3d51f59b740991cc70d235a55dcdec256913a461055c82f461f629e51fde1ff8931f6315507a1ae4f9d7e632e69a06303e720bad0d6ff853ea45f1d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fi/firefox-67.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f045076c1234deb367aaf4e2057df25c87e2a8c3e7c7460c3e0b4c93ee965c8fddac397f73477d882f1f7498c37ad8b6eb0b561ee5b377b553167e1c02a90463"; + sha512 = "9cbd9620e6ebbed8e02d3acd35967b1f797ac8ae141de45d4be5bc21b166ce6803b4b667b05de789c23f8326c652b2b978b5681dc84af49798d319019dc9bcf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fr/firefox-67.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "81a7ab933324f259677cb1a885fe8fe6732ef8c6b501b7b720282e0d25288b8c96f399813d912157a0fbeea7a049caf5e16620f4d92de325db40cb05cab310c0"; + sha512 = "e4cace463f0f87532274f1094c7e843eca07100541f300bdd092860dee986a87779e03bb960e4f6a06d652d93d0e667093c516614442277a9106a84cd8d9ca75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/fy-NL/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/fy-NL/firefox-67.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d0f793c39ea81f5c51457f24e17159e038f19e403e93e465dd5f407073a864b578d738b34921276196cb37daa36f21776b12f443873b6cb5047e747d6b658084"; + sha512 = "1cacbe08d3a059ced3397110fff471b5879e3eab9d2391383063638d62792c76432ef58be2b2c7d4e23bb72fa145a175ff228314c768a1fd3bb41b72df990b66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ga-IE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ga-IE/firefox-67.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e8d17eba416dbbad268910b2d4dfc4014e5e2d85fa2ea696e2527cddaf71d4d77b5f758ee89b0acee9226292060cca6cb4413317ebf0ffe66a95b587fe65a2ba"; + sha512 = "c38de270ccf6b7ba5caf2ebb986c80a7d35996a3b7087816a2438e5dc8440819501eb08f9810c592c699b101693cea256c5265b37f51433558fade6030ecfc5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gd/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gd/firefox-67.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "26a34e017a974e072c5b10c8356062f9fd4a27603af93cf3debe9b1be64e0d5ed12509200b76051e0203e04e0488bb1e5c95e8fd5bb32f797eb65705815ea7b3"; + sha512 = "57573946f74bce289e14e7b07d4056e3fe2b631480a6fe25d8c844a7e8e39c5be4e065d21540fe53bb798cd35cbc26839cfb238ace6c312c6a1b46e477f6116b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gl/firefox-67.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "51f93bcabc735cd4938908f7e0e2bc73dbb6f459ed2d632b359322fc682362bbae324a885ec68cea1e91fd00a4f48dd088b3671ff8714dc8b7250500d6a3540b"; + sha512 = "816c5bc6f70d211471d469c4c2e8492fbf314419a24be460ba9df68f1548f1051333864220d664214f830fb15bc9e19092de5e070c09dcb938674f93b7b05131"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gn/firefox-67.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "2d494e7637e388b1d5e309c52a04ec3ce1cdedf4095f686b99cf4e22f601ccabd0f004e0d82ba0898470b26a1c19caa027e8eca75bb60e5029ff44c6319e0be7"; + sha512 = "dc09910ccc01bbb19adb3d02ea593dc959912a704d43e23e734ffd9d7f9bd19338832786544dfecf2faede03a9560e10537073208c1c7f23e1078a876c6efa54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/gu-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/gu-IN/firefox-67.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "f31322e26f76be2217d29e8b2a45761240e7e8bb6963a3410f994af81b9d10007ff0a7ea2477cc966d61f0464d1ea61f66cf80bf917787016ac43b86f55799c9"; + sha512 = "e2160344d5b59640c454f1387106c775a4c7b230db11b08748a6b5f253af9aee6656cc579068693e37c9c690a5cf21cd999d805c335b83f1b66f5d762387f8fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/he/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/he/firefox-67.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "bf78cc400c123fe2c9b1e813a0fb5f8155d08be70df18ac60cb474367fb57468d942b90d2472d56c95bd520dc8ec9fdf0daa3da93d6a703b04a6aff668a5b693"; + sha512 = "0c2cdf90dcf41e0912eb13e11e0461d007dca9c78449bbbf674e672b47552f3210ffd14b80442781c5746a098098e31756828652cab0e347db020cc37c3f6f6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hi-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hi-IN/firefox-67.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ebb919eb74747e4588f8fb4aa1bab924a128fa349804e7fafa9c9b7f7513ff99cba265457a9389c2bfa59a598bdca88570055eebaa0643bd23d242e1cfcc9477"; + sha512 = "0adb98dd37ddbfba3bc08ce59dd9f401fb00c6c5deb550b1a92baf2f2e42e4ab6aecc0f9ba3d35c57cefa3326f112bff351f4ff9a258369889565e4277445475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hr/firefox-67.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "6894b70c2a350d972409ca9da0525ab4099b6de1c227bb37936d8df9d83d37e2e13e5e3128ccca11b31d80ad0d76b1f25d79ae4f39f44497ea81f01e1cd78a4a"; + sha512 = "86782b71427e4da1c30371e40a16d84b13b24e04358d812a41faa08fe7bf178241d44fa91922058554e959008e276d38dfd61f7389e0c9e44737979486f22718"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hsb/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hsb/firefox-67.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "c8c472bef8dad8dc41a9f9e9dad52ca8a654ac9923587a6d5219c1e717db21262d176ab06597d72ef280ac65a5c3bdabffab2de987568185911d8bce3d3639ec"; + sha512 = "9ba1fe0695fd467d48c1fbe78423f0b91c962524762f1807b5778a9f81c6ff623cc6d4eba618a228ec182414e6e6823447b3992dab43176655fe8f90fc865c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hu/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hu/firefox-67.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d21398ad48ec3d4b1ed49b0e32a39d282098719f5cbe9cc9e2dc636898f3dcdb4e000ddf51476e0314dd9c2181f67c74384a96e2388f1795d384c9be87b92046"; + sha512 = "47d44fca671a44fe085bafc404992ca8c2b3fb2155c178c2cf38860e7105678077125487fcc459da3396157904fe6870e47bfbed09b4eaaddbb404715e2d098b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/hy-AM/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/hy-AM/firefox-67.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "c31b0e06a63afcea61fc880f9bf03d1e892d54e936541a9956355a40d782b9454f2179bdfa0a4f28bd010f4022ecab7d49914531219fd07eba4157ab1fc2b01c"; + sha512 = "72fab75e3cb0df96c2aa101475f1e66e5ad36473b400d4ea3efb1e14b22028a67303228b04fcf39221995ee3b18302d9d447b315c48401b8acd566d815bae60d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ia/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ia/firefox-67.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "afe670c307b528d29ae8e957b3686b25e89812b2c61ea2153110bdc49f08601c3d319ec547b296b6e8efe18e32b95effedfc24101570bf01f5ba1057369e092e"; + sha512 = "a057c3b8bf87fbda631206a6c2ba1398c18641b92093478f472e818f81dece057234c221322497eee68d33838f5dc99a6cadc92f157aa464802e92f08f7a5f20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/id/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/id/firefox-67.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3bf8d10779e4864185f08311c604e2c696ed63fe31558a13ee17b841b85518ac354798c999e7f498df563d75b8eaf901cfac4b08680fdf15b79b0826618bf0bb"; + sha512 = "c9165eef8d41c5e72956beccac415fd4695178c465ecd81abe82fbc372826d8823056a1484e01442f883022182818e7c5154441c113519b2a918e1233346001c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/is/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/is/firefox-67.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cbc28d40a088ee44d06eb27c01dc1f07cf4a5e5f62e81f748f9a031a40be75c858cb3074f64e488a9e1e6775f984f10257d8bba78fbc7704a0ae7c09e1d0c5cf"; + sha512 = "b41810b6e4b5f28efe83aee464f5edee0784f24982198fc0b3e333b7a16d816504e8ad558e6298517695f06c3c7f87d7b98ad80e0baa6b10d748c57ec3fa8e5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/it/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/it/firefox-67.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a02199739bad49bab88536e2f35eab6ba1cfd848fc5ea6a45a575806f88bb2f92a3e5ef2b37e96666749cb1724f3b3211ee261b3a8c69435280bd107df8a68f5"; + sha512 = "a20c21d5249fdcd0e7c2bb62177046ac26fc6b0b87f53ed56511f44798fe6a99737851045de3dcd2f42db689b32853848d25df8cf2a8cf731853fdc23a191a7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ja/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ja/firefox-67.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7edf5c6f834ea9bc2ee07c2348869d456d189ddc75aa592b983f68c0ae6be48bf6cc32260d2cc45032f764a0716474cd02c7fc6905ffacc5d5f132facb83a152"; + sha512 = "233574779b07c9173b160760dd1b229305b225e9b9580a680baa31a0f5b6b2133fe3013dd2f4cdabec3a1c930aa1def9f3ae687c4043cc9a4edb83ede83a353c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ka/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ka/firefox-67.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "319bc1710d79a998d7ec5b23401b018b5518945eb79a3948ce9163d9bf7774cbbc74587e3ad9cdaeba273f0cf5310d6e9aa863b7d8850c019943b998dbd0d18c"; + sha512 = "b1e3b26e05c527111888b5d683e040873c3dd324bf3d3c143e22abf1e55bfc4b43ccea09fdf05a58dd28710d5624b01529c1e341b963c13895caf2931c7048e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kab/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kab/firefox-67.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ff97e48ac35e86f65ce937c72e1e8588ec592a6627d957b92a989542fbea1ec8f3a4e2af7cf58f2aa7352e834d22f3d89f5639389873f5e9a2a86f2c5176e890"; + sha512 = "3f0a5dfe8701ac74fafd654607d40b3a258586bb7791823be84db682a84339ec1f0305212de9efc2754ec90ae7584a05c58c26d370090871af38e5ef8bbb95a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kk/firefox-67.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "69e0d3812a628c86a6718312e06dc2ebe7958b04453a116f6cecfb4703313d574db927e1a52ffc6bab31e6d1caff078b1672ec1dcf014522cf2dd2a3dfb28645"; + sha512 = "55a39f67b34b21d3fb31b4dfbbde75af058ba32b1e5f666847d2d053743ae51cf0787a09959fdb8fd27df6daf38f801f7aa2c0c6ac4f64d8ecaac3d893242e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/km/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/km/firefox-67.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b9d80e54fc85f17f070ba1fc1f0feb8b029441581f9f274e939b3fcd9fcf5657d1d4cf8d292a2a36bd2b032ddeb8c881baabae7899f07ce91f3d3ca66284b82e"; + sha512 = "e4fbc74ef0df4989b5776d3a5c526f323d2472f5a2460b539c120c54e3c3fb3cb8397e71126fef3cccbbe9326d2346195f08f415c49938dd65f63807894f67b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/kn/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/kn/firefox-67.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c2f77903621e9fd45fabb0e30450dba7cdd73a50318c30b70c360ca89c048fa2444d5bce2d79332e3f85da54fadd682e22d64423b1ec4f72284e4f9d3b8ffae8"; + sha512 = "5834427a79672c0e7538825e52eff561a7f018e763eab8755e295396f64315de968360ba4a8a039215dc80444d8e465a1d5ba7c11a60694b4ea16e7f0f340a77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ko/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ko/firefox-67.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "537f3a403df5a6a806aad85021c87c193caa61920cd1b6cf0601ffb18d6a63c1e9bd64bbd664cd8441d7433a4e909b11270e1c6925444d1f851d8be79a731239"; + sha512 = "9761f01f078d2cec24ac785c68c95588de533be04b4ab37184b01c677c98ffd70dbbc1d1550338253dc38edc884d51d134496cef70a05435a838edc0b5068990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lij/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lij/firefox-67.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "695dd509a943c4c976e0833482f73e12a90ad9b282eab21fb4766e183dbe048ea600f0f0a6eb7504bdbc8a3211feba57a0ba73eda6d05e7ed7d451fd43392ce1"; + sha512 = "4b3bc0acb18d2a2f80a4a469882df2b72594357ef201f337996bbb3315c260ee503030620e9e42a823ebd8cdca531f63e9a94b9f52bfafb83a7cde1e520d0e3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lt/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lt/firefox-67.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "bd40ffa8dbbcf94fdf654d2c161aa29a700318aa6fa60bbd72b588c50215bd43827fd4c867403b163ac8e49b9147ec7c4dfeebc2e453aa5686de1f884624716b"; + sha512 = "5e9b8361dadc8df55055dbd15f4b2245cdb9acd7ddd7853417451246e59fd4b30b570c30acb2ed078cad3fc239f15218045ec99eb006c8702677ad289e73271e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/lv/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/lv/firefox-67.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bc744d57e782adcd1a0094aea87f6b8ef9ca9b2bc24af81fbe2c6eb5bd29a3dbfef7886602d59b02e2653ea343748456dbe46ea86bd4fe04696f9750d248fe0e"; + sha512 = "757428fc0c04f757c424da039bef8d7f4653bae24b1532c1bff55305a1f7be8063e9e4a01ea5034f7f2badbb5202bfcb82954cb39438c714dd97ed0b6af07f04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mai/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mai/firefox-67.0b7.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "dcd1f55c885e46eb5040a1029f4e55de35c0fb8dda84cfd825b05e7df0be18ca6b9af4e86d38651f64e25ae1589eca19f49435afaf82e7df5f55851d433eeb75"; + sha512 = "451cb28d1aa9d8898827be4645eb32f49cdea09b493802c78c9b4316b22fef7cd99a46c1c07e2f06e7dec2415abb6bd3cc7b4075e54805a843aee852aeeb19ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mk/firefox-67.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7381f183be6544770f23eda7446b57f51bc4db88b80ac315acaf28a9115754c8e0d98379f84832616faffb0f08ece31ba33c48f9061ef039851e8b24d449cf2d"; + sha512 = "6ce5dc05deb1f2761a8a1d4703522b4b90fa6ceb1d7189818f0b22340d956664af1ec3b92c965bbc46889835e4403e1ba189b3c0bdea92e36a8aaf3061a3625b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ml/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ml/firefox-67.0b7.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "a1147a41b8f4488a8ea44ba4b22f18f51cf8ffe56357ff5578dce15a22fa583ec071132eef808839103cbecc4339caeb49ea26a39d396826ece640fca8f9f749"; + sha512 = "fc9a68806276cbc7e9b3b528d6b93075429aa8759722bac01575680e6f7e94914f51e44ba0968aa841631aa876bcf716a0f9c1cbafdea31adfc0dddf758a80c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/mr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/mr/firefox-67.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "8af9862886400dfa46ceb152feef81c1f5356c1a6c51636fa9da71582ddb7893c1e61ec8f3daf65348d01eabd9f88b68f1e56084ebf4fc1198f98499c14e8823"; + sha512 = "0ecf5e23e5c2bcc32946e3e4672557224e0af6081f8280a9c1f49927bd9dec9b3ce4b445c800a8ae48e75a514e24beb2bc0e760f859bf1f5a6c0cf02c594a6c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ms/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ms/firefox-67.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "afe1fd2de336d0b2065abe87dec8917fc88a57ac6c76a96d21168d6c0c19d4ed1f60bba1dd544edd484dd16f8d95b65ecc3f1eebd0c856621d5171980f49a7aa"; + sha512 = "1adbb3d092dd0909f5ddaac58240dc587dc819fe8a64e5e5bd3a81ba2d7effb516ade1a37bf437c42803ebb9860b322917ee347b62d4ff1cee503f3432988923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/my/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/my/firefox-67.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "da39e6ef9dea62d98a6c2fc761a82a774cdcf69a9393f07552086a70e44cc0521913e6949e147c572e66e06ee19cf03f3b9fa1f3d1f4a64bc0cca6da257cdcaa"; + sha512 = "c7f9549a94b511231bd0cd22e7705cec80548a52eaf8f4af5fc975d18e0ee504a2e7be5b4b06504d66cceab993dff4ecc37e014ddcd051ccd545ef19cffcec5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nb-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nb-NO/firefox-67.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "59bdf1ec0d89c928da03078933fa332376b7e581078af02b66455cc15640643b3697d81912674492c3e174e28e6c2d3af0401664952e308dfb325907b6a98d74"; + sha512 = "a6129f1dd66cde5a9166ae180ca24d533f7b2ac463eff50276354f0db7eacf28f64d5df587e833342c1968fd3c4a1f9f91861907767e5ed0ff543c37da6925bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ne-NP/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ne-NP/firefox-67.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c99bd2039cce00863055f4102de1c73e17c0dc41c09a68418e7bf6f7d0b6668bc2f0a33b33494cb969d9904b7253574fb46b8398612154d43a2e35a124a47f04"; + sha512 = "3281cac33c6dd97b497d2a10e4d4c9c60efd6d138ec9944d0d0e836629c036c7fb0c00cf84e27bd9bb7e443ddb6a69df4485a014930e2ba0a4ad8a224644a9c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nl/firefox-67.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "599553e97cd68a9e9f1174d16d44d51544c2702a20415f60342fbd962a26e10847fdaebedec51d4ccd6e7bced6408a3fe56a6d0c3d4246b488d4ce0f68eec6f2"; + sha512 = "b54914b0b065514a0af1f469fd601b76bc8c30087d7a23d5466ab5c8a71e5ec31ff5293ec2b1a621d6c4ad64158144d0f0691682cf974b97cde011701a8a9fa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/nn-NO/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/nn-NO/firefox-67.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "facd1f9c324e19672056d6b8327ae48c3725e367b5c958c832bce934ba7a5a011580954de956a044afd75d1b92b5ceff574ff38ecad1c351511b33a4f07c72c6"; + sha512 = "6790ce0522f6595447a9f3b7419255cab8f4635807f8e67d83095d37c89aeb4eef657aa8c1b9a3aaa436b06484872933e5b0a8a115e43f7fcf17381726653c2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/oc/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/oc/firefox-67.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1ab0008822ab659bbd094b3d4bb0768a0145bf81db33a7ce7b5edda76466d4908a91e81b560f98a30c9b0c11527855483413a5f2e1a2b329a81c5979355bbdbc"; + sha512 = "418bef24367b311cd26d05e736b73127538297b5c2a672b9e3e4c2b1f81b92e04564f3722a41fb2fd05d712f7c848248d020a2040843e797f7ec7747fe274b53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/or/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/or/firefox-67.0b7.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "d4c7746274df0b178640777fb178292366625c7b4faabf63b3ea6322e1fdb4a2bdb41727e75da62f64b704bfcfcb2b6682023bf92f5625c8e74c3cb22df7cecf"; + sha512 = "50972ebf6d86827604b066ad175a6a16250225083ae7b66a27690d8c052da84899a382fe80ea7f329b0d79b826375e9a356f5660f0f19b106f9539ca4375d023"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pa-IN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pa-IN/firefox-67.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "af3270453278160f15285b00f722491b61e0d27a2fa8b6efbd1200e9ac19ead8dfd119352b81f792584d56a03e4a8fe5cf90c091ced0ee5278726d32719807d9"; + sha512 = "96a3cf9c11b1d1c77e3d51576229d046072fa44ca035bfae726e1dfcda696b0f78e5ee34a0d8372fc641245f41e685ce716be6a19bdeeafb0dd74a3aca5e089a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pl/firefox-67.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "8f2ebce9a4a6f0c8a6be05d52679306b79ec4f8cabd69482a8dc4cdc6f042b6037c2ba75060b4d035460de9b4404b793e52ec65e63361f870495c6b14cd22900"; + sha512 = "5edef293b1d8140240d7621503032d6b28ab6ac6c481ee82c0252e7dfa8a24633e00401ad790a80165f8074a289a58125afa29d1133331aa38c6e6a1740b1261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pt-BR/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-BR/firefox-67.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c373437716555bfb28c163b6e86648891bc77d3ed3c260bd4791a5b2c577f19712eaf22959dcae85e9352699985c3cc598cdcb1a393ccc76c6d06cf26eecfadc"; + sha512 = "f294b7fb5e2f2277ea5985e7441e9515a434ae45ec45b40e590e469720cedece0b5475e7f5249b8dd4aaf1d1dbf76a2150aa9a5bf53dc1e81042b9ebbd1956b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/pt-PT/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/pt-PT/firefox-67.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c97fd8e14b35e0580c2f5fe0d6c165794333475da4aef3d61ab8d8bc996c5db5426ed38eacbc14e720197d2eaf642b3214c68497f3f55845ba91e8703a181716"; + sha512 = "76e69887b1f6aad40164db1c7129ec0b80052dcb039a3e70ce7b5829d1f01e4a4006c028474cf101e59af61c0889f54f00351bdf94aed5d7929ffaa26625239f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/rm/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/rm/firefox-67.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "ba192d6dbe106af3e7bf82731c432c3ca2c45ef3e0b9515b9f03b418c88b0cdbb2e9dadfdcc96177b8e655a6d2ea25d7ca671005e369613eaec33656a135bdf7"; + sha512 = "07a18b9c089cbd64eb4baca99a76cfe2358e2bc5b3e8e63e7ebff64c801218774fe6c50cdfad0d5317963db74d79fc7d65000ee68b87f31700ab54249e73c39c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ro/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ro/firefox-67.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0438b185ee69b1ced92adc8e3f92c96653293e1f36ef644173245202898f16daa1c243c2776b330efe3252c1cf31c958097eb09a60336c9f7008db7f51982331"; + sha512 = "f9412dc6fe36f9c36d36c1ec3f9ea757a9401d0f111c2b95332c0c2fc64308969764d06df39c57ae457b924214c841843b9d64d42020920d83fffcfe2cb18834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ru/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ru/firefox-67.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "965036260d00935afc0e386951c380e5e1fac7b9908465406efd1aff8aada74bafe0b957901ac3676a7c6ecef30f903ac4166054f75d14e35756454165aa6104"; + sha512 = "da5cc7a67b119d1b454ab5a6597bf697ec95411f32680971ad9ca0882d74b8008ca84d72878271379a7404ccba4f04b00f9d606ac157323d6cd33646bacea313"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/si/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/si/firefox-67.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9a8f05061cce41c96a47028ba6c0082fecf343c91c718e3de6b1d125fc786b39f4e88231b48cf3dae07657621cd5d0bdceb3cbb2a7ee4e2728e2970cd47a0293"; + sha512 = "31713c81b82debe496f6b94799f81f68390b5c8fef96024a5baa8e54ffc39d39fcd820683873abf3b6456b5e789e2b882a6f0dba9a64e145a79782013fef74b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sk/firefox-67.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f592aea9178f2802fc29102e46ed49f122c734fb5fcf21f9c59f38564356a570fd3fd758d2651f4a1e095a1d28226a1bcaf93d24ef8b46650e5306a0b15841db"; + sha512 = "0475c5ddde2f150fe2c2a62d6d62db80084f7bf37ec191e2b976d6fd5a0a0169d7c557cd1cf9ab56b0f666b84bea8a6d51510320e8aa75096b654b6b335be26a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sl/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sl/firefox-67.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b83008a7fc9ff2fd3073dadad7f6bd3277719bbb945f7ce741cb3c7e59effafdf6436fe4340aaba84ff5f0d89315f152fee06beea1206d9d0bd83e4f9d8d8335"; + sha512 = "771f9c7a404a2a2cbcc754fbd26ed5a47d093da522c8270526f1ba31b0535a669beb7325d81b38f6667b8cf982c95cb5a8528bb80fe32b8e2770d45b1b3d2311"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/son/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/son/firefox-67.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "64b8e3c7701b42fdea997036949999bc41b846c36b2403c7d2f3d5f26d08e2282e04a38fa1751de4df676fe6179c9e79390d1dfd4f5e69e0f3dba1d937d43767"; + sha512 = "b283f759743e0298bc9c0dbc82c524a6e997754cdf9aa57792ada118631635bd673559275e9e6cd270e49ecae57587082290d66f023f9dcbe1fe0ec5d2649644"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sq/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sq/firefox-67.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2bcd1ba640008b38c9b00a5bd1d7262e66a48145dee08870f4f175d2f8639aa30dd67d2ea720c4fe5d7db8c364967d187bad7e1851f241e15e688a0332a2c6b7"; + sha512 = "698a5dfe611fb2956d319b81b09886ebe511ad2f1e99bd6970de31498ed8f016edc3d136a9c3aeae42367cef09639b5ae9a22539560fc394bf93bc83d1344e3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sr/firefox-67.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9c4a686480402299710579ce8e2d40289802cf05f8c188ab65fcf40d236c37e7e4e244f9b5d1e79abb347643b0fa65d16cd5ea2256a7488371e7ef6e7b3a2f8f"; + sha512 = "a9c3b24129df77638866d9cd72afa5f72dd6181355174e40e0cf8ac2c1a1da87c9a60565e6d97863e50e14a76ccfe0110194ce2547f8297bcd89bf8cade4f24e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/sv-SE/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/sv-SE/firefox-67.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ff0db370979bfe4cc2542a2048b05aa6e10ff8965719a0ae371d196566981ad449c42acb6b6a44aa2a19cca768ac7f4074c27e1741fff8d7908855d1ff8c06bd"; + sha512 = "e71cc0f01b4a9e279810523dcf98b43a9ef82a64769ee7cfde94896d0caed75a0bfda07cad1f0120d44b738f48a0998d090deb49a7e9395cfd0150e18d292c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ta/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ta/firefox-67.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "330334037c1f2fdccb8700b3068e6e10ee6a52090b106aceb7f96e3b55cc2797bf3a483cfddf7440f0280e54f3115f280a420ea78d4bc934cc570dd8590d1190"; + sha512 = "5c7948e1db8a8523591cfa598cf2b1971f01d7b8a79baeb932aee2aaa8ba8230aecf783bf7be8b27312599b8a59abceedd07cfa5e140e9107289e717efd77894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/te/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/te/firefox-67.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "0ab6da55daead9c2e83d4595b3f282f3cf9f5747ab435f098e38cc664c42c1b9490730126cb73a85a2b5a3ee4016739d3d85987ae174a5a63d3921322cc22e54"; + sha512 = "01c2e2103faa9b2bd22c6b3a9604433350095a8bcee430007114c440b765f091dd3adc28119c24c9024d70fdff1256220305ac8b4f66182e6fa9e5dd35c7c20d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/th/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/th/firefox-67.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2a4b8c5f185e017b01b4e2b54ada5237482dbc83125554e21325a1fee427ad64dbaa887fe02705618c074a51229748e2f091ae62cb2054e0b2c158d9a2c2d04f"; + sha512 = "9782614b88612fb1bc669dc26a61d266fbf1a8613e3ad3cd1193482985c05f182343589589c24ff016ce4dd1c63c755348dbdb6a699cb2f093ea00f7a629e573"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/tr/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/tr/firefox-67.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fe07d4ada692091072ec0e636c95f000c9c5fcd3b403ad216230100bab2b5afd9c76098bd6bca3f1ebdee6189b3ead9b082d77b3fd24d52d0b3f358b24e59ecc"; + sha512 = "4dacea29f57f6acedf30231d08d86d53afb88b055195a0c11a9f4e2598460900b3b20be4aa22a8fd5794de3f636a575a0e55815621dbeac4a2f7854399915767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/uk/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uk/firefox-67.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "1f95b06b26b4a1005424640355f93d7a8eb7fe66f93e24f8728c2eb4e1f69919f1431abfcc2b5ef2a1c830b87f4b907f497ac72b28c5a81166878722333818ba"; + sha512 = "3b92fc3c99366d332261c8cfe57a04fcbf285b5d5976e60da29a0844a30e9e15b1441cebfb8bda6dfc048f95ec233ee099042285effccd2d9fa10dc572b03e2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/ur/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/ur/firefox-67.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "76e41d84384f47a5d654972babce48b6aa4d17294bf6bd8fd0d47948a4428d5c81b87d6c1f657c5e6a8e84afb94e5dd23c7faa472f3b0104c87c408eb7ec752c"; + sha512 = "0194916cd60f933c5a8ac7738487b90584e2881cd45f51aa1fa81ccd410b0596623bdb880226247a943910add37342e54cccc9bd250e2091cadf871f26931ea4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/uz/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/uz/firefox-67.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ee582f0c4500844a99e671d2dd18615e0e7faae2a41ca781fe2c8d05dc7256e931d34a559c9e2b976bb7a7347b1e51578727d0b014d59ee8d464279f561ddd47"; + sha512 = "579779fe27dd2d30a5fe2498eba0e9227f0322f3533837dee60240cbfe98b68ba2b696984a110dd42f4a5b3c12110f61e33c38f7f489fa69a5c1c38280932466"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/vi/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/vi/firefox-67.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "705eea5171f9059a2ad02d15f58959a6a85656de44e7b301f851a7835ba6a1d8a6b908ddd9048e357141a6bcd9c03075650376eef0f859823604991db19a3671"; + sha512 = "d7f8699f2f172725095bacb2a7a9dda73d131933d308420a938b49a7cbdc0cb56e957573f9f8c46a909cc07184f848e98713390b1eea816e97cb6f4007179902"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/xh/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/xh/firefox-67.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3a737d094a9d70ce72282a286beec8feffb397dec3ce032fc2f5013b0676455b3e8719f569d75a3849e42547752de6124f65bd618b0c629253d6360cd3a2efd0"; + sha512 = "4201fd07a57086607501c193ccab243a6a6e1758d349895ed1fcd3ef1142b450da16285881b9319bb63afe7f622e5cb7dbf68db27d17c6f21ab94920d5c8a305"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/zh-CN/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-CN/firefox-67.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "eb79ef6b04a82305faefab6b775a41412d939a91ba819bd327eaccbee3b744f64294d0fc66fefbd848766d07e4fd21dbef2bcc862dc664d7d2367334d7f11750"; + sha512 = "d0a35927d7fd6b6f72b21ad6c15533af13a478d8465f1eb39ef9ddf1dfeaf5653d097e59de410f97453f9b545b97b9b82f22973366efc3b03aff7603594f7edf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/66.0b7/linux-i686/zh-TW/firefox-66.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/67.0b7/linux-i686/zh-TW/firefox-67.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dbc3b3568bf023830ff6fc009da3737c7609b7204307ca553e629150cecaf5f5e06cbee0fe95e02b040864fbb60b38ab1b319cf5bc9e3568387bfb49251d0b17"; + sha512 = "f01bccf18cec3f201a9a69e167543de472d7dde86304539d6c17f093468d5197b0230ef4280a0b7af8d5a264485a69667fd81b458d85ab0bc7175aa80667d419"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0796bee85806..d60cb4203501 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,995 +1,995 @@ { - version = "66.0"; + version = "66.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ach/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ach/firefox-66.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "26d7b82ca1287a547ecc8f0bba4b76e52704e3d4144c840088493fcf5ecc5a610dfe6a877f0afdf06c5ddf5f3c655dd33ddd0f233386748dfde496009fc6ba84"; + sha512 = "65f92c4efa17af90eee9c44add39c3b3cc0749a334043fbc56d24966979631248de2bc2f9f7978e97482a363528412bf38780d84955d8cd0edc05898dadc30dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/af/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/af/firefox-66.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "04453ed81ee3de014d0dc05a89ad41d8fdb11fe45dd987728fd7fb77efda6a8b1772371c79a162bba263c4dda1aed3141ad0cac736a4078fa615a6e143574c0e"; + sha512 = "06f8e60fda4ce450ffbdaf12dc95cbf3dd8ec7cc6b9bbc8ea76c144e800a17b96fbdbeb31c6f118a50b14ea7f55b5ff125380ce86b4ab2d2bdd05d5ec4e33881"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/an/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/an/firefox-66.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "081d435566c27240ae118b882541153bd39e12b6d064cf36ae93e6f24cc2013819f3f42a91c8bad3a7e15ea251243540077218fece98372508e1b2fc19418b73"; + sha512 = "9f3a0c73bcca0445ea9002e46c4d42d8ad2cc06419f663270cfcd4c6a57e1937530e6a1b0302648fcc7a64e5e3b7fe41424e56ba9c81a6726b556630f81165ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ar/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ar/firefox-66.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "3bf68bc1b876ecdfcd9a996b5ebcb1a28eb4fe82e92cdae6c6a00489d7b19a9b107d4363a43114e2ee25fed107f6d41d8d81c4781cfa48fdce81a28761ab0d42"; + sha512 = "f9db879e2aedbc09f58a004a6b7e4836da8c0715367335028176c7051b831e5f88c9d7cacea91bcd3ecfe4f0c041f9f8d16c1a27ccffa9a89ed41b7dd3b4c472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/as/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/as/firefox-66.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "ff2cb9a5258e6310ff6deff3ceb635467d22c83df9171bef369496f0c086f54d70d126ead02e23c5000387deebe9d9ec2074bdf75507524a05ca45d731229029"; + sha512 = "3be820595d129db7cbe07d6500c9d9128a55adacf6f1d3d53fdec8d705453d9f94c53ff489de74805237024cd668f2c9568bc67fa2df686c3a4e7544a252b694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ast/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ast/firefox-66.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f935d5ccb24b27295d9256dbefdaf3aec87ac4d3e3929ca2c330f79fb7026935b958ab306758de0bd1a8929766d7752cc3c80d6a834f60a08e17f3f4daedb9ef"; + sha512 = "c04842ed940c442549504cb8b26610c00508fa1d7155cd690d43227b343816d8c780282d330ecfc2ce951a486f022adbe18ffa8008aa3a43c89b079af968b466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/az/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/az/firefox-66.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8675c7e95e8483aa6f48ddb29af5f0007aabf4f517724235102bbcef7d46e3ea5e05cc1c60321b7a441f8a4089a95b40271b38e5d876b7bf047a667387547efc"; + sha512 = "2deb0ebfa3e2bb74c3c7f80c08b0323d81b38f9399037a3955fbb53e219850a8899ed19aff5b81188c3c8e4bbecb411ad046e0fbb5fe5834d5023935e1e10968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/be/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/be/firefox-66.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "79a4ad947e1943bd972a5586f3da5257c8ec4de5700da8af825605ed439ca2691fb7ad65b0d634d0c0c5a288965f683b203356b3edcca11bbc1f835681008cc4"; + sha512 = "c7012a19e0283cf0b7c45153f078eb9170447c95c62141bb1ea54516e363b11b306e1d7d89f673387ccac727b36caf51ead6dcbae3d290923eb05bc792c06187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bg/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bg/firefox-66.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7a2fff247f6f02514424f23c9a9022a2b43dd29822565e226976c6cc4a1857bb4b310f95ffc1c566730df07fe715436169f1627e3240f983041d759b52b00587"; + sha512 = "b9e54ea4d35e4f2d53c8e87e86f1b4d245ca677279ad16ff4d10abb252801245c80666d977993739f14ecc6ee5d80e07abfdd0ebb096c71a65eec4fa7df3bbbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bn-BD/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-BD/firefox-66.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "a825dc9ed2016861eecc9add037316516e55a7b0f3bd6f3d76bad80db3d94b5199f55bab170d5736a06890ebc392be5793d828b4c9ff20e7073fff2109e6da63"; + sha512 = "bf75162072dfafaebc0c02339d5e2697ebf27615cc7d902c0d2504e986592764293272573d23f5faee12dc253b8ec29fa994106fac21a8fe9f11cacff2b28fc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bn-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bn-IN/firefox-66.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "618bf54d2e4a48388e33a952d13136b2752e72084c791f6df3b638a489a21d0b9435d943a9ba427815cfcfae04bec55ee393f39a04d126d9a18a4a1eeaa9c676"; + sha512 = "c7bc4d575ab66066c88a5cdfc65cdb958479973ba44a909609aaf71022a427b982918177c2ee80ce692030702191d02408d775d262882809583e2e057a7e7fb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/br/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/br/firefox-66.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "277d2931ff28e6336897b3d3aabf14c70d9ace5e3f65158773c66422c7bdb848afa5e5cf6e4545b13d4cdc7bba0f3b38abf83acd66aa5ee94d387134e0530ad7"; + sha512 = "3e929becf7b4ed961c5aef6627e6537b2f9ac71804e206a0a29d7b538dc53a09c7c8b018655846ee16caaa8d704082a5ae25d6b74ab2cf859d78ce58e8ee9617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/bs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/bs/firefox-66.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "83ca0b6775d8e22341dcea6af8c87f11c43c4eef2b57d194aa5b1493dab480db44cb0498134d364b3d478f7a7807289950784bc40cc142d621928837812eeff3"; + sha512 = "13f7240e1c27a7223e37b1fea9885f75969857857e880cb960059039e39fdd5d22100fd693a213cd5e471aa112ae05a9eef3a5a26d277e2b83286769d1333920"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ca/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ca/firefox-66.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8992c2d60e907524b228e329a919f67ece92d345d4dba1cd3a0ddf7231c557cdae0127952d004b67fe171a5e45156e93f51a8a95aab56572c0b88132277da0ec"; + sha512 = "c9ca70971a8ce500c12fabcb4b13f6ee92d3ea55c7db4936fd5be238217af7541b7d87b6d61355d91ef44a0aa98f584d76e99b80fa42eb43da6da12548170942"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cak/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cak/firefox-66.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "cc9ab038fa728c56ffdd05b65b2779db282c70d60d088cbad9405072a0fc5a4742d70a04b8f13e394e5ecbadf62b738f896a9385933f74046bfa14b677f50ed6"; + sha512 = "3496530d20164aaa8af56e72b294d9e68139bf3c8140a7d94647d0deb802f4dea7801643ea08dda69546e8bacecd29ab1bbee7854eddd3c4dd8d931d902f865c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cs/firefox-66.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "646eecfd8c389ac7a5004b3aa0a59a8f28cef4727654139466d5bb0df31ab0a4e73a2b09fe12e210187b464c446631eb4ba75242ca6f5985f6ddc67f12277ae4"; + sha512 = "065e44c11789e2c12bb1a1ae4aa67d986c8e718ee964108d8bb9697050c534ce01ef0d1c9b00eb03b28a55a31ed7ba7741fc7fb692a09c1b8512f4f4f2d77d7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/cy/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/cy/firefox-66.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "eefeed94cac6aae5f8047ef51becaf778c344c2423220484426fad4190225c056d2a48c07280906fa85f645524a9dfd97105bb8313c0739fff6a683ad4e87bbb"; + sha512 = "824263895aaf97000efe2bd59345ddfb4e3f056fb15f93c7c211f001c3921c83d736b8c03c68fcf7b2a35560b12f6581b0df30e9382ccd3d725839d9385b0f8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/da/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/da/firefox-66.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "28a525f3e65c56c8c19881f0ca1d1549082bf0ef609f5627258f77a67a5f4fe92866fb2ec474540e28c8523a931a76c1f3fb00309a0e0c19d2fa9fa2876266ad"; + sha512 = "8804542db2d736139718e45e5e549be9981469d4e68d7f6ce0a362289f8ab72994983309dfe1c6c0d1d73694b3b9bd726c13c62048397d8c865717596939bda1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/de/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/de/firefox-66.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "5921cfd02fe91167a3f723a6ef82cb165a28df488672bcf95c70dde93cba69de66821ac1590b547b03700ba6071086d0b641bf440e73a21ba14c43d52e242528"; + sha512 = "44e233c9023d574c0c9a24ac12e91311327b513d790efaddc76d46c869ca6297087039201e4b886575509e78cf9c4a6a18cc898d866e85aea5790dfab8674987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/dsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/dsb/firefox-66.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8da41c8e9246459b95a4967e6a34740ca1088432db0c8af5180165fecdfcb33ca4893209f276f73032f74bc1d25bb7a4beaffe2b85de1c7226305420d6c76482"; + sha512 = "4d5b87e5310655138f3300a0c6aae55bdd7a8bff419ca1798ffabf54340eb61981d48d17ad8bc9ca396271ed8e57afdb4cca0e1954a66daa8588cc2f954b8d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/el/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/el/firefox-66.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "cfb985dd8f2eb3042b55c048d9c45c7f0531fc22237cddc2c80cf54bf909cd1881e402a33a6fc332878260619a255c32ff60c0f036ba45d73c369e117df47bbb"; + sha512 = "add0ed575851a65218361802a597fbcd26cfee5fea3bd76f15c32f0045eace55a65158aa56d50039d1fd5866a34fb3eac091c3746f69ef6529fb6fa5abccb095"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-CA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-CA/firefox-66.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "15cfcd53a7d8be85c19c3c374e78771f39b6d66ee764f5a649b54753d19d93f460a351497cf9890bc6d0665ffe46b4d63975a1b75401f398a7ff7c92a5a3709d"; + sha512 = "f02ea6b747a8f3753de493820e21d0b61ab7ca6aa5de7d5b8fbdf9481ccf59d9ce79b3622b10ea13ceddb329d9369a857fbc972932f6b08c25bb9d5177ee4108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-GB/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-GB/firefox-66.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "da42b99056c07ecbd3dbbb3005977c7574596acf431dae40c903e4d117b0f94b1a5a0239952b5f069805e1a9d2ac3578cbee7e7e7e1db3debf5be991a6d64367"; + sha512 = "0afeab9506114ccc8f64299633e19382c1038cef090d7a257a6cbf2b4d89986111c72b7273c7c803d870d05a9456cc8e761d2527d17220f8d70c97738068936d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-US/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-US/firefox-66.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6cb8ff86518b89111c3a16a78f1acd7888002be8956076c61370e52e7bfe72f3260816620c1947ba77a6af3d3bd511bbb97dd8461c50d3da782a5beddb7ca8fe"; + sha512 = "ee23f32f5efe24652a21a32e23d39bf3ea566a9833352b99a051e56da2b9156852d36e922e8afd08c4910bb8e921d1a4e0f49d3dd34d7e0b369584572d7e62a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-ZA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/en-ZA/firefox-66.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "3ef0091bda2e35ae44148fb75f52ac45efcbab328441b711d79f6d2ff1b079f366a94436d9fe8ba9c075e86392d8512a15e9aedcb73aec498783899b7fa9ddcb"; + sha512 = "1165fe055f78c7cf6f7771869dfe710b7d55836a6ad3c09697252dbd7e79f9f597cb97cf733f1268b59f6823f2d456ec8b0af13fbe3c68cb3df8a08a57bab95d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/eo/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eo/firefox-66.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "062239ecbb4df13d616a53c6806dcfd69aff8a34bdaf19dfe3f1ab3e6c4a07ecce4198a9f876060d633ab4b15569bd96f78868f966dfd3bb4a23d5d66500eaed"; + sha512 = "d3d5fd7ac3b89e21d857fd94273f1df7c1118f5be25c294b38cbcf0a6594afd51fd58a164df04e93aa991fea44e51c7fc974d44213ebde1f2415cc43cb242af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-AR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-AR/firefox-66.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ed98fa585e45ef508735c87d66f140c0aa90aa0228af0f6082192214a15057b7b18d98f8949f9d7dda12fb71fe225884202bd25a52f11ff32c6de410e2012654"; + sha512 = "77332230576e3babcb71b9ca74c14266733fed67a370d7adac8f0bdabaf16358a1ee7188211a3590cfd02a7cbc06e5e125b20f0f68468f3900e94d332a39ef3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-CL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-CL/firefox-66.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "788e8252611653aabbe90b668d9b3d3ccf659e5994e5ec27cb06ab55176ea169ede2e9e387bfb34c9f2bdc719f6f06cedebe26891970783a37cdbcacdd44dd0b"; + sha512 = "0a28e64b356f9deba612365ad615f2a5e5d0654ee20e4361ea7959e791faf60aa116f3bd3e451af88cb6738cb815b78cfd26e44c012d03aa624bad4e1257dd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-ES/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-ES/firefox-66.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "7326551139c749c80dc8c6e1f83e94efa5dea148e0d8decfeb8b7c4aacea87c5b08009bfff372f32545e92f6972ba62c491ab898f1469da0661cf633680ab775"; + sha512 = "90b18eadcfa5099785d0b46203866e575c4f065f9e70d133393caf5a1551c0f3e22051e274875e6b039b310f2b230e8c85af38eea722e50b357ab3eaf338f9e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/es-MX/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/es-MX/firefox-66.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "3d759f48bc4408ff29d389f0d2d85be8094c987aa7ea2353137ca1eb9c25e6bd27324606afe1b6936919c4fba828400921604284c2009eb116d7463a184ba12e"; + sha512 = "ae8bb311cae77f2bbb103a2221c42cdb26699c258fe077f0a5871068b66c8ca3cf0df5fdfc6ef58bd5ff91fbebdf519c7f319c9e1a6702cef9fc260c6788fd57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/et/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/et/firefox-66.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "39263040a02198e0f947cd473b00d5d9836103d2d5cd773a6cfac92ea00862003ddd972a2203176ce2df86b3542d6a23274d6ab4803e61210bda1ca68d496d69"; + sha512 = "45d48243b86ee2601368ff1a14e918aee4e5f02d3b2e6a8fc2b5f6c97ee76d7b2caad0131863a192651049e099688b3aa27308e121ed49cfc11a012c71978ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/eu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/eu/firefox-66.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "138eb7dd9642b5c878056a853a7eb326f33960229e0275d18c8d516f491ac4abed319a4bd1b4ddfb19495c5eac08c0736fd0a0f6dac7b535bd22655df9e4cb96"; + sha512 = "9357f45c6c484adafd58a204a233c2620e3493aff2b5a1cae16dd8ca7f73003fb6f6d01bcfa8924c499a3052ac6a5aaeb7dfc0cca3d7a664a12219fd5b57b4e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fa/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fa/firefox-66.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7a24a8293f6d0ae1e27efd3d295b56ad10f7af337ddd5852277427f574cf9684a8fa072114b75b83a9141441b096128b505fde34ae23884d5caf592864ec94c9"; + sha512 = "72d81059001c37edcfbc2e994bff4f9c2dff57fff85a562d389789b8752931a898bfa058225b66868e17db9333449399d23f0043b1c4c102a92739f90e61be40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ff/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ff/firefox-66.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3a2fc784c2a9415f4373239ca786a98212361d8783eedf315371baa29211366499fa4fe0b52c8050228d6cc0abf57329381ef220b6eb5936df64ea016f6d28c9"; + sha512 = "fdd14ec7cc8be41fcfd9f2013fd9ed032c119a34cba51642fa3c18cd8ae8ac138859218985a6481d0ac5aa974b226b550eec0f99ea1c62ef65da8c17ad019f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fi/firefox-66.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ae78203f8d0251562e01f8accd1a1a119becde11928dc325d91e3c6f66fc1fb996d917cc4b2eb94d5761ae9484aeb44f0282b888bae6376b635bc171faee00c5"; + sha512 = "fe15c43cff8159abe81ae0f51569d5aa4185d7583d92086491d694792c46b10520f77e187dc75379fbbe432da78d869172502e8b8fd6542f3f4d2641cc6df402"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fr/firefox-66.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "f235f4cff178291b14f2e2c5b55e4c37deb9f11f7838411a77813c9d0c358cc01d42947511d1b91800b894436202219adc068562de6b524f4e2d9432ac4e41dd"; + sha512 = "9125d6bd70290423cc9913146707a50accd43ac1f05ec58257e41805d7a052fcadb25629926e0b20d53c2553476d58b9691f48f59538e68aa7b661ff655c6ca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/fy-NL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/fy-NL/firefox-66.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "05f90317a77984d3eb71c45c6e72d8a3c3630c98f98f129d3f4ef0b3f1598b4b49060ddc8c420fcdbfcab59f739056f78234f5c764265f03b140dee384d87a75"; + sha512 = "b4d4ef0ecee7e0b0f8b429b7cb48641f6d8fecd89962587e5daee7ad43d18ef99c6a03292624ce634c1630f147626df6dc76713f3f9187b63a4ac501180979d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ga-IE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ga-IE/firefox-66.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "37397f5bdb3f36464af9e8675ef0bdfe9d778de42ad75a5043e890db9c4dc96d72001a001030a7db895a92630ff9fc734a335c1644546f675a78efd74c9115c3"; + sha512 = "ec94b0dd54d36a78f7ab05901f22eb93c963b48e57b49253f3a3de6a7fe04de227f856fb82c4414d264143bffab5789a9eb3882f8d2dfa8ed6bc0c7d757e2602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gd/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gd/firefox-66.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "3a679287bac794390e0a39a980507717d72633112e7a51c43097a647b8ffa88a6f93ae5cfc1a0f99e668984bdb59b38f72f8d74fcb733888dbbe7ccc9cef731a"; + sha512 = "e283b895cdcb60d5cab1cdcbf64022306e2f7617b880c386096d800c634469f45543802f489a6160eaf531fb35e744d78b806990a776df27a150f06e479d4297"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gl/firefox-66.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "9f1086387e08446fc8ba49051a992b1f508e0b830888f10b366bdd5ec03a366fc805b1477dfb70bd52af7e0fbe49d2232919aecf32755a870561e4c99e989df3"; + sha512 = "4db9cd8584f30e75e30545803d8dffa935fb75a2f091d20d213f3cf7a55ade3e406d066142d7c4444fe0ef9309f265320caebe07b669c253685c1a0fa4319e91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gn/firefox-66.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1938a8b3e53a4d11247407fe74aa7ec9d5aef4dfb83fe21b3792e0c043065025feee6248efe70419c8f521fbf0f442bc4f38d10a9a4222659881a65d2c450b3c"; + sha512 = "73a5bd92ce989a62f060ae5be5993188b186b26ce3c818b14366d1fd1da09059d02e30ca239a32b74a4cbe2116c3965e5301ce42c2fa08b5af554b399b4cd6e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/gu-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/gu-IN/firefox-66.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "70a0c478a84118e6970e931607dc631ab345ecea70e0936975bf196dcddb5012d39f770749744f7742ed20f1b283488cdf594e32e8915de88be51293574e3670"; + sha512 = "628e0460eddc0b748cb6968d096836a9e88e44ea43facde7b2969a7c262ced4aad51d97f335bd3ea26b378c102b131411d1de0322d618ed47025092647f02e99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/he/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/he/firefox-66.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "4d9003ddb9836746c54c6b74ade3787f108fd71b2479e198243c8059601838ccdc5a5d107ae4a41a7014c12edefafacb6f6f82cbf744427f9e59e5cc3acb33d7"; + sha512 = "315ec2d0af7bf39dd4aff5f7f3ed41b24d9726b3b02003d282dee80f7ab785cedab0ee0d47ef004c5b30407b72228bbc84ae21882268ae34210d5e5cdd9a3be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hi-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hi-IN/firefox-66.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7c42a9e5ca1fc6cad9268837707cd802c2c1f796819756ec5798b40e2c14b774967335da52a99d4abd9cbb197c78fadf306bc0460d6b8182f895e4d8987bd84d"; + sha512 = "63edbdae70206aacd70b777e551a2d2af8226c304f3d8c3052436749f71556f4a8f1d11a941f6918878de3d33491a0bbbd198da80780f7aae8a70acd1b8495ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hr/firefox-66.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "979720d0480786c8d6336237da65813635f04286f60da0fbb8222d1821548da40d2a78bea98ce5baa62298d4b2c4a03c99455c5285bf73d44e21c1b5f497e56a"; + sha512 = "e65fce5ab014392710f9dfd4460db1748cc04f9b36e91d358bea411aec32494717956ff4268c19a3263ee296f52e24a9c9d83cd210f82fb090c1e4df7ac77cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hsb/firefox-66.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8c9c876974441ab9bf7678c1aabb4c068ff61d2e23e69ed1c048a5d83801341cb7b2c3da3146d6c04fcaf9ecb2dcbe83bb2578aa50a168b21aca0ea6b95a539e"; + sha512 = "c0b164a380f86a90489a201c0e4fe5fed6eb5461a90ebe2b241beb8eeeb6680f10963e589dc52ee1568d9e25989514fbf8ba80c53c1cbb6c2fa931bede95e674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hu/firefox-66.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "748b53186b901ce526b19c6995de78b6bbcc7e99f88b146de6f24ad3c9854d1251b3259ff61ed80184d20db46ff015bbfbf499a643626e8b733ab6b82e2bd08d"; + sha512 = "6535c5b15f2321d8b69e6c59fd06b5029611e9b06bb4cc967741aa6edd9eba734f84776a35b6c76ea181481c965fcb452fafed80ea07973e9d6d5ce1cea01005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/hy-AM/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/hy-AM/firefox-66.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8730ea2e7fe5c2718f8e1d3d3b9ddab49932b05b121bf46cfd3a1d31361a61116f6f6ee64cbc74da19ebf4b147c1cc6223b5500880c627926ce1201fe1511ed3"; + sha512 = "af9091a8868031fbc840a00bf584f5c8d868db0b308bb7f492a2257a16ac0c52bfac9da77b07bc4a575ca05854e58c8b892d4b989e199b50d66a4cfb5cf2f2dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ia/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ia/firefox-66.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "a72b3065f5994dc2a035f0f6194a8345f308c97ba1718989b0f01291ef9f6d90d7e83ec88f8f37d43ceaca548e7d37ae3d703803a67cab5df08c00c6344ec710"; + sha512 = "50a73f0d3260ba21698c59a1a806e47a8329d2f20bd1983d3201de4c0f85599698b0afb5c42239aa8b88bb3e1becd1eaee26643088f55b51b4c3830bde4828e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/id/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/id/firefox-66.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "33b12474f8d66df94c06132b2c8a09ddaf60038b61cd06fe24109e52c8c81b750d4f4d7e65ce78f46edae4a062ac72e7c7176e8038f5f2b934784e3ebaed75c5"; + sha512 = "e77b80bd36b21bea3c614c4e1b72d41b9fcccd24be0487b98ddb3d94db53ec703cea8103c1d5dd6f037eba8158aa1a3b9f22ae076f7acd9bd8d5b3743c56d7d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/is/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/is/firefox-66.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "4801bac4c8b00b581feed2de9486f05bb7cdc8c6cc49ef2318e8353fa9a0add7292c36045cd89c384dec08d3a87fbf1b820d8593d7e44367606f08413d939e01"; + sha512 = "9b3ee06f79c82ee4215f5a046102e0da4280e89948f5c15b3b8f7cec512b722f6015ee00fa961f2424fa3eaa9d05eb97bfa4514833c8607f8c856fc1ec15e719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/it/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/it/firefox-66.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "1fef11b6e4c2b92e7f0a71bbde1178aba75843a8e451d9514ffa7502df5e93948df781a932f8e9cea58a7f244dca044dd321d0a7c9ef43d628f4da6b96fb77c9"; + sha512 = "4d03f5c013142361bac168ddc1f1b3195e6e095d281eeea6129d917ccb41007ad7d1c16ac30c49047c3b620ac4e89e6af69fe3ec2b614bb2e6f647e303ee6dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ja/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ja/firefox-66.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ae703a6710b7f32ecb5e5380ae0a1c7fa18800a734932be0a97a225e21f98b62aab14b5d5189036120589005e64265cf46db9083d9a0d205f9403bd431efb582"; + sha512 = "5cc48652dc4a23c5fa8f41568cc0a51da5fb6039a5235f6cce79362958b5b7ad0f04ef6d8d832d4d60c39b7802bc87e6e95f2803f2d07a98f7a66ee87e49a2d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ka/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ka/firefox-66.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "adf78cf231af749f5c365f49eff2d18b28a12c865f6b8e61bf363df9079ab6e6d3ad2fd6986c9cbb70e97e725d8f0b1e38fd11cd7668f6d513bab96bc12d0c98"; + sha512 = "50277cf7e49d986746bf2075db7b4de1fba6a793731a82d7b53669cf9b8bc6a4036413611a20700a5e6cb91fc61be8189f86dc47e61a9c493cba17719f668c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kab/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kab/firefox-66.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "50d76f0f91ee648a5b16ce1ae2220458258258245a5aa77d9ba72d6cc1a9a7ea5404ac47206a3d60a66da79cc333f6fa01d63add7ee6d2f7e003536fc221246e"; + sha512 = "df71955a1ef801b49e86de2be14a9a1cdb325a45a8f9424829fc3333841b9019cc927aff9c7ece78b1e9e7df77f88cd899737dfa856a08e0440a6212acc8b9aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kk/firefox-66.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "0522a872bfcbc7df7e1efdb0f6583a799ec117d884971a4fb870d8d7c693a09659b7f8b7ff3b7f1903822f1a68575667175e42dd6701e740e339deeca196e56e"; + sha512 = "ca589dc0d215d8b470f36b05312ad016c523fe4ebb54e37220ad1322e99b5ebf8a3874bce6d131ad6f7ff1008ff29d23393b347dd216bbb0776077a54f84b664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/km/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/km/firefox-66.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "33bda0e594b1dc41e33dd414bd74fe177bd8d18610fa2705a088b7e92d65e6c4f6fc1cc8169c302676e2b726f5d95e335cd3ed83706b8b145adf65e3778d7aed"; + sha512 = "46d8788fe845ebf00bfb7c69122e74c5345295aecce61d2903cb55fc85830378aff0280c297082f88a681c393c948a07593c402faeb25c2f22c301207087d930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/kn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/kn/firefox-66.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "52723a2f98b452aec9a47a545f224262dd819eacbeb4a76ef628875625d801dcfb2eef2ef607b9ae3bcd477dd5f8484119117c3129100d1fed8599ee0887913f"; + sha512 = "97fa909c1d3468c17a122e248758fca50a8979ea7cb964dcfddaa17804abf56b62af730665efdd45e9cf617f4ec3f238e6ffd9977a64ee42eb4dddbcf7fbffe9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ko/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ko/firefox-66.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a10ca925d7126a6f524e8b20abfbcc1ddb2e28d2e69453d7234e9353dc609281e3de69a3f5bdaaf33591a1da493bf54ba15ff0a03b980af44075ef7cf0e46b99"; + sha512 = "56c3d254ff64554180a1fc6e968a653ecbf8e31403f37f211cc9a41fae9a51b21260d5804ab8c6a36c1feb2b479e55b3c568a46609b3bbd56ad05d47c6ecbe76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lij/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lij/firefox-66.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a8778e8422502386116c6d77aa624261a2098d4d3d77d95204d47b3c3f6dcd3e8575ca3b5f9695e7ef6e37101a4864790410d78a805701083255e39216a21dbd"; + sha512 = "ed2eb3aa60089cbaf3d606959bb8b6f5cc80b0baa466796fa1e2587558bb0e1f62445760f2ecc93f83394a246555660e8fd253dc621ffb3f3ae55817e368d630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lt/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lt/firefox-66.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "3ed9069c44377c8b6dff86624b7ffe29a3b10178dedce24d0684495c1b731c243d1516adf17bf6d23bdb8a472be28c8265b3f6523bf9d09f68d25695a7d6ef2c"; + sha512 = "b22a7db91c29a934dd1ec57bcc77869cd28baa6884e61b25c2b84e4dff5fac9d55e0a7e38f1e8301383644799e5dae8b7fa330d554a9309ef0b58a6bac5ca964"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/lv/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/lv/firefox-66.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a0969d6650403541a28203432134847279d0ed067973e4efe4460010b2e5eca633b11fcef5080f3fa1b8c8cdc8a1c7cd20001d924e672d261ae435e34baf38f3"; + sha512 = "77bd42fe4966a7dffdf34470cd5657aba9aee81157a78a98a20b0200d71d11162058dfdb9d5a96f9d6648b0513cea3b5c97c8e59e169fe8e955e81c4578ac3bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mai/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mai/firefox-66.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8a739840c2ada4aa9de4262a4f3048a197e19a1900622c066ae698e2665ea758a831b3eb09450fcf5d8af547681985e1698af6a00cd9b046f5493893f94a2e3f"; + sha512 = "c110e1559f8f9972b4696c8ee463f813d5088d1babc62333060debf77eac52e7d5b96733bc82c8ffe22aeccfb30c076bba204dbd87890763f3e538a41e2fa414"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mk/firefox-66.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "cf432e12b0222c2a3d9f52fca83539772b27c3928a210510709e30f058d2a96b67f829d7154cb31c2a916f45c16cc50b7c425d8afe170853bf3851e44e9fbe36"; + sha512 = "57cfad52e649aa43add6f3d908c2f45005bb1e6cd298bd7158e4ed62013c0de053169e5f52ef4c4e0c5521a7b952b26a3cee8ebb088ef26f769a76d025f6f9ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ml/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ml/firefox-66.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "7174c595765d1ff727f4d1845bfb5c01eeff9e4e1ba760188dad3be59744c915f8b7af669bcde0bb66d1ef301022386120c11249d291cbc9343ecdd607a4d52f"; + sha512 = "df9c00947fba8e813895dab7f31d284187482a640d880841093e2638ae04c8f12bd8239a35dfd5d5ede4a219300306ef449295431eaa1e3480510b1e63a7e281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/mr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/mr/firefox-66.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "997e63a30a55792f2995d06a54cc198859207a35154ac481e806955728bf916d06456d6e27df8142335d743d468adf2e521b120da03f7386e592def6123cc9cf"; + sha512 = "4afff5982f466eacb86b1a429e68a17c9cbbb9d7a6e59b3ca7eb33341fec9ce904a4289911a0f39f52d4e8eaa5996c3db97d1887209558238f241847a9f941ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ms/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ms/firefox-66.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3c14275661d84aeacc653c8b4c122b04b60b1669907a4b18ea32a7ef6b36ddb249b5a7c10e5c4eb3453a662d4b8ac4f2b94a304f3dc4c1abc0661c9bbfe8f035"; + sha512 = "ba2b33574bebd9f34a0503f5c651837a3ea278eff635d486f99102e3f25c3130dc496debbd40d7268af3aa37d2b69a7b572eb7b794c44049bde1492e60b2c534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/my/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/my/firefox-66.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "3268b3044a98c87a1302aa7a68cf14b18666c60778e86f039b445739c86074f6572218586b1f14e71f27376df4af9be12307b6877e1336d1047c4330421165d0"; + sha512 = "bb5480f0d995512f274eab70ec18160714559f5dc36c937dd4fedea483c2c42964765863c696bf44f1bfd3491b706e14ac223817f1f97553c3968c6c8843a71c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nb-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nb-NO/firefox-66.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "41311c4fa3da459eefc3fb328f6f0076b2d4d6b9ce2e6c4f707489c236521f30effaa76a2f8831954d5d1f39f948b068cce3cabdcb8f114d9a4119ca319a43cf"; + sha512 = "cee130f0e6a4a18612b8e90fddbf923456deea6d8ba452a01b06b03e637c14b4131160f3bddf9f4feee05a5a675150c917e891b02c04a42234cda6229de12122"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ne-NP/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ne-NP/firefox-66.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "511244eee5cdda8654bb1c274fe61e8a74127d2b488659cfeb6065cde6df9f4f4bc139d84e3271623bb917b6796d9b5473fc1280d311e9f0a6a1104410080af0"; + sha512 = "cc75630facb9471172e2419d0addc02b1afde95fbf43a53afca63bb6af353adc3dcf45ca7199daeb6e2db312c48ccdffe520b09d316f195f614f5922831791ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nl/firefox-66.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "3238a01998a0a1deb9634d7d731e6bcf7a155d62d7fe5d443dffa15a6cf3913065da1b437a481b58df204abbe7528802a7193f931961714b3a36754855d4d539"; + sha512 = "8e45b9250267a95f583744c94dad0c7bcdc7c00e2dbb1d91efb8b8e56b1f2bff81037936eb840f68e83433590b26a1db18cebbe1dc2ce1f2bae05b65099492d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/nn-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/nn-NO/firefox-66.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e00f7f0384f1fdad8f43e2123b46ff789d68011bf5abec709237b709481256e17305482dae4e2c9ef60702dccd3dbd8f984dfa1ddfd444c2565f8f2a4f73e67e"; + sha512 = "689c3ab0d66991573990ff8a3e1e7e7d878addc15609b4cab2b97faff6e8fe44513183f03dd3d23c22795e80e4028f18d2c329cd14f7e7808e784e02a1bc8aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/oc/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/oc/firefox-66.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d8d11e009926bf5c55c57d51914d96e7771dfd7184f6eef958860907e73274a83e457e734ebfa093b35dad3b6c1f8d4927b244eeb8e4cdce20c833289045dbd2"; + sha512 = "834d098342739e99bbb2ab1dcee997bfcd433d357962e25bc5ecf3026e2f41525c19b9d11ccf2ca0705590d23f8a13ab316f41a90e1d605dfd284421f502a6f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/or/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/or/firefox-66.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2f3400fd9b53be32463a9ec9455e7b7bad61ec0d4e4efb8b116f5337f68e3262a8a01b06051e7b75be1c99698ed8fec7f730dd0eac839e1b643da730af4abb23"; + sha512 = "62a696155aa25b6cc62885f15d29988b50b9a4e8d127ff259759b948be0c6b73eb99237116c188b5a46c638525e5890768a6d3978e9a1fad5a1748b917f2ea7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pa-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pa-IN/firefox-66.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "331a0bdf3aa9995b0b079fb753393d3f2fb6bde56f6fdb81a73ad3cfffe1e3ef0b456a2ab6ca795fee7b3561f4e253d4f05fe6f297646f450ac32a82891b71b7"; + sha512 = "cc5a35cfba0b96a5d526196b2c56eba9a2cbf75d5bdf564bf85dbc6676849505c62f8e6d8c8a88cc5e6cb7f67d8670878dfe05a074d28bf895790efe7aacf404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pl/firefox-66.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "b191fe57c47d9a363a81381a2a40452fbcc8f29df09a6dba1405d1bf47f16e989d3b8c870b04566107d88d830b5cbf315fea6dfbcb420d8bcadf522c6024ab22"; + sha512 = "1549a76ead00ecff081580f1fc77b31c3c7f57aa9d2a7a24231cdfd20f5ec12803ad61b04bfd1693a571f51e18ee9f29d51b5f60361ea5c5fcf7764b04ff102e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pt-BR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-BR/firefox-66.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3dbfe79e86ea5d3a34c83981a5f8824ed2e72ac38fef6fa3a50e688152111576d4fbf8c267ab0ce46e3685520ed68281e5924a4aad0d4cb87eae97c0df48d7d4"; + sha512 = "fec6c531e4ccdfce86c461744e4ffac4238ccb3c1e4134c09828e3bb171561241f9e683a2cfdb22dc45f674c03b0d59b212a242ac4344be2a74dca7bcc39ccd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/pt-PT/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/pt-PT/firefox-66.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c656a63a06c18ff35e250bbc0f29536eca725c4deab6f125a6c7f7cb69f36315169b050d64dfcc23c5f8beb2bc030025eb259153e7272ebcd35ec9bf9d2a7649"; + sha512 = "ffb01c1fe171dd86c86617ecf752b196ccf48f6aa117ed86447a741fe82adb00fb908f2f7e01fbea57f6a2cd9c3dc603da47838e61c28a2e1e56a03df9497e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/rm/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/rm/firefox-66.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cd1bfb416de16ab4c800e868f78046247c8e0ab8bd5b4e338e77b5a0cd045f86552ed48bb7b6b000ed3e82a96d78cd35d8213f8f16b896c7600d57f73574f2ca"; + sha512 = "941cb0cf6f67146216553804629001f317f0c3ca4c3cd9525cca819a73aac72b31bf62ed6efc550301b870916f2e697dca6d840d7495c1276a9a031e5c173ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ro/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ro/firefox-66.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9206d173852cc0203f6707eb5935a1f627142c093c965081c87990ea6fb7032d1d2d877db0c3db18323bc1a8ea03f477de539cf6deea5b4e16f60826cd5e5ff4"; + sha512 = "53586bc5d4420435005fdb0f920fd4d7812dbe381119ca2f97c91cf60191c794070f301c4b65903fa3dcdba7045636e868cbda8f3e1e20592c226b38b6a51a84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ru/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ru/firefox-66.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "deda3aff41c9b82bedd4d4fe1225cc424bd8eede7253bcfb5a5773b41e30e9fa18e35dc859863504db190ead420b32547fc3f345ff1f6301438d9368f39e33f8"; + sha512 = "efa1e8b1c63dfccb1bcd04c943e21cc7529de39ac710d1224588cb9f6e47bb0d600457e49510deb924bb9de32bb61c4aceb027a803e47c75b40f8b00c95bac69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/si/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/si/firefox-66.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d559ebfe3baf3908d68e60ce3f46f2e050f6634a081fca6fe2c27a522c79b429fdedf181291a93af4177023b1030bbf92a1f3221fcdcb74bcc75dc98e53a8330"; + sha512 = "cf38f59d72961e3adf56ffcdde2cda6923b2fb09fbed09b3eb5b3bc843905773dafcbab858fbf50328e22f7b36c580d1e6ffe4481827cea006f1901fc04c9899"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sk/firefox-66.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6b0c1bd8313f75532f57d49a32bc088079e1d1031b0fd5a60d7fcfe4ee37d93d89fc46c81d042335d613f0fd739b5f0995f04762f9d019b40680296595349b0b"; + sha512 = "e05c3b45a25ac44d3c6b46dcfb9214fb9c2e40453bf041352e10d6790ccc43a9523c541fa0aba473301b4a0298b74e6e74ee399cd65bcdb59dfdd1b2390d3fdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sl/firefox-66.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "29eb0aa43f1d71ad13e5ac41b16f1839f8249b94d673dff48cc67bbc42fa618031d27b80b996a98a393893720562b5c9aa2445195922b435e69e9acebdd8320d"; + sha512 = "2c1728a9f4f2754d8381aae570c61be4806725ed5913e16bec06d871f101454218e9165daf323d496d94ca3ada1e83e69d2b7947641082a70b99f98844d06650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/son/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/son/firefox-66.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "baf9f64912376bf00997da2c1a4e6f08408677d9b0f98420d262810f24a238cf1ea0dd2673cabf9f0a770dba76b7eb09801dcfc9efe0833a9711cc0d52bb9f2f"; + sha512 = "b3752b9ae75efe0c9eca05f17bb5b9d9e62f92c6ed3fe2602c278f0c2c5e2916400eb1b077054612f21e63c0c26752ec2f03cc34820ff95e4e2d8efe66e15804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sq/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sq/firefox-66.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3620eb66ef5c6b81c1a4206b04d8c385e966d807b163736641054083baa924d259d5e0bc83ec6cbdde002cfacc56c42e60b7bdad8099f857c9508ff86a5e884b"; + sha512 = "056f6c4a5547057ed8ff3cbaa77d270e5ebb6d315aeabea9d552690eaa6f7c9a5365cddb5c5eedd07b1fcbad64b3bbadc9390c886656650018dd2cb690a29acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sr/firefox-66.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "49426038b933ec8ee0a3f1222f3aab1ca842e65a23a3699a13e9012415fc7faa156fe1be9991f4dd1528b011bd381758541086e8148224a5f0e8e9328731885b"; + sha512 = "aa8e8164be5f6c3d40af39807b8f20a4cc5dcbe2230156c60ba92c635b828a40d93918484350e27046464ed67cd3fc4e87ab8bbb0ff4d2594f7d916caa9b6806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/sv-SE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/sv-SE/firefox-66.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "eed125ee751f2b4aa03197a697f50e22a63535d2fec17983e8d9af533f7a625583a0b856f3b37ac92e82b1c67f5c11d3dc9f485fc0236bb8e36c9b3a30bb5eec"; + sha512 = "81936ab4ac5f876eea54a833c2f6c447a74ecb3636461b0334f4126f890aac36dfa77eabd9e16e8f9943ff40fc9a862ff2b1e2f3b3ed1eab51a6beb5516f55da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ta/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ta/firefox-66.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "993459f0188ab45e172340c9a6e93727c424e9e1ae629abce5028f805781dbabbc26fe2dff87f988c0abbb04c80682c34ac6f69df3768f24a116e6ac7fbae636"; + sha512 = "0537cfad54bec863b83e27a7a36c8fe5126cf704c6a5dcab3d4319a55b27533d66ed98b43a664ee3513b2e8e0cc96fd56126d4045a93db7487e76ecfad967250"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/te/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/te/firefox-66.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ef0e9519134bf9cf4d148cfa51790613ec5a225a0522385dc8f689e256e0c91a7d39eddffea81a6d08e319cfebd9c447515eae42a7d1813554ec310f68e44fde"; + sha512 = "1084fa1da0cafd8894659636f7cb14498beac52adc92ab0ae4b9ca1e35517482a39a37d1d4906b4bc6a5a1ecb3c443681705582be5a2aa21745c767b0672078f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/th/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/th/firefox-66.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ff74f294fea1998555434a8802240abd5c3232097ce7d5968ed3636afd13d80b03ba0380e45e0e5b5f1017ad2337bcc4983836b233f1bb879beca4495c63aebf"; + sha512 = "fa6a5eb637154f9eabd3d5e30eea90d17a2281d65bb25d283a91f36a8db05d615fcc633cc77845e29b898699d9b4c091aaf5d1f81b71aa2d60fc2007040068cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/tr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/tr/firefox-66.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "094a9db1217c094ea317facddd298e8bb5e0d856888db183430ca7303125d6c0762b616e748c26f9fdae122b2c82719f9efd2607410c11fc428ddabc4b561e1c"; + sha512 = "a5df3fb13b78f1cc85bc0881e99390183251c4f8cc108e346bf257a2ca757a6232469e11e8c533b4722cc1381723fae7aa0132e3300bec500ed2c5e5f7070527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/uk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uk/firefox-66.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "42524cfa7f7adc5c1bb68d1bd695f58ad9bb062499540449b9d83664086f595142cb54fd261ba52b325ffc1d79389a8e2671c52553f1c13ffeeb06cb23e2a40f"; + sha512 = "7925b95cc4ac4b35bfef29d715ae21bf6f98ab7fc99bfda66f3514cc2d67f9a3f327bcb74a8e1545ad20918c8e50488ff0dfea478a08e9f1bc0c5d28cd8c9a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/ur/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/ur/firefox-66.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "aac59bac539fab1682ef42cb6c37e3f61a5eac1c3d3b9daaf960ceb8e5bbcd99ae6e7fce3d1ebc36a72a69cc900b770e3d60fbdc21d2d53d24217c0939b3c7bc"; + sha512 = "1fd3b03251130cf5b13a98135a5820379c4cf771ba2fabf0ae34d2dbfadca2b5d971c7c0db588fa75ba2594d5c88493961fde59cf743024bc31a7e2aba149b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/uz/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/uz/firefox-66.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "560e806bf5786307b3d68a16136af71876071e4fd57de974a0f1573cd67df54f56962137b80641900cca2951be95835ba7420cd7a8fde549f6368da7d362c993"; + sha512 = "9baf67bb532ba992d9e28a59348836fcecab10bf793c2504a93822641fbcd3fbdb1922f4ed68cd5ab9783ca2c3a382360eb9eb50889bf3979e7f16b306320c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/vi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/vi/firefox-66.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "69bd8d24aea9d4e7ff0dbcc628acccb705f1fc6bc09faf1e02f7e7a4fe821fda1c8375f5029b44cac28130484cd87dae1cfee3e6ad92aa54f5e94b18d9c6f62c"; + sha512 = "12afad955cc1674b89af3a8861c3746318fae7e3683ea35e26d3c2f0856c86bb154b860baadecc9d7bedb520e1dea6af0ef73ae420a2b551d5730bfca3c4ed23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/xh/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/xh/firefox-66.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "061f38f6cdb3ea324015dee38fa9ef5f61217b2b8d7873655bdc44fce5d0064a40149d987e62f7f49730c38745d1618f0050379e51639efdea133ad510a3a6c9"; + sha512 = "e9f4f9576e9a0195c6ff8f67cca6bb3794294886ac2a71376c7bf9f8da824b7c15c59d09645e67fdb9f6371142b29d8cf3a45f80039ec405ad1ae837ca105764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/zh-CN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-CN/firefox-66.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "32ddf5349b99cdae0a0fca1d1d17373797e643dedbcaf523e26c7c576b3bc6d51595c7f49b449cd79e14353d3d7ec4497b43a30c26853a9513679ed78b87ffaa"; + sha512 = "4b1558c2b211f9fb69b8b5f4559f1f35bc547a1ee65ee81ce4d9639b886f765fc97e62070cf39d425dcc8f1fa0d13b7c4dfafc3daf60b660b751d8904f46452d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/zh-TW/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-x86_64/zh-TW/firefox-66.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "1f57a17c1b070751a0212cb7b74e9840e012f540b6dbff22a5983607539a49e65ddf6388808e82d268f403eb9babdf6760671671335a2df5d2c7ac1147e50399"; + sha512 = "73c4940b6fb87f3f98341bafd894189d9d24357fe3fd1ba28397ffae365f4883933fb759d90a385bb306269376cb2c30b4564e2fd585978ec2fdb73b657e3b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ach/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ach/firefox-66.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "b859d67092ec6aed8681d95c796dd8d843929f22030a43d52c2480762964378b01fa166b4500afadd9d23bf5f57a2f78b41b1cb84ed10f1eaa183bd45990218f"; + sha512 = "ad20dd3b682f6809f499349fc50131a016fdd424dc87626d151c7b9283d6ed1ef585c829519a434da39ba33a31f6a855628f5e6a950eff89b97465d4d6f97838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/af/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/af/firefox-66.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "e1cf74ecce528cbe51d7690cc3c2417b0d0050cd1067b0f1320d7d73c1e28e921979842f1213b235b19415aae4468776b12d78fc26205c849701bcb155e7f0e0"; + sha512 = "8151ed85053d31956fa8f12e296d5d694066b001f07648845cbacbd206e252fa4bb962f349472475feec99f6a26f30a2fc1e63000664bafff6dc83db7674bd7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/an/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/an/firefox-66.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7360a37cc763c3152f5f6752985a5676f284346968edae3129f3e944f0599213fff7ca8b6e79d5ef9f2fdc6f744aafb2913f0a14deddb98e7c7f5ead67cf1878"; + sha512 = "fcb83bf9b222eb5a6d872d6c2b4b7bde7ceb7e97ecf9c908d8dd90a7edb52a10378de453f8ef9643735fdf1bb6459610e77e4c05d14c9c594d94314d707fc222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ar/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ar/firefox-66.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "ac80c54b771c8b0ea8ce93cb8a5a7f21740e5de81388708df7c3114e1864dab2a67574474f5386d6f2f94563323219f8c0f9126bc689b7a784a92f9bf5bf6536"; + sha512 = "b393dca33c937d282c7658a635808682e1c9829a2c7d567f5e8f854295a9dddbc88971c929ae7ba65acb9cdd7f31f6bb1d8b27fe93c3f74bbd82fde6022ca9d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/as/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/as/firefox-66.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "3cbb8869e8844ab54dd780c5674663a1b9c3dac6270de9c0be72d526c4f349647f71dcd73f71cbac6ccf4fdaee699f129ef1df0ab9155ea52446a0e8a0547fc7"; + sha512 = "d53e0d3f7892fe68434e6f5bfd4e6e894077932c0c757567c15a43495a2372a97015f0a78ad47dabb7b7bd21509373e9d034ec5db3d0ada955ada23bcf860467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ast/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ast/firefox-66.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "884cbb70775fca488d90ef1ddb2cc4e976ea22f2879a8a4b953c4add0ccc05d80594c99a0bbd56a4cc5f8f463caf1f38af7559012f499d145b998b2e7a27528c"; + sha512 = "3ac14d571276b03d4ef74123eeb85a79a422ee9fbd014ec369e0bf7c8efe1d4d3f435897e72a43475e13e0a9ea4a9cfe277455e08bf85d70c2612357ec08a789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/az/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/az/firefox-66.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "cff6e4986a14ea789e3a09fa4224b405a98b6e93cc8c106f76acdcbdcd7bd6013f77cff16c8057c8ced232901272b36ab8a3519a5c60c92d16a6b447735e92ef"; + sha512 = "4894d809e0b3db5f01e898e14f396bb4ecb968e5d0129b55ccd3de31c31c50ddaaddd09742e092f4cc62969e70b5e4d821e1a206bd676d98b346e45e1510c3ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/be/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/be/firefox-66.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6d0121e0329539c4f8587e24455fd44b2847c8b3e2ef2758174e640f1aa2d45ea918512342f612cf5456b47665978f9ba7f588ae329b10c9e32aa29450586618"; + sha512 = "ac0d6cbd5ce46d1cba9405ad097291ff36038be8631b46703b0ed7fcb93cee6a88664d3c73216f6fc21ff3c16f4c02aae31860d49b9b894aac7b79b01faf720b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bg/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bg/firefox-66.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a9364f8ec3fa4c129172f43a901e74281217fa586e75464b7dc461ec58178a5aac5eac8f9a6a93f745c4fe75135e427bd2427e084146d5c27821ebb3db06d844"; + sha512 = "0c097df8470e5fe5241525662b262fa1f3d088c3a82c596636a2fc79b9a99263717a4cc6b06734e134511f395ee211f95985f287455541f71f09d5522a85807b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bn-BD/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-BD/firefox-66.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "8fc2eeac47af9eb77422f14daf46746e44ce0f3f6463f929b3c1ad167bf3ef9116c38906804c4cdbc31ceac8c1a33e52916b6a14e2fbfe70231c0ef452798b5c"; + sha512 = "886bd3d7ede79f0fabba534a07abc26c44f58250f4ec8447b176562cf554aa988f8c88d6f8310cc00f431a9710c4d43a5396312546db1adb81cd40684b83887b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bn-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bn-IN/firefox-66.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "819bf16a7d3bd83a5d8919974acd6f84ec41798858beac53a3df0ab66d483eef0dd5c02719a0ced894497d6fd2f5f43979e9d6a24a03e50b4817000c3ccc64c4"; + sha512 = "5a686bb6a1ffac5473056ecb6c15bfed19f58d118b0b58fe8a058a66eb3ff6ed9793aa5d67eda8357e7652127a887a244d1bb2cf218ba459e18a791b188a13df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/br/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/br/firefox-66.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd469af1d65c2273e3d048b647663b14a27a249b0dcc511ad39f40abaff6c56d6c4b258af0cb078083d3580a3ba8f88182bb26cbca0581fd90a91e13ab972588"; + sha512 = "87b7e90a5ab950e428b0a794392b5458e2d7e0e5224982b78ce600adbbf89085e45d6ecf194837e9437465f10e01cd0405d1df99afe90612551af77510514666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/bs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/bs/firefox-66.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "9f584c6c12401a2d720b7325e24891852a3dc002261e6c4be191d26a8c2ce4252d333ae53fab6c1d840e881806a030bdc34106ea81c06d196112807600faa94b"; + sha512 = "80b0dfe3801ec8c979fb0caacccc6409d64b839c40d4ba0ca6fc114e4dd694299197a24b51138c734c0eac85feba9eeeb4ccf187622632db362b8ba4069b0e83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ca/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ca/firefox-66.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a2d7c8efd908dd68944ffdc81cfe343224ec91e90c461be9adbb6287a775029521f755a59ab273a2d19ea22324954e6a51b202dbe1b8be75a06277cb240a2681"; + sha512 = "7d186f282f82b73433f49bd9f0c3703ecf74d5cbca452ac2469123cd99eaea9f47e0bb46d4f5dba37f291fd0a7bff1136028651118a8b46cb362a5b41ae7e83e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cak/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cak/firefox-66.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2330a8049b8aa5139d8ac53198eece399914de39ac2e1e031b65db8798c8ab8b1cdab9437999991435739b3513a87f4eb627e5f309bc41c84c71ee8d22715c63"; + sha512 = "9a7c2bc579913f23fa0a9e52c077e52516c66afd5a2319290d8a074e2bce6ec86ec2648f45d810c26e2d60c0a6e1e6ce8c810bc460285eaf268f193e9034faf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cs/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cs/firefox-66.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8afaca3fde6c2f5e8b642029a16aeb565b4d0982ae847c1c74368b237e7368027a63a7729e03ae7410e48aa2dfec5381b7ac7ca507401ab2109844b8f6a44e20"; + sha512 = "1068f4851c0ffcd92cfec959ece7264fdb218920d805dec670c57648e59d10bef3a7df1a4de330bde7d99fc52211ee4f862fc9c414a6f2e096e63d4b9afb789a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/cy/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/cy/firefox-66.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "dda113e382b74d9d0cd5c57cd14c9f82518361294e15d717b4e5cc99b89f6fabc48c3a112c843e9e64391b3a230815b38e7cd76e641cc3d9ea6434f282ba74f6"; + sha512 = "1bc1629faef6fc5bfda6f294bcb6b97f120c65b9251128ba7157a36502ae8f22f9bce27cf0a32395f3e2a43e952a8fe2d509ddfc0e6e7f282d30a32310c68493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/da/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/da/firefox-66.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "6b87f1dcb4a452585356245fa5af9acd1df4e3fce3faf9acdbd611027e48fc54d393f7be22a435208a4c8e47f294f9f1d1ae3844fb2081ffd6bcce55ee78bdbf"; + sha512 = "b8fd09ae3071742598466eae89d4d038bde1c0a07d1849d9b25269806b64b22371f046ede66e130f6a249e7746d58553c9e79bf918e96a4f22c4d176304ebbab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/de/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/de/firefox-66.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6fac7b55b4ee01476796b7c8df56593501544fd924622b5735c7773bcc605d373b622ae17ec14118f4567018d0541d3e4639d826b99dcbe1d521912fa039e51a"; + sha512 = "226265a47392fc10a9c5638df606bc0cd47403410dd503ea1988dfca29a3c1f6a75ce053e2c604138a453cf5998489396ba5dc173993de5053f9bf0f6dd95996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/dsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/dsb/firefox-66.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "53b5405363fcfe5131341fd712de0f65e3cd6d0fc06dfc297470e8afebbad699bb405351a9523b1c391bb5c158944d9edf825c338daec913feb5399c4a222076"; + sha512 = "ebe9c8bb5f55ec3915bd1e53ff78005d8799d6ec0e3a7fd940394084aac0cd54fe8852f5e9ecfe63e15efcc48439849c6a8801a8c7127d4bddd880ed4b13b1e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/el/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/el/firefox-66.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "dded0705229e8323fba35e40bc2ccaa807550b15f367cd230bebaddc981ad983983b9a4185389d2d5d0ae240e86460934f0b96f9b1a307765743ff1a44cae09d"; + sha512 = "a54f1c2b0d38268a7517ae5436be6194039926d162e10c8deda35d328ad8b367dbbdeef00e727e504726d5e93bcc04dcb254bf92072022eee1b327735a3bc230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-CA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-CA/firefox-66.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "34146bcbbc5284ea25f0235ddbc93478d3d09ccafc1522d6ae2c76a56873ed19184d390dffcbf4e3fac406b886c848dbfb5b4cd6c1febb59f7371b5042a32873"; + sha512 = "78bfae33a23334bc262c0f311a6bafd7e1175235311f7e48017173aeecce29d771b2f70223ce6f54bbb08a7796e18ec53c75499c4e6a821bc5890c14339ee3a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-GB/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-GB/firefox-66.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "968e0b90079774c36d460f861c6d2cea96c0e8b82173f11eea1e712fd93c3491d85af898df1ef2a8d324baeb04b220c46aaa07e8dc93b9b3c4a0fff394c24be3"; + sha512 = "6119e0c74ce896ac4569efeb4660feafb1097162a908a68df0cf33cd5bea2633e85ee2149cbec2ff85bdb1579a055d4776b7d4c2473baadcd9c17a2e9cee1dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-US/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-US/firefox-66.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4a1c3fdd39bc38e11c69925f61ad7334376174f389053f850bf6f83b5d572e7132f5f80def2ac6531f688b66fb6d789bdb8f456df1990f6fb8e32dd693c940c7"; + sha512 = "5fadbcdc7d39f21bb8c5051702a1239945e53a058fc61a2fffec0e51c4e31898b0ef5625d51c87612e4fcbf9fc8f3be9e18d6cb86e832d895278965a5c21e034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/en-ZA/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/en-ZA/firefox-66.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "562748c8932ed587527147d7797a9a11d57d4051cf269e7fed07e5ec794de68d8acfe5cd5b7c5e30cf1f3dc5aa340df81169073c67b3cf3243570ff1733552e3"; + sha512 = "7abc0ce1d718bdf2d3d1c47449ce4298194b061f6ef35c95577beb1036e5c4a2fc99bdaa145a888bcae0f316034d522a4766c7b1530e7b4b1c9b7a3066d2a771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/eo/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eo/firefox-66.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "a2da43ec4e6fc4ab383ac1e4a160b5fb220cec68894b126becef4760ea405cb9e9d3e7fdd980a0624dd34824da528de4c14a9e0acee478021f6861ca6dd35b04"; + sha512 = "67100d6438b6b7ca5072ed1cbce1b77387042f01f0fbef87105c535048e44cbe057996e5441879bbbe2066233a638e1b1faf8e880337bc2cc1488893d14a7aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-AR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-AR/firefox-66.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "08f2cabccc7ed0a41c7f6b4eb29ba6cf3562a6b397d60156aa7e8dc967aafaa0cb85d16575bf8b7cd95837207c7aa9ec23c7e821be59ee037a37f3df8655cc66"; + sha512 = "4ec1451840a7cabac57feca4d62a572bc3719444f858a07d6b664ec649bd4a2f2f5cd78d9b30663ff1e2f6b0acfce864ecea60850ef4972f3ba00f42b979ecf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-CL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-CL/firefox-66.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "6e48b7d451ea55a778050e43c53a53cb00b339c9de3046512bd89db3bfe8a2a3f36a3b567d4e40a9ab9731fe95e52fc6232fc69e76d950c86b779ad4c3085879"; + sha512 = "a75fda20a7c8c0ccdd5ab857f62c59b7e843d5f47ce5ea2aafe0459298606f4e66bbcab6e825134b7a35f4f7b217550b8ebcee780cbaebf5bd438fc382fc49d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-ES/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-ES/firefox-66.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "6bfb3283e12658f5bf7d4547f8d6ed7bb0f5f8a8148bc9bed7474697dc73b87cb17649f26a100fd6f6717d9f0dd4a0795071e432300c57c7f3a2626149275ed1"; + sha512 = "76d8438d349e1d52097208000d96e7994ff3fae46e6a3ed6db0977492b4ccd93b49104393779db6f85d5b8303c01bc1d30c93013536b68992b59063a931948b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/es-MX/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/es-MX/firefox-66.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "40833a6228af9d8aa4071d9acda505315e573fa256879ec65caa780342e822ea5cbc5406b1a118b42bcc65075af9bffb2eeb416611276e9f981927e3b69f6e04"; + sha512 = "34cc6dc8bb07b76e322b3da263be6d91468634a08074da8000ad69a4ef3d93aa281996b5058a24f163db52dad7c73f7264c37bb6905217ddabbf8844076aa934"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/et/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/et/firefox-66.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "88fb3c3cd75d9a1b48bad3a368e52657f2d6e3304c339371d748a2909193f87ee5f017d496027741bc7d274067ba2f659f6a608aa2f961552f599a730ee99097"; + sha512 = "84f6514e106ef5457e20d25497a93f44d6968ed3b44d513325926abbb7c3fa36db8c198f71631f28f03afea4d8d1994de07a2aa14fa64693196b4693e1820a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/eu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/eu/firefox-66.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f0c04bc08d58954a0a2aba21a4adbcfd87112433fa1c77c3b79ae2ea1a71ce045c0ae606d27c88959a1fe8c6274e4376f73177d1eb69bee5dedfba66082d5a90"; + sha512 = "dc0713db71626da9224050e3af5f94158002b8eeba4ae0a5f7bcd1e837e4bb1850bc180bf77c35473d6395728397af15eeb0082570e9ef62b3690c73f84cd7dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fa/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fa/firefox-66.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "14fcb0714fe094ede4938fe03799b796c4778baf6d23036a25983a9cf831714ca367c85315f81367a9ad49fe880f6baab84c9b84c45257aa11a3001d5bcc3493"; + sha512 = "6634a79d9e3be0050fb4c13a8a39e7316084ee7ef48c32b826954133c516f271672f2b89f91d1e62af7ecdaebe33be3418a8a128b2b0b91388ff18d13e265207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ff/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ff/firefox-66.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "253ade7a299e032fa8fb5a1fc40c19b07789f1fee88cab2531c2db949ef25849c4c7a1e1daa96d4e2be677af8b1d4b66fb36b15cf8ae7da136b9cb7d16483ee1"; + sha512 = "b5954d6f5ab4a3fb3c337a67a590513003d781825ff870f8c7a4d10bf73476f017141763f98e433c0f1ba6668f2a76ebcb76bca80e2b73757b3fb2abd98c1ae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fi/firefox-66.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "fcef2476774d9651bb999582aba326d670e2cb2504eb7a993d71866badd2d05bdf4715cb0a9c17e323b59234c2a69b18d31464afdd98ad1b8fc4e305985035a5"; + sha512 = "2973860cce56da4e81058e565d541fa4f785ab8d567486f992e67d6ae2de60e334fd114adb6b584277ad6c01cd4019b1d1917c709bc1437ecd927c9d7851768b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fr/firefox-66.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b9ae06ba6a15388fae18868d1acd876af821bea32a5c55493fc5a2ec66f16f3cc9f1517a6d3a3634bfb0d1ef2bc92606ae716d6f006020b2acf1f790c48d15e6"; + sha512 = "a3f58d4926dfb07c51b21cb900b654a56aa7bfe238c36eef104d66d72fb52b431a0cd5684fef6b20c8aaa6b89203116d6ed18a5f1ee0fa79879c25b64931fc3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/fy-NL/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/fy-NL/firefox-66.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "51a6e9580dc2c02d6e8c2aeb4691c469b8fa3ebd87c7ee576d6ee92ea6f457de658ad1e80da27a57b82496031bfcb24b76aafe065f2700ff6daaba16729b35a2"; + sha512 = "c9befd42b54c68f2fbb5cac27b0c84f0d24691999a3d6547b946b574e959ce895a1b7dee37873f9ab19ab1cbe5f1a313d5b9bd251dbf68d50aa009d0a6952f68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ga-IE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ga-IE/firefox-66.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "76726e012d32f8502095823c27663be484aec67fd267924a80605285c306fd49be911c3fb3f50ded984b7c5441437415c9637ace39f3688789bbc3d9f23c1071"; + sha512 = "52cdf9616308625a57a56029fcfac0e0a31879b24112a946f219ae86bd72453e04ac8bfb910b387972b398b21e2f26cedb58a6c21867511261946de5bfbc74ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gd/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gd/firefox-66.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3b478aa67a9704b15ce0bba6ed62f3cfdada73d025d65b9d13beb15ee7ba27ba976a364f5cad9bddb345da6ba5ec097f4847fc3e0f0d7d61a45672eb95a0f6b0"; + sha512 = "e1aa8899fd0b14e34d195975fa9fcd08135dd4a9ba51bb315bf906d924ba962ce39e343a412cc2fd9a01a902ee627809512e9fc476c5630d5ae026feefbf84d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gl/firefox-66.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "b854233abccebc0158b06d9dccce06d3b1f030bea5dd90a0fa1d7810461560cc139adeebe12cdec8aab8aa1e8a19796d8928c59c87f15e3793cb27825c5d07c6"; + sha512 = "bf9746a296fa402d3165bcca29257bf6953c49164dae50611de14fc0244c220d3904b0f24dfc1045849e12c37e30276fee9efe8f6a857833347987fd87c58e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gn/firefox-66.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "b78aa95097cfe92b1ed883c56cfbd4a921b2550ce75d76e8fe0938e67d88dbab2c1e27f1a977689c79a1763111ef52f2246c7918e0567000b856a1fbd1554b09"; + sha512 = "1d320e4ccc4f2b8108ad1cd4d1427104aa76a5214259b70ccdcd3dc797dabec0839653e310c74967b99c60f017371db71b99aa695fc6dbec0a7a5db16906d987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/gu-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/gu-IN/firefox-66.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ef4575bd214729c0c08e14d93a07c259577430b9ebf6680c90c5e3d8fe191c7f58f3d7f44819417247bf9a4edb738bd1aedec58167ec5829563ad452b3b83891"; + sha512 = "98854b4e0d44e55c797a79df6a12dd473e70fd030f410944097f7ac3ca3ca50d80768cc627aa55cf8a686b47fa8ee1c15ea9c7ff89f0c4eaf2a1760515372482"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/he/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/he/firefox-66.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b4815c1b409740c74faef621ea2a0ced33569bd8daaa966876f60cc1edee5d65303af62ad1631ddc7f876455ec9b8a91106538c5dc79e6047b9ee80446a8a73a"; + sha512 = "bfcfda4c361ef95c85ee3b90daa2b641cf0846e242d71321662000eb2e0319eccd01f0382df41053e10daf9a9a5cf97972ab00889d6f1eaaa41a83253e2261fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hi-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hi-IN/firefox-66.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "82bd95fb958d143a8ac63937cb5d39e8d31c53ffdb62b6bc5019e33ef5ff9822d0cd5e34966e99587936084992dc26af88c1b11ac0c7ab74800b6d0bec797c46"; + sha512 = "0fc7933d48d7a648780e7a0aded7912b92749aef7f873338f9eeac6c59e0fe86e997d69886bd2083ea987cf74b176e477ec70a33eafde3aea3f1492da1077c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hr/firefox-66.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a655e42c3bffb558a604611d43f92a809c3aff68df556daf08c932148d58a7a21099bfbda5abcbfd1d3fb9258837e5ed0637c2c82cd9a7a7b468c12b9062ad56"; + sha512 = "0cf72ac981d5a2cbafd3d3b4dccf821d235c5743556703cdf2ba1405181342b29c3830b8693b54757404b8ceb3a51c7f8d1a812a26088f21954c37d308c79fa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hsb/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hsb/firefox-66.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7564349b272a2b5a26332514826f134b83bb9971aaaa990525797c4c9798e645772653a96aee684a4d40762435035c173bba8ee2d1e4d591dc79b3a5a6ac2d49"; + sha512 = "35d81a78827e8faf1f1f9b939427b2f7198e84aa841cbe2bc764f7531ab26e1e192d539c9818a0b7c8d77bf0dae15ce24bf805f0c7164db509f359be649e1041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hu/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hu/firefox-66.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "9ec92a81fd3c2fd4f01ccdf37190f8f50419a257997d793abb609e9a4f21166f7b90d26755a59238cc197e4276f71b2f23e6f550b596b96984e2dfd0bd77a48f"; + sha512 = "1d7b3c5cae0f9478b1a68d3c6e9bf4098a54579872fd38440e9bfd118151efadf35dd8db54441861bf4de11bbaf0358df74f26eebbfbff352de7cbaecd04a091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/hy-AM/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/hy-AM/firefox-66.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "60710cf9808ce45c736bacd2368d4a7db93ec78d43ab486bf3640cd5d3e747649060f6fdc2443151387b15284ea12268520fd3c9b4c8d291035b2b46adbc67f5"; + sha512 = "6d36b676b98c749ffc88bf831be7d9be27bd4b435ab32be9b61bf93edf69a3d8ec91a1b6ec2b16d1e5384c6cbea5fe3300e98d6212f5d3260cef121f75e24bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ia/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ia/firefox-66.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "dd55d54f5f39321fe9f23b95824dbdffe6a57b100001a0df13fd7500de14d3f7dad028c957d8dec9a8b5a57798b278b27fe6f53005eaab8aefe5f22b67589a0c"; + sha512 = "38a4baf9dd145fde8400a2c08f142565c41d6dd63ca4317c759e9dddbc76fdebad588127279b31becd0b4033c3d610fbbc6dee4ad3d23d4bee5c55904a8ef939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/id/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/id/firefox-66.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "14fdcbd0aab6244bc5a31120801c47c31e14528af6411eec54d61bec340683931a532ad42718d69069500008ab79e2271887303f6dbc51454365e51893b8d89c"; + sha512 = "06814d2b227ee60324a1e84a7e41b8fcd8e1b8ac35ffdd34b0d45ba528ca12a3d1fe9a60a14ce5b16fdf795f5c4d31d1825f3addbd8300c76fe0eb60bb29d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/is/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/is/firefox-66.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ed65e4796929ce84e790e68301166576e56d9f595abef74a77fbe34d26f8ebb2c040a382434158cf860dc3a187e0de1216b61308a25a8cbabffb2214115e68e8"; + sha512 = "f1b062932ee0b4ddd7aef3944d1d819e6ec0a2fcf4606ba62bcdbff55b13897a09265632c4f7451f673e82de0359e0dd2e927d3e538f32390d3bf2f0b794ce41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/it/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/it/firefox-66.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6d4b5f415a6c66fc6348da794806e85f2a9ad935baf112524ff72126a0b3757970a9034448873ad91615d109613c537eb999ba570a1fb7e323522fb6fb7a292b"; + sha512 = "c4b456da77214a6a8e435bf347ecafa49e3513e0788f750ead5fc17218a5a52809756c02ea0c44d29adc037605b365651eb81eaaada2d21f0235865c1d585e95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ja/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ja/firefox-66.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "33bbf9c30d23a4d3041c1c654bf91702aea62beb97bbb662bdf04bb234be40ab7a9d8e5b099e9d4a2f450a99c3d8ba57db713f19ba0436204e35fec0895ad2b1"; + sha512 = "63f460ece90c5d360060fcbba81db3a62508f915608e393d0610ba1696ee030d81cee4654a25cd1e9e4ef374f3f5c1529d8945c38e10a6552f269beaf2bb71f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ka/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ka/firefox-66.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c5556081cd31c9750d75e11dd1014ef43573932d4c380bf2bedb256bde91cf88c0857732760a19d507c201f0d75a81601690d052c6f4d635946d988c4bb1d2ca"; + sha512 = "12ea4c14139457b125fbd92b6e23c26b178637638d205a7f19c90818f97730bc7a1ea947ced3c3daa79bfded228d8afc9178c0cb885334db7ee30abbcb909beb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kab/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kab/firefox-66.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "aaff95e7c94963b2ccf0bc55cfe840b4c07d5f5d490e1e866897feb6a7fb9eacd6a7eccd54847e79e179c249e053df71c96ebcb5fcc2658b7a240a774bd884e1"; + sha512 = "64f1c0d5a332e1c7d97a6dfc2f3ed71f1824af41d849113daadcaff8cd9bf6b7b630a2b39468a6ac3599fa69be05abec44c9319658728ac2c666d22e0026ea6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kk/firefox-66.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "015f155b3bda0f3fbc9225abad1fd8c67f7f008f0b14e341691783d46d222f0c6e56558191b8d8e8253ccb3ab0903fca0c0c536cbf46072b873765b38ef23003"; + sha512 = "a4b75e4fe66d2e0ec08e87fcade8c990aac5f1be28a98f35aaa3f43a7064866ea5ab90a738ec30e7d00dc1111896a3fe3a976b6f97ad1db08177d73fddd60bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/km/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/km/firefox-66.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d42d50e475c3e558679ff6c254c9f8a17557114f9fe6d68d3d708c26d559a9dc072965241b121d2fa0b89a2ef314a6ad098b119df5a3560e88658074a595892d"; + sha512 = "026c8356efce7734a392f2fbaf8328f22b3a58e32bc8fd588ba73f7aab5f77cb0de2787db652abdedeaf79ad5c2628a84841f5b08e4477d911ea185f1bfb3fdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/kn/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/kn/firefox-66.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2bde522cd206cd0c826490aa48caf26433e93832adb4de8e0ad95894bdd48186e2f2b9049b37cee99dd4abc751922895e7e0905e253829b644e57bfa684beb43"; + sha512 = "a10623c4a3e123ed826129d67fddb74e027274440b7c21cbb2c8adcb50a1b7e486b6cc5f16cc8b07beed3e056d034f35ffd61742fa6e77f001fa6b9e5737d938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ko/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ko/firefox-66.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2606dd33e8122560cc0dbe360783f8e0b5a68e492a2e8e15f2ff1620b853557f841adc0232a8c714997485ce60ca89890b9b77e256a8da6adbce81eeb8a0b1d1"; + sha512 = "a598ecf2cd1e6171209cf99fe32e6a9b981ffb92921a738237d1a7c7d575e284943da6cf37b531b3cc5ae3f08e02c2dea0d41a36f94147500977107d4d0f5884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lij/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lij/firefox-66.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "852cec92ac0bb14af07a0d968d265bdd4e2513ca9c1ebeb86ce102ea6c8648bff9946de5f520cb81af99be772145776596893fe6c15dd487409b77814481c504"; + sha512 = "01c8ce34b83bd851d92bfa47c9d79dc04a17fe925a7d14d0a21e6f2dec7b467ac27c3ecbb48c6cd24254f435208123254ba23ed4b7f4230fcd1108efb597aba8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lt/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lt/firefox-66.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ffc4001e79148edaab5be9ad6925788e6bc17054641174ddd37b4a54a8ef2444ea698333492fcc545c4450f9fabb5146bca4c79cfcfbca95fdffde9823292187"; + sha512 = "ba92713101a02cbcf0f7851b9bcc623174101ef2c7d974fd6a7e47db812347f4319d5b55404a0d5c00707f3bc1c065ef98e0e7ec5112114bbb0704d10de2be80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/lv/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/lv/firefox-66.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a95d1db28f93a9a6c67919bf1bb1870f269ad835e88ea2e04b4b3c42d9b893409cfef476654acd1547f6758f2e39f83df19ef4f399d48c7ebd2cfad26b645aa9"; + sha512 = "eb9cbf6331da0cf7c1af6d1c69f4b832c07879631788cd4caac865fc9884cceb5f63fb63dab024ac4d4d2cde5bd75b90a46e38473e68cfc800bb2326555980b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mai/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mai/firefox-66.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "f097f29a0664cc86a883e0a85fe8ae72dfc944a3b9244809918c88d9482ef5a421017928d19b5a8993dc6a1986a874425480eccec99d7f524d347820414e7f11"; + sha512 = "78e1e89f86e875b31cccec93bc0e85b9c7c9952553724ccb7929cfdc6eaf7f0661d5d40e6d4494528953e30af80a9b83cb16b49ec555fb4556eae8f0e29cccf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mk/firefox-66.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "fa6fa0b318d891de341103b845cff034e77fde3f0283376ed80ae3a1df2231818356073dd94baaa4f4a8404e79905b621aead1def237e0cf8912078ae569a3b8"; + sha512 = "45c965b386a88f1ff266d6aa5b50adff28c5b8c5e60cbaca96133ded59eca8c7a9068179e4ba84ee35a48be949a59a1eb81f1b82beab5eef8fc21ddf5b387db1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ml/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ml/firefox-66.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "513e0263a90d89ca92b95f6549dea42a328c3cd719a7b76d3397642c554aec9f7035b2287dbb3fb4ecf92133d262f5e2f2cd2c760a6dca1e34c1012b6b9449af"; + sha512 = "4785519f5fad4d1bcd3f5fdfa219eb0d9373db6d7187b0ccf57056718214206b9d1d73a3fb99f73403bf11bcedec360ec58b22640bd27c15e0ad981516a062c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/mr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/mr/firefox-66.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "c31cdbd9b69f9785eede4693ab1624c625bb1eac67af1e613854b7979a593e0833a1928db6258c5206c499799e0fded4bff167bca3aff314752daf17663f75f4"; + sha512 = "54523da6bdc639c3a803a161f670185395f3955093cf4dcfce3e209e5c041af7c12098d1d9c7918888cd826d3e2aa63d645f363f5f82b7b6bfb8a845c35b3db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ms/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ms/firefox-66.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "05c239c686a31d61e4efa5595b31b95cbaad4e40fa7d065c4f91696881a91851cca88b005488db5ede88ed1d84532d57b47c939d8cc6aac48606e52dd0ebd20e"; + sha512 = "916ecf06b7426bbb7583ae124c9400a8fd505d764fc190a28b906165737cb9e087a96bed97f566459574cb99e96773a1c458a8a3a97d48075aecee4b30d2f7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/my/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/my/firefox-66.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "609b9f8354b41ee4cf5b70281b0d482ccf1f7bedc9438adeccf277c249e5a16924819fb6aaea3cb6b7e0a389590977662178d425d75bd1b1f5aa336db995a4d9"; + sha512 = "f1afaca5fea61cb66379c4fbaa3d1ef89438984ceeaa3eef687b43d5ab9ac00ae9ff8573289aa6b0cd353a11c784eae188f70dc4b314f45058362540e9cb4d3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nb-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nb-NO/firefox-66.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4cf408e264ba160ab0377aa4e54c44b4e4e6f561b000ab1a43e33389a269c69008a88f4de35c9c704ea613c1390f4682cfea11a95184fcc3f8104614ebb67715"; + sha512 = "1a53aa28d7ad3b7aa88fe3014dec35b9ecf2995fb51e49a88574fcdc2ba08f421654c1c4458ea0ed7a9b1acf8d4c70269fa55f37c8fab92331b593b0b27a0421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ne-NP/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ne-NP/firefox-66.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9a15fe0c668d46fc87bac7ba49e380b5c99cc5f0bf6a0f077d88a1d32f715fecb3da2e0beedd86803d70a2f66c163d391dd0470b594546873c7fa8928a883365"; + sha512 = "e9f402763dd04f2eb556ec6101749c1203db89305c3be56bf63931d3ab61230303f3b35718fe0aab896adab22248b8c5ecb973a1784d5ac10ea84c3efa0079d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nl/firefox-66.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "12dc7c65ccc5681b5e1cbbf7641d5799c2f87a8ec9e42ce877f669d1beb992d5d24f774bafab858ea0beb3ad80b17bb5eac74d808548c5fdd1b842f1d487b571"; + sha512 = "6c5e493e2b8d6a065c1db11c84850c462a5e5d68e0bbe97903f76dfda6e150a244236524f2bc82ef75850c84a2cbbdc9bebde4d587f24f3065eea071b74189e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/nn-NO/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/nn-NO/firefox-66.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0df3bafc3b4c9dfa3c5c79da4f776bd4daf8c656336bcfa9033b8d439836472fbd3caf57063a450c8b30825d6e7ffab91138b3d4113515e2afed2633fb59b4b5"; + sha512 = "134ae8ffe1039df99e7eff2ebd5a86639d4b80b4d19b7382b2948ccb910f1bac4372d0a670faa0ffcf47722bea6c980238c00c338b4625adaa37927dabbde416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/oc/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/oc/firefox-66.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "306ca3beb0862fdbc17d72f5d1aba6d2fcb5df9645a4b453a01399c0b4ceb0ffc5fa5c3cec281a514dcf4f3cf0600473f8034fe9fc7227c26e962488c946f7e2"; + sha512 = "889ed30b46197a79ab9eeacdb72dac673dd3f584ed23a528ebfb3d2819021f7c08867503086c62a4cf29258a48ea2d370b0480d3096489d1d0596761a05c2b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/or/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/or/firefox-66.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c915378e137c4f1161283b2585bb0a45dc389ccef1cfeff68d570c7f5e7e039e3a53bf6ba186f7fe036f2c598adbf8746a5c01187464034024be95a2aa1cd58a"; + sha512 = "57ad08fa2a598f58480e618d6d78ee691512594dca86d391bf1c9d87c6c06e3bb863b596c1812117c7994e06ec06936d48c81b0cb67750e117740b907ef528a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pa-IN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pa-IN/firefox-66.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "53d3037bd46747b2dbd6959934e7d240807f6cfac674da83f99bace5ae4f29668a55014a3a196659784543633e132e72d1063542096cde5ca8dd87d7c741ff04"; + sha512 = "f4da8860b36a06e8d7ed5e782f10a0181075b7f4ce85f75ce2d9009a2b5ac089b4df208ab29253414c1aba4e4d954866368b7de57b8f71aa894814008135f613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pl/firefox-66.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "85e62ff828ec6942db8e87179a18f319f71234c1887c7a0114a56f7e57da2064873bb2da5c9a9de67438e9be4cdb09b8eedc9ba45b5fb5ecae6c6a19cd5991df"; + sha512 = "ab449c5f797218f92923abb9bb891ca2b8181f9a858c65515c72808efdf6535e1c0540a74b3038938570f210eca6be446edb2e4dd55e9a5f6e1a55f6d3fe6aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pt-BR/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-BR/firefox-66.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b33c5150958f8e6b7e6e7a497cb27c928096453a6b795a9426b6ee636a01ad594d5330ad797aa5ae9cb807672b1411ad02294ce43a975dc4142b0ca52bc9fb76"; + sha512 = "ce1436189aece0310f4a817bf838b88f5daa85c4c11ab14a93b48a6e7f779dc26c3a8ee5e1a0eb7d09a9d8f856c30ba0196e8ebb6e319883c917f46e7f5f4ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/pt-PT/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/pt-PT/firefox-66.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "729336b27f781bab8f81abc95bb8ce5f8f10fe12b060aa9461d9abd0d33dbff7415b4fe401a068bfcc1f0f559d748d68e126ee8ee245855ad00721045f77bdaa"; + sha512 = "dc07a770cbdfc80a65a48882b3c4a96a74a9771ce75806956cefce7a5748c065b92cfaa066e7a59ff1c78a8584e06aeef96021ab9d22388fede1b824a8740fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/rm/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/rm/firefox-66.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "613768588a795d6849c761b4500091f6653ed2d53ab18cdd5fce69dcd0560f8da4d91c6a9f01dd17401acc0626445b0d8a53a6b78e2801a89a95624d9a4da68a"; + sha512 = "507825359c936c0030440b3ebfafb11e344c0ff1e1b610d23c0d432265c5c5e1de9ce00f69fcbadf87295c4b29be621325a114ed084547bcf6de79e0fd091ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ro/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ro/firefox-66.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "49c00fbf2fc04dfd553f8b117b609e904917d1c6be8c781af52cf5281db4c741c6203b323fe401b46618eaeaacba8fbf4c8303856cedbb9fcc66fc67938b2a6f"; + sha512 = "89df1ca413857d9ba492bcfb460d0a9ad8d08ada7064b52a620a1b7534d7e2c063c5bedba6daeb25bd11f10360f4929cb4ae279ae9aca4d9a2d77d9c070cdf4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ru/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ru/firefox-66.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c7807bb29ba57ca984767de0f8d1eafc38e1596be14d53deac118b6bd5c78387b60e2a5f89e3fd02f7b2db7a98caf45f210b4f9b55a28b9c8692f3ff85e13f41"; + sha512 = "7bcb17030fbb31c5defa72341ec1d4f6194d2c6bb88636ce75ab4b4af387550915a3527aaec12b67bf7993b5bde4ea7087d59c0d46b62c5acde03d162f1fd408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/si/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/si/firefox-66.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c6f200e5b85e11662536dcc842fa36cf8f308be41e40b93716457255bd72123d6b09d9619ddc736aa81619cd8c291e48b899973185fb9ae21439499f15a405e1"; + sha512 = "ab54d6eb2f9e6d964b03c50d524d08e2906a6ee4e2161a516e26bafb4065b67cfe613782f57cfa4fb2e0f04204b62fd013ab6f75596d6f3f9162a24f6126b611"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sk/firefox-66.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f733bd13e30f9e0026f4cc7cf4e5bc3a806cc6b573cdbc44258000f42bfc2157f6d78fae2f61cda9f7a635c79b957f92cfecf566b4b298b2582d6256c8701d2f"; + sha512 = "db88ef36e7053594acdf0d46e42e948cfaa5e792e1782f9400343070aed8ace2793e482f25f7e1134ece6ca64ac27023b11888b012d74fc0a0af523a7984cdce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sl/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sl/firefox-66.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "21aafdfede4cfd1e9f97567870b4197107776f01f5271ef28fa4e4b584250c4850a4a71a5dfbefe0f6ed7609e5c5c7260c2e6a92d3f4ab2876a6bbe6d7a6d319"; + sha512 = "f98af8f8d38bed7b54955536a8d68de4dc49b6a7bf672c4fc9a5ccc85cd41e5299d3ab897cbc794f2427a0c44da5b54b855c4680315ce6d5b13f378381216a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/son/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/son/firefox-66.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7bcc839215d28a8ef5d04e1e623afee3097d2618d248c158078975c62f6743e49185e6ae006820d2e14305cf3bf6f3e02fa358c366389389595bc28e26376afe"; + sha512 = "e146a52b975fe95e5bc5b832a84ed352310f981ef87fa0ddec60cdd05c630db24f8661504a7854a17d26f68042021c4431e5c4199870fb26a060365d4ee8dfd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sq/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sq/firefox-66.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "db07ce91bb91e102ae6f244dd39aa41b5adf2862291808aa2cd2051e75ce4ed781601ca77ad61615037997f6b14bc690387f1dcdcf1af86691f82cb23c881828"; + sha512 = "0904eb3aa5ce9fbd51094b751220f33eb20a2eb5eaa1768adbae36d7caa1c9b1d69782e6392fac877297628f0a075bfa8eeac67c96884f40830d10254ff5f6bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sr/firefox-66.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "f011fef6b5be9ef595ad0856625aa33c7c553ae5a24534326b32da9c535a72fd1646fbd0e4e0e8b181e7b284a8b73c4c6beef39895e06e1cacfe388f56dc4e9d"; + sha512 = "984c046333eae94afbffaf8a8b93dc141f77216fa425e3663656487c36056c45cc922fbd0e7173f6c271e1f7b3a3b07caa9d0a21881e6b9de3a9e86a5330d318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/sv-SE/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/sv-SE/firefox-66.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "53cfef65bddfab983aec05182a2f4b2a3b8c913ec558d44644a8e39534ddf969b877a4d7ae4513f6c3758d7c0f8899aab0c6a017fce24cbbef8aa65e21dce1dc"; + sha512 = "55e4fde42ee9b1bfbcf223d8e277101569e914d3e36f74c2dc003a22f1b7f36920a4e7cbb146ee72f6ec4edd90d6e0cf159bd74bd4725232b7e8fb61e9e838f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ta/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ta/firefox-66.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "847ef028665801f77cb1984506b61329098c9cb82562442ccf9a572aae9c9235e9a12cafabd762f4dcb12a3c137d2eb5a35c5cf509d6c7afbecd3abf9f7bdd21"; + sha512 = "f4c00470d6bf3adbe864655b87bc40bbe018cd132204bebad3273f5454966540f724cd135fa53adc432c27fc5876245ba5cf0b9fca1887ee37ab572b7a74cb36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/te/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/te/firefox-66.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "659c3840ba4b8cec8d4a55d9ef46c4998911cdc631562572f2b42b855bface596b0d148207be2339ecfc47af5fcf3d377911563cbcc75bac70a2008da4361234"; + sha512 = "eae9d861788975ebd216d3775273c51dbbb6bfae08eda8bf883609950b1d28de38cb3cc16b48f3f93b15065e2c9b69b882077786398b4ef0794442a3a9377045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/th/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/th/firefox-66.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0dc1e021c72960a36ab38945e98552a3e6d7f8cac466fdd0f163f8dcc5b5322032cd348201fbaf09d91a1c7bd19c357de72c86f77e90178fa6f009fad0eb27cb"; + sha512 = "f25178b67d23a6e04b1719c4553eb30bf6e2563c46ccfc42470d1127c59e4740bfb08589c7a2c034efb37d5b7962d10784ea9a131e265706959dfbf02ccb736d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/tr/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/tr/firefox-66.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6beec8ecd2238f26f9d149d7f582908007dff7ad9ee5ee54189ec6287297ea9fbc7b4a48e3bf266272da9fe9a5614ce1c7bcb475a321f47c8ecd43c0e8e07002"; + sha512 = "9e57dc0338fc84eda2f5aaf4d14e185af061b853e81163b6ee4002e9a7b1dfbd3025d04073d7981e9983de5e27f81e4db3b23397e5083999d3972c02d1fac06f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/uk/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uk/firefox-66.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "85948afdf08109e94674c5d2c3bfb8308d821686e83d5921800adbd79b2e87728717f8256fa127ad26c5d8a399b69cfe5145916b11bd7ac3f1f345f9df01bfc8"; + sha512 = "7658f8a0a3679f1c1575d89aee699cbac41c5c922ace6cc9addffd0cefb5c0e6acd8b12797cf07ab1d75a08c8f3ed179af433ef2c18a9751982fba307340b963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/ur/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/ur/firefox-66.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "46d59602130865f769dd3f4c040a00a443101fe42f8cb8e4995be33c03ba629aea235d26a3c6653a233c5cd68c42928f75ccd807a125859931a1a2a62f58aa9c"; + sha512 = "499b74fe1d42e0680c89b9eb2c4ae6cfecbae6a301f531fd9a858a8cff181dc9bf36e879149aa503159dfbf292a8a75c0b62bad75bb196a5b8fb8c10e62f51ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/uz/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/uz/firefox-66.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "210ff33ca066df4617b3781fba35497b9a5efe6a682aba08a30638313f349ecef31bdcbc05bb5d132c4b81d87eb7f5bfb9f029c749d07d9b7654187389467886"; + sha512 = "84eb5a78e66afd9c64ebcd419eaa4272a699a1a0394cb4d45f148b149bbddd6e0d827f62b353d50b09dd0ef6c111278eb7947bd1bebe38dd0da0b6522c9221b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/vi/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/vi/firefox-66.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5c072fe63f0416e2dbc111c87251fbff6e532c86d5619245864287492805a9fd5afd1f8e0bdbe50faa7b9432533906c4d33f6d70b879a94815a70f603708f164"; + sha512 = "cd8ec1c51ebf079aeed69f5875549727851f3999a26d75ef4e6b15f70b4a746f8dbe29f2527e37c4b3b4ad2d83972ebb7e4781b4d9304e6d09939684bf13a23d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/xh/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/xh/firefox-66.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "2e053262d94f580d51cd90ddcd1794fef4780541a541d89984b516695ddd3b3937ae2ac66962edaa716964f2217be070cc9787e8500977dc1835f61e5c63dafe"; + sha512 = "abfa5c22d001e5f8298b29b53f6864f7ab2745ae474b113fb5ec6fcb3ea2dc27b1c98abfd0e55bc9c0fc0e43be55a362264ee6f7ad2938dc846826ba6e4ab516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/zh-CN/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-CN/firefox-66.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0e4e0ddb9e9290d6813439e3213c3802ec799acfec8b9ba0d788c81cefe742b5fab3a19e9bbfd28114c6aa89619974920e918adf6ad7002a8ddbf213cdb00857"; + sha512 = "c9e536e63d06f8a1a94d881008ad5d645cb56fd3acd40ec473ee0f0ddc1957ac567fad96057d27ad00000ac40da06c12f8422f743f37bb9a51ba56de214c13ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/66.0/linux-i686/zh-TW/firefox-66.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/66.0.2/linux-i686/zh-TW/firefox-66.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "1b7e986275483b016f86e092e4c8325746c76cdd610b94498168c35697c3a828cfb3813978b0244c7a9750b4dee98c92d724cb60c04c228096962e6744f43528"; + sha512 = "a47432a5f5c7e39ff66c2c832161f3105dea259d15a9151ffee8fec04fad3a6760ee06bd4828f7e361d78a1bf08163f17014e3389936ec60f1babe764d263371"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index bf671a4d6286..76e80e517e9e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -252,8 +252,10 @@ stdenv.mkDerivation rec { # and wants these ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${tbversion}" + "--with-distribution-id=org.torproject" "--enable-signmar" "--enable-verify-mar" + "--enable-bundled-fonts" ]) ++ flag alsaSupport "alsa" diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 58e3be78d4a2..c985cd8bf29e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -4,10 +4,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "66.0"; + ffversion = "66.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1izxikivz0jb8kzq4cd040a70s3j83nw324yvvbmi7g808s7s6b8ljia5allbrkqcgrvrx3rq4w09kwffwmwd43jxgc1bfl8af3v8d9"; + sha512 = "1dzqzigrwb7q75zlyd74ncic3b39yvziccpgbzh7881lzshj7x6f2r6ssj8ssdkh8lm2ckhjzbn6pf44vlh8ciql9bxb8g8sjpg6ii2"; }; patches = [ @@ -56,10 +56,10 @@ rec { firefox-esr-60 = firefoxCommon rec { pname = "firefox-esr"; - ffversion = "60.6.0esr"; + ffversion = "60.6.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "14vymgczx37q3yj8ndxq6wmmachaf08kx6n3wgjd0qqg5xr18abns999f7ng51abnfrribkrpzmn22vc061sm6wldszawwq6w5r2lg4"; + sha512 = "3nl3cisn1sw3y6dxnv0bm143dpp091h1s9j7g73qfx5s6sfxl832lan177ikm00ay7fsly251vi1xz17wwicch1himsmhjisnd3ws51"; }; patches = [ @@ -249,16 +249,16 @@ in rec { }; tor-browser-8-0 = tbcommon rec { - ffversion = "60.5.1esr"; - tbversion = "8.0.6"; + ffversion = "60.6.1esr"; + tbversion = "8.0.8"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.5.1esr-8.0-1-slnos" - rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; - sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; + # branch "tor-browser-60.6.1esr-8.0-1-slnos" + rev = "dda14213c550afc522ef0bb0bb1643289c298736"; + sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2f8f020dd9be..b6ccfdd921db 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.0"; + version = "1.6.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 = "1pkbzhd5syn7m8q0i7zlxjdgd693z0gj0h22nkc48zjkn214w236"; + sha256 = "1sckfp9l2jgg29p2p4vmd0g7yzbldimqy0a0jvf488yp47qj310p"; }; # Needs tox diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 3c1273876002..283c63dcd6fc 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.6"; + version = "8.0.8"; lang = "en-US"; @@ -99,7 +99,7 @@ let "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" ]; - sha256 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7"; + sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi"; }; "i686-linux" = fetchurl { diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 8c8212e9e2c8..2c6940e037cd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,9 +340,7 @@ stdenv.mkDerivation rec { `tor-browser-bundle` needs for the bundling using a much simpler patch. See the longDescription and expression of the `firefoxPackages.tor-browser` package for more info. ''; - homepage = https://torproject.org/; - license = licenses.free; - platforms = [ "x86_64-linux" ]; + inherit (tor-browser-unwrapped.meta) homepage platforms license; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 259f7982a6b8..5eaf1d13d618 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; }; - modSha256 = "1mx74nci7j7h44pw1qf5fxkvfnhppj46898f8895ay8hhxd28lbm"; + modSha256 = "1j04xyjkz7jcqrs5p5z94jqagrzcxjr9m3lyp8i91c0ymxf5m2g3"; buildFlagsArray = '' -ldflags= diff --git a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 7fd3e6b9cd91..88aa8777ee5e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; - modSha256 = "0l6ccxzfxl918hzbky5ivlw413hiwagwc2cbp3f05i21qdi5mw5p"; + modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix index d6e703f79d05..19194c2d0873 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kompose/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kompose-${version}"; - version = "1.9.0"; + version = "1.18.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,14 +10,14 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86"; + sha256 = "1hb4bs710n9fghphhfakwg42wjscf136dcr05zwwfg7iyqx2cipc"; }; meta = with stdenv.lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; homepage = https://github.com/kubernetes/kompose; license = licenses.asl20; - maintainers = with maintainers; [thpham]; + maintainers = with maintainers; [ thpham vdemeester ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index ffae170a1990..ef31898dd0c7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1q3dc416fr9nzy64pl7rydahygnird0vpk9yflssw7v9gx84m6x9"; + sha256 = "06pf4h76zsqs3dsxr57y9sb9sw48nfyw1x2q1725zww61jfz2a6y"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 13c7f59f7944..4263abf0771d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,9 +14,9 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.35.0"; + version = "1.0.0"; - kubernetesVersion = "1.13.4"; + kubernetesVersion = "1.14.0"; goPackagePath = "k8s.io/minikube"; @@ -24,7 +24,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1qb342zs50sdfvfb8vbn7vrx11qqjy1hw518c053s7p34ljb24qd"; + sha256 = "170iy0h27gkz2hg485rnawdw069gxwgkwsjmfj5yag2kkgl7gxa3"; }; buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet; diff --git a/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix index 9515b6ce3d05..a8161ed30771 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.32.0"; + version = "1.33.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.15.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "06qhcycnr06fw5dmmzwizmknm0j34j43894nl3kxa5mxh8x542pa"; + sha256 = "0n3pj410bgjblv27p55piln0vi618mnyzzswcyfc2v73bfnzrydf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 652d4e58f678..dd57add14af9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,8 +33,6 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - # go > 1.10 - # [FATAL] [14:44:02+0000] Please install Go version go or use PERMISSIVE_GO=y to bypass this check. buildInputs = [ which rsync go-bindata kerberos clang ]; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix index 34945ea87a4e..ef0da8e6ff5b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,22 +4,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-acme"; - version = "1.1.0"; - sha256 = "1ha56pr5hixpz2nmqy5558ljkvcs4c23i0jnw4vqdv1a00hi035z"; + version = "1.1.1"; + sha256 = "0fva2kw82s94r4s4dpk38kcmssmcr71ia9jyg1rqmc00ifilfrzj"; }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.32.1"; - sha256 = "0gdx54iw6q3w5pkci7433rd5yrplv1f08svsl7r3a75pww16j103"; + version = "1.36.0"; + sha256 = "13rmlsnplcmcxjksm1wizgzlx47h5in5gmqhbm2n6k5ayx4x9ha2"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.1.0"; - sha256 = "1fsynv725cmqz819v9p4i4h4w4y77mbya5y9v81sqvacqvr3i05h"; + version = "1.2.0"; + sha256 = "1qargj90nl7r8a1fcsj10fnjirskvbn3gz0dsijqnr432jxs2cvh"; }; arukas = { @@ -39,22 +39,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "2.0.0"; - sha256 = "17hf59wavv44a8a2vy2smcs3sxnws30h81jxiimg91vh1rrhisrw"; + version = "2.3.0"; + sha256 = "0cim14q56xr7hm06d4sy205p4xp1x3kbddb4pw65ck671i55h7ln"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - version = "0.1.0"; - sha256 = "0jrsg3a9cb16jinzjhg2pfm65b1bfhdwnyhag1x3x4kffm3gm148"; + version = "0.2.0"; + sha256 = "01aiynw905gbn6dv23971yhwv0kfcbckcqp4f65sypn1l8szqyjg"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.22.1"; - sha256 = "0jg2vsfkk3z1gppcfwla5aqbn9vaxbl8px1hps7nhmylp06l9avv"; + version = "1.23.0"; + sha256 = "11v1832sxnigyiyy4i34mxwn7j18i6iwsff8sqabpa7v9a405ngp"; }; azurestack = { @@ -109,8 +109,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.11.0"; - sha256 = "14v4461bxxr5zdr11v1s89m1x9kpjxa1mff9inx2vwkdz9s02w0i"; + version = "1.12.0"; + sha256 = "1kq9mbs3if7w9jnsdkj104lvy532lwkd9wr4m0ilh7zql0vm9mpk"; }; cloudscale = { @@ -144,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.6.0"; - sha256 = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh"; + version = "1.7.0"; + sha256 = "0a7nvq2nhfv2jg6jc83jjg11yzzkiwyifdj5ni76nri82mbhb14q"; }; digitalocean = { @@ -179,8 +179,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "1.1.0"; - sha256 = "1ba9z9fd69hpg6kg30nf95zzskzipi74s1aadywc068gfrkdm9jj"; + version = "1.1.1"; + sha256 = "0bqwdx8hb7bym4hh01a0n1zrgb1081rvn0qawck712wz0jkzv1r3"; }; dyn = { @@ -193,8 +193,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-external"; - version = "1.0.0"; - sha256 = "1sh0m8d6wp76h1b89j820yl3caji0f0wlgq3pwa5nk99h73rlndn"; + version = "1.1.0"; + sha256 = "18gwwcspj31rid0r603z0688nzdwl2nl8wy6hrzw62bx5gy4bdrp"; }; fastly = { @@ -228,15 +228,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "2.1.0"; - sha256 = "1dcdk60xwqr9sazllzxai8g6ghk0pnrz4zwm5qf6m9d3l39y2gkr"; + version = "2.3.0"; + sha256 = "063z08qamy0yx376qh0pxd446kbnp6z1828x6nr7yzh4dw0rzc3s"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - version = "2.1.0"; - sha256 = "04lx43bb1kwd36a78l49knk8n6g5bh6p970yhniyypr28zrss1by"; + version = "2.3.0"; + sha256 = "120vq5bd092ykv6cc53w9208wfmf2hd8hflas282l4yg0b47gx83"; }; grafana = { @@ -249,22 +249,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.8.0"; - sha256 = "1gahka6012rq1p2wwvsbb1w353vm4aaifgb08a6s9la47ca7944s"; + version = "1.9.0"; + sha256 = "08ag1xwn6vj4w8kz37z8hsi8lkvfwkw5n8wjb5c03g9yva1j85yx"; }; hedvig = { owner = "terraform-providers"; repo = "terraform-provider-hedvig"; - version = "1.0.2"; - sha256 = "1zk93iv57f9b8qcr1byhpxjpf1mxpbsd94iyv5k5r2xzw53ccv7q"; + version = "1.0.3"; + sha256 = "0kqnbd78m4r97b5w7skkpcnhc0bqh2cky7q0inhdhsb7gvivz1b1"; }; helm = { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.8.0"; - sha256 = "1v30sr5dql2365bf63gcr0hqn85gk6lk9lzz1i3w0j232jw700bh"; + version = "0.9.0"; + sha256 = "1psqabifb1kabg268ca1x4l79z1xga1pr2sf8x9lrd7z856v18l9"; }; heroku = { @@ -284,8 +284,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - version = "1.3.0"; - sha256 = "1pm2zfss20spfwqidhn04hcq4nxxamjkn6xv8vxm3mgrky1ysvp5"; + version = "1.4.0"; + sha256 = "018b57cndl72vjlijwvjx64rxjgimcqq1f6dxdny3wj1j4i0h4fi"; }; icinga2 = { @@ -305,8 +305,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.3"; - sha256 = "1mdarb65v977680q55bis9ds84vx8vv84p7sgf0f0svfwq8z9r0k"; + version = "1.1.0"; + sha256 = "1mxvc3pwzgj7r79a5vz8n489xny12wa75zpppgh7948fy8m8b23f"; }; kubernetes = { @@ -333,8 +333,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-local"; - version = "1.1.0"; - sha256 = "1qxfyyg8k43rw0gny4dadamc2a9hk3x6ybdivifjc17m7il0janc"; + version = "1.2.0"; + sha256 = "1w63ar3cr4095kza400chmmdzdadb1d871pbd14pzghl63nyg4ig"; }; logentries = { @@ -375,8 +375,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - version = "1.4.0"; - sha256 = "09asrq9y0l49vq3cg96zmshdpgv7dgkvi2yda45cqz04bi6jvszz"; + version = "1.5.0"; + sha256 = "1if8i435v4nf18hdvwwz3nvlkaf8yjzcxi300blri2xfx95chsxw"; }; nomad = { @@ -389,8 +389,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - version = "1.1.2"; - sha256 = "0ayxw40yg0k64i3y4hsghzyv3q3bqr1y142y7mc2xwnvgvgzzg98"; + version = "1.2.0"; + sha256 = "0j9xghm84zjfgsmix1gdslr4pnhcf2xmb7n1851a3pmxd851fd9b"; }; nsxt = { @@ -417,8 +417,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.17.0-rc1"; - sha256 = "0c49i4fic0bqgpwg05q60a99w7a236kxyhdww5k4sk04cdg3aa1f"; + version = "3.20.0-rc1"; + sha256 = "07z4bl2fz8wvfjznrci6dxigx8ypi2r4w8xk9fv0bpjm0a6pp813"; }; oneandone = { @@ -445,8 +445,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.6.1"; - sha256 = "143sbfhc44bw21wa86lyd2m7vdihhnqs7grrdxpmw4w7bcx9sql2"; + version = "1.7.0"; + sha256 = "15p5xvl6ryj5silpd2yrmjjh0d4qf89v8x6zbq8x7j351a1fljak"; }; opsgenie = { @@ -459,8 +459,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.4.3"; - sha256 = "0lyz2fjs4hr28ymx1qlzp93r3w4qn74bglipgv5mf55k543dmwdz"; + version = "1.5.0"; + sha256 = "1vnaqzs7i2kn37sxf1sknxn6j1d24xlckqcvkh9xzi8jrmm4rgvr"; }; ovh = { @@ -473,8 +473,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.4.1"; - sha256 = "0wky3kw3vhb1bn7n7h03nbd6n7bz1xbmygs0ipnkgq4qyzydjrhh"; + version = "1.5.0"; + sha256 = "0c59f2q8ivdn47f4shy674794aijc7byb6273lfcdaal1gb0mw79"; }; pagerduty = { @@ -508,8 +508,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.4.2"; - sha256 = "0raz070sj5csyqn3gav1a5p5dsbrym9ba8nfw43hbnk5ixxr0izk"; + version = "1.4.3"; + sha256 = "19rqqx5ib23nhvz2smh20cii25g09sdi7kg85m4nlbh63gqg86qf"; }; rabbitmq = { @@ -529,8 +529,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "2.0.0"; - sha256 = "0plg139pbvqwbs5hcl7d5kjn7vwknjr4n0ysc2j5s25iyhikkv9s"; + version = "2.1.0"; + sha256 = "1219128f838szcjgjv6figrmh4r7lhxrr22mf9fpf5a30wi0ssqf"; }; rightscale = { @@ -557,15 +557,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.8.0"; - sha256 = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2"; + version = "1.9.2"; + sha256 = "0wjkjf4sc3rfxiz3lfw6cfhdn8a7pzmyfw1f2dsp3a6fpa2srbph"; }; selectel = { owner = "terraform-providers"; repo = "terraform-provider-selectel"; - version = "2.0.0"; - sha256 = "1yw1526llvqc3ibrmjffan2lvqas99x93h6rlz9lrgzylgxnqaxy"; + version = "2.1.0"; + sha256 = "078pyml9nwv7347yni1h7mjdp8sd4zyccv80mgjn8xh2q208fqpg"; }; skytap = { @@ -585,8 +585,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.8.0"; - sha256 = "1j6gab5vva21m01p5gh0x1p64jnx9ch2q3zd4f1s8ch9mba6zgsl"; + version = "1.9.0"; + sha256 = "0rpkxg50gkm9ji7s4bl1wz7j1z2iw5jq9n1pfmcs9nk0rl17j77j"; }; statuscake = { @@ -613,8 +613,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - version = "1.2.2"; - sha256 = "1ypsfm48c30szg3zc1sknblhwcnca8aapfgp62bhszyqxq6zq37s"; + version = "1.3.0"; + sha256 = "1pdzzrg4qrsjiv67yr2g6a9l1n9vqi5n4m53kbb1fp04g3s2sw31"; }; terraform = { @@ -627,8 +627,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.7.1"; - sha256 = "0iqr1r4fd14c9fyj4f21kmnlypxsdi1w787gdj2jr27acqkq3pqh"; + version = "0.8.1"; + sha256 = "0an0il8h0ly639z92cc007xjjs3cyk25jkbnkp99kkj0mf760729"; }; tls = { @@ -648,8 +648,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - version = "1.2.0"; - sha256 = "1pq0288lgj288xjs647n740fbpxgbly0hxy5kz9xr3lf7ld1cclq"; + version = "1.4.0"; + sha256 = "1nl6k2313wwdzpm2n29bab9xs3l00vyhrdl14r82kax6hjm748qm"; }; ultradns = { @@ -662,29 +662,29 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.5.0"; - sha256 = "1lny94555ws0nd2lp9zkbq6c1324h50izfk88941irl7apjmwzw5"; + version = "1.6.0"; + sha256 = "06hykz37yhwhj6fjz2zi5c80mzv8i91kpsr5cdqkc8rnfmcbhzqx"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - version = "2.0.0"; - sha256 = "1h4zcxbrg6j4xy3hw84f9mmnz535a91jgxvymnrjadgm91bn6g8s"; + version = "2.1.0"; + sha256 = "0azmjddysl38n58vk94zhm2g7s5aw71gvn83h4n7amf2j7p7ks9j"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.9.1"; - sha256 = "07pxzy8fw0n0kq9mf43bz4cycbwxp8vy0jbl44sknszmzbn4pam7"; + version = "1.10.0"; + sha256 = "039s95afqrcpf6jiprqsqnvlsnxbs5vcqrsgg6pbs52rlwp1ixgw"; }; yandex = { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - version = "0.1.15"; - sha256 = "03ynfzdlpl5z7lpq5yisqkzsk53lfz71ss30bfvx0q3qhv7514dy"; + version = "0.2.0"; + sha256 = "0y7pnl47dg83i7r95gy8h1ayilaji2k5i048l5pkavp1yxx9i22g"; }; matchbox = { @@ -714,4 +714,11 @@ version = "0.2.0"; sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; + ansible = + { + owner = "nbering"; + repo = "terraform-provider-ansible"; + version = "0.0.4"; + sha256 = "125a8vbpnahaxxrxj3mp0kj6ajssxnfb6l0spgnf118wg3bvlmw5"; + }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt index 3352fb79f1e7..c5d6fda16514 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -20,3 +20,6 @@ tweag/terraform-provider-secret # include terraform-provider-segment ajbosco/terraform-provider-segment + +# include terraform-provider-ansible +nbering/terraform-provider-ansible diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index bb29f234040f..fad4a1d06521 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.11"; - sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5"; + version = "0.11.13"; + sha256 = "014d2ibmbp5yc1802ckdcpwqbm5v70xmjdyh5nadn02dfynaylna"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix index fc6cc61787fa..f09f685ea739 100644 --- a/nixpkgs/pkgs/applications/networking/dropbox/cli.nix +++ b/nixpkgs/pkgs/applications/networking/dropbox/cli.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, fetchurl, python, dropbox }: let - version = "2018.11.28"; + version = "2019.02.14"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "0m1m9c7dfc8nawkcrg88955125sl1jz8mc9bf6wjay9za8014w58"; + sha256 = "09yg7q45sycl88l3wq0byz4a9k6sxx3m0r3szinvisfay9wlj35f"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index 7ed0e8e137fd..8b5f1ce3425c 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,18 +1,18 @@ -{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +{ stdenv, rustPlatform, fetchurl, fetchpatch, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { name = "newsboat-${version}"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "13bdwnwxa66c69lqhb02basff0aa6q1jhl7fgahcxmdy7snbmg37"; + sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s"; }; - cargoSha256 = "11s50qy1b833r2b5kr1wx9imi9h7s00c0hs36ricgbd0xw7n76hd"; + cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn"; - prePatch = '' + postPatch = '' substituteInPlace Makefile --replace "|| true" "" # Allow other ncurses versions on Darwin substituteInPlace config.sh \ diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index b8af1541809a..9afc61c3c0c4 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -1,4 +1,4 @@ -{ lib, python36 }: +{ lib, python3 }: # Flexget have been a trouble maker in the past, # if you see flexget breaking when updating packages, don't worry. @@ -6,7 +6,7 @@ # -- Mic92 let - python' = python36.override { inherit packageOverrides; }; + python' = python3.override { inherit packageOverrides; }; packageOverrides = self: super: { guessit = super.guessit.overridePythonAttrs (old: rec { @@ -24,16 +24,14 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.17.20"; + version = "2.20.17"; src = fetchPypi { inherit pname version; - sha256 = "a09ef9482ed54f7e96eb8b4d08c59687c5c43a3341c9d2675383693e6c3681c3"; + sha256 = "ed021d8d5c10555dad8dc1cb93c012e17b541fc25fc122b7ca76bb7e53fe82b3"; }; postPatch = '' - # build for the correct python version - substituteInPlace setup.cfg --replace $'[bdist_wheel]\npython-tag = py27' "" # remove dependency constraints sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt ''; @@ -47,12 +45,13 @@ buildPythonApplication rec { beautifulsoup4 html5lib PyRSS2Gen pynzb rpyc jinja2 requests dateutil jsonschema - pathpy guessit APScheduler + pathpy guessit rebulk APScheduler terminaltables colorclass cherrypy flask flask-restful flask-restplus flask-compress flask_login flask-cors pyparsing zxcvbn-python future + progressbar # Optional requirements deluge-client # Plugins diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 58335f1faad2..464722612c7d 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage, stdenv }: let - stableVersion = "2.1.14"; - previewVersion = "2.2.0a2"; + stableVersion = "2.1.15"; + previewVersion = "2.2.0a3"; 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 = "1k4g1sd9s6nc3rsc918chnkr515qik4hfd4z5lw065bp3lshf48b"; - serverSrcHash = "0npm9p52jk04g9cmflsfph4dkj6373mfyvd3hff1caqmjalnfxg4"; + guiSrcHash = "116wigkh5kwna00q200yv2wm8dpi4kmsns96iglzwrrl19fk538p"; + serverSrcHash = "1mqwydxn58v5ddpnsxvf6vgqwhrfm3mwjwf030lv83zmcjhx237q"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28"; + sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9"; + sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56"; }; } diff --git a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 47270cbcba8a..15e0b5a07b43 100644 --- a/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "0sjjlfndz8s78fl7vb8alz3nsksjrm4hbnnj11xa0i6k16v6pv1y"; + sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy"; }; nativeBuildInputs = [ dune ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index edcf154dc77a..aefde289db59 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.5.1"; + name = "bitlbee-3.6"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln"; + sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index 86fb3d7de2c1..e2e94db089da 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "coyim-${version}"; - version = "0.3.7_1"; + version = "0.3.11"; - goPackagePath = "github.com/twstrike/coyim"; + goPackagePath = "github.com/coyim/coyim"; src = fetchFromGitHub { - owner = "twstrike"; + owner = "coyim"; repo = "coyim"; - rev = "df2c52fe865d38fa27e8a7af1d87612e8c048805"; - sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; + rev = "v${version}"; + sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index c71db351e9d2..64443461e375 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -3,13 +3,13 @@ fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { name = "oysttyer-${version}"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "oysttyer"; repo = "oysttyer"; rev = "${version}"; - sha256 = "05bfak4jr8ln4847rkj5qkazqnjym65k1phav3yicbyr3mxywhjw"; + sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json new file mode 100644 index 000000000000..cb3c90923747 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -0,0 +1,15 @@ +{ + "name": "riot-web", + "productName": "Riot", + "main": "src/electron-main.js", + "version": "1.0.4", + "description": "A feature-rich client for Matrix.org", + "author": "New Vector Ltd.", + "dependencies": { + "auto-launch": "^5.0.1", + "electron-store": "^2.0.0", + "electron-window-state": "^4.1.0", + "minimist": "^1.2.0", + "png-to-ico": "^1.0.2" + } +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix new file mode 100644 index 000000000000..25cc694afcfd --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -0,0 +1,1148 @@ +{fetchurl, linkFarm}: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + + { + name = "node-9.6.45.tgz"; + path = fetchurl { + name = "node-9.6.45.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-9.6.45.tgz"; + sha1 = "a9e5cfd026a3abaaf17e3c0318a470da9f2f178e"; + }; + } + + { + name = "ajv-6.10.0.tgz"; + path = fetchurl { + name = "ajv-6.10.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz"; + sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1"; + }; + } + + { + name = "applescript-1.0.0.tgz"; + path = fetchurl { + name = "applescript-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz"; + sha1 = "bb87af568cad034a4e48c4bdaf6067a3a2701317"; + }; + } + + { + name = "asn1-0.2.4.tgz"; + path = fetchurl { + name = "asn1-0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + + { + name = "assert-plus-1.0.0.tgz"; + path = fetchurl { + name = "assert-plus-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + + { + name = "asynckit-0.4.0.tgz"; + path = fetchurl { + name = "asynckit-0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + + { + name = "auto-launch-5.0.5.tgz"; + path = fetchurl { + name = "auto-launch-5.0.5.tgz"; + url = "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz"; + sha1 = "d14bd002b1ef642f85e991a6195ff5300c8ad3c0"; + }; + } + + { + name = "aws-sign2-0.7.0.tgz"; + path = fetchurl { + name = "aws-sign2-0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + + { + name = "aws4-1.8.0.tgz"; + path = fetchurl { + name = "aws4-1.8.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; + sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + }; + } + + { + name = "bcrypt-pbkdf-1.0.2.tgz"; + path = fetchurl { + name = "bcrypt-pbkdf-1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + + { + name = "bignumber.js-2.4.0.tgz"; + path = fetchurl { + name = "bignumber.js-2.4.0.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz"; + sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; + }; + } + + { + name = "bmp-js-0.0.3.tgz"; + path = fetchurl { + name = "bmp-js-0.0.3.tgz"; + url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.0.3.tgz"; + sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; + }; + } + + { + name = "buffer-equal-0.0.1.tgz"; + path = fetchurl { + name = "buffer-equal-0.0.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; + sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; + }; + } + + { + name = "caseless-0.12.0.tgz"; + path = fetchurl { + name = "caseless-0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + + { + name = "combined-stream-1.0.7.tgz"; + path = fetchurl { + name = "combined-stream-1.0.7.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; + sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + }; + } + + { + name = "conf-2.2.0.tgz"; + path = fetchurl { + name = "conf-2.2.0.tgz"; + url = "https://registry.yarnpkg.com/conf/-/conf-2.2.0.tgz"; + sha1 = "ee282efafc1450b61e205372041ad7d866802d9a"; + }; + } + + { + name = "core-util-is-1.0.2.tgz"; + path = fetchurl { + name = "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 = "dashdash-1.14.1.tgz"; + path = fetchurl { + name = "dashdash-1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + + { + name = "deep-equal-1.0.1.tgz"; + path = fetchurl { + name = "deep-equal-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + } + + { + name = "define-properties-1.1.3.tgz"; + path = fetchurl { + name = "define-properties-1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + + { + name = "delayed-stream-1.0.0.tgz"; + path = fetchurl { + name = "delayed-stream-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + + { + name = "dom-walk-0.1.1.tgz"; + path = fetchurl { + name = "dom-walk-0.1.1.tgz"; + url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz"; + sha1 = "672226dc74c8f799ad35307df936aba11acd6018"; + }; + } + + { + name = "dot-prop-4.2.0.tgz"; + path = fetchurl { + name = "dot-prop-4.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + }; + } + + { + name = "ecc-jsbn-0.1.2.tgz"; + path = fetchurl { + name = "ecc-jsbn-0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + + { + name = "electron-store-2.0.0.tgz"; + path = fetchurl { + name = "electron-store-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron-store/-/electron-store-2.0.0.tgz"; + sha1 = "1035cca2a95409d1f54c7466606345852450d64a"; + }; + } + + { + name = "electron-window-state-4.1.1.tgz"; + path = fetchurl { + name = "electron-window-state-4.1.1.tgz"; + url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-4.1.1.tgz"; + sha1 = "6b34fdc31b38514dfec8b7c8f7b5d4addb67632d"; + }; + } + + { + name = "env-paths-1.0.0.tgz"; + path = fetchurl { + name = "env-paths-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz"; + sha1 = "4168133b42bb05c38a35b1ae4397c8298ab369e0"; + }; + } + + { + name = "es-abstract-1.13.0.tgz"; + path = fetchurl { + name = "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-1.2.0.tgz"; + path = fetchurl { + name = "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-3.3.1.tgz"; + path = fetchurl { + name = "es6-promise-3.3.1.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; + }; + } + + { + name = "exif-parser-0.1.12.tgz"; + path = fetchurl { + name = "exif-parser-0.1.12.tgz"; + url = "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz"; + sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; + }; + } + + { + name = "extend-3.0.2.tgz"; + path = fetchurl { + name = "extend-3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + + { + name = "extsprintf-1.3.0.tgz"; + path = fetchurl { + name = "extsprintf-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + + { + name = "extsprintf-1.4.0.tgz"; + path = fetchurl { + name = "extsprintf-1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + + { + name = "fast-deep-equal-2.0.1.tgz"; + path = fetchurl { + name = "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-json-stable-stringify-2.0.0.tgz"; + path = fetchurl { + name = "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 = "file-type-3.9.0.tgz"; + path = fetchurl { + name = "file-type-3.9.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"; + sha1 = "257a078384d1db8087bc449d107d52a52672b9e9"; + }; + } + + { + name = "find-up-2.1.0.tgz"; + path = fetchurl { + name = "find-up-2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + + { + name = "for-each-0.3.3.tgz"; + path = fetchurl { + name = "for-each-0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; + }; + } + + { + name = "forever-agent-0.6.1.tgz"; + path = fetchurl { + name = "forever-agent-0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + + { + name = "form-data-2.3.3.tgz"; + path = fetchurl { + name = "form-data-2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + + { + name = "function-bind-1.1.1.tgz"; + path = fetchurl { + name = "function-bind-1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + + { + name = "getpass-0.1.7.tgz"; + path = fetchurl { + name = "getpass-0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + + { + name = "global-4.3.2.tgz"; + path = fetchurl { + name = "global-4.3.2.tgz"; + url = "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz"; + sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; + }; + } + + { + name = "graceful-fs-4.1.15.tgz"; + path = fetchurl { + name = "graceful-fs-4.1.15.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + }; + } + + { + name = "har-schema-2.0.0.tgz"; + path = fetchurl { + name = "har-schema-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + + { + name = "har-validator-5.1.3.tgz"; + path = fetchurl { + name = "har-validator-5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + + { + name = "has-symbols-1.0.0.tgz"; + path = fetchurl { + name = "has-symbols-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + } + + { + name = "has-1.0.3.tgz"; + path = fetchurl { + name = "has-1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + + { + name = "http-signature-1.2.0.tgz"; + path = fetchurl { + name = "http-signature-1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + + { + name = "imurmurhash-0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash-0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + + { + name = "ip-regex-1.0.3.tgz"; + path = fetchurl { + name = "ip-regex-1.0.3.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz"; + sha1 = "dc589076f659f419c222039a33316f1c7387effd"; + }; + } + + { + name = "is-callable-1.1.4.tgz"; + path = fetchurl { + name = "is-callable-1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; + sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + }; + } + + { + name = "is-date-object-1.0.1.tgz"; + path = fetchurl { + name = "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-function-1.0.1.tgz"; + path = fetchurl { + name = "is-function-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz"; + sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + }; + } + + { + name = "is-obj-1.0.1.tgz"; + path = fetchurl { + name = "is-obj-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + } + + { + name = "is-regex-1.0.4.tgz"; + path = fetchurl { + name = "is-regex-1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + } + + { + name = "is-symbol-1.0.2.tgz"; + path = fetchurl { + name = "is-symbol-1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; + sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + }; + } + + { + name = "is-typedarray-1.0.0.tgz"; + path = fetchurl { + name = "is-typedarray-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + + { + name = "isstream-0.1.2.tgz"; + path = fetchurl { + name = "isstream-0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + + { + name = "jimp-0.2.28.tgz"; + path = fetchurl { + name = "jimp-0.2.28.tgz"; + url = "https://registry.yarnpkg.com/jimp/-/jimp-0.2.28.tgz"; + sha1 = "dd529a937190f42957a7937d1acc3a7762996ea2"; + }; + } + + { + name = "jpeg-js-0.2.0.tgz"; + path = fetchurl { + name = "jpeg-js-0.2.0.tgz"; + url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.2.0.tgz"; + sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; + }; + } + + { + name = "jsbn-0.1.1.tgz"; + path = fetchurl { + name = "jsbn-0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + + { + name = "json-schema-traverse-0.4.1.tgz"; + path = fetchurl { + name = "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-0.2.3.tgz"; + path = fetchurl { + name = "json-schema-0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + + { + name = "json-stringify-safe-5.0.1.tgz"; + path = fetchurl { + name = "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 = "jsonfile-2.4.0.tgz"; + path = fetchurl { + name = "jsonfile-2.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + } + + { + name = "jsprim-1.4.1.tgz"; + path = fetchurl { + name = "jsprim-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + + { + name = "load-bmfont-1.4.0.tgz"; + path = fetchurl { + name = "load-bmfont-1.4.0.tgz"; + url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.0.tgz"; + sha1 = "75f17070b14a8c785fe7f5bee2e6fd4f98093b6b"; + }; + } + + { + name = "locate-path-2.0.0.tgz"; + path = fetchurl { + name = "locate-path-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + + { + name = "make-dir-1.3.0.tgz"; + path = fetchurl { + name = "make-dir-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; + sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; + }; + } + + { + name = "mime-db-1.38.0.tgz"; + path = fetchurl { + name = "mime-db-1.38.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz"; + sha1 = "1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"; + }; + } + + { + name = "mime-types-2.1.22.tgz"; + path = fetchurl { + name = "mime-types-2.1.22.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz"; + sha1 = "fe6b355a190926ab7698c9a0556a11199b2199bd"; + }; + } + + { + name = "mime-1.6.0.tgz"; + path = fetchurl { + name = "mime-1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + + { + name = "min-document-2.19.0.tgz"; + path = fetchurl { + name = "min-document-2.19.0.tgz"; + url = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + } + + { + name = "minimist-0.0.8.tgz"; + path = fetchurl { + name = "minimist-0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + + { + name = "minimist-1.2.0.tgz"; + path = fetchurl { + name = "minimist-1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + + { + name = "mkdirp-0.5.1.tgz"; + path = fetchurl { + name = "mkdirp-0.5.1.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + + { + name = "oauth-sign-0.9.0.tgz"; + path = fetchurl { + name = "oauth-sign-0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + + { + name = "object-keys-1.1.0.tgz"; + path = fetchurl { + name = "object-keys-1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz"; + sha1 = "11bd22348dd2e096a045ab06f6c85bcc340fa032"; + }; + } + + { + name = "p-limit-1.3.0.tgz"; + path = fetchurl { + name = "p-limit-1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + + { + name = "p-locate-2.0.0.tgz"; + path = fetchurl { + name = "p-locate-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + + { + name = "p-try-1.0.0.tgz"; + path = fetchurl { + name = "p-try-1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + + { + name = "parse-bmfont-ascii-1.0.6.tgz"; + path = fetchurl { + name = "parse-bmfont-ascii-1.0.6.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; + sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; + }; + } + + { + name = "parse-bmfont-binary-1.0.6.tgz"; + path = fetchurl { + name = "parse-bmfont-binary-1.0.6.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; + sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; + }; + } + + { + name = "parse-bmfont-xml-1.1.4.tgz"; + path = fetchurl { + name = "parse-bmfont-xml-1.1.4.tgz"; + url = "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; + sha1 = "015319797e3e12f9e739c4d513872cd2fa35f389"; + }; + } + + { + name = "parse-headers-2.0.2.tgz"; + path = fetchurl { + name = "parse-headers-2.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz"; + sha1 = "9545e8a4c1ae5eaea7d24992bca890281ed26e34"; + }; + } + + { + name = "path-exists-3.0.0.tgz"; + path = fetchurl { + name = "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-1.0.1.tgz"; + path = fetchurl { + name = "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 = "performance-now-2.1.0.tgz"; + path = fetchurl { + name = "performance-now-2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + + { + name = "phin-2.9.3.tgz"; + path = fetchurl { + name = "phin-2.9.3.tgz"; + url = "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz"; + sha1 = "f9b6ac10a035636fb65dfc576aaaa17b8743125c"; + }; + } + + { + name = "pify-3.0.0.tgz"; + path = fetchurl { + name = "pify-3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + + { + name = "pixelmatch-4.0.2.tgz"; + path = fetchurl { + name = "pixelmatch-4.0.2.tgz"; + url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; + sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; + }; + } + + { + name = "pkg-up-2.0.0.tgz"; + path = fetchurl { + name = "pkg-up-2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } + + { + name = "png-to-ico-1.0.7.tgz"; + path = fetchurl { + name = "png-to-ico-1.0.7.tgz"; + url = "https://registry.yarnpkg.com/png-to-ico/-/png-to-ico-1.0.7.tgz"; + sha1 = "9346b5f4d6fd7e94cb08fd49eeb585f501c3e5f2"; + }; + } + + { + name = "pngjs-3.4.0.tgz"; + path = fetchurl { + name = "pngjs-3.4.0.tgz"; + url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz"; + sha1 = "99ca7d725965fb655814eaf65f38f12bbdbf555f"; + }; + } + + { + name = "process-0.5.2.tgz"; + path = fetchurl { + name = "process-0.5.2.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz"; + sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf"; + }; + } + + { + name = "psl-1.1.31.tgz"; + path = fetchurl { + name = "psl-1.1.31.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz"; + sha1 = "e9aa86d0101b5b105cbe93ac6b784cd547276184"; + }; + } + + { + name = "punycode-1.4.1.tgz"; + path = fetchurl { + name = "punycode-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + + { + name = "punycode-2.1.1.tgz"; + path = fetchurl { + name = "punycode-2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + + { + name = "qs-6.5.2.tgz"; + path = fetchurl { + name = "qs-6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + + { + name = "read-chunk-1.0.1.tgz"; + path = fetchurl { + name = "read-chunk-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-chunk/-/read-chunk-1.0.1.tgz"; + sha1 = "5f68cab307e663f19993527d9b589cace4661194"; + }; + } + + { + name = "request-2.88.0.tgz"; + path = fetchurl { + name = "request-2.88.0.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; + sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + }; + } + + { + name = "safe-buffer-5.1.2.tgz"; + path = fetchurl { + name = "safe-buffer-5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + + { + name = "safer-buffer-2.1.2.tgz"; + path = fetchurl { + name = "safer-buffer-2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + + { + name = "sax-1.2.4.tgz"; + path = fetchurl { + name = "sax-1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + + { + name = "signal-exit-3.0.2.tgz"; + path = fetchurl { + name = "signal-exit-3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + + { + name = "sshpk-1.16.1.tgz"; + path = fetchurl { + name = "sshpk-1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + + { + name = "stream-to-buffer-0.1.0.tgz"; + path = fetchurl { + name = "stream-to-buffer-0.1.0.tgz"; + url = "https://registry.yarnpkg.com/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"; + sha1 = "26799d903ab2025c9bd550ac47171b00f8dd80a9"; + }; + } + + { + name = "stream-to-0.2.2.tgz"; + path = fetchurl { + name = "stream-to-0.2.2.tgz"; + url = "https://registry.yarnpkg.com/stream-to/-/stream-to-0.2.2.tgz"; + sha1 = "84306098d85fdb990b9fa300b1b3ccf55e8ef01d"; + }; + } + + { + name = "string.prototype.trim-1.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trim-1.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; + sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + }; + } + + { + name = "tinycolor2-1.4.1.tgz"; + path = fetchurl { + name = "tinycolor2-1.4.1.tgz"; + url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz"; + sha1 = "f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"; + }; + } + + { + name = "tough-cookie-2.4.3.tgz"; + path = fetchurl { + name = "tough-cookie-2.4.3.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + }; + } + + { + name = "tunnel-agent-0.6.0.tgz"; + path = fetchurl { + name = "tunnel-agent-0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + + { + name = "tweetnacl-0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl-0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + + { + name = "untildify-3.0.3.tgz"; + path = fetchurl { + name = "untildify-3.0.3.tgz"; + url = "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz"; + sha1 = "1e7b42b140bcfd922b22e70ca1265bfe3634c7c9"; + }; + } + + { + name = "uri-js-4.2.2.tgz"; + path = fetchurl { + name = "uri-js-4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + + { + name = "url-regex-3.2.0.tgz"; + path = fetchurl { + name = "url-regex-3.2.0.tgz"; + url = "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz"; + sha1 = "dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"; + }; + } + + { + name = "uuid-3.3.2.tgz"; + path = fetchurl { + name = "uuid-3.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; + sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; + }; + } + + { + name = "verror-1.10.0.tgz"; + path = fetchurl { + name = "verror-1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + + { + name = "winreg-1.2.4.tgz"; + path = fetchurl { + name = "winreg-1.2.4.tgz"; + url = "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz"; + sha1 = "ba065629b7a925130e15779108cf540990e98d1b"; + }; + } + + { + name = "write-file-atomic-2.4.2.tgz"; + path = fetchurl { + name = "write-file-atomic-2.4.2.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz"; + sha1 = "a7181706dfba17855d221140a9c06e15fcdd87b9"; + }; + } + + { + name = "xhr-2.5.0.tgz"; + path = fetchurl { + name = "xhr-2.5.0.tgz"; + url = "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz"; + sha1 = "bed8d1676d5ca36108667692b74b316c496e49dd"; + }; + } + + { + name = "xml-parse-from-string-1.0.1.tgz"; + path = fetchurl { + name = "xml-parse-from-string-1.0.1.tgz"; + url = "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; + sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; + }; + } + + { + name = "xml2js-0.4.19.tgz"; + path = fetchurl { + name = "xml2js-0.4.19.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; + sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; + }; + } + + { + name = "xmlbuilder-9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder-9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } + + { + name = "xtend-4.0.1.tgz"; + path = fetchurl { + name = "xtend-4.0.1.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + } + ]; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix new file mode 100644 index 000000000000..03f1cc2471e9 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchFromGitHub, yarn2nix, makeWrapper, makeDesktopItem, electron, riot-web }: + +let + executableName = "riot-desktop"; + version = "1.0.4"; + riot-web-src = fetchFromGitHub { + owner = "vector-im"; + repo = "riot-web"; + rev = "v${version}"; + sha256 = "152mi81miams5a7l9rd12bnf6wkd1r0lyicgr35r5fq0p6z7a4dk"; + }; + +in yarn2nix.mkYarnPackage rec { + name = "riot-desktop-${version}"; + inherit version; + + src = "${riot-web-src}/electron_app"; + + # The package manifest should be copied on each update of this package. + # > cp ${riot-web-src}/electron_app/package.json riot-desktop-package.json + packageJSON = ./riot-desktop-package.json; + + # The dependency expression can be regenerated using nixos.yarn2nix with the following command: + # > yarn2nix --lockfile=${riot-web-src}/electron_app/yarn.lock > riot-desktop-yarndeps.nix + yarnNix = ./riot-desktop-yarndeps.nix; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + # resources + mkdir -p "$out/share/riot" + ln -s '${riot-web}' "$out/share/riot/webapp" + cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" + cp -r '.' "$out/share/riot/electron" + + # icons + for icon in $out/share/riot/electron/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/riot.png" + done + + # desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + + # executable wrapper + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + --add-flags "$out/share/riot/electron" + ''; + + # The desktop item properties should be kept in sync with data from upstream: + # * productName and description from + # https://github.com/vector-im/riot-web/blob/develop/electron_app/package.json + # * category and StartupWMClass from the build.linux section of + # https://github.com/vector-im/riot-web/blob/develop/package.json + desktopItem = makeDesktopItem { + inherit name; + exec = executableName; + icon = "riot"; + desktopName = "Riot"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass="riot" + ''; + }; + + meta = with stdenv.lib; { + description = "A feature-rich client for Matrix.org"; + homepage = https://about.riot.im/; + license = licenses.asl20; + maintainers = with maintainers; [ pacien ]; + inherit (electron.meta) platforms; + }; +} + diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2201efdc028a..7ce41d9e27e4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1gwz47wi9g9g9zzf46ry3q9s855rvlcjlg3dsxr1xdvz4arci195"; + sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 51561fa2233b..116e4917354e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,7 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, udev, libnotify +, cups, expat, udev, libnotify, libuuid # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -37,6 +37,7 @@ let gtk3 pango libnotify + libuuid libX11 libXScrnSaver libXcomposite @@ -56,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.22.0"; + version = "1.23.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1j5kh0fvbl3nnxdpnwvamrnxfwbp6nzbij39b2lc5wp1m1yaaky5"; + sha256 = "0nl8rv0lgp4cwv029kl7y09ngcrik2657m4wjn0rnls8kpmdhd8j"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index f510e0e783ec..883258f71b1d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3 -, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }: +, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg +, at-spi2-atk }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.34.0.78"; + version = "8.42.76.54"; rpath = stdenv.lib.makeLibraryPath [ alsaLib atk + at-spi2-atk cairo cups curl @@ -56,7 +58,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1986nvdw1cpj06rq76hjsif0j4z5g2k01v73r4c4n43q7dgzl5z0"; + sha256 = "1r2wkaa4ss6b8289db3p012nlhvljbx57hp7jc9n0mp19yphd07l"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index ece9c1089fad..76880c92c133 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -5,7 +5,7 @@ let - version = "3.3.7"; + version = "3.3.8"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -48,7 +48,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1q3866iaby8rqim8h2m398wzi0isnnlsxirlq63fzz7a4g1hnc8p"; + sha256 = "02435zvpyr95fljx3xgqz0b0npim1j0611p4rc1azwgdf8hjn11p"; } else throw "Slack is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 4019ace542da..a37377835f5f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.6.0"; - sha256Hash = "0cspz2kbibrb19l0wbad2dbr0c9ibz153vgd4s45byqn3b5v6h6p"; + version = "1.6.3"; + sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "429149"; archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index cffe74a0e806..24529d83e04c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages }: +{ stdenv, fetchpatch, python36Packages }: with stdenv.lib; @@ -19,6 +19,13 @@ buildPythonPackage rec { checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; + patches = [ + (fetchpatch { + url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; + sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3"; + }) + ]; + checkPhase = '' TMP_TURSES=`echo turses-$RANDOM` mkdir $TMP_TURSES @@ -26,7 +33,7 @@ buildPythonPackage rec { rm -rf $TMP_TURSES ''; - patchPhase = '' + postPatch = '' sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py @@ -35,7 +42,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alejandrogomez/turses; + homepage = https://github.com/louipc/turses; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 93bde0b05c9e..3b75533e0e5c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -4,7 +4,9 @@ , libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev , xdg_utils, hunspell, pulseaudio, pciutils, at-spi2-atk }: + let + rpath = stdenv.lib.makeLibraryPath [ alsaLib atk @@ -43,69 +45,59 @@ let xorg.libxcb ]; - version = "3.6.2885"; - - plat = { - "i686-linux" = "i386"; - "x86_64-linux" = "amd64"; - }.${stdenv.hostPlatform.system}; - - sha256 = { - "i686-linux" = "1lj2gjv69z94dj7b4zjhls420fs5zzxkdlwv25p2gp4lkv0v6l98"; - "x86_64-linux" = "1dl88fpy8v3aprzdp1nnwg08sy7yiljqjnpnl3rw0h5nix6xmv9v"; - }.${stdenv.hostPlatform.system}; - in - stdenv.mkDerivation rec { - name = "wire-desktop-${version}"; - src = fetchurl { - url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_${plat}.deb"; - inherit sha256; - }; +stdenv.mkDerivation rec { + pname = "wire-desktop"; + version = "3.7.2891"; + + src = fetchurl { + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; + sha256 = "0x4nx1rpr9wai0h3n14h1r0f0lj5m29a3pkx1w6mfz5la74iczqc"; + }; - desktopItem = makeDesktopItem { - name = "wire-desktop"; - exec = "wire-desktop %U"; - icon = "wire-desktop"; - comment = "Secure messenger for everyone"; - desktopName = "Wire Desktop"; - genericName = "Secure messenger"; - categories = "Network;InstantMessaging;Chat;VideoConference"; - }; + desktopItem = makeDesktopItem { + name = "wire-desktop"; + exec = "wire-desktop %U"; + icon = "wire-desktop"; + comment = "Secure messenger for everyone"; + desktopName = "Wire Desktop"; + genericName = "Secure messenger"; + categories = "Network;InstantMessaging;Chat;VideoConference"; + }; - dontBuild = true; - dontPatchELF = true; - dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontConfigure = true; - nativeBuildInputs = [ dpkg ]; - unpackPhase = "dpkg-deb -x $src ."; - installPhase = '' - mkdir -p "$out" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" + nativeBuildInputs = [ dpkg ]; + unpackPhase = "dpkg-deb -x $src ."; + installPhase = '' + mkdir -p "$out" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + chmod -R g-w "$out" - # Patch wire-desktop - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/opt/Wire" \ - "$out/opt/Wire/wire-desktop" + # Patch wire-desktop + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}:$out/opt/Wire" \ + "$out/opt/Wire/wire-desktop" - # Symlink to bin - mkdir -p "$out/bin" - ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop" + # Symlink to bin + mkdir -p "$out/bin" + ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop" - # Desktop file - mkdir -p "$out/share/applications" - cp "${desktopItem}/share/applications/"* "$out/share/applications" - ''; + # Desktop file + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; - meta = with stdenv.lib; { - description = "A modern, secure messenger"; - homepage = https://wire.com/; - license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; - } + meta = with stdenv.lib; { + description = "A modern, secure messenger"; + homepage = https://wire.com/; + license = licenses.gpl3; + maintainers = with maintainers; [ worldofpeace ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 7802a898d4c7..8aa599c09c40 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl }: stdenv.mkDerivation rec { - version = "1.1.2"; + version = "1.2.0"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "0jbhd4aad3bn61svnb2rwa4dwj8qyrb2dmzribi2hfn1f719wzfv"; + sha256 = "1sp3fc5fkdx0mmllvag94xaifnqbj1k09nl235pix26vv1gzq39m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 9769a5e8ca69..b34fde7b7c1b 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,585 +1,585 @@ { - version = "60.5.2"; + version = "60.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ar/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ar/thunderbird-60.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ebb79e23a3f67c6d365c95d4570d5d278731231839cf4ba8ae2231aa68eb28ef08165bf025798d5311f5fd28a66dc90a1fe52ec52e4e1eb21084c1d613c3c3e5"; + sha512 = "ba14ed80e0b18cc3b40a1bf1810eb67a246f6e995d527e625432eb24dce46bde85dd0dbcac5590d74b8bbb7be900f266b72055349f9b0ea6839fb8d5779aa54d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ast/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ast/thunderbird-60.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d3eb72f40f5fedc2e3c6f3b3472a8d90d74e1c6599e6dded49f20c1b3e99efcdd724c09645354d0ee531b2bb9f5750742c6c97f5323b23803b59a0f93f2fe98c"; + sha512 = "b6ab87d344c3e806a2316022a6c8632dcd9548c745766e136ca9aa70f54fe744587849372fc7426173a91996ff4709aee85f8e5de2565add3bbac58d370e7a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/be/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/be/thunderbird-60.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "b895b42343a9abc291b0cbaca4d1a190d7472f9206b3161cfa93d97489846682be44c923e92b27fb7e84e3dcda9d727ff8130eea731bdfd28273a691a38b3f00"; + sha512 = "2d5f88efb2f6e3be552cb503bfe184a3ad6b395da3139c6c97585f490d9a02c5ce391c0f6b3b1be0505b63f0b8af70da9eca8820b5baefc3dc043a60abb47d5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/bg/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/bg/thunderbird-60.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ba2b1c0666466d89ff01dba6fae809b7515d026b3d34de4f27c0bc6230f722739822da1d65f4a9c1ada66ecdff8b50f8aa6164c4ff0bb3d8a1c11c355e441cbe"; + sha512 = "16b7b8d54e200b9156a346a0e4b80cb5c91a0297222a3f4a227770344d6453fea679d7c8a512eb9d879abe262ce34c2dab654cbe60aab13d0cc7919757dcae8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/br/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/br/thunderbird-60.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "79937d514822bcf5f2882c4f71e277d6450adce04cd490001bf2535850689ff8691a715030132c805b85406d3aac0d4bbdc78c7f77398db43e1fedeaea2ebd81"; + sha512 = "d20854f75f09f95489a1d647bbdeed9062a553dcede68f48672d0a0a82001e283a7d24162a6110ce3efa1a1bdd846ca7fe036c37a20f63bf8dcd54d80a767084"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ca/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ca/thunderbird-60.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "f1948d481fff6cad4ab0ba48c40c3e317c3cd9a68972d7c94fd4d92fabcc0becc8bebaf4e5517016af26125334695fc6b7be17ccf26fd291cd5a679e95b632b7"; + sha512 = "8477742f367c2e4206ba61afcef372d39163aeba5e781ea9a089b0d3cf9ef44be8ce6bd3417490616a51aff3152a52eb3599b2acf66e0186e696c9df29b9732b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cs/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cs/thunderbird-60.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9210fda93564133c67db5f6a10783a65e34fe0a2e8dbdb7f30fda60b4b839525530081376dc88482bbe5aff37580f0d837010e21d076994520e36a7c6ea27721"; + sha512 = "b434e8763a93df511dcc9c032d11c0a26c7583f7ce01980be63ea453f8d503e703cddca5e5a67db619cb1b9690d0256c91eec8166fff30733186e429d3c513a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/cy/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/cy/thunderbird-60.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "29c35ffd5e33627ee4f3c9574b1dbe4e8addac509afbd4186f5e47284071711dc0bf74e550aa0896f39fb4fbefc72a8475b665685121fddbbbd870d020e5913d"; + sha512 = "71a6a2642dfce4505ed3b6b551ffdd5c469f1261191b73d3bd09bdf98788297536b3b94dd52327d263d4b1256080ff0317d8e10e09b53871ab805b426892e9a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/da/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/da/thunderbird-60.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e64c03f083325750020f5502ae4bdbd3b6e20a0fb9cd1163c87c2b7baabbd576dffb06b24d79c76a81d40744e6dc4064dff6d316d8e2a216a4a4e9e546f11aed"; + sha512 = "e24c19e5caafd4b4c5081acf700fb175e07c1702da0af111122cf793e4791d38c49902e1b9574ab9606482c539677e6caad2b9f8f655ac0fb24f1b0c8454c456"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/de/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/de/thunderbird-60.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d2727f56906e742c77365655422f0e53ca822702c13b496181889dc778502f922900c76178259797300dd3a440128103e7e6f48be1316a85f41edccb7a9c291f"; + sha512 = "e9ec916a00bfd50745c95ed42976eeb0b9cc314165b6401e24e1433a68fa5591c3020397a0c35566072784e423b42132d4e55dc307a47d34c693d5fe9e3e6380"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/dsb/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/dsb/thunderbird-60.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "19eb975d0c97168e0106baec96ca8a645bf42f7f5993e11f0e4e2c6bd797808a98b70cc643872e3f03c8f8fa644cfb46210bbcd96d91a5f5f8bb4443f49befdf"; + sha512 = "4fd72e0ba6982c0aeba4911a626aa7dea2d6678502aec9523efb5e89b613b20b471d50a2667df000541279ff961fc3323ebaa16d3482c2bebcaa33ec849a05d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/el/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/el/thunderbird-60.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "10cdb6888830d88bde779d402140dcfcc68c5d6d1fe77a8a0014bd230314af28b5a04a93f36a15e32d6cedbc6c06f9cedd447d1ef120bf0e332b71e8bd67930b"; + sha512 = "bd86c6855ce42bf52ca6822e6fd3cfd7e09c9fd2577407c666b46d84afcf43655f30dc0e3546ae41b84eb5ca7e681072fae90a08de9dd017c3594dea4e5b9bb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-GB/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-GB/thunderbird-60.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "09c8fb67e8d8c914be78d7af15e9cfc292fba45d87a8e95c83c38ee271c9004155a8d2826aaa880716e997ef4e6edeeab32b447b673c1ec6684d796d53e872f4"; + sha512 = "47009db4f18cad43a9d4ba20a4edbfbb07cc5222cb65121dfe45eb3c9120fd18277d5601309f9f3f21eebe10fd70201a9d15815fd35ef6f9d3f95360d939a0ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/en-US/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/en-US/thunderbird-60.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "89efb313ef9246590e38bec044682c0a472741be3dcb7addb982ae09072d0f63652e4bda632d76f0340417b7a4bbed4631e009300d896c0e06af7626ef2fe526"; + sha512 = "86bfb05041e347430c424652f8fcb102aa44c0bb68bf1b7a55ce888fcefa2ac08f55bb4bcbe7a558aaf3214ae694b97a6805f14de2ce575968fa2a1988e281ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-AR/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-AR/thunderbird-60.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "df915675422bd60d59f1e427c8a7fd68c20b3feb70e7a15a3d280ef3c98a40edae7663a266e5df3fb1045f63c480584a862dbe9c20bb4a208bc2baec2ab9255d"; + sha512 = "87a5caeb7d8f8846c52b9a7344260e480efce156239559a890bf5e167939cd35e2223ef4ad2429b196a87ca164b02eb7df3dd03ed1f52f95bf30d75afec40fd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/es-ES/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/es-ES/thunderbird-60.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "449e0e5d02bbad21569a45b61d16f5a8ccee853b1e6716b24e66744f1e6688bdd9adf240e06b2e40b71306759795bda150d8fff201c2b91466df06a66f55e484"; + sha512 = "ec6a17263d696b2fa4195349fd3badaf7ac7dbdf93ee7247a77d27aa13daf5de06db8c2df3449b06e6d28fc032e9c4eeb897be8b1a798e9fb7b68f3c8509d6d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/et/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/et/thunderbird-60.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "09f0e6dcbc99e9d39f253225db3d6f370414c3120b5ef0fcb3258ea3779117f4f41c6481aedda00ec7006993c3b05e14b0aaaf7b9a805046717ba29054803a70"; + sha512 = "d4591fdc97c5c1654f59116670e8516c12b53311e6f76f13711c04c86cfbf4cbd893a2f5f657b27fc44ad9919e3c0b5192ae98b26281ef4df6863fc522d50a7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/eu/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/eu/thunderbird-60.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "fd2097d6fbee4ccaa85744af1676b7ab8097315d9f52dbe0b60d2e620d1bcd052f9eabb9eff5791654a5b87a8d4e6b170318ef8dd68d666d4861c5bede1fc879"; + sha512 = "316b4d9d515b23476d29c0136c9981d281f7a3628aacd18f912640a2b6e1d5b53d66d42e9300af6b2cb78e4ada7458d0002c3d4a5ac7f5129db3dd66f4358341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fi/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fi/thunderbird-60.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "2c7ac9136d7d44f8870f5b5555f21405ddf6f243cbd346c985f71ca12bebc05c81a25ccc7050919704d9101643accc50c3fa8a5c6f93a6f97c96e91adcc07833"; + sha512 = "944742e4331c7ccbc27d887d9d5702ced9807d743d57e8a14b18f4dd6b2148ed24b295eb498c09d1d54f2f1110abfd9e2acbad83a882189d0d7e5403dbe650b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fr/thunderbird-60.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "303dc437b230d5991c4ca33afdec531c2c5b2b67d02b4f9ee923c2b4ec434d0765a8fd670cc2978226eb7a25982ddb4a14f91c0829aa97d822f7927421313170"; + sha512 = "1dfeaeb5e6985ebd820188721377589ebf4b993337a4231f6d036ae05173e8fb33c17bae76a3982e34a98da934d584d0efec4e01d6045b24345ea66299ecfe19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/fy-NL/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/fy-NL/thunderbird-60.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "040d1112d135ff81aaf86964eafd235f6d9cb793049e5cbb68d9d183555eb2b08af257046de373a1bdc76e0113e372369cc1c0ba26381204cc089f2a7c752977"; + sha512 = "6e61fc74b45e75170157806c8f358b5236e5de79e1d07db4f7834bebf2b9822d90377334ec1f2cf44a838c52c7135711b5a7036a0336813fe79c7dc3aa43e25e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ga-IE/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ga-IE/thunderbird-60.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "aa9eaaabbae45d554a31a5ec9940f7dad5c1ad46d34438f6cbdce5573a12d019c014bb4e9013e3efd73b68ffc699b5bda8721901b78af83dc370c71d588ca1db"; + sha512 = "7de19973a7e9770cfdd9ff944e9bea8e6755a81e2fd41ce27ff0d16bfe948534294c18f2f7ca05092aa574bea6fadd5a90bb08ca6472c27e7b0cdc6c15d25341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gd/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gd/thunderbird-60.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "479601e5d4b346d9c69daf2673b12a8e74e5f4ee924b0deaea7a6ff56c92ff5aa3ada825ebd75bbcf6e115455e032e50d1e7cfefe51f9bd059d499a023b514eb"; + sha512 = "1d5309b6eb47b16b49142ba18de96b285fc0f91a7eb3be5cac576683da37143c1e91318dff4f039119668679acf3c2643bdde9a26788f0bb240cebaa5f907389"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/gl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/gl/thunderbird-60.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "fc6b5c061bf402f46c255befe2ce6a752d2ede4af5ba303e1e88ce935553ff4bc3defa5a4b54a10a8b6a3888044300f9472e0390ce71e43b256be0e549a61f60"; + sha512 = "ecb09d7d8e6b5705d4c71d306a1556a74f78617520e59f041e3b63a0116f0472717c5f3bb055fda3c5c9fd72b198d997704292f64bc60349ec29efe057c46d52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/he/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/he/thunderbird-60.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f942b69831af29e4024c3b5250e6eee3cd5cc19863f960bc477f90e75e55bce7098fba1155452d67dc2f5a957c1fdcef049a0b4e0cd8867b540d34b6c17ac6c0"; + sha512 = "7ced9d95c40376ee1334e5c5cb2bb9fd6e5cefcc26dc134fb5ef71bc20b6476b263ee742d3e0634517ca399c61c776bd7347b58c2c9bd0c395949756d1d0f5af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hr/thunderbird-60.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "dd0cd07f20e8b28581ce34c3481a8aebad31099392151b5cfb5503b3cfbb6b69a595a4c58702a4f359d860f325cf1feb73ac13456f743410e63b2471587e45c0"; + sha512 = "c9cb6cd5b3d7f1091f55b74af73825d2d0e8b763ffc102a1d49e58b2ac9e6fe2fdd81c1bcf7effd53d86c1ba8f662e3ae0b413ef80bafcb6e2ae64d34c7f3311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hsb/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hsb/thunderbird-60.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7a18f221a0d41fc52a4efa63ad85bc41e3d7789f8e5d82ff60f2163ec4e9a0da420f795a2be4e4d05c35589cf26460b01f660d03b83039cd46684fde3f980668"; + sha512 = "e4f8092eb72e8311459a9232dc55342c2ff61b232d0b3a1be04acde78d7c06f14108f68378de200cadbe58125cddf46fddd421f76ac0d046e1a796fc5277278e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hu/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hu/thunderbird-60.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9a8206e613c8989f1288936853070b0e719294aabbd2454ceff0ea8f2fca36ead7aa51a0b7b1134b4d75854d77f64cc809d4a12e6e2216e30f7d67ff41c8db6e"; + sha512 = "ba1ca73de9b3b0137e38c10bbf29cd28310a7e2e58804de75247da098401f4b609d414e55a25b9646c16dae353db9d6fd193e437e42b7659d66f0ec9117e8629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/hy-AM/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/hy-AM/thunderbird-60.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1166b2380d09ae62dbe73713e9ae978f613997326cfac04b7c30abe94e51637a5ac4ac23be75d2cbdcdc60e1997b58bd8c07c35e13987be89b439cae4edc04ef"; + sha512 = "d5fbb20b9a75be427f1fb2a3c3674397b04793469dc3f493ec9bbf631e83a52573700540832cfe7faf71c16908ee0bc7bcd84b3cbd6e10fde950d477b27bc6dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/id/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/id/thunderbird-60.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "34006d900389d1cb5f29ef379e5aee0177df74f22e43a42f99520821c04fe5c33cda7ab8b77665091403b889ea54537561eea14532290fd096efb4f7f8ca3615"; + sha512 = "35b1d1db2dc6c38b8d2fce2652857d9251e287acad125ab19c5e20487ac5ee6d4ad01d8f6d6cfc1ed9618cb8a47666d9c64e725b2d1f11894741e8cf99a887f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/is/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/is/thunderbird-60.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e8b96762eae43a50b73b7faec2647d13612dfacc4c58687461ce2ac08e14c54bcce138c82378ec7a71660dde3bb9d96a29f78f304f51ede8751d97f32b9a4151"; + sha512 = "548170e5b1c2d7c09d4792f012064e5bbb201236768ba92fa318821b83101a395f3a4cd06560db89c23561eda20078921902aaa9b7ecbb201c356149af3d55cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/it/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/it/thunderbird-60.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "42182a88f948f57a9c8efb347b6178bc14c6d5bc13b3814cd9f187c84c47aa897d904495443d1d8800837d66e8c3bc4a266df4a08ff1a31ac136f0860a563423"; + sha512 = "026fc8d2b61eaff1f34ce7726923697ba5c7563b65fbb9bbd700e88998d198eee595348cc47135c5dc8589201fcf0d75141acd5d1e49980ccc5c544b545bb424"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ja/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ja/thunderbird-60.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "dbc4ccf655ded43805192ae65c67467002645fc527c935c4e15871173c7bf975681df66ba1e21ff823cefddc551e3680d50dcda9fd2a072234977c83dcbe31c9"; + sha512 = "deb6e23d8c3c700d7de3f433862040ae5db610012cfd4a8faaf239a6429662d625d8a40c583f22797e34afbeec7dd6888a1558155e0878f4a84ea71694cc97ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kab/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kab/thunderbird-60.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cf4fc5243334b8ad84e007606cf836c12d0c51aaffb02d97eff8a248fcbd5644a82767b8e129d1643e0efc03525db65b6ed7cefe8a53e0680c9984fe2a13f472"; + sha512 = "e6c1dba878c8bfcd4031123f0578512b0cfad675ddfd89859d5ea25b2c112195f788cb1d3e0deec12ca1f052c2c0bfdeda2527402cf0d51f54e781029a6e3b47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/kk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/kk/thunderbird-60.6.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a2be7803b84d9bc9ad5be834226e314a980c60d5079339beba9de6e296c9b26c02ab0fb6e06398061588df005b9dec4e19a6eb55a1f7f51ad7ecc61fe17a9b50"; + sha512 = "70dd97b4d5db05463deff785fbd9dbdb649c00ec79d8f1cf009ab54961efafc45f12da654367b0df58211a8fe57597cba7743b7557dc121bbf1d838aa692809a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ko/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ko/thunderbird-60.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a0b0a2a4818c61b838c22f55c8950a826be819c22e17e38548e18b189e5bf9743eb3832eba176087c291ff12349415d12c3c83416b24d38d148973e2219f6daf"; + sha512 = "8faf4d44bb882107805c663462170e96593f10e7218fa3a1e244937ee3965901d712c89edf9cbc4fefba85c91662c1a7e2811cf1bc3390377cd8ea3f3c8e29e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/lt/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/lt/thunderbird-60.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0b2635edecfa8517a967fb298f91e77861e8af2a6dead50a451ce23e36c26ba8b0aa4c9339828008178d5b3c3f36fb2a13d91f48446a507eeed8824fb162c578"; + sha512 = "604b8283cce3cddd90ae65be0d32ce7051bbe360fb772e47be60fa3312330d38b46d240b9e61eed3134fadef90aca9ac930ae6512dfdc1343104edff928be54c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ms/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ms/thunderbird-60.6.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3671774abf19d63fb5141c28f4d3a35608db59eb75530e6f78337122a42a78a467fbd0a0cd33402286cb3ebd43ce777b202ca704ddbf0ea7a4ed52981ea1c01b"; + sha512 = "b4af3085260ece6e30b482e9e8335a75298335b0b551a8219bbc04521d41d0088d483134df8801a529934320ab5d51b99b388177b9432b7fdcbd7391ac11b22d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nb-NO/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nb-NO/thunderbird-60.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cf1052a4c0a48d2f2c2b2a63a36266b7f33c572f5bc8d5fa0c6be94c5f4e5a71dfb19fb8971282bbccdc2c5366255bc46e0c549acfdb98b5b769af0b392496c7"; + sha512 = "75022e5524379f4683d6e85bfc057480dcc003d421ec256ade11ba9f4eb60b74c65a7131f07987cecd5a13d8e61dbf2c71446e4c2cbfd9efa65a1c86939e82aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nl/thunderbird-60.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8448a26d8e80d042f59d4bf617a60915b656d2477ca0e214b954104ff7a2d1a7751881c09f262d32046f9e9f3bece7e591dba689bf6b09b21b318e76de9cbffd"; + sha512 = "301dfe0a9ce8743703c1f4968bb9bd7b9881a7b70ce1760c12e9a9b2ffe386e8c85406a2b3121981676e4ba2f9ae5a32782857a168965f1fd93530cb22dc3ddd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/nn-NO/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/nn-NO/thunderbird-60.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c6a2c15d4e2470c9c0cbd984f8928b4eef88f356bdd16a24e4698bca7005a381001667e6ed357c22047c748a7fe0a6647402763c9c90c026306c23bd8b2dc3f2"; + sha512 = "67704f6dc56fb2d396cd5154d32648464cbf331890dfbe30c6870f63d8f26d8f46322c2b2c40cec86fdbd7b93eeacae2551b0e699428749c89acb715bf8d00b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pl/thunderbird-60.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d8a5e014e95074e68678c2fa2f4ecf0151495891d496dbb9c89fbfb9a2fd9e168af8751c214d612789dbf179817ffed4e0fbe27b8d8b15a1fe5a5bfa1710ca50"; + sha512 = "6477cf8274f38d3922edf51e0a419936d2ac494906c06fcf78c99ae95847c2fd4530e03d1574f7ba4b5d1221e98a71bb1a7e3810a1ebcd72c4e412f0e85c3c31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-BR/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-BR/thunderbird-60.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "913c164af6d714b9a99c8c28b52eac4fae702fd0626bb3c232d556c6047c809834c390946b4c9cfc52894bc8da7d0fbe794055642f3570f8bf7bab5b1de00977"; + sha512 = "775ccbd6e8adda7318a5ff9d364d6d8b3d8af39208a349f61123550a149c728f7d6248c27b3b4561c8445c1c7c53300579f073b47ba31a52b68a8570515e6329"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/pt-PT/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/pt-PT/thunderbird-60.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ed84b2dc5bc16bc79d9ad14ddf22d03c0b23c78a42e3cf447c4e456bb643ce23ef890399114bf47229f0a496d56617ba65ee71282bce5bb5f085eebda0e3b5ee"; + sha512 = "057a2b690dfd529be26ddc225f6f760190315721ef69ab0d9974788b7c00617704af82ec56cbb502a3854945b624896ceb800ba1a31080fe9984fe12af4d301f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/rm/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/rm/thunderbird-60.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b41c15cc2758f3a90c8e96ee20abfbd20f747bce5e40eb0301faec23e512e2a39c4d69b18356fbe72c6b8de3a83e79dc18be20a20c77f33d03bfaf7584cb86d6"; + sha512 = "10c4edf026d5b924d5105201179f8f5f6ecf5917e99efb60c663325ef98e5ba63f965954c93e3962af454111656687abd2be65e0c552617f8fc7eb6ee3b339bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ro/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ro/thunderbird-60.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b100178b0ddf33e5568180f7d3f64755a2722ed8693bfb92391bfa9a8c0a2f3b88534bd0bdecd3eb823cf25c5b17ea0d80a9a3f007b805d512a6f4b29321ae17"; + sha512 = "d6a4fe46346b6699d570e316c7e97b530100923771d4ab76878dbea959dcd1c34e694c3a968eb786d19be96e0b7757952d47a87bc52f99d078eefc9a2483dd7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/ru/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/ru/thunderbird-60.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "486b51a55c5dcac73ffc92a763dabdb4a428f7b23c7f4d3fd3e44ef814f26d4987f4cb794431d372d07453a9e3beaf3b985e22fce0d2d45cad7f75f0b32c5875"; + sha512 = "14b79c2751306b7e66cc3049c0338c16042c60fd707275f25775692b09c28fbd30b46886fdb2c8205de342e29cc0519887f8f92efd369e92a0a94ab33a5cba3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/si/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/si/thunderbird-60.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "edc25ee0903b52f6f5bde6bd81519e0cd76597fa5b93880312a1e251dae03ceff5166dfa137478805619b4776d4c00f9be6144c72dda2b4301794d38c1fe7c10"; + sha512 = "a8781bfe6bf9ceac67bab6e2f2957d61bb5d27292a15ea24776bdd8dda4b7828a350ec8caaae40a894db85b9d9fe4d457172f8dcedd681fa58912eef74ade60a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sk/thunderbird-60.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "fe383eda44cac66ffee31ac2dcd0afd1e5d864ca32f14114bd3be4ed9d59ce45b4cffda40aa15f5276b682110205c71f28ccc5a29222194782f0ec9ce4262f65"; + sha512 = "b22ef7083b344f8dec27b09631468c1263cb436479cfffc82b95ec78fc05ef66ec9b133d612dd097f9c24096b9c4e538efde6a88150816268a3a5a2d81a8e1fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sl/thunderbird-60.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "be543501922ef4b0e6205f25846a5ff07009566f018a880b38ca5525d601d107a1b0589fba4502711e4bf187f2e47445ece5c2f2b3b4523f887e865edef8816a"; + sha512 = "b3a295b4f1a27a75634bae5dbf033973849659bf9dc9fdecf33b90618aa919bf644e2211c789ceefa495cc72e6586ed1db1683658ca88f0fe4cb3ed7a909a208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sq/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sq/thunderbird-60.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1a26c71d2466ff93aa8814f0138e597f9b05e6c80ef712c6d91d17dd793529274b30dca8c9a864cfe5d5e959594cc5905e6aa6ec9503264b3e25e6dc240cda50"; + sha512 = "5f990f0f257d7b096f4310de22a0ea26f27b18e5f7566f3eed45bed66ff89e384f55b7932fd5ce65039077ff902631db3feffce69d2e6a8e13893586759d14b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sr/thunderbird-60.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6e61edd11aee58cde3e50f94d0053140289927239627e53b79a68d81d8ae4eb3adddf6fbaa92c71584a8cdb9b352f32ea64b1d118abee64be9ec5bd5ade6ab03"; + sha512 = "71623636dca3b89af58feeb1b998b9bf16c8f8c7ff7c8f273aafc0500ce4b5d4bfae3e997d8669e3075c6586b631df0a613ba062fc4d74cf281f686aa7b18109"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/sv-SE/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/sv-SE/thunderbird-60.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c85b14d0d69675290734896c2fa188fa2ebd291aefbc006c88f6a8b0929c3a0fdc88728af8f7a584155988e44ac18cc18468d05b38c0a3be45d0d9225a3ae8f8"; + sha512 = "2e0f6115a0e1b538288594ff47b92b1eb688a26e5f67bb7b83b5c01fe781efe414fc8a9e2c289fd7312026fa1b9bc56588a0c0b25172c35d1e224269a779e40b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/tr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/tr/thunderbird-60.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "03440acea9928ebab312dd9411aa01f4928bb379acd377b2999c9c11b0a39aa5045cbb396b4a76bbfe0c0161b1e1bb75bbbacca1b370dcc84a12a22925189642"; + sha512 = "fa3aa0c732a4e2feda079d283f6d0f98eb721a88e98a7df70681acb50d525e48af273deb19e6d2e5f41d20fc5daddf0c89c3e6d9ced74ccc34bd75fc12ebf26b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/uk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/uk/thunderbird-60.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "7f55c44695a62c9b889b2867dcf8c8b42e057afb9b94bd44912ad3da617c18f4064f41a05e2582b24acd982cb3c667d081dee4f012cfbe096f06d795dabe456e"; + sha512 = "535fff2ee782b9818f3953314b084f5d63af4457310e8236b5dbe0fb7d0db5ef3c1aa0efbb992ef32ad89cd1df3ad50acae26fc116eae474b6b6970cb1172772"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/vi/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/vi/thunderbird-60.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "316cc05da31325eab8299496660d0c3785ee4bee9939ef4c4ee4cb19688fea79131d1b47ffde3fe1154a9b90048bdd584ef584a0044c66d104eae6aae98f5913"; + sha512 = "54bfad80adc5f4a97e5dbb098e4330a7248b650178e9a9f49b2252fe1a15afb7e247f9af29253f59c7ff43e8af67a96f1cf069f3919ecd53ce0ff953e6cb42de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-CN/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-CN/thunderbird-60.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "99d7524b51e9d43b129903e9c4339d9db7e18541973e5813b491b4866e94ae51373a8b3e23aca41681bf097905e93dc888590cc208d40bacc907546b0f6f5106"; + sha512 = "7452bdee386e1e85967d7b88c6f935cb89ba7dece1f39d3b20f24cdd04a99793d3a11c333b76d107fe88d8c4c3eb69947be11792af7f8657515c48eda655d237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-x86_64/zh-TW/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-x86_64/zh-TW/thunderbird-60.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "235cd4de682d65ceae05aa2ed9f7971cc85aa01cb60e6bcd85de7da24d878d5d98a4e2f5386a9ee30263eb51da7cd50e9bfdd44136bddbcb7b001af0a79da34a"; + sha512 = "0c1a7048f250bb0f3248ed92ad2e45d3bb01b308eaa6115cde9050253d960b6538467ea6c5754c6f5458035fe31bd2fc529ab423f6ca9da179dfb7f51ef1f612"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ar/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ar/thunderbird-60.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a9356c983c9ecacc5f381c51709c41a529cb792eb2cfbe62bd55fa190ba6f53a417c5e7f1ee13ca57b71cb781cc7d1485d794cb1486a2f74d06e17dd3a59ccb5"; + sha512 = "c04863a1693b2e0567eda646f6364b58cbf959c61045ba1948aebe9f30f63351888cca4a70de4a1655b48ee0407e0c665691c6ffcc2638c18b70046eb04cb02c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ast/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ast/thunderbird-60.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "627cbc249e56351c527b33571a43f5b28c7c2267ce83466d74a66c231349a6677f423eb817a86fed84b3e214a274c87af5284164d39fdc74f04610bc289771c3"; + sha512 = "ed4c86716aa7ca675577f577f62bf11f025ba96a061e0c89952a99ad5e3ba3e3edb01dd8d428cd0884fdc78127453dcfde0e81ecb4ba3e11e650022f6df07102"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/be/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/be/thunderbird-60.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "a3d96e1ac59aa7144cdc50d7064ece222e401f8d6e6a2d7b60b2731510f934b8eb3c686ac53f6ff96915e14ff3b3cec38d7b01b4c549490d314aaa6a40bba365"; + sha512 = "fff19d979335f90004f35646edf2c4ca7f1243a013d79c246db6a0139f787573bd2db2636adf503366a94d44cf8b932d2141ff1df2faced750ac6c604116d6da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/bg/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/bg/thunderbird-60.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c39fd5d4dab48ce85bb4d524f210b17e1bf16d7b576639055d4f949e7ee549db3c681fb3579cc3722882753c401ce0a0dc97182767dbce57785a474105521345"; + sha512 = "afcbb510382a811af5afadf306ce66915f472a3cac62ec2e2ab5930c795fd443600c02743be29db3bbbccf3c9d8507bf54ad0452bd580de4f9db52d5438aa596"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/br/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/br/thunderbird-60.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b5e1a4c7fb6c12ea41d5e5c1cc7a6214e822012fe318e2777ebcd89b2502018c5af0758b704dc3cb1b0487a759222393a4cc4f57a491f5d9ee1f71522a8d242b"; + sha512 = "3ca375f94f1f5795b2676d1e8774fc17e3eb0824ceeef6b4598b99f35265806a017e0dfbf2b07f275eae92b68fa975b05cf2d66c6adfd1147399ee7be3df94eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ca/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ca/thunderbird-60.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0004d9792dcd2d0ae211083d6dc87019e362a6e10390a29dd8d9ef567a0282b0fcedfd95c4e91c857c25361673e2f3c429b3afd19f35714925a7252e15fc4231"; + sha512 = "75d31ded8c44d8429c58f8c6bc1b5104a4b62a3d0899ac81ba9deb277204290d7ae079e6baf4b243188db7e1050b4a0b9046dd26ca8fa546083fdfbbf724bd01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cs/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cs/thunderbird-60.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "c7428593007a117f44e9891e2cab7d352a64f9f53487478671bb062d7dfc623b65f15749b994c298afebd4776afae4619f36da513866607cdc1160896748918d"; + sha512 = "0ead8f9276a6dcfaf39c1d400c892f95d431cee960c94857cd3e95e6f148571ed946325e6518bcea5821aaeb0e8f8f5dbbdd3970aad9cda549dbfc07eb2392ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/cy/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/cy/thunderbird-60.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "6c768a2e5ff27988f7e52c9f38f543b40f3111c6e944e573e8dda4791253cb9f4f25d2dafd8d0c63d2120e7bd331315cc3ebcdf6381cbae0d4700564d7a54d11"; + sha512 = "fb9d58efc4b0a72a1bbe09624d38b83227c94a2584b4a852b95753d83481b64194e6d14578fe24210581feaf5b8ccf55c530cb3bae606ea6acd39a456a91dcc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/da/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/da/thunderbird-60.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e4bdab9dbdd1c4d2db731dad1e42c3e9839e6d2c8b9f92ae88ae76d6b838ff5d328f43c73c03a2a2e3998bf7f667d59f02016f676d3d23f1ca2d2fec105ed0db"; + sha512 = "1bf483526e7e52626b6298c93c6586d1973cdd9c3aec660b31550b4658690e8454622276d2bac3b096acceb8e9b41fbf7db735ed8a2c185ee968e489a62ae329"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/de/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/de/thunderbird-60.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "df0dc702eee0a658e2756fee0f3d26a43a8c2e5defca1e1a7a4cb34909af0e6a88f73f880fd06d0fb336b740b2d25174386d615434b1e4dd85c91416d08c2e2b"; + sha512 = "1bdaf4b2a5ce2b1824250b4fd35695ce9c3be306b8c21d9002995e142f6a655166df15d3f68f80dc0f5963f31e87d01b00ee8c4463c6002df0eb536fc3eb2bfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/dsb/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/dsb/thunderbird-60.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "0ba2bb386d9408b86041a87414e1c84ebae07f9ca357ad9aeb76aab195b16b90ba8313bcfa3b386b232a10ab295e183d4c1eda37ec4448b02abc1566ffc29b74"; + sha512 = "0b6f71ec6d02f06dde3509fd1fb771a341b12a7a44681d05244aa7ea61726f8f8792ff12a72b0700196162047b23b7a9741a3522519935813b075d617c79490c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/el/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/el/thunderbird-60.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "66b8ccf62e7e8bc3964ad18a21437acce9980b1378b05bc943fc579f8c3f201972ac7dfb3ce25dcfdfeda88008b6c273fa4a748e3b73d8500ace905ebc3cc816"; + sha512 = "bec935b6e469400f7d88fee26dab49c8159dd8a74bd34827122d23276e6b5e837dbedb8281b0a2c1b87e90d2897e2dc15a475ac53bf911f15887280630ef82fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-GB/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-GB/thunderbird-60.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ce8cccda4e620f712a78b477a37815404acd55580a977a7bb71cd349e64e28747935231cd5dec048e9d31fc1cf198a4579308f9a320220c282427913f323ecfd"; + sha512 = "4e28d8bbc384c98767825e16111d24a96ad2291f40b1eb7b295ab2b7103482a9aa11c00ae5e455ea7e5a7e5d077a4d7c45e6f8890c69e7c7c237909c332bad75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/en-US/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/en-US/thunderbird-60.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "50b50e2df00fc2a71c555105806b2134ba9f7e09601e9194334ac2e89e53fb940065e604b56c22a8aeb97ec6f30fa8cda6881347a53acd22270b38767c3b00ae"; + sha512 = "6b5619c5a03a4d585b030682fc41069c3ebe3c783578853c3c36c9055fe03c78c782f2621c12a454b4968e5416e01312639ef48047b407558dd6ad85fd81befd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-AR/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-AR/thunderbird-60.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e3d0708a89548a36712fddaeec6e7e2a15a255b29fb63e05efeb279e1748dd41034f9d568013ddae50484300b536ddcc08cb37d013b1d4beb52e7ca0fa47a924"; + sha512 = "9b6828c7c646f0483b758902d2cfd7897649acfc1622d1a338320d0f9a9f52b38dc8734ace3816fd4a116883ff7c9ffdfbae6b93e5070697a108a7df207de1d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/es-ES/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/es-ES/thunderbird-60.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "b34202bff1054718cc068f21c2d4cad9cf1cfdaedd5802a1c1a9f897e75e7cba1b2b63d4bfc9e3849468f69728308c2c1ebb716b19468de054149c8c5e614c7b"; + sha512 = "e0a8d2e68602cb5a9c0bca574ff8ed797c0e71a2bd86519e7d7de1ca8fc54316bead8ccc35e7f8dbc26cb11ab76e59076c09e69edb8175947c7c0dfab5758e3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/et/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/et/thunderbird-60.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "023343885b09835dc7a924407724aafbc6e833d668d4066aee0971abe93ecc53deab16b0d3a0e0527d159f62c1fcb1243615736cd68404537587b57173c52573"; + sha512 = "c597b215fb574f948ed3cd169f7fd814a9f23e5c797da8457d9c810097f71b26751b386280cbba2fbf0224d07665c2fa33c3cb19c0fc54bbb0146fa271b25442"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/eu/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/eu/thunderbird-60.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b5db0e61be652f851cb4e729abaec04cd2295f5b769cbae82da9a13521b145e3af7bcdec0d595e82200840eb0e9e8d3b321c9e2bca7e504ecc45b4a438494e7d"; + sha512 = "9c1dfdeb74e6882689c036995d20ea7d0cbe9f3b406ec15b7a71d1f890cd209d3e7b03f6ce35d778adfcad2dfcfeb20ad55b9888dd222ffdb429166c8ad3a905"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fi/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fi/thunderbird-60.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "cfcd1cfc0b49b94acf2c4b65064badf4f48d85f6833b4ba6bb3b9da21a41815ca9c544899ca5282a96b3e498ff948037fd6e97755b9bd4f994e67341ddb46aa0"; + sha512 = "fa24033927751c7b1cffbd3e165507d8cc0ef7ac7755f08afe102b9b9a339d0a31b8f738d1bb71bc0a8876f51a1411b4840b033a3716306e5e8a17eb4d7f0382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fr/thunderbird-60.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "853d0b8d8cee1d036adc8784ffb750acebf4499adc41c770436e1499622e3a6dd4c79c64a088c2e80e7ae33b158f696c5d7b055e920379f0c39e574ef04b208e"; + sha512 = "37daee1b1c0f1757a0098806d41bcd71c0dfd700bce2f7da58ec670c58d2b5fefcef2fde102bed7fa6daa62b59404716c26547de54a00eaed6201616c681b5ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/fy-NL/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/fy-NL/thunderbird-60.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5556f9faa896595e1e3bf6b57fbd9e15cf66240b1483ffe0d4af2b58481892dbd2ba542e143b322a00cb8c3a25a54c5c6d35ab2a3eee0e20acfcb805706b9ed5"; + sha512 = "85b2a6fa843d5364eaaacbc3399ad4a05169a7c988640f3a120fabe994bca31b0c22019a8537d598a14d33dc75f2037cda5504cb7d72149fec1ff040e1f962bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ga-IE/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ga-IE/thunderbird-60.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "db7df726276180585e203b375f19adeec45bc7241f2f9804626cb4ded86714234c16ee39ca96e29b23caa9400100adbcc34d7610323b5c5c96b301fe80746f20"; + sha512 = "475b766786a50d461ec6896b72c4eef83231f903672d275513c632eb8f4e7e1dd24bc635c18c066fdada4616b99116b3757d59d2718bc8bf21bfa495abea9a5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gd/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gd/thunderbird-60.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5a5a2b058ce97d7860601a5e41edae6d4c61f4b533c3822aaf20a31a996fadb4da73c505cc83d42f53f4544c5dd95f03ca175950a8354ffafdbf8910c436a43d"; + sha512 = "d5ee56fd14c4abbf9d3335cd75e284d6c00ed28db74ffd2a726a19dbed21a74e2d97e9dcb63d63bca31f3637380a29f3bdd1280c670e446850ba8d4e98971395"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/gl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/gl/thunderbird-60.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6d757d6634bed978f71031fee24299015b1d9b1cba5166a29cb6a57dbddd93a2ce1ac002766cd4f705ebd3448b9f1e1360e88658d1e90225e04dd9533cc7fc41"; + sha512 = "262b36a73483dc3a379d416862f6f5c6d685a366f25a2599ba527d28fe0a17da9f3d377c38559a0688cfc5e5927001d3db7db0693fdbae44ba5596ac92c1a72f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/he/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/he/thunderbird-60.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "790b99eab94e6bf70fe935c4794413ff6fe1020a1baa73a66cb9b27dd630dd712266104b94eef23b17161fde4484037264b114cb367bd7db2c3fd213b6b0655a"; + sha512 = "404838f4defcb0da984532ba32740c9919ebf57c9e68137e43b1e40263a4f553a573028bc96c9f056141e405b4528e060ead4e30dcdc365e87069393b0056a5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hr/thunderbird-60.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b6e7649321d2f8976f71bb685cd6f29ad47a890139ea4d9ab509677e462a43cb27410c8516d7d1fa65e7273a2c006ae44ccc4e9cb93275970926661502bbba90"; + sha512 = "9793e03d4b01c90af721a0197e20ea61c30e09e602321e214674a85ba5366a4eb4a394d0a2347af2a3f8c7f40da2eff50bb25c935db7b59cf573b8e6033469e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hsb/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hsb/thunderbird-60.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "6c957a26ee1b17ed8a9087187fabb228028c2b6d472cb7d5e28c66724a8b34a7e6c74bbdb625041db9f4ddcf754c574b9d6b803cdb6b0445bb82077b93de35ce"; + sha512 = "bd5be5e781edef1d410ed85552d72449e94b13c28a9943cc64ea4bf8092ed477ad61a39eb956b3ed008168a62206a0684ae8b38f370ac88a3c67df78ed57720d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hu/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hu/thunderbird-60.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "a8f920c0b3691b36586d9a756d68a2e61d54e0195cf602dff5803cf79a0c13aef90db60a608b9d0defefde4e2e8778b316dc2fe38647fdb9406f74b6c316fb9c"; + sha512 = "a5f7e309efb45715dd67b4fb5ee1a88ac4c6ae54d5755c2476cff246d93abca6725116817173c72e701cfd570329f1d84f7732e3eaf3e7fd96e238512298c595"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/hy-AM/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/hy-AM/thunderbird-60.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "bd24605ba4a7eaa399e56cf244aab6a6f3c1158a7733bb99a4f57c3028acb648562adba1b7b4885b89a4142d023bd5be5d483fa4ba47378b8de300893e1e9ef6"; + sha512 = "145e562fdf0ea143d0c1e9f4581f2b2fc58bf085aa227e4486e780f7da54e7e0b1cce53cfe9dad1ac47aca50beee5e554f3494c7df2e2c240a3a9b350d5f46b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/id/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/id/thunderbird-60.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "0c66a067811907292ec54f1673c912b5bb4564e5493108121c628b277f91410b0fd6b579e073d8937588606be34ca2c9c317d4f46bdf5aaf0f839ce9704a9d20"; + sha512 = "6f865a97783fe0269547981367717de6577780b24eeab33e26a19fc716cd4733cca28b7fab8cb8156b6a04b09e09b75cfca8b43c07aa99088cfe98a96a716361"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/is/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/is/thunderbird-60.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9b9e85ac15437a3b7871f0842996e5c85386e9594fb4399ecfd3f599318155abd24929ec8be1ed0034ad24539415aa26d74cb1a1edc06368b71464cab28ed8b0"; + sha512 = "756301497644e2656a383f0c76a7723b1ce9ab49f760e08cc6f0159c898634664dcf5f92952310c408ecf8818939a25b3b181fd50836d32d017dc4c45b67dc25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/it/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/it/thunderbird-60.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "07c6fa4027816e1e6d58799d746543890f5eda26fc92179daa2d7b5c7762f5a5b3bb4e6aad784097ec4e013c5012e975289651a77fd78af711dc7c0516344297"; + sha512 = "4ebfd6d2dd79e238594286412516729b66fa26d99ed3d6a399428bca87f63bd3f329877f70702d1d43229755268b0e9c951c753ce110250e805cdcdf576e0eb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ja/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ja/thunderbird-60.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c64e1719914fc50b110a800395e404b0aa356cf8b7deaede6315da122b8cec01a69c530ffce232e3ef130068b6df94a1210b9655403e167ffe6e42d59b2456f5"; + sha512 = "0cbdd253afec94716c0a4ce4131e8260cf7e42d9a7df48210875524ca33d42fc7c011b3b9724b29054844b159896cf9a03fd817af4cfbae9b718777d4f4b278d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kab/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kab/thunderbird-60.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b0067c1d698a5a032122609fc9df96966c33c78b71611fba43762b9f14944c9b1be52e7d16d71cdf323330e3a473f0822a75b8d5ccb4756ce86e3c6cf5d47c3f"; + sha512 = "cf363a3e2177d2ac629713674bd22da270887882f21dccefbd6ca30c71f535c5b69fe1c05554fbed95920d4ebc4acc1649a05be1594b1cad5f4b17a7652f3e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/kk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/kk/thunderbird-60.6.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "7e0e9a5f7bdb609687c4e8a87c581a9c33b242c80f71fecfce0a0737a8cf70b4d864e6e8bc8ddf0d6bfe5212b4a5f44a7c11cc586348bf2c1325a177f04bc62d"; + sha512 = "77555e556b3d04ebc07390633e4ba3a3fda8c7ca9c8e7a61f522633a20378c857522598a3ad1b3b55e03bff181df615186183947c7770a3afc3df6c18d58446c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ko/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ko/thunderbird-60.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "45ecc21470e10df9d6b6eb9eb91729384c4aab20f4bdb3ab9659d30e0447441c26b9daa86b670d458ff90c8a7120333a5398caccafd4000a88fb219244bd5bca"; + sha512 = "634c0ba3322494670df3c7d14b8866d55f185588d1fe6dde706da86a66481f98deefed6739561f3c0c73ca005e1581d541da773c5d3d7caddd5b49510d9f138e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/lt/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/lt/thunderbird-60.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "6b47400b6260b172d9e40ac0c3f8cf94b02f31273acc18b9befa1c602188f6d8e0c46fefcb9b4faaa2513bd5c586559bf9fd6f5c03c1d4ff895c78e14c5a593a"; + sha512 = "9646f54ebabca5e8503d44b099871bfb6345cd4a3fe04ab0211aa8f019800b48faae93eb5565428818c4cf25b8b1e536614f23e4fcac76791c06482aa9fd7396"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ms/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ms/thunderbird-60.6.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "037c6d52bca81ddc54389546dcbf9422e3dc5872477f49e4a681a2dd75b6b7456ff2477b0b6e2e88d8b9e899ca9569751809a4ab5cfae8f8d8e7a5c13cd10bbb"; + sha512 = "ecec0bac0770bd3cad75881266aea00a9ae3c8506a64e000ffb118cc18cb28a3968b9ece10e11bbc4628612065345ab1f58df0df130a2e497809a244049c1774"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nb-NO/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nb-NO/thunderbird-60.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ebdb9cd19d874cee39a27f2f44e23d877c304cc44b3cbb9849237d08077a5e8890d444671efddb4ba0633f89ff6348a7195e96f8041025f39fd4773ad8a04a56"; + sha512 = "271be3b2bf2424bb149e7f1a1c11564e9b9d849e043a95489a8215a3ce757d032cfce2ff5df1b666fec5cad00b7a540b437d6d0ef33ccec485a0b5b96f61e8bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nl/thunderbird-60.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "251ccf641a7e6f724cbdee55eec09f6ef0a2b77b3c12c483e1b159840f039df0820c583ecc0ff5831d48582df7716f9c29678f1be81b6cdc39480dc2fc870d65"; + sha512 = "a80e354c855d51fc278fc46e83ad41de079f1aff1fb7d0329eba377c07ecf67621f9c11e2c51760b23aeea4547eacc7916f3092e61009b162283a8f4458b5573"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/nn-NO/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/nn-NO/thunderbird-60.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e4b12c33bb86fef90f699a2c8aa3bf66d140f77e3bcae5012fa005f47cecf978ca5b5051c7826b56f65cd8501413e649bbd73c01cddfadf97e3635a19a0f3406"; + sha512 = "312414bf118a808ad663807dfab5f69bca61a8f20087cfeac78883a869cd43eb03d5c7dd511a32350c0f59b0e28de7bc1992ce3ba48d8e1b5fe3c2abc09441af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pl/thunderbird-60.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c9d8fcf4a468fae3849fdd4c02e054bde1407f3007743744defc09a0d56de5796b46e8ea27247bad3e9ec8f3d588f8871390ef3568c2b27a4fc12d795474b739"; + sha512 = "4abf25e59400c038e9719200459903e3e113302592bf65d024c1dd05852d51e2969f3f53a33dd55f9d131bcd1405571f713a6dc3165d8af1147616574f4aa5c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-BR/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-BR/thunderbird-60.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0cdaf41470e28eb15d66da46ba2d3841f62fa11235b91b3b054e3ee7906e1952feb8f447ffef4195a6b49f7224af316731607945646d1157f6674b50d8c7e7fe"; + sha512 = "ca38fec5178dfc2f841dea0d30490df8be3e4424a2d94bda1a3cf1cbb1908df90c29adafe3f844ec13f2bf87606fcf20066d3789b29440b55762a9c83ff5bfb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/pt-PT/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/pt-PT/thunderbird-60.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bdf0af0eca14e74518d43246f515aa3e5ead284502a27d4b6dbf9e69a2657e55484793859682b807f0b9f2e7ae6d2c084a239f276524829b923ed6eaa4d63457"; + sha512 = "f8c25a0d9d6a4ca582c7d3593c8a74c1931fdd4a85ca9ac2af0b37efb877ac0232e9188af5cb5985f1a865aabb252b58197cace1f6cff3ce4551b5f4678eea56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/rm/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/rm/thunderbird-60.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4db1bcf38a6525e5507f02c07ee1bb877f81b4643df25eddf0c6b85a6fca5a4e892affb397caa0b5fbebdc5a044bc1eecf5d8755420e8e032906e81a1fcb68c0"; + sha512 = "ab74f4fa6729d6f7c2f0fb1f99c457ccd65a81be9bb5d7519beef4ec1ddf58c9f51370e7e3fbf71f2a8781f2669b50d20e65e687794b7dfeccb7da99865bd614"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ro/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ro/thunderbird-60.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "21a2dcf1a70657afaa49e3825fc6c544bd123c50c753ab2af52474daf80f7c01dafdff95a6c84a48f3f4b09d019acf6cf84958ef81fd12b5616fe4f7c44517c5"; + sha512 = "cb086a6ce3446ee8437c762040b03ee58a3cebd1a0cf473197e7da19d81704bd1ae7cda5d3329e17e76d1f7e682674a12bda3e964fa934fd271d80cfcb5da907"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/ru/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/ru/thunderbird-60.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "427b84004ea0a93c1eb55fdf3c46d4fc1560cd5b9284294b91ffc1f48581acfca4931fb90b2ec67f8f41763e47505be9e677e30ff009f1607b910272bd2aa481"; + sha512 = "2334973a52a5e954b082be0bc9921a6034532edf558a2ffc2b1ffaad7d1d8777832cfe21e005290c65f4ed906816243dc3c1a35a5e078f005ebe84f3769cbad0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/si/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/si/thunderbird-60.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "adb6bb5a5ea5aa26cd8edce2eccfce86c1f05bfedd784dd8b6438d5f9bc9b21b6fd1e9d544f0d72ca4c09b502843426b1db3a9faa51c795d1da7342263a68acf"; + sha512 = "aa7a52b410a507571551430d538fe4b84efbc57bad8eb89631c2c79f8bd23399a60e8ba8018e9b086d6562ef4e0e96b5f6b912952838ef38507a6eb41e776fe6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sk/thunderbird-60.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8e5774e339f29d4db96541227f0cbac8aa43940f8db803b1c3d0037e870ebabe0e35e931866206c45ceca60df940342e837f5a341fe297d1d77094a68ff087c0"; + sha512 = "4cef3b0059d27313ff35610fc273b7c02faaeb21996a5b62be6cefd0c4b76162fd8a54bae3e2f6527135bfc97ed8133cde34e51505d8abb25d90a03716427370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sl/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sl/thunderbird-60.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5bc6c3afe167b81e67236e2ce405c784ea6b3eccefbe64169df9c5846ac352b786e7cbb5a130134bc00bf711577425dcc228e44028b907517c870110392de9c9"; + sha512 = "6e4e2771a18bf7af347fff15eb5b5c312b7373d2fa86474317154ed8ae48e996028cda78ad9ac5ad09839af9844039334a25349df2c45c30095606f684b849b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sq/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sq/thunderbird-60.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "056cb05dbd7a8eaf482fe70cd48182d821724d531f482fa39f220b74da4ac3ffdd01ca25b3a31589081254b8be2868bb0bbe24d28fd02f817d64521136e9b652"; + sha512 = "eb1d190808ad33b2eecfd8979c3ae669f44c3426bc247781b11698818f1804ba1b28851b7c7f507b676c87d86d89b7f537d378a130997dc21cd8870e070dedcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sr/thunderbird-60.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "76a3b4c6d620a3d2309d1075d9a85e3603ab60bb9bfdfe6b538662b5281a4e2458d6e6ecbc977dadd7f7a2c9c78691277d5ca336c54beb2cb3f653ff4fe4e6c2"; + sha512 = "bd46e690c9969d65563075996581c9ff13576143425985764a1fef4d2d6d4bf55cecd1e52b3e7a237b187a9144c928578879737f16c4b59be29120b67b18526d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/sv-SE/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/sv-SE/thunderbird-60.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3519106ffd79c84ed2609675104889010ea3dad76ca2b3db5cb2729c99927ffa9d457e714e73862b01d0c88c52ccdd986ab15844e9bb3b8de2de0eb6f0e29b96"; + sha512 = "19e859d0f94de0b4cd82fb35a63a32cc9dfe09c74429380c90f749748e17123f161398a465b53aa333c50863a256be99df4029f45d08f80a7695b45883c94799"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/tr/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/tr/thunderbird-60.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "782825d4bb3f0073a2e417ec86e7ad27f7d84e482e6fd0435941cd2ecad4f930329362a1b1be32a99379e98d2dd4f43bc7bc4a80b0c38692c9f1e5436c6e3131"; + sha512 = "964a16f7836a1dcfda273db6c65ea22d516722e410ceb961ee8212540837911ba3b156d5c365a7c1a79c7d2239b0df03dc1176a266d09b075c1e5b870a833352"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/uk/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/uk/thunderbird-60.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9246e616b9c87383064697f8f9b17304768a85ef6e1f8bcf83d07cbf0990dac3c20b5add194f85f3a58021fc2f707004e8b348ca41a3052cad27f7ba117539d7"; + sha512 = "aee1e5a933bcb5238263ebc6ea57e9d3fe851c19c5c017e1e15bbb9e5cf1e9f39edf75b1b908caa4da688e14e41e4318a7fca0c41d045355cdc91b9ef48ba957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/vi/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/vi/thunderbird-60.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2601517a8a04bfc8068f03295c357f3980228fcb53e54d90a3aca190f94546ba8a4712e763c93faeffab036ad623e1e3cda4bf16d22774a3f95ed2869a4f00b8"; + sha512 = "dd667bf5db90586bb29c97c8dd3bd0d50c5f4c5f5cbebdfc908dda4a54e72575edcf5d5b8bed97b1b6aa7350ea79c767115137aa6500b263bd5ae80d61efdbc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-CN/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-CN/thunderbird-60.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "8ca48799b44edaec1d35bc690433c5a6790daa907cc64f67c1e350ce24bb4422ac04657f68898c6e3f40737b32a74b139e715c2e4dc33d4b179eac2d7e04c7de"; + sha512 = "f791ad02b1a67ac2906602a3c90238e5e8062fedea5851a790196eb1da0e19174543a7dc00e53460d40a0c39089c109125875fbec458fd65a650ab7d438cafdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.5.2/linux-i686/zh-TW/thunderbird-60.5.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.6.0/linux-i686/zh-TW/thunderbird-60.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "716c6392918f8fc6e6c1046b7454acc84484bc39a723dc659cc1e3919f04fcce628783685f63110370b38f64d60771e40425eeef1ecbb4b83ad999e29d8bede4"; + sha512 = "83cec9f663cd4e02d921f2f96a7dab791cdb015756f63148833491a263abb297bed5ee64101b4ae86ea4a3ed09b75d668bcf36a12563885f3eb164655b3348bd"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ae0db67920d1..e419b68ad81b 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -24,11 +24,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "60.5.2"; + version = "60.6.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "3q7h9jbxz7p7dh2dskmcqikpgd8czbmxknij063w02bh9lyffv6rasszl8pwz21mcylb9zzqjn29xl99g51sjx81555bdr38l8mjg55"; + sha512 = "2s8h6z3rkylrclng1cpmj5dvsbhqymrdwvjy3g2s8rq66xca13wkyswdhgh8671d0dw9bmminikk53d2xqg7lqvvd1rdsminwscln4z"; }; # from firefox, but without sound libraries diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index 8e1777b0ce79..715d8e13ec30 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -4,11 +4,11 @@ , libpulseaudio, libopus, libogg }: stdenv.mkDerivation rec { - name = "gnunet-0.10.1"; + name = "gnunet-0.11.0"; src = fetchurl { url = "mirror://gnu/gnunet/${name}.tar.gz"; - sha256 = "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"; + sha256 = "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 13d44655df84..d58c4214d0e0 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "tixati-${version}"; - version = "2.58"; + version = "2.59"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "077z5i0grkxkgw2npylv4r897434k2pr03brqx5hjpjw3797r141"; + sha256 = "0vf5y9kj2g7psgdzv2r46jdh5krdps838ca4wwwxi0dd1mwa65my"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix new file mode 100644 index 000000000000..e79ca515b518 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/protonvpn-cli/default.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils +, openvpn, python, dialog, wget, update-resolv-conf }: + +let + expectedUpdateResolvPath = "/etc/openvpn/update-resolv-conf"; + actualUpdateResolvePath = "${update-resolv-conf}/libexec/openvpn/update-resolv-conf"; + +in stdenv.mkDerivation rec { + name = "protonvpn-cli"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "protonvpn-cli"; + rev = "v${version}"; + sha256 = "0xvflr8zf267n3dv63nkk4wjxhbckw56sqmyca3krf410vrd7zlv"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p "$out/bin" + substituteInPlace protonvpn-cli.sh \ + --replace ${expectedUpdateResolvPath} ${actualUpdateResolvePath} \ + --replace \$UID 0 \ + --replace /etc/resolv.conf /dev/null \ + --replace \ + " 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 \ + --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]} + ''; + + meta = with stdenv.lib; { + description = "ProtonVPN Command-Line Tool"; + homepage = https://github.com/ProtonVPN/protonvpn-cli; + maintainers = with maintainers; [ caugner ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/ps2client/default.nix b/nixpkgs/pkgs/applications/networking/ps2client/default.nix new file mode 100644 index 000000000000..5b292fe7bec5 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/ps2client/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "unstable-2018-10-18"; + name = "ps2client-${version}"; + + src = fetchFromGitHub { + owner = "ps2dev"; + repo = "ps2client"; + rev = "92fcaf18aabf74daaed40bd50d428cce326a87c0"; + sha256 = "1rlmns44pxm6dkh6d3cz9sw8v7pvi53r7r5r3kgwdzkhixjj0cdg"; + }; + + patchPhase = '' + sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile + ''; + + installPhase = '' + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "Desktop clients to interact with ps2link and ps2netfs"; + homepage = https://github.com/ps2dev/ps2client; + license = licenses.bsd3; + maintainers = [ maintainers.genesis ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix index 8d0022e3c8b3..d6e25ae4e7b5 100644 --- a/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -38,51 +38,30 @@ let }; }); - versionInfo = { - "13.8.0" = { - major = "13"; - minor = "8"; - patch = "0"; - x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; - x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; - x64suffix = "10299729"; - x86suffix = "10299729"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html; - }; - - "13.9.0" = { - major = "13"; - minor = "9"; - patch = "0"; - x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9"; - x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; - x64suffix = "102"; - x86suffix = "102"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh* - }; - - "13.9.1" = { - major = "13"; - minor = "9"; - patch = "1"; - x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC"; - x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483"; - x64suffix = "6"; - x86suffix = "6"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html; + 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; + }; }; - "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.flip map 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 { diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index bd4ea2d9238d..951b136dd4e4 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "09mizr9igf22kk26rdx5masai8ghd2nbqryvswkybvia2s6lccrs"; + sha256 = "18p6v2lalpiba0r318grlc2bvqh2qlpjw811i0934g33faviyfj1"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/spideroak/default.nix b/nixpkgs/pkgs/applications/networking/spideroak/default.nix index fdb4206d340f..d96a810ee05a 100644 --- a/nixpkgs/pkgs/applications/networking/spideroak/default.nix +++ b/nixpkgs/pkgs/applications/networking/spideroak/default.nix @@ -4,31 +4,21 @@ }: let - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" - else if stdenv.hostPlatform.system == "i686-linux" then "x86" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; - - interpreter = if stdenv.hostPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" - else if stdenv.hostPlatform.system == "i686-linux" then "ld-linux.so.2" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; - - sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "a88e5a8fe4a565ac500668bd53cf5784752d7c9253304ddce39ee7b01d078533" - else if stdenv.hostPlatform.system == "i686-linux" then "668f3b83a974a3877d16c8743c233a427ea0a44ab84b7f9aec19a2995db66c16" - else throw "Spideroak client for: ${stdenv.hostPlatform.system} not supported!"; + sha256 = "6d6ca2b383bcc81af1217c696eb77864a2b6db7428f4b5bde5b5913ce705eec5"; ldpath = stdenv.lib.makeLibraryPath [ fontconfig freetype glib libICE libSM libX11 libXext libXrender zlib ]; - version = "7.1.0"; + version = "7.5.0"; in stdenv.mkDerivation { name = "spideroak-${version}"; src = fetchurl { - name = "SpiderOakONE-${version}-slack_tar_${arch}.tgz"; - url = "https://spideroak.com/release/spideroak/slack_tar_${arch}"; + name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; + url = "https://spideroak.com/release/spideroak/slack_tar_x64"; inherit sha256; }; @@ -46,7 +36,7 @@ in stdenv.mkDerivation { rm -f $out/opt/SpiderOakONE/lib/libz* - patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \ + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" RPATH=$out/opt/SpiderOakONE/lib:${ldpath} diff --git a/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/nixpkgs/pkgs/applications/networking/syncplay/default.nix index fc9ed59016f6..4f4eaf302455 100644 --- a/nixpkgs/pkgs/applications/networking/syncplay/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncplay/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "syncplay-${version}"; - version = "1.6.2"; + version = "1.6.3"; format = "other"; src = fetchurl { - url = https://github.com/Syncplay/syncplay/archive/v1.6.2.tar.gz; - sha256 = "1850icvifq4487gqh8awvmvrjdbbkx2kshmysr0fbi6vcf0f3wj2"; + url = https://github.com/Syncplay/syncplay/archive/v1.6.3.tar.gz; + sha256 = "151p1njlp3dp3pfr3l3m6ia5829zvjyjh4p45j6rgnicbh8sqrgs"; }; propagatedBuildInputs = with python3Packages; [ pyside twisted ]; diff --git a/nixpkgs/pkgs/applications/networking/znc/default.nix b/nixpkgs/pkgs/applications/networking/znc/default.nix index 472f6c13c56f..deb768e6feb6 100644 --- a/nixpkgs/pkgs/applications/networking/znc/default.nix +++ b/nixpkgs/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1ac2csl5jr56vahnxdynlvrhwlvcc1gqxvyifckc6cn5aj7ygd30"; + sha256 = "0g8i5hsl4kinpz1wp0a2zniidv3w2sd6awq8676fds516wcc6k0y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/office/aesop/default.nix b/nixpkgs/pkgs/applications/office/aesop/default.nix index 51e2c55ea7d0..ad11bb0290ac 100644 --- a/nixpkgs/pkgs/applications/office/aesop/default.nix +++ b/nixpkgs/pkgs/applications/office/aesop/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, ninja, python3, gtk3 -, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobject-introspection, wrapGAppsHook }: +, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "aesop"; - version = "1.0.7"; - - name = "${pname}-${version}"; + version = "1.1.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "17hjg4qcy8q9xl170yapbhn9vdsn3jf537jsggq51pp0fnhvsnqs"; + sha256 = "0gh1xwxlzyicw059g6h1icckinf5d9rqfnwml0cy85bbawm6w0xq"; }; nativeBuildInputs = [ desktop-file-utils - gobject-introspection meson ninja pkgconfig @@ -27,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pantheon.elementary-icon-theme - gnome3.libgee + libgee pantheon.granite gtk3 json-glib diff --git a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix index be31f5fd102f..6bb84c523362 100644 --- a/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix +++ b/nixpkgs/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-cli-${version}"; - version = "7.8.0"; + version = "8.0.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip"; - sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + sha256 = "0ysyam06ll70d0baa3hb7wcgqnqflssr64bqjr3db6fnk1q096m8"; extraPostFetch = "chmod go-w $out"; }; diff --git a/nixpkgs/pkgs/applications/office/autokey/default.nix b/nixpkgs/pkgs/applications/office/autokey/default.nix index e4b89ef36100..31e74ccf23a1 100644 --- a/nixpkgs/pkgs/applications/office/autokey/default.nix +++ b/nixpkgs/pkgs/applications/office/autokey/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection -, gnome3, libappindicator-gtk3, libnotify }: +, gtksourceview3, libappindicator-gtk3, libnotify }: python3Packages.buildPythonApplication rec { name = "autokey-${version}"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { # Note: no dependencies included for Qt GUI because Qt ui is poorly # maintained—see https://github.com/autokey/autokey/issues/51 - buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview + buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3 libappindicator-gtk3 libnotify ]; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/office/calligra/default.nix b/nixpkgs/pkgs/applications/office/calligra/default.nix index a7c6165bdd2b..4a050eb5d749 100644 --- a/nixpkgs/pkgs/applications/office/calligra/default.nix +++ b/nixpkgs/pkgs/applications/office/calligra/default.nix @@ -65,5 +65,7 @@ mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; + hydraPlatforms = []; + broken = true; # fails to start, kde home not found }; } diff --git a/nixpkgs/pkgs/applications/office/grisbi/default.nix b/nixpkgs/pkgs/applications/office/grisbi/default.nix index f901123065fa..338cdc170656 100644 --- a/nixpkgs/pkgs/applications/office/grisbi/default.nix +++ b/nixpkgs/pkgs/applications/office/grisbi/default.nix @@ -1,17 +1,17 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +{ fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "grisbi-${version}"; - version = "1.0.4"; + version = "1.2.1"; src = fetchurl { url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; - sha256 = "1rh2iqvi7lpz5l57vn7qk9azil3y1g65mfbi9hhbx956knh9bpf6"; + sha1 = "1159c5491967fa7afd251783013579ffb45b891b"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup + buildInputs = [ gtk libgsf libofx intltool hicolor-icon-theme libsoup gnome3.adwaita-icon-theme ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix index f5fc705eed4c..9c14ffdbbfdd 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "2"; - patch = "1"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0p2r48n27v5ifbj3cb9bs38nb6699awmdqx4shy1c6p28b24y78f"; + sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq"; }; } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/nixpkgs/pkgs/applications/office/libreoffice/default.nix index 9113eedc06cd..a7f24fdf1f38 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false }: @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "180d4rrzb3lq7g2w7x512fn8chfkjg4ld20ikrj6hkg11kj4hbmy"; + sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "06fgd5jkqqbvskyj1ywmsmb4crsj064s8r45nrv0r8j6ydn0hi1l"; + sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1"; }; }; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index e9eeacf63b52..fda975a9031a 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -56,11 +56,11 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.15.12.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.15.12.tar.xz"; - sha256 = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9"; + name = "cairo-1.16.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; - md5name = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9-cairo-1.15.12.tar.xz"; + md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { name = "libcdr-0.1.5.tar.xz"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2p.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; - sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; + name = "openssl-1.0.2r.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; + sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; md5 = ""; - md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; + md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/still.nix b/nixpkgs/pkgs/applications/office/libreoffice/still.nix index 1da6160e85bb..1b7d2b0987f8 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/still.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/still.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false }: diff --git a/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh index cff8f200e2bc..62569734745c 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh +++ b/nixpkgs/pkgs/applications/office/libreoffice/wrapper.sh @@ -5,7 +5,13 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}" if uname | grep Linux > /dev/null && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" - mkdir "$dbus_tmp_dir" + if ! test -d "$dbus_tmp_dir" && test -d "/run"; then + mkdir -p "$dbus_tmp_dir" + fi + if ! test -d "$dbus_tmp_dir"; then + dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus" + mkdir -p "$dbus_tmp_dir" + fi dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" diff --git a/nixpkgs/pkgs/applications/office/notes-up/default.nix b/nixpkgs/pkgs/applications/office/notes-up/default.nix index 2dee39a0ad3b..08b6d66a344c 100644 --- a/nixpkgs/pkgs/applications/office/notes-up/default.nix +++ b/nixpkgs/pkgs/applications/office/notes-up/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "notes-up"; - version = "1.6.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Notes-up"; rev = version; - sha256 = "06fzdb823kkami0jch9ccblsvw3x7zd1d4xz8fv3giscl3f36x4q"; + sha256 = "16bb9ffsg2csps1cb636rff5vc6f1yyhg65g3y5b4wf2hlbmzgql"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index f28c49ce4dd7..7c72c03edca1 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qownnotes"; - version = "19.3.0"; + version = "19.3.4"; 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 = "09265d9xgqmdw3fbf94fj2irgq2dp2jhkfd2kq33axfzgpm85bdz"; + sha256 = "4e2d25acf596ed3a759b298e39f6f8bea001c0625e143616bf97560913d7f86f"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/office/trilium/default.nix b/nixpkgs/pkgs/applications/office/trilium/default.nix index dc9f0b89b2ff..090152961ca3 100644 --- a/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "trilium-${version}"; - version = "0.30.4"; + version = "0.30.6"; src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1541z56rk329sj7a20llhhmv2f552amj1n3cisvqga4gn2yq3hnm"; + sha256 = "0f2hf2lky4r4nh3hj5fmniy8gjbgdyj8i5d6bhf156yp3lx802ay"; }; # Fetch from source repo, no longer included in release. diff --git a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix index 45e416a6c941..839cac32dd6d 100644 --- a/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/nixpkgs/pkgs/applications/radio/gnuradio/limesdr.nix @@ -5,7 +5,7 @@ assert pythonSupport -> python != null && swig != null; let - version = "1.0.0-RC"; + version = "2.0.0"; in stdenv.mkDerivation rec { name = "gnuradio-limesdr-${version}"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { owner = "myriadrf"; repo = "gr-limesdr"; rev = "v${version}"; - sha256 = "0b34mg9nfar2gcir98004ixrxmxi8p3p2hrvvi1razd869x2a0lf"; + sha256 = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index eb7ba2a8c9c4..fb7963416167 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { name = "stellarium-${version}"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1cnwfk3vdsxh8gacw22qik401z0kpzd1ralbg9ph2cjqx9x2m1s1"; + sha256 = "1x9s9v9ann93nyqd8n8adwhx66xgq5vp0liyzl1h1ji6qk8jla3c"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix index e97b5d1a3f4f..516608466a93 100644 --- a/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.4.3"; + version = "2.3.5"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp"; + sha256 = "12v240wnbc541hl4z2fiymxd3bd6czazs13fjkygldflg48w45m0"; }; buildInputs = [ zlib tbb python perl ]; diff --git a/nixpkgs/pkgs/applications/science/biology/itsx/default.nix b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix new file mode 100644 index 000000000000..804e71c1bfa7 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/itsx/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, hmmer, perl }: + +stdenv.mkDerivation rec { + version = "1.1.1"; + name = "itsx-${version}"; + + src = fetchurl { + url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; + sha256 = "0lrmy2n3ax7f208k0k8l3yz0j5cpz05hv4hx1nnxzn0c51z1pc31"; + }; + + buildInputs = [ hmmer perl ]; + + buildPhase = '' + sed -e "s,profileDB = .*,profileDB = \"$out/share/ITSx_db/HMMs\";," -i ITSx + sed "3 a \$ENV{\'PATH\'}='${hmmer}/bin:'.\"\$ENV{\'PATH\'}\";" -i ITSx + mkdir bin + mv ITSx bin + ''; + + installPhase = '' + mkdir -p $out/share/doc && cp -a bin $out/ + cp *pdf $out/share/doc + cp -r ITSx_db $out/share + ''; + + meta = with stdenv.lib; { + description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; + homepage = http://microbiology.se/software/itsx/; + license = licenses.gpl3; + maintainers = [ maintainers.bzizou ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/megahit/default.nix b/nixpkgs/pkgs/applications/science/biology/megahit/default.nix new file mode 100644 index 000000000000..56bb35b64df8 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/megahit/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, zlib }: + +stdenv.mkDerivation rec { + pname = "megahit"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "voutcn"; + repo = "megahit"; + rev = "v${version}"; + sha256 = "011k0776w76l03zmy70kfd3y9zjmdnspfbs9fcxmnl3bdwd36kcw"; + }; + + buildInputs = [ zlib ]; + + installPhase = '' + for bin in megahit_sdbg_build megahit megahit_asm_core megahit_toolkit; do + install -vD $bin $out/bin/$bin + done + ''; + + meta = with stdenv.lib; { + description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; + license = licenses.gpl3; + homepage = https://github.com/voutcn/megahit; + maintainers = with maintainers; [ luispedro ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix new file mode 100644 index 000000000000..dbbf8d39a93c --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/messer-slim/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: + +stdenv.mkDerivation rec { + version = "3.2.1"; + name = "messer-slim-${version}"; + + src = fetchurl { + url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; + sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; + + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; + + meta = { + description = "An evolutionary simulation framework"; + homepage = https://messerlab.org/slim/; + license = with stdenv.lib.licenses; [ gpl3 ]; + maintainers = with stdenv.lib.maintainers; [ bzizou ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix index 3f28b5e31ccd..85c2b99b3a78 100644 --- a/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/minimap2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "minimap2"; - version = "2.15"; + version = "2.16"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "0dy3m2wjmi3whjnmkj3maa1aadz525h7736wm8vvdcwq71ijqb7v"; + sha256 = "1ggm5psv3gwsz627ik9kl6ry9gzgmfsvya6ni0gv6ahwlrhdim73"; }; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/applications/science/biology/paml/default.nix b/nixpkgs/pkgs/applications/science/biology/paml/default.nix index fe25a04c420a..68efc2030e53 100644 --- a/nixpkgs/pkgs/applications/science/biology/paml/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.9h"; + version = "4.9i"; name = "paml-${version}"; src = fetchurl { url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; - sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2"; + sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw"; }; preBuild = '' diff --git a/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix new file mode 100644 index 000000000000..01b1c0ba81bf --- /dev/null +++ b/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + pname = "stacks"; + version = "2.3e"; + src = fetchurl { + url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; + sha256 = "046gmq8nzqy5v70ydqrhib2aiyrlja3cljvd37w4qbd4ryj3jr0w"; + }; + + buildInputs = [ zlib ]; + + meta = { + description = "Software pipeline for building loci from short-read sequences"; + homepage = http://catchenlab.life.illinois.edu/stacks/; + maintainers = [ stdenv.lib.maintainers.bzizou ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 7f5eb7b76e8c..c55766b8d615 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.31"; + version = "14.29.32"; 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 = "15mxifm1h145bhyrm9rvmipvg048q8rgwg1sn6jmfgrimy0cjraj"; + sha256 = "0jpl8smljyjpd3x1q6fcamgia1ij7gxk51faw99ys8ydnrzd57di"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix index 99a8c777cd0e..35d21848e2b3 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/molden/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { - version = "5.9.3"; + version = "5.9.5"; name = "molden-${version}"; src = fetchurl { url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz"; - sha256 = "18fz44g7zkm0xcx3w9hm049jv13af67ww7mb5b3kdhmza333a16q"; + sha256 = "0va5g03kvnzydx0b77y1p536iy7swzvnx6yknp87qgpw1bgrzdj9"; }; nativeBuildInputs = [ which ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix index 2dd3c9b64c43..5fc71c9fc6ba 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix @@ -3,7 +3,7 @@ }: let - version = "8.3"; + version = "8.4"; fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "0nr3qmyfhp6fy8qrp4p43pl5xxfqgqg5g1c2775hxhpsi29xr7zf"; + sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55"; }; nativeBuildInputs = [ perl procps fftw.dev ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 7a7f1b3596d3..777b3499bedc 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.3"; + version = "6.4"; name = "quantum-espresso-${version}"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "1738z3nhkzcrgnhnfg1r4lipbwvcrcprwhzjbjysnylmzbzwhrs0"; + sha256 = "1zjblzf0xzwmhmpjm56xvv8wsv5jmp5a204irzyicmd77p86c4vq"; }; passthru = { @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - # remove after 6.3 version: - # makefile needs to ignore install directory easier than applying patch - preInstall = '' - printf "\n.PHONY: install\n" >> Makefile - ''; - buildInputs = [ fftw openblas gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); diff --git a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index b97ede413963..831ec9662b09 100644 --- a/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "9.1.2"; + version = "9.3.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "0y7ahl9z5a7l9cjk8hzmyv6ga8chlry5rr8v116q5mnsgs4i11an"; + sha256 = "0hrbw368kskjzwjnqrri5j7c10d0z5m81h3s9zhqfrmwym42vdc5"; }; desktopItem = makeDesktopItem { diff --git a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index d2246f656db0..e3c51906435e 100644 --- a/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "4.010"; + version = "4.012"; src = fetchurl { url = "https://www.veripool.org/ftp/${name}.tgz"; - sha256 = "0wfmazhxb6bf6qznh7v756fv7jayjgkzar33gazkwdwfwa7p8lan"; + sha256 = "0xzndazp1g5qxzfirgiv219zmx7qyxfn7wsqbfq93cp1m6rp4pai"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/nixpkgs/pkgs/applications/science/logic/elan/default.nix index b5a6a5b963e5..eddc4b9b2080 100644 --- a/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { name = "elan-${version}"; - version = "0.7.2"; + version = "0.7.5"; cargoSha256 = "0vv7kr7rc3lvas7ngp5dp99ajjd5v8k5937ish7zqz1k4970q2f1"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0844fydfxvacyx02gwxbzpmiamsp22malyy5m4wpvrky4dkpn3qj"; + sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix index 099e2102c517..40b0115dc1b7 100644 --- a/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/hol_light/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation { - name = "hol_light-2018-09-30"; + name = "hol_light-2019-03-27"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "27e09dd27834de46e917057710e9d8ded51a4c9f"; - sha256 = "1p0rm08wnc2lsrh3xzhlq3zdhzqcv1lbqnkwx3aybrqhbg1ixc1d"; + rev = "a2b487b38d9da47350f1b4316e34a8fa4cf7a40a"; + sha256 = "1qlidl15qi8w4si8wxcmj8yg2srsb0q4k1ad9yd91sgx9h9aq8fk"; }; buildInputs = [ ocaml camlp5 ]; diff --git a/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 18a5281bebb0..4b9f15e0a92f 100644 --- a/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/nixpkgs/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.4"; + name = "ginac-1.7.5"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1vvqv73yk9klbq0mz239zzw77rlp72qcvzci4j1v6rafvji1616n"; + sha256 = "11v8dpdfq8ybbbadyakp19xc7jgckplbbj6q2hh1c2hj5ps6njz7"; }; propagatedBuildInputs = [ cln ]; diff --git a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix index e3760533edae..8f96eb8f3060 100644 --- a/nixpkgs/pkgs/applications/science/math/gmsh/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gmsh/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg , zlib, libGLU_combined, libGLU, xorg }: -let version = "4.2.1"; in +let version = "4.2.2"; in stdenv.mkDerivation { name = "gmsh-${version}"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "1f11481e68900dc256f88aaed18d03e93b416ba01e9e8c3dc3f6d59a211f0561"; + sha256 = "e9ee9f5c606bbec5f2adbb8c3d6023c4e2577f487fa4e4ecfcfc94a241cc8dcc"; }; buildInputs = [ cmake openblasCompat gmm fltk libjpeg zlib libGLU_combined diff --git a/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/nixpkgs/pkgs/applications/science/math/nasc/default.nix index aef18abaedfb..beed2de9759c 100644 --- a/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -2,47 +2,45 @@ , fetchFromGitHub , pkgconfig , gtk3 +, glib , pantheon -, gnome3 +, libsoup , gtksourceview , libgee , cmake , libqalculate -, gobject-introspection -, wrapGAppsHook }: +, cln +, wrapGAppsHook +}: stdenv.mkDerivation rec { - name = "nasc-${version}"; - version = "0.5.1"; + pname = "nasc"; + version = "0.5.2"; src = fetchFromGitHub { owner = "parnold-x"; - repo = "nasc"; + repo = pname; rev = version; - sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5"; + sha256 = "009xmlsgl7r6wp6sczbdp8sjqqd6k2mychx5b4zn7wnrl7435y5y"; }; - postPatch = '' - # libqalculatenasc.so is not installed, and nasc fails to start - substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC - ''; - nativeBuildInputs = [ cmake pantheon.vala - gobject-introspection # for setup-hook pkgconfig wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme + cln + libsoup + gtk3 + glib gtksourceview libgee - gnome3.libsoup - pantheon.granite - gtk3 libqalculate + pantheon.elementary-icon-theme + pantheon.granite ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/nixpkgs/pkgs/applications/science/math/nauty/default.nix index 5b431f419261..7351de53cfce 100644 --- a/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -1,4 +1,8 @@ -{stdenv, fetchurl}: +{ stdenv +, lib +, fetchurl +, optimize ? false # impure +}: stdenv.mkDerivation rec { name = "nauty-${version}"; version = "26r11"; @@ -7,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "05z6mk7c31j70md83396cdjmvzzip1hqb88pfszzc6k4gy8h3m2y"; }; outputs = [ "out" "dev" ]; + configureFlags = lib.optionals (!optimize) [ + # Prevent nauty from sniffing some cpu features. While those are very + # widely available, it can lead to nasty bugs when they are not available: + # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA + "--disable-popcnt" + "--disable-clz" + ]; buildInputs = []; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} @@ -14,18 +25,18 @@ stdenv.mkDerivation rec { find . -type f -perm -111 \! -name '*.*' \! -name configure -exec cp '{}' "$out/bin" \; cp [Rr][Ee][Aa][Dd]* COPYRIGHT This* [Cc]hange* "$out/share/doc/nauty" - cp *.h $dev/include/nauty + cp *.h "$dev/include/nauty" for i in *.a; do cp "$i" "$dev/lib/lib$i"; done ''; checkTarget = "checks"; - meta = { + meta = with lib; { inherit version; description = ''Programs for computing automorphism groups of graphs and digraphs''; - license = stdenv.lib.licenses.asl20; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.linux; homepage = http://pallini.di.uniroma1.it/; }; } diff --git a/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 5104d1012b2f..61ebed896875 100644 --- a/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "qalculate-gtk-${version}"; - version = "2.9.0"; + pname = "qalculate-gtk"; + version = "3.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0c5s7mz8xwwmzc22yai8vqiww7paafkyi7khp8a2yws78m2nirdx"; + sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index dd51059ff01b..75cd308da400 100644 --- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -137,6 +137,13 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/27405 ./patches/ignore-pip-deprecation.patch + + # https://trac.sagemath.org/ticket/27360 + (fetchpatch { + name = "eclib-20190226.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=f570e3a7fc2965764b84c04ce301a88ded2c42df"; + sha256 = "0l5c4giixkn15v2a06sfzq5mkxila6l67zkjbacirwprrlpcnmmp"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/nixpkgs/pkgs/applications/science/misc/root/5.nix b/nixpkgs/pkgs/applications/science/misc/root/5.nix index 1f0fc663647a..871f5ece9cfe 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/5.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2 +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 , libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1 , Cocoa, OpenGL, cf-private, noSplash ? false }: @@ -19,11 +19,30 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers_root5.patch + + (fetchpatch { + name = "enable_new_gcc.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/enable_new_gcc.patch?h=root5&id=91c50876081a0af36f84ec4f0f9dba869107fa4f"; + sha256 = "1rnp0xlw0yqi7mjs4w145njd79i8kkir1qik7zwicdik9axf8ygm"; + }) + + # prevents rootcint from looking in /usr/includes and such + ./purify_include_paths_root5.patch + + # disable dictionary generation for stuff that includes libc headers + # our glibc requires a modern compiler + ./disable_libc_dicts_root5.patch ]; preConfigure = '' patchShebangs build/unix/ ln -s ${stdenv.lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + '' + # Fix CINTSYSDIR for "build" version of rootcint + # This is probably a bug that breaks out-of-source builds + + '' + substituteInPlace cint/cint/src/loadfile.cxx\ + --replace 'env = "cint";' 'env = "'`pwd`'/cint";' '' + stdenv.lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" ''; @@ -73,8 +92,5 @@ stdenv.mkDerivation rec { description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; - # needs to be adapted to work with modern glibc - # it works on darwin by impurely picking up system's libc headers - broken = stdenv.isLinux; }; } diff --git a/nixpkgs/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch b/nixpkgs/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch new file mode 100644 index 000000000000..abd6222847ef --- /dev/null +++ b/nixpkgs/pkgs/applications/science/misc/root/disable_libc_dicts_root5.patch @@ -0,0 +1,27 @@ +diff --git a/cint/ROOT/CMakeLists.txt b/cint/ROOT/CMakeLists.txt +--- a/cint/ROOT/CMakeLists.txt ++++ b/cint/ROOT/CMakeLists.txt +@@ -47,21 +47,13 @@ set(CINTSTLDLLHEADERS + ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h + ) + set(CINTINCDLLNAMES +- stdfunc ++# stdfunc + # stdcxxfunc + ) + set(CINTINCDLLHEADERS +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h ++# ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdfunc.h + # ${CMAKE_SOURCE_DIR}/cint/cint/lib/stdstrct/stdcxxfunc.h + ) +-if(NOT WIN32) +- set(CINTSTLDLLNAMES ${CINTSTLDLLNAMES} valarray) +- set(CINTSTLDLLHEADERS ${CINTSTLDLLHEADERS} ${CINTDLLDIR}/vary.h) +- set(CINTINCDLLNAMES ${CINTINCDLLNAMES} posix ipc) +- set(CINTINCDLLHEADERS ${CINTINCDLLHEADERS} +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/posix/exten.h +- ${CMAKE_SOURCE_DIR}/cint/cint/lib/ipc/ipcif.h) +-endif() + + set(CINTBUILDLOADER + vector diff --git a/nixpkgs/pkgs/applications/science/misc/root/purify_include_paths_root5.patch b/nixpkgs/pkgs/applications/science/misc/root/purify_include_paths_root5.patch new file mode 100644 index 000000000000..6773603b8ad3 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/misc/root/purify_include_paths_root5.patch @@ -0,0 +1,204 @@ +diff --git a/cint/cint/src/loadfile.cxx b/cint/cint/src/loadfile.cxx +--- a/cint/cint/src/loadfile.cxx ++++ b/cint/cint/src/loadfile.cxx +@@ -1365,92 +1365,6 @@ int G__statfilename(const char *filenamein, struct stat *statBuf, + } + } + #endif /* G__EDU_VERSION */ +- +-#ifdef G__VISUAL +- /********************************************** +- * try /msdev/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/msdev/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif /* G__VISUAL */ +- +-#ifdef G__SYMANTEC +- /********************************************** +- * try /sc/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/sc/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif // G__SYMANTEC +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif +- +-#ifdef __GNUC__ +- /********************************************** +- * try /usr/include/g++/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/g++/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif /* __GNUC__ */ +- +-#ifndef G__WIN32 +- /* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/CC/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/CC/%s%s",filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/codelibs/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- workname.Format("/usr/include/codelibs/%s%s" +- ,filename(),addpost[i2]); +- res = stat( workname, statBuf ); +- if (res==0) { +- if (fullPath) fullPath->Swap(workname); +- return res; +- } +- } +-#endif + } + return -1; + } +@@ -1960,107 +1874,6 @@ int G__loadfile(const char *filenamein) + } + if(G__ifile.fp) break; + #endif /* G__EDU_VERSION */ +- +-#ifdef G__VISUAL +- /********************************************** +- * try /msdev/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/msdev/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* G__VISUAL */ +- +-#ifdef G__SYMANTEC +- /********************************************** +- * try /sc/include +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/sc/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* G__SYMANTEC */ +- +-#ifndef G__WIN32 +- /********************************************** +- * try /usr/include/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif +- +-#ifdef __GNUC__ +- /********************************************** +- * try /usr/include/g++/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/g++/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-#endif /* __GNUC__ */ +- +-#ifndef G__WIN32 +-/* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/CC/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/CC/%s%s",filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-/* #endif __hpux */ +-#endif +- +-#ifndef G__WIN32 +-/* #ifdef __hpux */ +- /********************************************** +- * try /usr/include/codelibs/filename +- **********************************************/ +- if('\0'!=G__cintsysdir[0]) { +- G__snprintf(G__ifile.name,G__MAXFILENAME,"/usr/include/codelibs/%s%s" +- ,filename(),addpost[i2]); +-#ifndef G__WIN32 +- G__ifile.fp = fopen(G__ifile.name,"r"); +-#else +- G__ifile.fp = fopen(G__ifile.name,"rb"); +-#endif +- G__globalcomp=G__store_globalcomp; +- } +- if(G__ifile.fp) break; +-/* #endif __hpux */ +-#endif + } + } + diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a682d59ab23a..f0ac310ea665 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2019"; + name = "gromacs-2019.1"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz"; - sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.1.tar.gz"; + sha256 = "1v438nf6viwpl53ydrljf598cf8lh7jqxp5bzi74rrnhzk97xhxj"; }; buildInputs = [cmake fftw] diff --git a/nixpkgs/pkgs/applications/search/catfish/default.nix b/nixpkgs/pkgs/applications/search/catfish/default.nix index c2afda2d53d9..a0917d03ce11 100644 --- a/nixpkgs/pkgs/applications/search/catfish/default.nix +++ b/nixpkgs/pkgs/applications/search/catfish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, + findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme, wrapGAppsHook }: @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.gtk + gtk3 gnome3.dconf pythonPackages.pyxdg pythonPackages.ptyprocess diff --git a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index 5e1a0cab69d9..d7d0c28dcc12 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -7,7 +7,7 @@ with stdenv; with lib; mkDerivation rec { name = "cvs-fast-export-${meta.version}"; meta = { - version = "1.45"; + version = "1.47"; description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; @@ -16,8 +16,8 @@ mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.45.tar.gz"; - sha256 = "19pxg6p0pcgyd2fbnh3wy1kazv6vcfi5lzc2whhdi1w9kj4r9c4z"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.47.tar.gz"; + sha256 = "08kll7jlak26asvnqgwbkci3d6irvy96ijjl7fmck6h7i5mx5lz7"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 9f18beda7f93..e6e136e290d8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.10.0"; + version = "2.11.1"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "1vvrc3k81jm9c664g0j9666i7ypn7n7jfyj4gxcybq3sg2d4di27"; + sha256 = "1gq3m4w4j63n3i43pyq2niwacd8cjypaj27yjabb582x63a431xy"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 2d02287f2617..347d4469f063 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,27 +1,31 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "lab-${version}"; - version = "0.15.2"; - - goPackagePath = "github.com/zaquestion/lab"; - - subPackages = [ "." ]; +buildGoModule rec { + pname = "lab"; + version = "0.15.3"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1210cf6ss4ivm2jxq3k3c34vpra02pl91fpmvqbvw5sm53j7xfaf"; + sha256 = "00c0ljyvcqrzzcsdb3r37lxd4z2wvwp80ggs8jvp7y32p1b61bsg"; }; - goDeps = ./deps.nix; + subPackages = [ "." ]; + + modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb"; + + postInstall = '' + mkdir -p $out/share/zsh/site-functions + LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c \ + $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab + ''; meta = with stdenv.lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = https://zaquestion.github.io/lab; license = licenses.unlicense; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix deleted file mode 100644 index c0526595d4fa..000000000000 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/deps.nix +++ /dev/null @@ -1,507 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/avast/retry-go"; - fetch = { - type = "git"; - url = "https://github.com/avast/retry-go"; - rev = "5469272a8171"; - sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.8"; - sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; - }; - } - { - 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/derekparker/delve"; - fetch = { - type = "git"; - url = "https://github.com/derekparker/delve"; - rev = "v1.1.0"; - sha256 = "0gpsd9hb7r65rn4ml9jzsmy72b8j0id6wik2l48ghzkwjm72rsdz"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "b23993cbb635"; - sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "2f258105ca8c"; - sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "d547d1d9531e"; - sha256 = "0rhgxfh8b3qq4imkw6dmv0hxsmflm9pkax8i7a9z8q464z1ixrz7"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.2.1"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "231272389856"; - sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn"; - }; - } - { - goPackagePath = "github.com/lunixbochs/vtclean"; - fetch = { - type = "git"; - url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a"; - sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.7.6"; - sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.2"; - sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e238"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.1.0"; - sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; - }; - } - { - 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/rivo/tview"; - fetch = { - type = "git"; - url = "https://github.com/rivo/tview"; - rev = "f855bee0205c"; - sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.1"; - sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - 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 = "044398e4856c"; - sha256 = "0nrrk25vzzrrsmmprs72ldfy041crjjsj44n47aj9w8gw379hl5p"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.0"; - sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.2.0"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/rsteube/cobra"; - rev = "v0.0.1-zsh-completion-custom"; - sha256 = "0l0c9p5pdv3fq27ich4psaffivwv43acknqnzyql3bgx08vhnsxd"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ec"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.1"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "15738813a09d"; - sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; - }; - } - { - 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.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/tcnksm/go-gitconfig"; - fetch = { - type = "git"; - url = "https://github.com/tcnksm/go-gitconfig"; - rev = "v0.1.2"; - sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9"; - }; - } - { - goPackagePath = "github.com/wadey/gocovmerge"; - fetch = { - type = "git"; - url = "https://github.com/wadey/gocovmerge"; - rev = "b5bfa59ec0ad"; - sha256 = "00m7kxcmmw0l9z0m7z6ii06n5j4bcrxqjbhxjbfzmsdgdsvkic31"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "7bc4155e8bf8"; - sha256 = "1zk3f00i9ji57m85hzkrg8f1b9l5acd5p75kpzhr087skk943rdm"; - }; - } - { - goPackagePath = "golang.org/x/arch"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/arch"; - rev = "5a4828bb7045"; - sha256 = "1c550zdqvyjvc5xc1yqaxa3pmkcdjc5cmbmrhy1li6g3ysfbcil3"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "03003ca0c849"; - sha256 = "09ag58l678hr9bzy5fn8i3m5rxn2scps74zm0kmkb6p25lg5z4sl"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "f42d05182288"; - sha256 = "1cbwgr3f3wj84kjpldzzvrlkvlpp0jz8rgbj31xw8n3h502phwab"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0be0721c37e"; - sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; - }; - } - { - 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 = "e063def13b29"; - sha256 = "1aphxa8g0936jbmqjlfjczq6wlr0mc2iz965fql764kvqb5szkkw"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.3.0"; - sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370"; - }; - } - { - goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; - rev = "v1.3.0"; - sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; - }; - } - { - 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/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"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 0074d44391ef..06c8bb8cb2dd 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2; - homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; + homepage = https://github.com/tibirna/qgit; description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 7b36a142d15d..a129e0f75272 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.2.4"; + name = "subgit-3.3.6"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://subgit.com/download/${name}.zip"; - sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw"; + sha256 = "1zfhl583lx7xdw9jwskv25p6m385wm3s5a311y0hnxxqwkjbgq1j"; }; } diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 6f72b2e1775c..38aa63c1ab07 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; buildGoPackage rec { - name = "gitea-${version}"; - version = "1.7.3"; + pname = "gitea"; + version = "1.7.5"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0q33xn2l2ii8vd3hxr0f6ipk8mv2ahb3p8fzdzylhgg9w15snvsr"; + sha256 = "063rfb0jwxfq91cw7gp0achqsgi3dpj1pqfi7k5md67bhp2i2si3"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' @@ -35,12 +35,15 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ] ++ optional pamSupport pam; - buildFlags = optional sqliteSupport "-tags sqlite" - ++ optional pamSupport "-tags pam"; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ${optionalString sqliteSupport "-X=main.Tags=sqlite"} + preBuild = let + tags = optional pamSupport "pam" + ++ optional sqliteSupport "sqlite"; + tagsString = concatStringsSep " " tags; + in '' + export buildFlagsArray=( + -tags="${tagsString}" + -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' + ) ''; outputs = [ "bin" "out" "data" ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 3298bc167517..e15709191bfd 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.5", - "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", - "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l", + "deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.5", + "rev": "v11.9.1", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } }, "ee": { - "version": "11.7.5", - "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", - "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd", + "deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.5-ee", + "rev": "v11.9.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } } } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 81f1864099f3..8a8ce5771cf4 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,10 +3,10 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.16.5' -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.3.0' +gem 'gitaly-proto', '~> 1.13.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false @@ -14,6 +14,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.15.0' gem 'sentry-raven', '~> 2.7.2', require: false gem 'faraday', '~> 0.12' +gem 'rbtrace', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -27,4 +28,11 @@ group :development, :test do gem 'rspec-parameterized', require: false gem 'timecop', require: false gem 'factory_bot', require: false + gem 'pry', '~> 0.12.2', require: false + + # gitlab-shell spec gems + gem 'listen', '~> 0.5.0' + gem 'simplecov', '~> 0.9.0', require: false + gem 'vcr', '~> 4.0.0' + gem 'webmock', '~> 3.4.0' end diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 59f8ad69f223..4deb64c4cd5b 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -10,6 +10,8 @@ GEM 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) @@ -19,18 +21,22 @@ GEM adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.3) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.4) debug_inspector (0.0.3) diff-lcs (1.3) + docile (1.1.5) equalizer (0.0.11) escape_utils (1.2.1) factory_bot (4.11.1) activesupport (>= 3.0.0) faraday (0.15.3) multipart-post (>= 1.2, < 3) + ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.3.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) @@ -58,29 +64,35 @@ GEM gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) + hashdiff (0.3.8) i18n (1.1.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) json (2.1.0) licensee (8.9.2) rugged (~> 0.24) + listen (0.5.3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) + msgpack (1.2.6) + multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + optimist (3.0.0) parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) @@ -91,7 +103,15 @@ GEM 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 (3.0.0) + rbtrace (0.4.11) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) rdoc (4.3.0) rouge (3.3.0) rspec (3.7.0) @@ -121,13 +141,19 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.10.0) - rugged (0.27.5) + rugged (0.28.0) + safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.7.2) + sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) stringex (2.8.4) thread_safe (0.3.6) timecop (0.9.1) @@ -142,6 +168,11 @@ GEM 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 @@ -151,7 +182,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.13.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) @@ -159,13 +190,19 @@ DEPENDENCIES google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) + listen (~> 0.5.0) + pry (~> 0.12.2) + rbtrace rdoc (~> 4.2) rspec rspec-parameterized rubocop (~> 0.50) - rugged (~> 0.27) + rugged (~> 0.28) sentry-raven (~> 2.7.2) + simplecov (~> 0.9.0) timecop + vcr (~> 4.0.0) + webmock (~> 3.4.0) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 349b75f19347..d476e7c9038f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.12.2"; + version = "1.27.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; + sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; @@ -27,7 +27,14 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib} $ruby + cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $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 + # read-only filesystem + substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \ + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" ''; outputs = [ "bin" "out" "ruby" ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c06be7891ffb..61abc97ed548 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -25,6 +25,15 @@ }; version = "0.2.0"; }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -75,6 +84,15 @@ }; version = "1.1.3"; }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; crass = { source = { remotes = ["https://rubygems.org"]; @@ -99,6 +117,14 @@ }; version = "1.3"; }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -133,6 +159,14 @@ }; version = "0.15.3"; }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; gemojione = { dependencies = ["json"]; source = { @@ -146,10 +180,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.3.0"; + version = "1.13.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -224,10 +258,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -238,6 +272,14 @@ }; version = "1.15.0"; }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; + type = "gem"; + }; + version = "0.3.8"; + }; i18n = { dependencies = ["concurrent-ruby"]; source = { @@ -272,6 +314,14 @@ }; version = "8.9.2"; }; + listen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; + type = "gem"; + }; + version = "0.5.3"; + }; memoizable = { dependencies = ["thread_safe"]; source = { @@ -281,6 +331,14 @@ }; version = "0.4.2"; }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; mime-types = { dependencies = ["mime-types-data"]; source = { @@ -301,10 +359,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -314,6 +372,22 @@ }; version = "5.11.3"; }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + type = "gem"; + }; + version = "1.2.6"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; multipart-post = { source = { remotes = ["https://rubygems.org"]; @@ -326,10 +400,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -340,6 +414,14 @@ }; version = "1.5.0"; }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; parallel = { source = { remotes = ["https://rubygems.org"]; @@ -390,6 +472,23 @@ }; version = "0.0.3"; }; + pry = { + dependencies = ["coderay" "method_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; rainbow = { source = { remotes = ["https://rubygems.org"]; @@ -398,6 +497,15 @@ }; version = "3.0.0"; }; + rbtrace = { + dependencies = ["ffi" "msgpack" "optimist"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + type = "gem"; + }; + version = "0.4.11"; + }; rdoc = { source = { remotes = ["https://rubygems.org"]; @@ -487,10 +595,18 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -505,10 +621,27 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; + type = "gem"; + }; + version = "2.7.4"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; type = "gem"; }; - version = "2.7.2"; + version = "0.9.2"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; }; stringex = { source = { @@ -560,4 +693,21 @@ }; version = "0.2.8"; }; + vcr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; + type = "gem"; + }; + version = "4.0.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; + type = "gem"; + }; + version = "3.4.2"; + }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index bb48a441253f..c3199142da3f 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.4"; + version = "8.7.1"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; + sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia"; }; buildInputs = [ ruby bundler go ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 7819c863a359..9b5efeaee801 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,16 +1,16 @@ diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index 435cb29..078c1df 100644 +index f951fe6..b422fe3 100644 --- a/go/internal/config/config.go +++ b/go/internal/config/config.go -@@ -2,7 +2,6 @@ package config - +@@ -3,7 +3,6 @@ package config import ( "io/ioutil" + "net/url" - "os" "path" + "strings" - yaml "gopkg.in/yaml.v2" -@@ -26,16 +25,13 @@ type Config struct { +@@ -30,16 +29,13 @@ type Config struct { } func New() (*Config, error) { @@ -28,12 +28,25 @@ index 435cb29..078c1df 100644 + return newFromFile("/run/gitlab/shell-config.yml") } - func newFromFile(filename string) (*Config, error) { + 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 57c70f5..700569b 100644 +index 2cb76a8..f59ad5e 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength +@@ -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. @@ -43,16 +56,3 @@ index 57c70f5..700569b 100644 end def api -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..6814f0a 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/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c49bbe9ccef7..6540ee0be963 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.2"; + version = "8.3.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; + sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j"; }; buildInputs = [ git go ]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f59e61208ac3..f36e2e38d6be 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -68,7 +68,7 @@ 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.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# 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.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -113,10 +115,9 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -126,9 +127,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -144,7 +145,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -161,12 +162,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +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 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -185,10 +186,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -203,9 +204,6 @@ 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' @@ -225,7 +223,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -305,6 +303,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -321,7 +325,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + 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' @@ -378,7 +382,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -408,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -417,7 +421,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 77b4360cf413..1be6f2289544 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -85,7 +85,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -113,6 +113,7 @@ GEM 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) @@ -143,7 +144,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -185,7 +186,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -206,7 +207,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -217,32 +218,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + 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.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + 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) @@ -258,6 +260,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -274,7 +279,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -282,11 +287,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -305,7 +310,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -353,15 +358,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + 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) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -389,13 +391,18 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 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 @@ -416,10 +423,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -462,9 +469,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -477,8 +484,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -544,6 +551,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -575,7 +584,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -606,6 +615,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -618,7 +628,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -657,23 +667,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.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.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -693,7 +702,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -775,9 +785,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -816,12 +824,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -847,7 +856,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -868,6 +877,7 @@ GEM 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) @@ -875,10 +885,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -890,7 +899,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -908,7 +917,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -917,7 +926,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -957,7 +966,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -974,7 +983,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -994,27 +1003,28 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + 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.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.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1031,20 +1041,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1059,7 +1069,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1077,6 +1087,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1084,7 +1095,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1107,7 +1118,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1128,8 +1138,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1142,14 +1151,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1157,17 +1166,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 10b8c3f25ead..f3e2dd91d556 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -309,10 +309,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -407,6 +407,14 @@ }; 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"]; @@ -587,10 +595,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -772,10 +780,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -881,10 +889,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -925,64 +933,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1028,6 +1036,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1085,10 +1102,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1130,19 +1147,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1183,10 +1200,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1306,10 +1323,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1337,15 +1354,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1465,6 +1473,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1483,13 +1500,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1563,10 +1580,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1581,10 +1598,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1743,10 +1760,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1759,10 +1776,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1857,10 +1874,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2067,6 +2084,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2174,10 +2207,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2299,6 +2332,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2346,10 +2387,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2443,10 +2484,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2483,13 +2524,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2524,14 +2565,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2605,10 +2638,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2895,22 +2936,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3045,22 +3077,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3151,10 +3183,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3256,6 +3288,14 @@ }; 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"]; @@ -3298,22 +3338,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3378,10 +3410,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3421,10 +3453,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3456,10 +3488,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index f01944a0e877..2847bd3e6c27 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -71,7 +71,7 @@ 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.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# 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.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -123,10 +125,9 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -136,9 +137,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -154,7 +155,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -171,12 +172,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +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 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -195,10 +196,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -213,9 +214,6 @@ 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' @@ -235,7 +233,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -317,6 +315,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -333,7 +337,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + 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' @@ -390,7 +394,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -423,7 +427,7 @@ gem 'net-ntp' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -432,7 +436,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 8d07afb59bf1..251d759be059 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -93,7 +93,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -121,6 +121,7 @@ GEM 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) @@ -151,7 +152,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -206,7 +207,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -230,7 +231,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -241,32 +242,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + 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.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + 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) @@ -282,6 +284,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -298,7 +303,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -307,11 +312,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -330,7 +335,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -380,15 +385,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + 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) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -416,14 +418,19 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 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 @@ -444,10 +451,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -490,9 +497,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -507,8 +514,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -574,6 +581,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -605,7 +614,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -636,6 +645,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -648,7 +658,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -687,23 +697,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.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.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -723,7 +732,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -805,9 +815,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -846,12 +854,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -877,7 +886,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -898,6 +907,7 @@ GEM 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) @@ -905,10 +915,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -920,7 +929,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -938,7 +947,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -947,7 +956,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -988,7 +997,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -1005,7 +1014,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -1029,28 +1038,29 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + 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.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.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1068,20 +1078,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1098,7 +1108,7 @@ DEPENDENCIES net-ldap net-ntp net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1116,6 +1126,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1123,7 +1134,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1146,7 +1157,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1167,8 +1177,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1181,14 +1190,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1196,17 +1205,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 03f885f2f9e5..c62c26b2bd10 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -344,10 +344,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -442,6 +442,14 @@ }; 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"]; @@ -622,10 +630,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -851,10 +859,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -969,10 +977,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -1013,64 +1021,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1116,6 +1124,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1173,10 +1190,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1226,19 +1243,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1279,10 +1296,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1411,10 +1428,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1442,15 +1459,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1570,6 +1578,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1596,13 +1613,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1676,10 +1693,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1694,10 +1711,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1856,10 +1873,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1872,10 +1889,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1986,10 +2003,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2196,6 +2213,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2303,10 +2336,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2428,6 +2461,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2475,10 +2516,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2572,10 +2613,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2612,13 +2653,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2653,14 +2694,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2734,10 +2767,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -3024,22 +3065,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3174,22 +3206,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3280,10 +3312,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3385,6 +3417,14 @@ }; 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"]; @@ -3427,22 +3467,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3507,10 +3539,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3550,10 +3582,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3585,10 +3617,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 64e8e5d2d253..e5940c939561 100644 --- a/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -121,8 +121,8 @@ in { }; subversion_1_10 = common { - version = "1.10.3"; - sha256 = "1z6r3n91a4znsh68rl3jisfr7k4faymhbpalmmvsmvsap34al3cz"; + version = "1.10.4"; + sha256 = "18c1vdq32nil76w678lxmp73jsbqha3dmzgmfrj76nc0xjmywql2"; extraBuildInputs = [ lz4 utf8proc ]; }; diff --git a/nixpkgs/pkgs/applications/video/bombono/default.nix b/nixpkgs/pkgs/applications/video/bombono/default.nix index ad095ddbea51..aaa1737f99a1 100644 --- a/nixpkgs/pkgs/applications/video/bombono/default.nix +++ b/nixpkgs/pkgs/applications/video/bombono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, +{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons, mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, enca, pkgconfig, fetchpatch }: @@ -18,20 +18,20 @@ stdenv.mkDerivation rec { }; patches = map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} - {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} - {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} - {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} - {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} - {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} - {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} - {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} + {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} + {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} + {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} + {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} + {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} + {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} + {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} ]; nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ - gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools + gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools libxmlxx ffmpeg enca ]; diff --git a/nixpkgs/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix index 24a1f07fb0d2..f7ecbc23a309 100644 --- a/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -44,14 +44,14 @@ assert vdpauSupport -> libvdpau != null; let kodiReleaseDate = "20190129"; - kodiVersion = "18.0"; + kodiVersion = "18.1"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg"; + sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"; }; kodiDependency = { name, version, rev, sha256, ... } @attrs: @@ -70,8 +70,8 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; version = "4.0.3"; - rev = "${version}-${rel}-RC5"; - sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx"; + rev = "${version}-${rel}-18.2"; + sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; diff --git a/nixpkgs/pkgs/applications/video/lightworks/default.nix b/nixpkgs/pkgs/applications/video/lightworks/default.nix index 4bfd9e790070..2b21a25434d5 100644 --- a/nixpkgs/pkgs/applications/video/lightworks/default.nix +++ b/nixpkgs/pkgs/applications/video/lightworks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv -, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let fullPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc - gnome3.gtk + gtk3 gdk_pixbuf cairo libjpeg_original @@ -21,7 +21,7 @@ let lightworks = stdenv.mkDerivation rec { version = "14.0.0"; name = "lightworks-${version}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 5b786b255019..28056bf6cb81 100644 --- a/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -11,14 +11,14 @@ assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "mkvtoolnix-${version}"; - version = "31.0.0"; + pname = "mkvtoolnix"; + version = "32.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1fml374ivzzmac0ixhngj4bdxszcaw5yxdmacpn6ia7pdyvpf5lh"; + sha256 = "022mmgm0a6qxybjrygisg731sg9m9d8svd0mxr77wfknwa7m09c9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/peek/default.nix b/nixpkgs/pkgs/applications/video/peek/default.nix index 728f6387ffa9..374ea08816f7 100644 --- a/nixpkgs/pkgs/applications/video/peek/default.nix +++ b/nixpkgs/pkgs/applications/video/peek/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala, wrapGAppsHook +{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook , gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg }: stdenv.mkDerivation rec { - name = "peek-${version}"; + pname = "peek"; version = "1.3.1"; src = fetchFromGitHub { owner = "phw"; - repo = "peek"; + repo = pname; rev = version; sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; }; @@ -17,9 +17,21 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) ''; - nativeBuildInputs = [ cmake gettext pkgconfig libxml2.bin txt2man vala wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + gettext + pkgconfig + libxml2.bin + txt2man + vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433 + wrapGAppsHook + ]; - buildInputs = [ gsettings-desktop-schemas gtk3 keybinder3 ]; + buildInputs = [ + gsettings-desktop-schemas + gtk3 + keybinder3 + ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix index 3683973824a3..135dabd68981 100644 --- a/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix +++ b/nixpkgs/pkgs/applications/video/subtitleeditor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, - desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, + desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ desktop-file-utils enchant - gnome3.gtk - gnome3.gtkmm + gtk3 + gtkmm3 gst_all_1.gstreamer gst_all_1.gstreamermm gst_all_1.gst-plugins-base diff --git a/nixpkgs/pkgs/applications/video/vlc/default.nix b/nixpkgs/pkgs/applications/video/vlc/default.nix index cd3999e38c09..7f1233a4e04e 100644 --- a/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -13,8 +13,13 @@ , jackSupport ? false , fetchpatch , removeReferencesTo +, chromecastSupport ? true, protobuf, libmicrodns }: +# chromecastSupport requires TCP port 8010 to be open for it to work. +# If your firewall is enabled, make sure to have something like: +# networking.firewall.allowedTCPPorts = [ 8010 ]; + with stdenv.lib; assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); @@ -42,7 +47,8 @@ stdenv.mkDerivation rec { fluidsynth wayland wayland-protocols ] ++ optional (!stdenv.hostPlatform.isAarch64) live555 ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] - ++ optional jackSupport libjack2; + ++ optional jackSupport libjack2 + ++ optionals chromecastSupport [ protobuf libmicrodns ]; nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; @@ -76,7 +82,12 @@ stdenv.mkDerivation rec { # "--enable-foo" flags here configureFlags = [ "--with-kde-solid=$out/share/apps/solid/actions" - ] ++ optional onlyLibVLC "--disable-vlc"; + ] ++ optional onlyLibVLC "--disable-vlc" + ++ optionals chromecastSupport [ + "--enable-sout" + "--enable-chromecast" + "--enable-microdns" + ]; # Remove runtime dependencies on libraries postConfigure = '' diff --git a/nixpkgs/pkgs/applications/video/xawtv/default.nix b/nixpkgs/pkgs/applications/video/xawtv/default.nix index f6f8016ec1d3..db9a5ce7850b 100644 --- a/nixpkgs/pkgs/applications/video/xawtv/default.nix +++ b/nixpkgs/pkgs/applications/video/xawtv/default.nix @@ -2,10 +2,10 @@ , libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}: stdenv.mkDerivation rec { - name = "xawtv-3.105"; + name = "xawtv-3.106"; src = fetchurl { url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; - sha256 = "03v4k0dychjz1kj890d9pc7v8jh084m01g71x1clmmvc6vc9kn1b"; + sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix b/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix new file mode 100644 index 000000000000..c55eb342e069 --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/charliecloud/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, python }: + +stdenv.mkDerivation rec { + + version = "0.9.8"; + pname = "charliecloud"; + + src = fetchFromGitHub { + owner = "hpc"; + repo = "charliecloud"; + rev = "v${version}"; + sha256 = "1w1wy4sj9zqfysrpf04shhppcf5ap4rp7i3ja81sv2fm27k4m9nl"; + }; + + buildInputs = [ python ]; + + preConfigure = '' + substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' + patchShebangs test/ + ''; + + makeFlags = [ + "PREFIX=$(out)" + "LIBEXEC_DIR=lib/charliecloud" + ]; + + postInstall = '' + mkdir -p $out/share/charliecloud + mv $out/lib/charliecloud/examples $out/share/charliecloud + mv $out/lib/charliecloud/test $out/share/charliecloud + ''; + + meta = { + description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers"; + longDescription = '' + Charliecloud uses Linux user namespaces to run containers with no + privileged operations or daemons and minimal configuration changes on + center resources. This simple approach avoids most security risks + while maintaining access to the performance and functionality already + on offer. + ''; + homepage = https://hpc.github.io/charliecloud; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.bzizou ]; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix b/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix index 6089aa7f69cd..7ddfc2ebab06 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/conmon.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { name = "conmon-${version}"; - version = "unstable-2019-02-15"; - rev = "cc2b49590a485da9bd358440f92f219dfd6b230f"; + version = "unstable-2019-03-19"; + rev = "84c860029893e2e2dd71d62231f009c9dcd3c0b4"; src = fetchFromGitHub { owner = "containers"; repo = "conmon"; - sha256 = "13f5as4a9y6nkmr7cg0n27c2hfx9pkr75fxq2m0hlpcwhaardbm7"; + sha256 = "1ydidl3s7s5rfwk9gx0k80nxcixlilxw61g7x0vqsdy3mkylysv5"; inherit rev; }; diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index e50803db4e33..6321be0f0709 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "180sv1a7k3866ilb0mxbhiysms9xy4v6xbpy4in6ch8m8qym9amh"; + sha256 = "1nlll4q62w3i897wraj18pdi5cc91b8gmp360pzyqzzjdm9ag7v6"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index b89ef1dd7bff..1801dd9eddb6 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -5,13 +5,13 @@ with lib; buildGoPackage rec { name = "runc-${version}"; - version = "1.0.0-rc6"; + version = "1.0.0-rc7"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + sha256 = "1baryjpka8wmzc6c66bir12i390ix3641a06j33shpsb683ws3fj"; }; goPackagePath = "github.com/opencontainers/runc"; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index 178d111d79aa..d9095d3911b6 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2019-02-15"; + version = "0.9.0.2019-03-21"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "2dc958995834b529a245c22c510b57d5c928c747"; - sha256 = "091a2pqgkiwnya2xv5rw5sj730hf6lvkp2kk5midsa3wz2dfbc2j"; + rev = "18300e6b9259053b80c37aef56c958fe5f50062b"; + sha256 = "1g1ra0i7jlkdslmfycdyb2wh2s4gfawd0k2pjqx3ayml9kgq33yh"; }; cargoSha256 = "06izzv86nkn1izapldysyryz9zvjxvq23c742z284bnxjfq5my6i"; diff --git a/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix new file mode 100644 index 000000000000..d615b4fe010c --- /dev/null +++ b/nixpkgs/pkgs/applications/window-managers/wmfs/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, gnumake, + libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: +stdenv.mkDerivation rec { + name = "wmfs-${version}"; + + version = "201902"; + + src = fetchFromGitHub { + owner = "xorg62"; + repo = "wmfs"; + sha256 = "sha256:1m7dsmmlhq2qipim659cp9aqlriz1cwrrgspl8baa5pncln0gd5c"; + rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; + }; + + nativeBuildInputs = [ + gnumake + ]; + + buildInputs = [ + imlib2 + libX11 + libXinerama + libXrandr + libXpm + libXft + ]; + + preConfigure = "substituteInPlace configure --replace '-lxft' '-lXft'"; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + "XDG_CONFIG_DIR=${placeholder "out"}/etc/xdg" + "MANPREFIX=${placeholder "out"}/share/man" + ]; + + meta = with stdenv.lib; { + description = "Window manager from scratch"; + license = licenses.bsd2; + maintainers = [ maintainers.balsoft ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 142f5255caad..72327d2bb671 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -186,6 +186,7 @@ stdenv.mkDerivation { }.${targetPlatform.parsed.cpu.name} else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" + else if targetPlatform.isMsp430 then "msp430" else if targetPlatform.isAvr then "avr" else if targetPlatform.isAlpha then "alpha" else throw "unknown emulation for platform: " + targetPlatform.config; diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 8d47f1570138..344f1abc8b26 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -45,13 +45,18 @@ rec { , sha256 , os ? "linux" , arch ? "amd64" + + # This is used to set name to the pulled image + , finalImageName ? imageName # This used to set a tag to the pulled image , finalImageTag ? "latest" - , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" + + , name ? fixName "docker-image-${finalImageName}-${finalImageTag}.tar" }: runCommand name { - inherit imageName imageDigest; + inherit imageDigest; + imageName = finalImageName; imageTag = finalImageTag; impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars; outputHashMode = "flat"; @@ -62,7 +67,7 @@ rec { SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt"; sourceURL = "docker://${imageName}@${imageDigest}"; - destNameTag = "${imageName}:${finalImageTag}"; + destNameTag = "${finalImageName}:${finalImageTag}"; } '' skopeo --override-os ${os} --override-arch ${arch} copy "$sourceURL" "docker-archive://$out:$destNameTag" ''; @@ -200,7 +205,7 @@ rec { # Unpack all of the parent layers into the image. lowerdir="" extractionID=0 - for layerTar in $(cat layer-list); do + for layerTar in $(tac layer-list); do echo "Unpacking layer $layerTar" extractionID=$((extractionID + 1)) @@ -344,7 +349,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . + tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." diff --git a/nixpkgs/pkgs/build-support/docker/examples.nix b/nixpkgs/pkgs/build-support/docker/examples.nix index 8a1b35f02d99..557a4dbf54b7 100644 --- a/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/nixpkgs/pkgs/build-support/docker/examples.nix @@ -88,8 +88,9 @@ rec { nixFromDockerHub = pullImage { imageName = "nixos/nix"; imageDigest = "sha256:85299d86263a3059cf19f419f9d286cc9f06d3c13146a8ebbb21b3437f598357"; - sha256 = "0vnp3mhpk4ny3xa3cgngqsargnmvfgld54d5sn4b5av6yqzzp67z"; + sha256 = "07q9y9r7fsd18sy95ybrvclpkhlal12d30ybnf089hq7v1hgxbi7"; finalImageTag = "2.2.1"; + finalImageName = "nix"; }; # 5. example of multiple contents, emacs and vi happily coexisting diff --git a/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh index ff814c1f6130..4cf338b9b252 100755 --- a/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh +++ b/nixpkgs/pkgs/build-support/docker/store-path-to-layer.sh @@ -9,6 +9,7 @@ layerPath="./layers/$layerNumber" echo "Creating layer #$layerNumber for $@" mkdir -p "$layerPath" +tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --owner=0 --group=0 "$@" diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 0978f7e1756f..2999c3d4c1d9 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -11,7 +11,7 @@ rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=1"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; # Some platforms have different names for rustc. diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index b184d363d554..165b3414c6a3 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -22,7 +22,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitString "." (lib.head version_); rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=1"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); buildDeps = makeDeps buildDependencies; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; diff --git a/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix b/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix index 8a0a62434ec0..14d997b2d5cf 100644 --- a/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix +++ b/nixpkgs/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -14,9 +14,8 @@ include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); - suff = lib.strings.removePrefix p path; in - suff == "" || (lib.strings.hasPrefix "/" suff) + p == path || (lib.strings.hasPrefix (p + "/") path) ) includedFiles ) src; exclude = excludedFiles: src: builtins.filterSource (path: type: diff --git a/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index 5bedd1a9f9ca..6af8eb1aed99 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -15,8 +15,10 @@ isExecutable() { # *or* there is an INTERP section. This also catches position-independent # executables, as they typically have an INTERP section but their ELF type # is DYN. - LANG=C readelf -h -l "$1" 2> /dev/null \ - | grep -q '^ *Type: *EXEC\>\|^ *INTERP\>' + isExeResult="$(LANG=C readelf -h -l "$1" 2> /dev/null \ + | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" + # not using grep -q, because it can cause Broken pipe + [ -n "$isExeResult" ] } # We cache dependencies so that we don't need to search through all of them on @@ -207,10 +209,11 @@ autoPatchelf() { isELF "$file" || continue segmentHeaders="$(LANG=C readelf -l "$file")" # Skip if the ELF file doesn't have segment headers (eg. object files). - echo "$segmentHeaders" | grep -q '^Program Headers:' || continue + # not using grep -q, because it can cause Broken pipe + [ -n "$(echo "$segmentHeaders" | grep '^Program Headers:')" ] || continue if isExecutable "$file"; then # Skip if the executable is statically linked. - echo "$segmentHeaders" | grep -q "^ *INTERP\\>" || continue + [ -n "$(echo "$segmentHeaders" | grep "^ *INTERP\\>")" ] || continue fi autoPatchelfFile "$file" done < <(find "$@" ${norecurse:+-maxdepth 1} -type f -print0) diff --git a/nixpkgs/pkgs/build-support/trivial-builders.nix b/nixpkgs/pkgs/build-support/trivial-builders.nix index 58bc7147ede4..ab83b73c5455 100644 --- a/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -149,7 +149,7 @@ rec { ${text} ''; checkPhase = '' - ${runtimeShell} -n $out/bin/${name} + ${stdenv.shell} -n $out/bin/${name} ''; }; diff --git a/nixpkgs/pkgs/build-support/writers/default.nix b/nixpkgs/pkgs/build-support/writers/default.nix index 6e932ce860f6..3454450c1f3a 100644 --- a/nixpkgs/pkgs/build-support/writers/default.nix +++ b/nixpkgs/pkgs/build-support/writers/default.nix @@ -178,6 +178,16 @@ rec { writeJSBin = name: writeJS "/bin/${name}"; + writeNginxConfig = name: text: pkgs.runCommand name { + inherit text; + passAsFile = [ "text" ]; + } /* sh */ '' + cp "$textPath" $out + ${pkgs.nginx-config-formatter}/bin/nginxfmt $out + ${pkgs.gnused}/bin/sed -i '/^$/d' $out + ${pkgs.gixy}/bin/gixy $out + ''; + # writePerl takes a name an attributeset with libraries and some perl sourcecode and # returns an executable # diff --git a/nixpkgs/pkgs/data/fonts/b612/default.nix b/nixpkgs/pkgs/data/fonts/b612/default.nix index b7b79f2e2ca1..2f583e2fc4b2 100644 --- a/nixpkgs/pkgs/data/fonts/b612/default.nix +++ b/nixpkgs/pkgs/data/fonts/b612/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, lib }: let - version = "1.003"; + version = "1.008"; pname = "b612"; in fetchzip rec { name = "${pname}-font-${version}"; - url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip"; - sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464"; + url = "https://github.com/polarsys/b612/archive/${version}.zip"; + sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; postFetch = '' mkdir -p $out/share/fonts/truetype/${pname} unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname} diff --git a/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix new file mode 100644 index 000000000000..54ddc95bf6cc --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "behdad-fonts"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "font-store"; + repo = "BehdadFont"; + rev = "v${version}"; + sha256 = "0rlmyv82qmyy90zvkjnlva44ia7dyhiyk7axbq526v7zip3g79w0"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/behdad-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/behdad-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/font-store/BehdadFont; + description = "A Persian/Arabic Open Source Font"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix index 595a1c0d37f5..51f1d668cd24 100644 --- a/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix +++ b/nixpkgs/pkgs/data/fonts/font-awesome-5/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "5.7.2"; + version = "5.8.1"; in fetchzip rec { name = "font-awesome-${version}"; @@ -12,7 +12,7 @@ in fetchzip rec { unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "0b3syzz8baxmwzjgz09dnamm4nzmyvb2yddlrm94ww5j9bjk25al"; + sha256 = "1fc177sgf4qd231dmpr7cwr1j03wzb927ylpng2gn94iksln924d"; meta = with stdenv.lib; { description = "Font Awesome - OTF font"; diff --git a/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix new file mode 100644 index 000000000000..938ff272cbd9 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gandom-fonts"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "gandom-font"; + rev = "v${version}"; + sha256 = "1pdbqhvcsz6aq3qgarhfd05ip0wmh7bxqkmxrwa0kgxsly6zxz9x"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/gandom-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/gandom-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/gandom-font; + description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/gohufont/default.nix b/nixpkgs/pkgs/data/fonts/gohufont/default.nix index 7936a216ada7..b394cb47157c 100644 --- a/nixpkgs/pkgs/data/fonts/gohufont/default.nix +++ b/nixpkgs/pkgs/data/fonts/gohufont/default.nix @@ -1,49 +1,55 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }: +{ stdenv, fetchurl, fetchFromGitHub +, mkfontdir, mkfontscale, bdf2psf, bdftopcf +}: stdenv.mkDerivation rec { - name = "gohufont-2.0"; + name = "gohufont-${version}"; + version = "2.1"; - pcf = fetchurl { - url = "http://font.gohu.org/gohufont-2.0.tar.gz"; - sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s"; + src = fetchurl { + url = "http://font.gohu.org/${name}.tar.gz"; + sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; - bdf = fetchurl { - url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz"; - sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; + bdf = fetchFromGitHub { + owner = "hchargois"; + repo = "gohufont"; + rev = "cc36b8c9fed7141763e55dcee0a97abffcf08224"; + sha256 = "1hmp11mrr01b29phw0xyj4h9b92qz19cf56ssf6c47c5j2c4xmbv"; }; - nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf ]; + nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf bdftopcf ]; - unpackPhase = '' - mkdir pcf bdf - tar -xzf $pcf --strip-components=1 -C pcf - tar -xzf $bdf --strip-components=1 -C bdf - ''; - - installPhase = '' + buildPhase = '' # convert bdf to psf fonts - sourceRoot="$(pwd)" + build=$(pwd) mkdir psf + cd ${bdf2psf}/usr/share/bdf2psf + for i in $bdf/*.bdf; do + bdf2psf \ + --fb "$i" standard.equivalents \ + ascii.set+useful.set+linux.set 512 \ + "$build/psf/$(basename $i .bdf).psf" + done + cd $build - cd "${bdf2psf}/usr/share/bdf2psf" - for i in $sourceRoot/bdf/*.bdf; do - bdf2psf --fb $i standard.equivalents \ - ascii.set+useful.set+linux.set 512 \ - "$sourceRoot/psf/$(basename $i .bdf).psf" + # convert hidpi variant to pcf + for i in $bdf/hidpi/*.bdf; do + name=$(basename $i .bdf).pcf + bdftopcf -o "$name" "$i" done - cd "$sourceRoot" + ''; + installPhase = '' # install the psf fonts (for the virtual console) fontDir="$out/share/consolefonts" mkdir -p "$fontDir" - mv psf/*.psf "$fontDir" - + mv -t "$fontDir" psf/*.psf # install the pcf fonts (for xorg applications) fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" - mv pcf/*.pcf.gz "$fontDir" + mv -t "$fontDir" *.pcf.gz *.pcf cd "$fontDir" mkfontdir @@ -52,15 +58,15 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0msl5y9q6hjbhc85v121x1b1rhsh2rbqqy4k234i5mpp8l3087r7"; + outputHash = "0kl7k8idl0fnsap2c4j02i33z017p2s4gi2cgspy6ica46fczcc1"; meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = http://font.gohu.org/; - license = licenses.wtfpl; - maintainers = with maintainers; [ epitrochoid ]; - platforms = platforms.linux; + homepage = http://font.gohu.org/; + license = licenses.wtfpl; + maintainers = with maintainers; [ epitrochoid rnhmjoj ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/data/fonts/inter-ui/default.nix b/nixpkgs/pkgs/data/fonts/inter-ui/default.nix index 81d392982eec..15032ebb3e33 100644 --- a/nixpkgs/pkgs/data/fonts/inter-ui/default.nix +++ b/nixpkgs/pkgs/data/fonts/inter-ui/default.nix @@ -1,18 +1,22 @@ { stdenv, fetchzip }: +# XXX: IMPORTANT: +# For compat, keep this at the last version that used the name "Inter UI" +# For newer versions, which are now simply named "Inter", +# see the expression for `inter` (../inter/default.nix). let - version = "3.3"; + version = "3.2"; in fetchzip { - name = "inter-${version}"; + name = "inter-ui-${version}"; - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "17fv33ryvbla4f4mfgw7m7gjlwyjlni90a8gpb7jws1qzn0vgazg"; + sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; meta = with stdenv.lib; { homepage = https://rsms.me/inter/; diff --git a/nixpkgs/pkgs/data/fonts/inter/default.nix b/nixpkgs/pkgs/data/fonts/inter/default.nix new file mode 100644 index 000000000000..8973eae1464a --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchzip }: + +let + version = "3.5"; +in fetchzip { + name = "inter-${version}"; + + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + sha256 = "0zqixzzbb3n1j4jvpjm0hlxc32j53hgq4j078gihjkhgvjhsklf2"; + + meta = with stdenv.lib; { + homepage = https://rsms.me/inter/; + description = "A typeface specially designed for user interfaces"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ demize ]; + }; +} + diff --git a/nixpkgs/pkgs/data/fonts/manrope/default.nix b/nixpkgs/pkgs/data/fonts/manrope/default.nix new file mode 100644 index 000000000000..1fdf88b79abe --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/manrope/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "manrope"; + version = "3"; + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + sha256 = "1k6nmczbl97b9j2a8vx6a1r3q4gd1c2qydv0y9gn8xyl7x8fcvhs"; + }; + dontBuild = true; + installPhase = '' + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + ''; + meta = with stdenv.lib; { + description = "Open-source modern sans-serif font family"; + homepage = https://github.com/sharanda/manrope; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix new file mode 100644 index 000000000000..f40ee8da7502 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "nika-fonts"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "font-store"; + repo = "NikaFont"; + rev = "v${version}"; + sha256 = "16dhk87vmjnywl5wqsl9dzp12ddpfk57w08f7811m3ijqadscdwc"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/nika-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/nika-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/font-store/NikaFont/; + description = "Persian/Arabic Open Source Font"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix new file mode 100644 index 000000000000..00f03b53078e --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "parastoo-fonts"; + version = "1.0.0-alpha5"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "parastoo-font"; + rev = "v${version}"; + sha256 = "1nya9cbbs6sgv2w3zyah3lb1kqylf922q3fazh4l7bi6zgm8q680"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/parastoo-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/parastoo-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/parastoo-font; + description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix index add2c44cd480..fabaa8d491c8 100644 --- a/nixpkgs/pkgs/data/fonts/ricty/default.nix +++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ricty-${version}"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh"; - sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf"; + sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix new file mode 100644 index 000000000000..20545be3dcad --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "sahel-fonts"; + version = "1.0.0-alpha22"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "sahel-font"; + rev = "v${version}"; + sha256 = "1kx7byzb5zxspq0i4cvgf4q7sm6xnhdnfyw9zrb1wfmdv3jzaz7p"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/sahel-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/sahel-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/sahel-font; + description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix new file mode 100644 index 000000000000..620e2fdcfb9c --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "samim-fonts"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "samim-font"; + rev = "v${version}"; + sha256 = "1mp0pgbn9r098ilajwzag7c21shwb13mq61ly9av0mfbpnhkkjqk"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/samim-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/samim-fonts + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/samim-font; + description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix new file mode 100644 index 000000000000..a474c3db779d --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, mkfontdir, mkfontscale }: + +stdenv.mkDerivation rec { + pname = "spleen"; + version = "1.0.4"; + + src = fetchurl { + url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; + sha256 = "1x62a5ygn3rpgzbaacz64rp8mn7saymdnxci4l3xasvsjjp60s3g"; + }; + + buildPhase = "gzip -n9 *.pcf"; + installPhase = '' + d="$out/share/fonts/X11/misc/spleen" + install -Dm644 *.pcf.gz -t $d + install -Dm644 *.bdf -t $d + install -m644 fonts.alias-spleen $d/fonts.alias + ''; + + meta = with stdenv.lib; { + description = "Monospaced bitmap fonts"; + homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix index 12c46a12b938..27abb72e124f 100644 --- a/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "4.46.0"; + version = "4.47.0"; in fetchzip rec { name = "terminus-font-ttf-${version}"; @@ -18,7 +18,7 @@ in fetchzip rec { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; - sha256 = "129rfmwnm2bhp99w4zl262l6sdx8pddc0gf1ispjqs6dz3m3mdkp"; + sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z"; meta = with stdenv.lib; { description = "A clean fixed width TTF font"; diff --git a/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix new file mode 100755 index 000000000000..408bd9a92644 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "vazir-fonts"; + version = "19.2.0"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/vazir-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts + + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/vazir-font; + description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix index af73ec322d00..78948a1813a2 100644 --- a/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix +++ b/nixpkgs/pkgs/data/themes/shades-of-gray/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }: stdenv.mkDerivation rec { - name = "shades-of-gray-theme-${version}"; - version = "1.1.5"; + pname = "shades-of-gray-theme"; + version = "1.1.6"; src = fetchFromGitHub { owner = "WernerFP"; - repo = "Shades-of-gray-theme"; + repo = pname; rev = version; - sha256 = "1ql8rkbm5l94b842hg53cwf02vbw2785rlrs4cr60d4kn2c0lj2y"; + sha256 = "0jp4p0wdmac5dkz1hqhzqmn59zgxqd77gn0napy3wbqr5yc60pp1"; }; buildInputs = [ gtk_engines ]; diff --git a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix index 3c99c40ee807..ee0c81d7d39e 100644 --- a/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dbus-factory/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=$(out)/share/go" ]; + makeFlags = [ "GOPATH=${placeholder ''out''}/share/go" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix index 6e61a30e258c..8db376e01fd7 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-api/default.nix @@ -1,12 +1,32 @@ { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib, - alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler, - pulseaudio, go, deepin }: + alsaLib, + bc, + blur-effect, + coreutils, + dbus-factory, + deepin, + deepin-gettext-tools, + fontconfig, + glib, + go, + go-dbus-factory, + go-gir-generator, + go-lib, + grub2, + gtk3, + libcanberra, + libgudev, + librsvg, + poppler, + pulseaudio, + rfkill, + xcur2png +}: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-api"; - version = "3.5.0"; + version = "3.18.1"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -14,33 +34,62 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3"; + sha256 = "0y8v18f6l3ycysdn4qi7c93z805q7alji8wix4j4qh9x9r35d728"; }; goDeps = ./deps.nix; + outputs = [ "out" ]; + nativeBuildInputs = [ pkgconfig - deepin-gettext-tools - go-dbus-factory - go-gir-generator - go-lib + deepin-gettext-tools # build + dbus-factory # build + go-dbus-factory # needed + go-gir-generator # needed + go-lib # build + deepin.setupHook ]; buildInputs = [ - alsaLib - glib - gtk3 - libcanberra - libgudev - librsvg - poppler - pulseaudio - ]; + alsaLib # needed + bc # run (to adjust grub theme?) + blur-effect # run (is it really needed?) + coreutils # run (is it really needed?) + fontconfig # run (is it really needed?) + #glib # ? arch + grub2 # run (is it really needed?) + gtk3 # build run + libcanberra # build run + libgudev # needed + librsvg # build run + poppler # build run + pulseaudio # needed + rfkill # run + xcur2png # run + #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) + ]; postPatch = '' - patchShebangs . - sed -i -e "s|/var|$bin/var|" Makefile + searchHardCodedPaths # debugging + + sed -i -e "s|/var|$out/var|" Makefile + + # TODO: confirm where to install grub themes + sed -i -e "s|/boot/grub|$out/boot/grub|" Makefile + + fixPath $out /usr/lib/deepin-api \ + lunar-calendar/main.go \ + misc/services/com.deepin.api.CursorHelper.service \ + misc/services/com.deepin.api.Graphic.service \ + misc/services/com.deepin.api.LunarCalendar.service \ + misc/services/com.deepin.api.Pinyin.service \ + misc/system-services/com.deepin.api.Device.service \ + misc/system-services/com.deepin.api.LocaleHelper.service \ + misc/system-services/com.deepin.api.SoundThemePlayer.service \ + misc/systemd/system/deepin-shutdown-sound.service \ + theme_thumb/gtk/gtk.go \ + thumbnails/gtk/gtk.go ''; buildPhase = '' @@ -49,10 +98,9 @@ buildGoPackage rec { ''; installPhase = '' - make install PREFIX="$bin" SYSTEMD_LIB_DIR="$bin/lib" -C go/src/${goPackagePath} - mkdir -p $out/share - mv $bin/share/gocode $out/share/go - remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/* + make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} + mv $out/share/gocode $out/share/go + remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix b/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix index bd7a13043da2..03758f0d43e1 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-api/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/alecthomas/template"; @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "9458da53d1e65e098d48467a4317c403327e4424"; - sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4"; + rev = "061e8a750a4db9667cdf9e2af7f4029ba506cb3b"; + sha256 = "13fkknwz2iby5rdzv9sgam6p27zdgxis3sxgyls9sdir5lbhjhm7"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/fogleman/gg"; - rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db"; - sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5"; + rev = "0403632d5b905943a1c2a5b2763aaecd568467ec"; + sha256 = "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; }; } { diff --git a/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix index 631471527f3a..0ef0da5c70b7 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-calendar/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { qmake qttools deepin-gettext-tools + deepin.setupHook ]; buildInputs = [ @@ -27,11 +28,14 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs translate_generation.sh + patchShebangs translate_desktop.sh + + fixPath $out /usr com.deepin.Calendar.service + sed -i translate_desktop.sh \ -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," - sed -i com.deepin.Calendar.service \ - -e "s,/usr,$out," ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix index 3678694be9ee..954d0971c250 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,13 +1,15 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, - librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, - python3Packages, hicolor-icon-theme, go, deepin }: + deepin-gettext-tools, dde-api, deepin-desktop-schemas, + deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, + libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, + pulseaudio, xorg, python3, hicolor-icon-theme, glibc, tzdata, go, + deepin, makeWrapper, wrapGAppsHook }: buildGoPackage rec { name = "${pname}-${version}"; pname = "dde-daemon"; - version = "3.6.0"; + version = "3.24.1"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -15,15 +17,14 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj"; + sha256 = "1qxj0mqnl10qj8qidpc1sv8gm4gj5965i07d003yxlxcw9cqwx7y"; }; patches = [ # https://github.com/linuxdeepin/dde-daemon/issues/51 (fetchpatch { - name = "dde-daemon_3.2.3.patch"; - url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch; - sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg"; + url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch; + sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; }) ]; @@ -38,46 +39,70 @@ buildGoPackage rec { go-gir-generator go-lib deepin-gettext-tools - dde-api linux-pam networkmanager networkmanager.dev - python3Packages.python + python3 + makeWrapper + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ alsaLib + dde-api + deepin-desktop-base + deepin-desktop-schemas + deepin-wallpapers glib - gnome3.libgudev + libgudev gtk3 hicolor-icon-theme libinput libnl librsvg pulseaudio + tzdata ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs network/nm_generator/gen_nm_consts.py - sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,' + fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go + fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile + fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go + fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go + fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go + fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go + fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + + + searchHardCodedPaths ''; buildPhase = '' - make -C go/src/${goPackagePath} # compilation of the nm module is failing #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code + make -C go/src/${goPackagePath} ''; installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} remove-references-to -t ${go} $out/lib/deepin-daemon/* + searchHardCodedPaths $out + ''; + + postFixup = '' + # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec + for binary in $out/lib/deepin-daemon/*; do + wrapProgram $binary "''${gappsWrapperArgs[@]}" + done ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix b/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix index 3d241baa3260..fab2f9f93b20 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -1,4 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/alecthomas/template"; @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "03541136501cab4910ad8852fe749ef8e18907ca"; - sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp"; + rev = "48c75d615ef634d9b1c24f8e8a30f56201b4f561"; + sha256 = "1x2i9wg6lyskls5qi3d2r84bdhyhgi8v1d8scxx9ysjaw9di9ldl"; }; } { @@ -50,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/msteinert/pam"; - rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7"; - sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync"; + rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; + sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "69cc3646b96e61de0b417f4815b86c36e65783ee"; - sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9"; + rev = "3fc05d484e9f77dd51816890e05f2602e4ca4d65"; + sha256 = "0mcip8jpz2061j1z658rfskphc92wv6sapy81p95bnjdymi562k3"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; + rev = "74de082e2cca95839e88aa0aeee5aadf6ce7710f"; + sha256 = "0a4y3y0q5bkif7wvdkyjkvgnzlbh2n4zk7wsy5j95raf0i3zlw4s"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; - sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + rev = "e3703dcdd614d2d7488fff034c75c551ea25da95"; + sha256 = "1xh106aslp04vbzb4hc7cc5fyg2ljwny8fwfwsp5mpbqr9ixkikv"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/linuxdeepin/go-lib.git"; - rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7"; - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + rev = "3558b2348565e983c7d4a57a0a21bbe716a55b83"; + sha256 = "0p9yrxa3x71n3jxffh03ahjgimdzvxzhny632k363lkha6glvbnc"; }; } ] diff --git a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix new file mode 100644 index 000000000000..17b88738c36f --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, + dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dde-polkit-agent"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1x7mv63g8412w1bq7fijsdzi8832qjb6gnr1nykcv7imzlycq9m6"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + deepin.setupHook + ]; + + buildInputs = [ + dde-qt-dbus-factory + dtkcore + dtkwidget + polkit-qt + ]; + + postPatch = '' + searchHardCodedPaths + patchShebangs translate_generation.sh + + fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop + fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "PolicyKit agent for Deepin Desktop Environment"; + homepage = https://github.com/linuxdeepin/dde-polkit-agent; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index f28d8f77b3c3..1d9c13c17bbc 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, qmake, python3, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8"; + sha256 = "1b2i5m6fzkga72hbl85v2rng3qq53di39p7jj2f119wmlfbyp2vg"; }; nativeBuildInputs = [ qmake - python + python3 + deepin.setupHook ]; postPatch = '' - sed -i libdframeworkdbus/{DFrameworkdbusConfig.in,libdframeworkdbus.pro} \ - -e "s,/usr,$out," + searchHardCodedPaths + fixPath $out /usr \ + libdframeworkdbus/DFrameworkdbusConfig.in \ + libdframeworkdbus/libdframeworkdbus.pro ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix index d3970cf87108..a61a0fdbb84e 100644 --- a/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools, qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt, dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget, - hicolor-icon-theme, deepin }: + deepin-desktop-schemas, deepin, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dde-session-ui"; - version = "4.6.2"; + version = "4.9.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1fxlrj7vv7nqllwpwc8mxiv9bfqcj9b2qwkpjaq326pfmg5p5lhq"; + sha256 = "1bh7wbkzikcnka94nzqzl87cs2m6bslrv9r2hdsvqqr3aaad5za3"; }; nativeBuildInputs = [ @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { qmake qttools deepin-gettext-tools + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ @@ -35,10 +37,13 @@ stdenv.mkDerivation rec { xorg.libXtst xkeyboard_config hicolor-icon-theme + deepin-desktop-schemas ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs translate_generation.sh + patchShebangs translate_desktop.sh sed -i translate_desktop.sh -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 80a368c5be99..b5e75c217b1e 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -3,34 +3,40 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-base"; - version = "2018.10.29"; + version = "2019.03.29"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235"; + sha256 = "1d016h95nsn5yay9f4c13hixfxj0q01hpxwj2x84i6qpx63dxdwq"; }; + nativeBuildInputs = [ deepin.setupHook ]; + buildInputs = [ deepin-wallpapers ]; + # TODO: Fedora recommended dependencies: + # deepin-wallpapers + # plymouth-theme-deepin + postPatch = '' - sed -i Makefile -e "s:/usr:$out:" -e "s:/etc:$out/etc:" - ''; + searchHardCodedPaths - postInstall = '' - # Remove Deepin distro's lsb-release - rm $out/etc/lsb-release + fixPath $out /etc Makefile + fixPath $out /usr Makefile + # Remove Deepin distro's lsb-release # Don't override systemd timeouts - rm -r $out/etc/systemd - # Remove apt-specific templates - rm -r $out/share/python-apt - - # Remove empty backgrounds directory - rm -r $out/share/backgrounds + echo ---------------------------------------------------------------- + echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile + grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile + echo ---------------------------------------------------------------- + sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile + ''; + postInstall = '' # Make a symlink for deepin-version ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; @@ -39,6 +45,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; + # TODO: revise + longDescription = '' + This package provides some components for Deepin desktop environment. + - deepin logo + - deepin desktop version + - login screen background image + - language information + ''; homepage = https://github.com/linuxdeepin/deepin-desktop-base; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index d2b70ec4a896..f0a3d711a1d7 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, python, deepin-gtk-theme, - deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3, - deepin }: +{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme, + deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; - version = "3.4.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq"; + sha256 = "0bamjcpmsl8xhw3ksgl11wv5xwcdhrkl1namikfzc4an03sk1rdq"; }; nativeBuildInputs = [ - python + python3 + glib.dev + deepin.setupHook ]; buildInputs = [ @@ -27,12 +28,34 @@ stdenv.mkDerivation rec { ]; postPatch = '' + searchHardCodedPaths + # fix default background url - sed -i '/picture-uri/s|/usr/share/backgrounds/default_background.jpg|$out/share/backgrounds/deepin/default.png|' \ + sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ + overrides/common/com.deepin.wrap.gnome.desktop.override + + fixPath ${deepin-wallpapers} /usr/share/backgrounds \ overrides/common/com.deepin.wrap.gnome.desktop.override + + fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ + schemas/com.deepin.dde.appearance.gschema.xml + + # still hardcoded paths: + # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon + # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds + # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds + # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; + + doCheck = true; + checkTarget = "test"; + + postInstall = '' + glib-compile-schemas --strict $out/share/glib-2.0/schemas + searchHardCodedPaths $out + ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index 779fae6a113e..d9a6f3701688 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 8d11ca8bf42a..e0657752d102 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix index ef4574206019..3b6b61c1ae76 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }: +{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-icon-theme"; - version = "15.12.64"; + version = "15.12.68"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc"; + sha256 = "12jgz81s5qggmnkfg9m5f799r10p43qmh4zqxl1kjvlrqgvsc9rf"; }; - nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + nativeBuildInputs = [ gtk3 xcursorgen ]; - postPatch = '' - patchShebangs . + buildInputs = [ papirus-icon-theme ]; - # install in $out - sed -i -e "s|/usr|$out|g" Makefile tools/hicolor.links + postPatch = '' + patchShebangs tools/hicolor.links + patchShebangs tools/display_unused_links.sh + patchShebangs cursors-src/cursors/bitmaps/make.sh + patchShebangs cursors-src/render-cursors.sh # keep icon-theme.cache sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile ''; + buildTargets = "all hicolor-links"; + installTargets = "install-icons install-cursors"; + installFlags = [ "PREFIX=${placeholder ''out''}" ]; + + postInstall = '' + cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ + ''; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 0b08f7cd39a0..7e2840f0f3f2 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -6,19 +6,20 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-image-viewer"; - version = "1.3.1"; + version = "1.3.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5"; + sha256 = "0paanw9sd67ic9yrbzqhrwi4bf4lpvsk16jynx99n76j3jgyijkk"; }; nativeBuildInputs = [ pkgconfig qmake qttools + deepin.setupHook ]; buildInputs = [ @@ -33,12 +34,12 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths + patchShebangs viewer/generate_translations.sh + fixPath $out /usr viewer/com.deepin.ImageViewer.service sed -i qimage-plugins/freeimage/freeimage.pro \ qimage-plugins/libraw/libraw.pro \ -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - sed -i viewer/com.deepin.ImageViewer.service \ - -e "s,/usr,$out," ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix index 645abfedad71..5de292805b65 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-menu/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig qmake + deepin.setupHook ]; buildInputs = [ @@ -25,7 +26,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i deepin-menu.pro -e "s,/usr,$out," + searchHardCodedPaths + fixPath $out /usr \ + data/com.deepin.menu.service \ + deepin-menu.desktop \ + deepin-menu.pro ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix index 78b6303188a2..fdf2c240e2c8 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,31 +1,32 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, - json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, - deepin-wallpapers, deepin-desktop-schemas, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, + gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, + libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-metacity"; - version = "3.22.22"; + version = "3.22.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gr10dv8vphla6z7zqiyyg3n3ag4rrlz43c4kr7fd5xwx2bfvp3d"; + sha256 = "1im0wz1zlxiag4kpp5d4hv0aa0ybr4bizarr3903hrqv0lp46hyx"; }; nativeBuildInputs = [ pkgconfig intltool libtool + glib.dev gnome3.gnome-common - gnome3.glib.dev ]; buildInputs = [ gnome3.dconf - gnome3.gtk - gnome3.libgtop + gtk3 + libgtop gnome3.zenity bamf json-glib @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' ''; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; configureFlags = [ "--disable-themes-documentation" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 3d195f8f1c0c..8a675ca1169e 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-movie-reborn"; - version = "3.2.14"; + version = "3.2.21"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707"; + sha256 = "09a4sirbdxnrwj9ww2v7b1s9ylsincqzpqm2zisny9zxy22fm8s9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix index be845d3c6bac..fc26440a3ef1 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, - libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, - libstartup_notification, libinput, cogl, clutter, systemd, deepin }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, + xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, + libstartup_notification, libinput, libgudev, cogl, clutter, systemd, + gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook, + deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-mutter"; - version = "3.20.35"; + version = "3.20.38"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7"; + sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31"; }; nativeBuildInputs = [ @@ -19,27 +21,32 @@ stdenv.mkDerivation rec { intltool libtool gnome3.gnome-common + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ - gnome3.gtk + clutter + cogl + deepin-desktop-schemas gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas - gnome3.libgudev gnome3.zenity - upower - xorg.libxkbfile - libxkbcommon + gsettings-desktop-schemas + gtk3 libcanberra-gtk3 - libstartup_notification + libgudev libinput - xkeyboard_config - cogl - clutter + libstartup_notification + libxkbcommon systemd + upower + xkeyboard_config + xorg.libxkbfile ]; - enableParallelBuilding = true; + postPatch = '' + searchHardCodedPaths + ''; configureFlags = [ "--enable-native-backend" @@ -50,6 +57,8 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + enableParallelBuilding = true; + passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix index bb004372497f..bb752cc1ca90 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix index 70e15441436d..74337974acca 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala, - gettext, gobject-introspection, at-spi2-core, dbus, epoxy, expect, - gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, - libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, - deepin-menu, deepin-shortcut-viewer, deepin }: + gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, + libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, + libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, + libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-terminal"; - version = "3.0.10.2"; + version = "3.2.1.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "0ylhp8q9kfdq9l69drawjaf0q8vcqyflb2a3zfnwbnf06dlpvkz6"; + sha256 = "0dj386csbiw0yqz9nj6ij0s4d0ak9lpq2bmsfs17bjkgdp0ayp90"; }; nativeBuildInputs = [ @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ninja vala gettext - gobject-introspection # For setup hook + libselinux libsepol utillinux # required by gio + deepin.setupHook ]; buildInputs = [ @@ -49,15 +50,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs . + searchHardCodedPaths ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DTEST_BUILD=OFF" + "-DUSE_VENDOR_LIB=OFF" + "-DVERSION=${version}" + ]; passthru.updateScript = deepin.updateScript { inherit name; }; meta = with stdenv.lib; { - description = "The default terminal emulation for Deepin"; + description = "Default terminal emulator for Deepin"; longDescription = '' Deepin terminal, it sharpens your focus in the world of command line! It is an advanced terminal emulator with workspace, multiple diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 8f04bd482184..f99974ba9c26 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -3,19 +3,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wallpapers"; - version = "1.7.5"; + version = "1.7.7"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-wallpapers"; rev = version; - sha256 = "0mfjkh81ci0gjwmgycrh32by7v9b73nyvyjbqd29ccpb8bpyyakn"; + sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; }; - nativeBuildInputs = [ dde-api.bin ]; + nativeBuildInputs = [ dde-api deepin.setupHook ]; postPatch = '' - sed -i -e "s:/usr/lib/deepin-api:${dde-api.bin}/lib/deepin-api:" Makefile + searchHardCodedPaths # debugging + + sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile ''; diff --git a/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix index ea2f06aae607..d1ae0557aaa7 100644 --- a/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,49 +1,55 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - bamf, clutter-gtk, pantheon, libcanberra-gtk3, libwnck3, - deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, - hicolor-icon-theme, deepin }: + bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3, + deepin-menu, deepin-mutter, deepin-wallpapers, + deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "deepin-wm"; - version = "1.9.34"; + version = "1.9.37"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "13hydcalifdc6723k8l4pk905y9sxic5x1fqww0fyx7j6b3hm13f"; + sha256 = "1xd2x0kyav2cxnk0bybl7lrmak1r2468slxz5a6anrdriw9l10gi"; }; nativeBuildInputs = [ pkgconfig intltool libtool - gnome3.gnome-common vala + gnome3.gnome-common + wrapGAppsHook + deepin.setupHook ]; buildInputs = [ - gnome3.gnome-desktop - gnome3.libgee bamf clutter-gtk - pantheon.granite - libcanberra-gtk3 - libwnck3 + deepin-desktop-schemas + deepin-menu deepin-mutter deepin-wallpapers - deepin-desktop-schemas - hicolor-icon-theme + gnome3.gnome-desktop + libcanberra-gtk3 + libgee + libwnck3 + pantheon.granite ]; postPatch = '' - sed -i src/Background/BackgroundSource.vala \ - -e 's;/usr/share/backgrounds/default_background.jpg;${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg;' + searchHardCodedPaths + fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala + # fix background path + sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala ''; + NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; + preConfigure = '' - ./autogen.sh + NOCONFIGURE=1 ./autogen.sh ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/desktops/deepin/default.nix b/nixpkgs/pkgs/desktops/deepin/default.nix index 4c0e44f6b726..d864fd77389e 100644 --- a/nixpkgs/pkgs/desktops/deepin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/default.nix @@ -2,6 +2,8 @@ let packages = self: with self; { + setupHook = ./setup-hook.sh; + updateScript = callPackage ./update.nix { }; dbus-factory = callPackage ./dbus-factory { }; @@ -14,6 +16,7 @@ let # XXX: the build is finding references to Go when compiled with go v1.12 go = go_1_11; }; + dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; deepin-desktop-base = callPackage ./deepin-desktop-base { }; @@ -29,11 +32,11 @@ let deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { - inherit (pkgs.gnome3) libgee; wnck = pkgs.libwnck3; }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wm = callPackage ./deepin-wm { }; + dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwm = callPackage ./dtkwm { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix new file mode 100644 index 000000000000..4baa2262cd6e --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, + dde-polkit-agent, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dpa-ext-gnomekeyring"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + qttools + deepin.setupHook + ]; + + buildInputs = [ + dde-polkit-agent + gnome3.libgnome-keyring + ]; + + postPatch = '' + searchHardCodedPaths + patchShebangs translate_generation.sh + fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "GNOME keyring extension for dde-polkit-agent"; + homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix index 9904c58128f5..4081a40a96e2 100644 --- a/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dtkcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkcore"; - version = "2.0.9.8"; + version = "2.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h"; + sha256 = "0dwpq6c38gaa95mgjnwj3vjz57n0cz6jfk950xi6s9ww2f4g6kq7"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix index b61f31e40ee9..b55a5fbc9fe9 100644 --- a/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/dtkwidget/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dtkwidget"; - version = "2.0.9.10"; + version = "2.0.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0757dzy82bfv97b1gzkwa9zx3jzfbap20v3r1h7lkfcfw95410iw"; + sha256 = "11a7yirfkcj3rq7va9av4m1pr22mq1yx1j9k18xrqv36n0rlbrr6"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix index 01d504eda896..ad2926fa403f 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-dbus-factory"; - version = "0.0.7.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; + sha256 = "1i1ymi2qpcbf4d6rnfzrbq5n2vwnn8dvbq9xlw7jls3jpr3d5r00"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder ''out''}" ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix index 1e3da129a612..92cf3960c736 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder ''out''}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix index bd979b31784f..03c906585e3d 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-gir-generator"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb"; + sha256 = "0d93qzp3dlia5d1yxw0rwca76qk3jyamj9xzmk13vzig8zw0jx16"; }; - patches = [ - # fix: dde-api build error with gobject-introspection 1.58+ - (fetchurl { - url = https://github.com/linuxdeepin/go-gir-generator/commit/a7ab229201e28d1be727f5021b3588fa4a1acf5f.patch; - sha256 = "13ywalwkjg8wwvd0pvmc2rv1h38airyvimdn9jfb5wis9xm48401"; - }) - ]; - nativeBuildInputs = [ pkgconfig go @@ -36,7 +28,7 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder ''out''}" "GOCACHE=$(TMPDIR)/go-cache" ]; diff --git a/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix index 684f1dd7f32d..41315c440901 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-lib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.3.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv"; + sha256 = "090l33y79gdj2xy1bhk2ksl6hvmsfhmx0bhygm4y4d0iqckf2x2m"; }; buildInputs = [ @@ -21,10 +21,12 @@ stdenv.mkDerivation rec { mobile-broadband-provider-info ]; - makeFlags = [ - "PREFIX=$(out)" - "GOSITE_DIR=$(out)/share/go" - ]; + installPhase = '' + mkdir -p $out/share/go/src/pkg.deepin.io/lib + cp -a * $out/share/go/src/pkg.deepin.io/lib + + rm -r $out/share/go/src/pkg.deepin.io/lib/debian + ''; passthru.updateScript = deepin.updateScript { inherit name; }; diff --git a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index c4ce0ca563bd..7d2c89165087 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; - version = "1.1.13"; + version = "1.1.25"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x"; + sha256 = "1nadmj1hdpw4n3kpk3dlx22bmxdli66abhjl73hwrbvszmmcm9vp"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix index 809156377225..634bac5cf97d 100644 --- a/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/qt5integration/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "qt5integration"; - version = "0.3.6"; + version = "0.3.8"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy"; + sha256 = "12d6iv2x0q2n73rscma30q31nh7h26gmhlf665gkgl2j825hlx5n"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/deepin/setup-hook.sh b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh new file mode 100755 index 000000000000..15fe5be1538d --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/setup-hook.sh @@ -0,0 +1,53 @@ +# Helper functions for deepin packaging + +searchHardCodedPaths() { + # looks for ocurrences of hard coded paths in given (current) + # directory and command invocations for the purpose of debugging a + # derivation + + local dir=$1 + + echo ----------- looking for command invocations + grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $dir || true + + echo ----------- looking for hard coded paths + grep --color=always -r -E '/(usr|bin|sbin|etc|var|opt)\>' $dir || true + + echo ----------- done +} + +fixPath() { + # Usage: + # + # fixPath <parent dir> <path> <files> + # + # replaces occurences of <path> by <parent_dir><path> in <files> + # removing /usr from the start of <path> if present + + local parentdir=$1 + local path=$2 + local newpath=$parentdir$(echo $path | sed "s,^/usr,,") + local files=("${@:3}") + echo ======= grep --color=always "${path}" "${files[@]}" + grep --color=always "${path}" "${files[@]}" + echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}" + sed -i -e "s,$path,$newpath,g" "${files[@]}" +} + +searchForUnresolvedDLL() { + # Usage: + # + # searchForUnresolvedDLL <dir> + # + # looks in <dir> for executables with unresolved dynamic library paths + + local dir="$1" + echo ======= Looking for executables with unresolved dynamic library dependencies + echo $dir + for f in $(find -L "$dir" -type f -executable); do + if (ldd $f | grep -q "not found"); then + echo $f + ldd $f | grep --color=always "not found" + fi + done +} diff --git a/nixpkgs/pkgs/desktops/deepin/update.nix b/nixpkgs/pkgs/desktops/deepin/update.nix index 22a6acb8ce31..089d9289827e 100644 --- a/nixpkgs/pkgs/desktops/deepin/update.nix +++ b/nixpkgs/pkgs/desktops/deepin/update.nix @@ -1,5 +1,5 @@ { stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: -{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }: +{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }: let nameAndVersion = builtins.parseDrvName name; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix index 1a01bd307eaa..c27e380470a3 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/evince/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin + "--enable-ps" "--enable-introspection" (if supportXPS then "--enable-xps" else "--disable-xps") ]; diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 2988dd1b47e2..30d082e07e29 100644 --- a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -1,18 +1,28 @@ -{ fetchurl, stdenv, fetchpatch, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo +{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo , glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 -, gsettings-desktop-schemas, gnome-desktop +, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, geocode-glib, pipewire, libgudev, libwacom, xwayland, autoreconfHook }: +, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }: stdenv.mkDerivation rec { - name = "mutter-${version}"; + pname = "mutter"; version = "3.28.3"; - src = fetchurl { - url = "mirror://gnome/sources/mutter/3.28/${name}.tar.xz"; - sha256 = "0vq3rmq20d6b1mi6sf67wkzqys6hw5j7n7fd4hndcp19d5i26149"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28 + sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v"; }; + patches = [ + (substituteAll { + src = ./fix-paths-328.patch; + inherit zenity; + }) + ]; + configureFlags = [ "--with-x" "--disable-static" @@ -31,21 +41,16 @@ stdenv.mkDerivation rec { libXtst ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ]; buildInputs = [ glib gobject-introspection gtk3 gsettings-desktop-schemas upower gnome-desktop cairo pango cogl clutter zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon pipewire + libxkbcommon ]; - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch new file mode 100644 index 000000000000..6c40624a55da --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 5b8de18c7..546352a95 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -635,7 +635,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix new file mode 100644 index 000000000000..293918bd2b11 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, glib, gnome3 }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-tilingnome"; + version = "unstable-2019-01-18"; + + src = fetchFromGitHub { + owner = "rliang"; + repo = pname; + rev = "bd4fb8c19f7a6282b38724b30e62645143390226"; + sha256 = "1y4s4n88gdkpvgd3v3dg0181ccyhlixbvkx3bwyvdxyyyxbqibid"; + }; + + nativeBuildInputs = [ glib ]; + + buildPhase = '' + glib-compile-schemas . + ''; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/${uuid} + cp -r * $out/share/gnome-shell/extensions/${uuid}/ + ''; + + uuid = "tilingnome@rliang.github.com"; + + meta = with stdenv.lib; { + description = "Tiling window management for GNOME Shell"; + license = licenses.gpl2; + maintainers = with maintainers; [ benley ]; + homepage = https://github.com/rliang/gnome-shell-extension-tilingnome; + platforms = gnome3.gnome-shell.meta.platforms; + broken = lib.versionAtLeast gnome3.gnome-shell.version "3.31"; + }; +} diff --git a/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix index 49a71987e754..0866fd104d23 100644 --- a/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/nixpkgs/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { - name = "lxrandr-0.3.1"; + name = "lxrandr-0.3.2"; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e"; + sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 1989ac8e12cc..d6d189624f17 100644 --- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - gnome3.gtk + gtk3 mate.caja hicolor-icon-theme mate.mate-desktop diff --git a/nixpkgs/pkgs/desktops/mate/eom/default.nix b/nixpkgs/pkgs/desktops/mate/eom/default.nix index 3b830f73c76a..22f100008aa8 100644 --- a/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { librsvg libxml2 shared-mime-info - gnome3.gtk - gnome3.libpeas + gtk3 + libpeas mate.mate-desktop hicolor-icon-theme ]; diff --git a/nixpkgs/pkgs/desktops/mate/marco/default.nix b/nixpkgs/pkgs/desktops/mate/marco/default.nix index 975c80b1d0cf..8a707c78a510 100644 --- a/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libgtop gnome2.startup_notification - gnome3.gtk + gtk3 gnome3.zenity ]; - + meta = with stdenv.lib; { description = "MATE default window manager"; homepage = https://github.com/mate-desktop/marco; diff --git a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index f9f0689fa65f..0a562b1f3cc7 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk - gnome3.gtksourceview + gtk3 + gtksourceview3 gnome3.gucharmap libwnck3 libgtop @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-suid=no" ]; - + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index 8697a150881b..d24198f5d7f4 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 librsvg libappindicator-gtk3 - gnome3.gtk + gtk3 gnome3.dconf hicolor-icon-theme mate.mate-desktop diff --git a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index e6a43e6b457d..7d957e749b0b 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-desktop-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.dconf - gnome3.gtk + gtk3 ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index 643f67cd1e95..90b97cd2bfb4 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-media-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libcanberra-gtk3 - gnome3.gtk + gtk3 mate.libmatemixer mate.mate-desktop ]; diff --git a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index e9f8b4b75b1f..91ed947c97cc 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, - libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: + libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libnotify libwnck3 - gnome3.gtk + gtk3 ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index a7d34fc85a64..64b6b333f5a3 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libwnck3 librsvg libxml2 - gnome3.gtk + gtk3 gnome3.dconf mate.libmateweather mate.mate-desktop diff --git a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index a9c162e59122..88f497f21de9 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { itstool libxml2 libcanberra-gtk3 - gnome3.gtk + gtk3 gnome3.libgnome-keyring libnotify dbus-glib diff --git a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index 480304fcb1c6..3c47e50b9c82 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,6 +1,5 @@ -{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier -, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook +, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { libnotify nss polkit - gnome3.gtk + gtk3 gnome3.dconf mate.mate-desktop mate.libmatekbd diff --git a/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/nixpkgs/pkgs/desktops/mate/pluma/default.nix index d71bb08dd5cb..b27804e50a55 100644 --- a/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "pluma-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { enchant libxml2 python - gnome3.gtksourceview - gnome3.libpeas + gtksourceview3 + libpeas gnome3.adwaita-icon-theme mate.mate-desktop ]; diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 2e90a96411a3..90f326fb8269 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "camera"; - version = "1.0.3"; + version = "1.0.4"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "05rjymflhwbkw8yc57rgi9n7lrhf4dpvfvlifdnazyqn9iiaxc46"; + sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9855a1394e59..d224dbce7891 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "files"; - version = "4.1.5"; + version = "4.1.6"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0z0pisg7py2k6i31v18z5fgpj8x64m1s5clfq4vbbjrcjwx6dcx5"; + sha256 = "1c17d5lvpzyqd7mmzyfms80am46s566xr1r7b27rgv9w7vpzpgm0"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 01fe35e4a8ee..19bf4ce098bc 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "terminal"; - version = "5.3.3"; + version = "5.3.4"; name = "elementary-${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1rhqfq5dn913g551ribycid4k8add2lanxkkqpv6zzdgvah26ni8"; + sha256 = "08vwgd385j7cbi7c8442sjygzw9qy2phsi5lva4jaxwm8l15hk86"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index e47dc4c4060c..c661e4f21112 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0yy821hl26jfd9hyigqi7nmaf30iww0lhg9qzcwlfzsvvfwnxagi"; + sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index e4d0db46923b..baf5becd3477 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0dvxmjziifffa2rm7h43ca5grhlcpih3rgik50mz808mqfxr4l1q"; + sha256 = "101a39v8fssc7s56cpi60zsggvw66y9gaxwjvawds928cll0yiy9"; }; passthru = { diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch index 438ed79d1bb0..1b2dc835706d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch @@ -1,7 +1,7 @@ -diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override -index 6452c30..899972d 100644 ---- a/debian/elementary-default-settings.gsettings-override -+++ b/debian/elementary-default-settings.gsettings-override +diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override +index 1aef29c..08de164 100644 +--- a/overrides/default-settings.gschema.override ++++ b/overrides/default-settings.gschema.override @@ -1,5 +1,5 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index f133324a81ec..39299d2c2eb7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "default-settings"; - version = "5.0"; + version = "5.1.0"; name = "elementary-${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0"; + sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym"; }; passthru = { @@ -21,16 +21,6 @@ stdenv.mkDerivation rec { }; patches = [ - # See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release) - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch"; - sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l"; - }) - # See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release) - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch"; - sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x"; - }) ./correct-override.patch ]; @@ -41,7 +31,7 @@ stdenv.mkDerivation rec { cp -av settings.ini $out/etc/gtk-3.0 mkdir -p $out/share/glib-2.0/schemas - cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override + cp -av overrides/default-settings.gschema.override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override mkdir $out/etc/wingpanel.d cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index bd5688f941b2..466e7b6f22fb 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank +{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: @@ -6,10 +6,11 @@ let gsettingsOverridePackages = [ - gala - epiphany elementary-settings-daemon + epiphany + gala gnome3.mutter + gsettings-desktop-schemas gtk3 plank ] ++ extraGSettingsOverridePackages; @@ -32,8 +33,6 @@ runCommand "elementary-gsettings-desktop-schemas" {} cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - draw-background=true - picture-options='zoom' picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch deleted file mode 100644 index 2370fbcd3cb2..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/calendar-exec.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Widgets/calendar/Calendar.vala b/src/Widgets/calendar/Calendar.vala -index 76443ca..d86bd44 100644 ---- a/src/Widgets/calendar/Calendar.vala -+++ b/src/Widgets/calendar/Calendar.vala -@@ -19,7 +19,7 @@ - - namespace DateTime.Widgets { - public class Calendar : Gtk.Box { -- private const string CALENDAR_EXEC = "/usr/bin/io.elementary.calendar"; -+ private const string CALENDAR_EXEC = "@elementary-calendar@"; - - ControlHeader heading; - CalendarView cal; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index ee5cd5118186..5fa95c75ccc9 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -43,15 +43,16 @@ stdenv.mkDerivation rec { ]; patches = [ - (substituteAll { - src = ./calendar-exec.patch; - elementary-calendar = "${elementary-calendar}/bin/io.elementary.calendar"; - }) # Use "clock-format" GSettings key that's been moved to granite (fetchpatch { url = "https://src.fedoraproject.org/rpms/wingpanel-indicator-datetime/raw/c8d515b76aa812c141212d5515621a6febd781a3/f/00-move-clock-format-settings-to-granite.patch"; sha256 = "1sq3aw9ckkm057rnrclnw9lyrxbpl37fyzfnbixi2q3ypr70n880"; }) + # See: https://github.com/elementary/wingpanel-indicator-datetime/pull/117 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/4859e72a52d8dac5cad87b192fc912fb013b0ecd.patch"; + sha256 = "0jfhb5sax4sivdfx7il1rc1dvhy0yfv27qhvwbdy0hza9wf8q9k0"; + }) ]; PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "lib/wingpanel"; @@ -61,6 +62,11 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + # launches elementary-calendar on selection + preFixup = '' + gappsWrapperArgs+=( --prefix PATH : "${elementary-calendar}/bin" ) + ''; + meta = with stdenv.lib; { description = "Date & Time Indicator for Wingpanel"; homepage = https://github.com/elementary/wingpanel-indicator-datetime; diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index 814795499a99..5c27d0d2f182 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.5/ ) diff --git a/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix index 8f93a0b37721..182f8fbefab5 100644 --- a/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix +++ b/nixpkgs/pkgs/development/arduino/platformio/chrootenv.nix @@ -13,7 +13,7 @@ let inherit version; sha256 = "678c98275431fad324275dec63791e4a17558b40e5a110e20a82866139a85a5a"; }; - patches = []; + postPatch = ""; }); platformio = self.callPackage ./core.nix { }; diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 6e3fe6c4ebf1..8e8b157aa229 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec { # Remove some broken manpages. rm -rf $out/man/ja* + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + rm $out/lib/libfreetype.so + # for backward compatibility ln -s $out $out/jre diff --git a/nixpkgs/pkgs/development/compilers/compcert/default.nix b/nixpkgs/pkgs/development/compilers/compcert/default.nix index de01d7afdf04..4538d3031489 100644 --- a/nixpkgs/pkgs/development/compilers/compcert/default.nix +++ b/nixpkgs/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, makeWrapper +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper , coq, ocamlPackages, coq2html , tools ? stdenv.cc }: @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { name = "compcert-${version}"; version = "3.5"; - src = fetchurl { - url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "127s8nwsmpl7ng7h4yy8cci8p6ncsw8i8jq3z0pyhx2siryddq0v"; + src = fetchFromGitHub { + owner = "AbsInt"; + repo = "CompCert"; + rev = "v${version}"; + sha256 = "1g8067a5x3vd0l47d04gjvy5yx49nghh55am5d1fbrjirfsnsz8j"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +26,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patchPhase = '' - substituteInPlace ./VERSION --replace 3.4 3.5 substituteInPlace ./configure \ --replace '{toolprefix}gcc' '{toolprefix}cc' ''; diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index 3a34d14f8ad3..e2c3c8fe587b 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -147,7 +147,11 @@ let done < <(find $out $lib $doc -type f -print0) ''; - doInstallCheck = true; + # cuda-gdb doesn't run correctly when not using sandboxing, so + # temporarily disabling the install check. This should be set to true + # when we figure out how to get `cuda-gdb --version` to run correctly + # when not using sandboxing. + doInstallCheck = false; postInstallCheck = let in '' # Smoke test binaries diff --git a/nixpkgs/pkgs/development/compilers/dtc/default.nix b/nixpkgs/pkgs/development/compilers/dtc/default.nix index 9cc60003201c..ea305cc5c84c 100644 --- a/nixpkgs/pkgs/development/compilers/dtc/default.nix +++ b/nixpkgs/pkgs/development/compilers/dtc/default.nix @@ -1,25 +1,18 @@ -{ stdenv, fetchgit, fetchpatch, flex, bison, pkgconfig, python2, swig, which }: +{ stdenv, fetchgit, flex, bison, pkgconfig, python2, swig, which }: stdenv.mkDerivation rec { pname = "dtc"; - version = "1.4.7"; + version = "1.5.0"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "0l787g1wmd4d6izsp91m5r2qms2h2jg2hhzllfi9qkbnplyz21wn"; + sha256 = "075gj8bbahfdb8dlif3d2dpzjrkyf3bwbcmx96zpwhlgs0da8jxh"; }; nativeBuildInputs = [ flex bison pkgconfig swig which ]; buildInputs = [ python2 ]; - patches = [ - # Fix setup.py - (fetchpatch { - url = "https://github.com/dezgeg/dtc/commit/d94a745148ba5c9198143ccc0f7d877fe498ab73.patch"; - sha256 = "0hpryx04j1swvmjisrfhvss08zzz4nxz9iv72lp4jdgg6vg0argl"; - }) - ]; postPatch = '' patchShebangs pylibfdt/ ''; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 82edf0e33cfa..9e5a172eed84 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -5,16 +5,17 @@ stdenv.mkDerivation rec { version = "6-2017-q2-update"; subdir = "6-2017q2"; - platformString = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "mac" - else throw "unsupported platform"; - - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2"; - src = - if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; } - else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; } + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; + } else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 39fc3c517f81..80e042b5c2e9 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -7,9 +7,18 @@ stdenv.mkDerivation rec { version = "7-2018-q2-update"; subdir = "7-2018q2"; - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - - src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; }; + src = + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; + } + else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index a26131cb0536..ee57dcc8c144 100644 --- a/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -7,9 +7,18 @@ stdenv.mkDerivation rec { version = "8-2018-q4-major"; subdir = "8-2018q4"; - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - - src = fetchurl { url=urlString; sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; }; + src = + if stdenv.isLinux then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; + } + else if stdenv.isDarwin then + fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; + sha256="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb"; + } + else throw "unsupported platform"; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index ce3395f0be03..f5572c077f31 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -322,6 +322,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix b/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix index 3e355dc302d6..a88cf9c01165 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -70,11 +70,9 @@ let ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc") libiconv; - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix index 874580c87aab..da72c351ec66 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -72,11 +72,9 @@ let ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix index 140cea22442e..6cd7522bae87 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.6.4.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -32,6 +32,10 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 }: assert !enableIntegerSimple -> gmp != null; @@ -72,11 +76,9 @@ let ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -153,7 +155,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${libffi.dev}/include" "--with-ffi-libraries=${libffi.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ @@ -164,8 +166,7 @@ stdenv.mkDerivation (rec { "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index 7e670743f7fc..88b273500dc0 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -30,6 +30,10 @@ , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 }: assert !enableIntegerSimple -> gmp != null; @@ -69,11 +73,9 @@ let ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - toolsForTarget = - if hostPlatform == buildPlatform then - [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm - else assert targetPlatform == hostPlatform; # build != host == target - [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; @@ -159,8 +161,7 @@ stdenv.mkDerivation (rec { "CFLAGS=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ - # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" ]; diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index a88e2c48d03e..52f3ad497ad6 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -5,4 +5,5 @@ in self: super: { ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; + system-fileio = doJailbreak super.system-fileio; } diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix index 06187987b6c6..068d7b578dfe 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,6 +105,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; - meta.broken = true; meta.hydraPlatforms = []; } diff --git a/nixpkgs/pkgs/development/compilers/glslang/default.nix b/nixpkgs/pkgs/development/compilers/glslang/default.nix index 62c5a0de0a93..784d66a0f242 100644 --- a/nixpkgs/pkgs/development/compilers/glslang/default.nix +++ b/nixpkgs/pkgs/development/compilers/glslang/default.nix @@ -1,35 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, spirv-tools, jq }: - +{ stdenv, fetchFromGitHub, fetchpatch, cmake, bison, jq, python, spirv-tools, spirv-headers }: stdenv.mkDerivation rec { - name = "glslang-git-${version}"; - version = "2018-09-26"; + name = "glslang-${version}"; + version = "7.11.3113"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "91ac4290bcf2cb930b4fb0981f09c00c0b6797e1"; - sha256 = "0q477pm0n495acnss16ddlf82a6i5l2dfmvc7r8yi0bgmgpzi4av"; + rev = "${version}"; + sha256 = "1kzv2b4q1fddxd7c0hc754nd6rw6y9vijb9fsi13xzzq9dficgb6"; }; - buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs; + nativeBuildInputs = [ cmake python bison jq ]; enableParallelBuilding = true; postPatch = '' cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools - ln -s "${spirv-tools.headers}" External/spirv-tools/external/spirv-headers + ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers ''; preConfigure = '' HEADERS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools/external/spirv-headers"))[0].commit') TOOLS_COMMIT=$(jq -r < known_good.json '.commits|map(select(.name=="spirv-tools"))[0].commit') - if [ "$HEADERS_COMMIT" != "${spirv-tools.headers.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then + if [ "$HEADERS_COMMIT" != "${spirv-headers.src.rev}" ] || [ "$TOOLS_COMMIT" != "${spirv-tools.src.rev}" ]; then echo "ERROR: spirv-tools commits do not match expected versions: expected tools at $TOOLS_COMMIT, headers at $HEADERS_COMMIT"; exit 1; fi ''; - doCheck = false; # fails 3 out of 3 tests (ctest) - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Khronos reference front-end for GLSL and ESSL"; diff --git a/nixpkgs/pkgs/development/compilers/go/1.11.nix b/nixpkgs/pkgs/development/compilers/go/1.11.nix index db3731c2fcaa..355b2559e98d 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.11.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.11.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -152,16 +153,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index d7bbd4eaf0fc..bcd2eacc7ecf 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -154,16 +155,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; diff --git a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 876e474bed97..62934dd9eeb3 100644 --- a/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,12 +7,12 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b1248.6"; + version = "202b1483.37"; name = pname + "-" + version; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; + url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk8u${version}_linux_x64.tar.gz"; sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7"; } else diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch b/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch index 032b04708d16..e63be181f95c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/7/crtbegin-and-end.patch @@ -156,7 +156,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt =================================================================== --- /dev/null +++ compiler-rt/lib/crt/CMakeLists.txt -@@ -0,0 +1,101 @@ +@@ -0,0 +1,102 @@ +add_compiler_rt_component(crt) + +function(check_cxx_section_exists section output) @@ -216,7 +216,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OUTPUT_VARIABLE CHECK_OUTPUT + ERROR_VARIABLE CHECK_ERROR + ) -+ string(FIND ${CHECK_OUTPUT} ${section} SECTION_FOUND) ++ string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND) + + if(NOT SECTION_FOUND EQUAL -1) + set(${output} TRUE PARENT_SCOPE) @@ -231,6 +231,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") + +append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) ++append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS) + +foreach(arch ${CRT_SUPPORTED_ARCH}) + add_compiler_rt_runtime(clang_rt.crtbegin @@ -243,7 +244,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OBJECT + ARCHS ${arch} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED + PARENT_TARGET crt) + add_compiler_rt_runtime(clang_rt.crtend + OBJECT @@ -255,14 +256,14 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OBJECT + ARCHS ${arch} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED + PARENT_TARGET crt) +endforeach() Index: compiler-rt/lib/crt/crtbegin.c =================================================================== --- /dev/null +++ compiler-rt/lib/crt/crtbegin.c -@@ -0,0 +1,110 @@ +@@ -0,0 +1,108 @@ +/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== + * + * The LLVM Compiler Infrastructure @@ -282,8 +283,8 @@ Index: compiler-rt/lib/crt/crtbegin.c +void *__dso_handle = (void *)0; +#endif + -+static long __EH_FRAME_LIST__[] __attribute__(( -+ section(".eh_frame"), aligned(sizeof(void *)), visibility("hidden"))) = {}; ++static long __EH_FRAME_LIST__[] ++ __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {}; + +extern void __register_frame_info(const void *, void *) __attribute__((weak)); +extern void *__deregister_frame_info(const void *) __attribute__((weak)); @@ -292,9 +293,8 @@ Index: compiler-rt/lib/crt/crtbegin.c +typedef void (*fp)(void); + +static fp __CTOR_LIST__[] -+ __attribute__((section(".ctors"), aligned(sizeof(fp)), visibility("hidden"), -+ used)) = {(fp)-1}; -+extern fp __CTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++ __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1}; ++extern fp __CTOR_LIST_END__[]; +#endif + +#ifdef CRT_SHARED @@ -334,9 +334,8 @@ Index: compiler-rt/lib/crt/crtbegin.c + +#ifndef CRT_HAS_INITFINI_ARRAY +static fp __DTOR_LIST__[] -+ __attribute__((section(".dtors"), aligned(sizeof(fp)), visibility("hidden"), -+ used)) = {(fp)-1}; -+extern fp __DTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++ __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1}; ++extern fp __DTOR_LIST_END__[]; +#endif + +static void __attribute__((used)) __do_fini() { @@ -377,7 +376,7 @@ Index: compiler-rt/lib/crt/crtend.c =================================================================== --- /dev/null +++ compiler-rt/lib/crt/crtend.c -@@ -0,0 +1,23 @@ +@@ -0,0 +1,24 @@ +/* ===-- crtend.c - End of constructors and destructors --------------------=== + * + * The LLVM Compiler Infrastructure @@ -392,7 +391,8 @@ Index: compiler-rt/lib/crt/crtend.c + +// Put 4-byte zero which is the length field in FDE at the end as a terminator. +const int32_t __EH_FRAME_LIST_END__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), used)) = {0}; ++ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), ++ visibility("hidden"), used)) = {0}; + +#ifndef CRT_HAS_INITFINI_ARRAY +typedef void (*fp)(void); diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix index f970ff81e35c..44ec6c376cdb 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/clang/default.nix @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "07k6vcxnf9n8x21mala3rfvf450iqy24wcsqw4yc8b8lp1fwii6p"} + unpackFile ${fetch "cfe" "0svk1f70hvpwrjp6x5i9kqwrqwxnmcrw5s7f4cxyd100mdd12k08"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index cdc0e27c8689..4965b57b0d73 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; - src = fetch "compiler-rt" "16la7ksxwfs6wk3y7w8hh3c1svp095m7j4qfrdgv65lnfwp6rwf9"; + src = fetch "compiler-rt" "1c919wsm17xnv7lr8bhpq2wkq8113lzlw6hzhfr737j59x3wfddl"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_C_FLAGS=-nodefaultlibs" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" @@ -20,13 +20,18 @@ stdenv.mkDerivation rec { "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" ]; outputs = [ "out" "dev" ]; patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch b/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch index 032b04708d16..e63be181f95c 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch +++ b/nixpkgs/pkgs/development/compilers/llvm/8/crtbegin-and-end.patch @@ -156,7 +156,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt =================================================================== --- /dev/null +++ compiler-rt/lib/crt/CMakeLists.txt -@@ -0,0 +1,101 @@ +@@ -0,0 +1,102 @@ +add_compiler_rt_component(crt) + +function(check_cxx_section_exists section output) @@ -216,7 +216,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OUTPUT_VARIABLE CHECK_OUTPUT + ERROR_VARIABLE CHECK_ERROR + ) -+ string(FIND ${CHECK_OUTPUT} ${section} SECTION_FOUND) ++ string(FIND "${CHECK_OUTPUT}" "${section}" SECTION_FOUND) + + if(NOT SECTION_FOUND EQUAL -1) + set(${output} TRUE PARENT_SCOPE) @@ -231,6 +231,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") + +append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) ++append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS) + +foreach(arch ${CRT_SUPPORTED_ARCH}) + add_compiler_rt_runtime(clang_rt.crtbegin @@ -243,7 +244,7 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OBJECT + ARCHS ${arch} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED + PARENT_TARGET crt) + add_compiler_rt_runtime(clang_rt.crtend + OBJECT @@ -255,14 +256,14 @@ Index: compiler-rt/lib/crt/CMakeLists.txt + OBJECT + ARCHS ${arch} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c -+ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED -fPIC ++ CFLAGS ${CRT_CFLAGS} -DCRT_SHARED + PARENT_TARGET crt) +endforeach() Index: compiler-rt/lib/crt/crtbegin.c =================================================================== --- /dev/null +++ compiler-rt/lib/crt/crtbegin.c -@@ -0,0 +1,110 @@ +@@ -0,0 +1,108 @@ +/* ===-- crtbegin.c - Start of constructors and destructors ----------------=== + * + * The LLVM Compiler Infrastructure @@ -282,8 +283,8 @@ Index: compiler-rt/lib/crt/crtbegin.c +void *__dso_handle = (void *)0; +#endif + -+static long __EH_FRAME_LIST__[] __attribute__(( -+ section(".eh_frame"), aligned(sizeof(void *)), visibility("hidden"))) = {}; ++static long __EH_FRAME_LIST__[] ++ __attribute__((section(".eh_frame"), aligned(sizeof(void *)))) = {}; + +extern void __register_frame_info(const void *, void *) __attribute__((weak)); +extern void *__deregister_frame_info(const void *) __attribute__((weak)); @@ -292,9 +293,8 @@ Index: compiler-rt/lib/crt/crtbegin.c +typedef void (*fp)(void); + +static fp __CTOR_LIST__[] -+ __attribute__((section(".ctors"), aligned(sizeof(fp)), visibility("hidden"), -+ used)) = {(fp)-1}; -+extern fp __CTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++ __attribute__((section(".ctors"), aligned(sizeof(fp)), used)) = {(fp)-1}; ++extern fp __CTOR_LIST_END__[]; +#endif + +#ifdef CRT_SHARED @@ -334,9 +334,8 @@ Index: compiler-rt/lib/crt/crtbegin.c + +#ifndef CRT_HAS_INITFINI_ARRAY +static fp __DTOR_LIST__[] -+ __attribute__((section(".dtors"), aligned(sizeof(fp)), visibility("hidden"), -+ used)) = {(fp)-1}; -+extern fp __DTOR_LIST_END__[] __attribute__((visibility("hidden"))); ++ __attribute__((section(".dtors"), aligned(sizeof(fp)), used)) = {(fp)-1}; ++extern fp __DTOR_LIST_END__[]; +#endif + +static void __attribute__((used)) __do_fini() { @@ -377,7 +376,7 @@ Index: compiler-rt/lib/crt/crtend.c =================================================================== --- /dev/null +++ compiler-rt/lib/crt/crtend.c -@@ -0,0 +1,23 @@ +@@ -0,0 +1,24 @@ +/* ===-- crtend.c - End of constructors and destructors --------------------=== + * + * The LLVM Compiler Infrastructure @@ -392,7 +391,8 @@ Index: compiler-rt/lib/crt/crtend.c + +// Put 4-byte zero which is the length field in FDE at the end as a terminator. +const int32_t __EH_FRAME_LIST_END__[] -+ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), used)) = {0}; ++ __attribute__((section(".eh_frame"), aligned(sizeof(int32_t)), ++ visibility("hidden"), used)) = {0}; + +#ifndef CRT_HAS_INITFINI_ARRAY +typedef void (*fp)(void); diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index 33c985210eda..c5f2163450fe 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -6,14 +6,14 @@ let release_version = "8.0.0"; - version = release_version + "rc5"; # differentiating these is important for rc's + version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "https://prereleases.llvm.org/${release_version}/rc5/${name}-${version}.src.tar.xz"; + url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0705xl8ysjc9pdrggyc51zjq3kwcrckhz4cf4z8wbgi7x2li1djd"; + clang-tools-extra_src = fetch "clang-tools-extra" "0jwx6nnshp92pd5852y7ip7qhaqdf8az5g0440pli9q8whmi402g"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix index 6b9734e11b90..84db33209ebd 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "1hdhr4nnynwf1m1581sjl8pdh3gdxsz1rdzdryig7ll9v2lp0rkc"; + src = fetch "libcxx" "1qlx3wlxrnc5cwc1fcfc2vhfsl7j4294hi8y5kxj8hy8wxsjd462"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix index 3c328369c5ac..976c289e5bc5 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1s65sb5vv5l532fmcwvxd3apxm1jjc64yb5qn30f0zzdx9g3rx69"; + src = fetch "libcxxabi" "1k875f977ybdkpdnr9105wa6hccy9qvpd9xd42n75h7p56bdxmn2"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix index 68e6cdc0e067..7fff6843c5f4 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lld.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "1w0f3s5rzv90yiv4k9wdvkpc89k3g9crbwf1sh8xbi5jsjnz4539"; + src = fetch "lld" "0dvf38pbm7jy88g66mz7ikkdfhm2qpj0iyzh62hzycifjbnciblw"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix index a6e0401250c0..ae9198e99d27 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "1i3hy37qmwqblxpac88ing7mg3jyp2hh08rfv3xhlxj9wddz7nyd"; + src = fetch "lldb" "0wq3mi76fk86g2g2bcsr0yhagh1dlf2myk641ai58rc116gqp4a9"; postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place @@ -45,6 +45,10 @@ stdenv.mkDerivation { postInstall = '' mkdir -p $out/share/man/man1 cp ../docs/lldb.1 $out/share/man/man1/ + + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix index 484484e17255..5d8d08167298 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/llvm.nix @@ -22,8 +22,8 @@ let inherit (stdenv.lib) optional optionals optionalString; - src = fetch "llvm" "1hb5if7vmgkb52dpj9lyvn986mnk2jbpryng2r1rc5vy25wxw759"; - polly_src = fetch "polly" "07l3y20j8124x24yqiq0qmz9rhkfh3c48q6vnpgldj2scr3vgyb2"; + src = fetch "llvm" "0k124sxkfhfi1rca6kzkdraf4axhx99x3cw2rk55056628dvwwl8"; + polly_src = fetch "polly" "1x4xv3j226rqdddp7b61d71wsx2b8vmmri02ycx27y2fg7ba7xg3"; # Used when creating a version-suffixed symlink of libLLVM.dylib shortVersion = with stdenv.lib; @@ -71,6 +71,8 @@ in stdenv.mkDerivation (rec { substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir '' + '' patchShebangs test/BugPoint/compile-custom.ll.py ''; diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix index 16bfe828e4da..bf85cae5abe7 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/openmp.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "1nad9ihnaa4xpr77lp9y6zzqqi90d5p280zwv260z9mifkl4dlhm"; + src = fetch "openmp" "1mf9cpgvix34xlpv0inkgl3qmdvgvp96f7sksqizri0n5xfp1cgp"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/nixpkgs/pkgs/development/compilers/pakcs/default.nix b/nixpkgs/pkgs/development/compilers/pakcs/default.nix index ef53280b679c..a118e7ab73ba 100644 --- a/nixpkgs/pkgs/development/compilers/pakcs/default.nix +++ b/nixpkgs/pkgs/development/compilers/pakcs/default.nix @@ -4,13 +4,13 @@ , curl, git, unzip, gnutar, coreutils, sqlite }: let - name = "pakcs-2.0.2"; + name = "pakcs-2.1.1"; # Don't switch to development release without a reason, because its # source updates without version bump. Prefer current release instead. src = fetchurl { url = "https://www.informatik.uni-kiel.de/~pakcs/download/${name}-src.tar.gz"; - sha256 = "1hm80gvpsifbsfi13i0iiv7f2b72ymw98bbrm6a8hjsbnfw55jvg"; + sha256 = "112v9ynqfbbm4x770mcfrai9v5bh7c3zn7jka80pv6v4y65r778c"; }; curry-frontend = (haskellPackages.override { diff --git a/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/nixpkgs/pkgs/development/compilers/ponyc/default.nix index 767eafc456c0..749fbcc2fafb 100644 --- a/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -2,14 +2,14 @@ cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation ( rec { - name = "ponyc-${version}"; - version = "0.27.0"; + pname = "ponyc"; + version = "0.28.0"; src = fetchFromGitHub { owner = "ponylang"; - repo = "ponyc"; + repo = pname; rev = version; - sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla"; + sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix new file mode 100644 index 000000000000..5e84f2d874a5 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, zlib, gmp, ncurses5, lib }: + +# from justinwoo/easy-purescript-nix +# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix + +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; + + patchelf = libPath : + if stdenv.isDarwin + then "" + else + '' + chmod u+w $PURS + patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PURS + chmod u-w $PURS + ''; + +in stdenv.mkDerivation rec { + name = "purs-simple"; + version = "v0.12.3"; + + src = + if stdenv.isDarwin + then + fetchurl { + url = "https://github.com/purescript/purescript/releases/download/v0.12.3/macos.tar.gz"; + sha256 = "1f916gv4fz571l4jvr15xjnsvjyy4nljv2ii9njwlm7k6yr5m0qn"; + } + else + fetchurl { + url = "https://github.com/purescript/purescript/releases/download/v0.12.3/linux64.tar.gz"; + sha256 = "1fad862a2sv4njxbbcfzibbi585m6is3ywb94nmjl8ax254baj3i"; + }; + + + buildInputs = [ zlib + gmp + ncurses5 ]; + libPath = lib.makeLibraryPath buildInputs; + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin + PURS="$out/bin/purs" + + install -D -m555 -T purs $PURS + ${patchelf libPath} + + mkdir -p $out/etc/bash_completion.d/ + $PURS --bash-completion-script $PURS > $out/etc/bash_completion.d/purs-completion.bash + ''; + meta = with stdenv.lib; { + description = "A strongly-typed functional programming language that compiles to JavaScript"; + homepage = http://www.purescript.org/; + license = licenses.bsd3; + maintainers = [ maintainers.justinwoo ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix new file mode 100644 index 000000000000..28c651f9b16a --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchFromGitHub, coq }: + +let + params = { + "8.8" = { + sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + }; + "8.9" = { + sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; + }; + }; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + version = "1.1"; + name = "coq${coq.coq-version}-coqhammer-${version}"; + + src = fetchFromGitHub { + owner = "lukaszcz"; + repo = "coqhammer"; + rev = "v${version}-coq${coq.coq-version}"; + inherit (param) sha256; + }; + + postPatch = '' + substituteInPlace Makefile.coq.local --replace \ + '$(if $(COQBIN),$(COQBIN),`coqc -where | xargs dirname | xargs dirname`/bin/)' \ + '$(out)/bin/' + substituteInPlace Makefile.coq.local --replace 'g++' 'c++' --replace 'gcc' 'cc' + ''; + + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ + ocaml findlib camlp5 + ]); + + preInstall = '' + mkdir -p $out/bin + ''; + + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + + meta = { + homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; + description = "Automation for Dependent Type Theory"; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; + + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + +} diff --git a/nixpkgs/pkgs/development/go-modules/generic/default.nix b/nixpkgs/pkgs/development/go-modules/generic/default.nix index 12a095e10bb5..339e58029045 100644 --- a/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -38,7 +38,7 @@ let go-modules = go.stdenv.mkDerivation { name = "${name}-go-modules"; - nativeBuildInputs = [ go git ]; + nativeBuildInputs = [ go git cacert ]; inherit (args) src; inherit (go) GOOS GOARCH; @@ -47,16 +47,6 @@ let GO111MODULE = "on"; - # XXX: Add support for other fetchers, such as hg, bzr and alike. - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - # Instruct Go where to find the cacert. - # SSL_CERT_FILE is used by Linux machines. - # NIX_SSL_CERT_FILE is used by Darwin machines based on - # pkgs/development/compilers/go/ssl-cert-file-1.9.patch. - NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 4bdb11eeed28..c439d2cca00d 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -48,7 +48,6 @@ self: super: { # Break infinite recursions. attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; }; - clock = dontCheck super.clock; Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres; hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; }; @@ -85,7 +84,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0"; + sha256 = "08gw3b5gbbxs2dr3b4zf9xsvhbvpqjj4ikmvzmcvs3fh1q65xbgl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -1044,6 +1043,8 @@ self: super: { # https://github.com/dmwit/encoding/pull/3 encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch; + clock = dontCheck (appendPatch super.clock ./patches/clock-0.7.2.patch); + # Work around overspecified constraint on github ==0.18. github-backup = doJailbreak super.github-backup; @@ -1217,6 +1218,14 @@ self: super: { })]; }); + # Remove unecessary constraint: + # https://github.com/agrafix/superbuffer/pull/2 + superbuffer = overrideCabal super.superbuffer (drv: { + postPatch = '' + sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal + ''; + }); + # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. pandoc = doDistribute super.pandoc_2_7_1; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 2d382e906325..5a856032e47c 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -67,4 +67,25 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; + # Needs a recent version from the "develop" branch of the upstream git + # repository to compile with ghc 8.6.4. + liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquid-fixpoint"; + rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9"; + sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf"; + }; + version = "0.8.0.2-pre-release"; + }; + liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquidhaskell"; + rev = "254e77da9cd36e95b72c526bfb9eec50d3447050"; + sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza"; + }; + version = "0.8.6.0-pre-release"; + }; + } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8cd3b979906c..439a7f4dfea3 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.13 + # LTS Haskell 13.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -263,6 +263,7 @@ default-package-overrides: - bazel-runfiles ==0.7.0.1 - bbdb ==0.8 - bcrypt ==0.0.11 + - beam-core ==0.8.0.0 - bench ==1.0.12 - benchpress ==0.2.2.12 - bencode ==0.6.0.0 @@ -386,7 +387,7 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.11 + - checkers ==0.4.14 - checksum ==0.0 - choice ==0.2.2 - chronologique ==0.3.1.1 @@ -600,7 +601,7 @@ default-package-overrides: - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.1 + - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 - dlist ==0.8.0.5 @@ -743,7 +744,7 @@ default-package-overrides: - fmt ==0.6.1.1 - fn ==0.3.0.2 - focus ==1.0.1.2 - - focuslist ==0.1.0.1 + - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 - fold-debounce-conduit ==0.2.0.3 @@ -1034,7 +1035,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==1.6.4 - - HTTP ==4000.3.12 + - HTTP ==4000.3.13 - http-api-data ==0.4 - http-client ==0.5.14 - http-client-tls ==0.3.5.3 @@ -1134,7 +1135,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.2 + - ip ==1.4.2.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 @@ -1153,6 +1154,7 @@ default-package-overrides: - jack ==0.7.1.4 - jose ==0.8.0.0 - jose-jwt ==0.8.0 + - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.3 @@ -1188,7 +1190,7 @@ default-package-overrides: - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 - - language-docker ==8.0.1 + - language-docker ==8.0.2 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 @@ -1268,7 +1270,7 @@ default-package-overrides: - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - mainland-pretty ==0.7 - - main-tester ==0.2.0.0 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - mapquest-api ==0.3.1 @@ -1294,7 +1296,7 @@ default-package-overrides: - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - menshen ==0.0.1 + - menshen ==0.0.2 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1401,7 +1403,7 @@ default-package-overrides: - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.4 - netlib-ffi ==0.1.1 - - netpbm ==1.0.2 + - netpbm ==1.0.3 - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1840,7 +1842,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.3 + - simple-cmd ==0.1.3.1 - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 @@ -2050,7 +2052,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - - tidal ==1.0.8 + - tidal ==1.0.10 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2154,7 +2156,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.12.0 + - util ==0.1.13.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2231,7 +2233,7 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - websockets-snap ==0.10.3.0 - - weigh ==0.0.13 + - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 @@ -2304,7 +2306,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.12 + - yesod-core ==1.6.13 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2429,6 +2431,8 @@ package-maintainers: - lambdabot-core - lambdabot-irc-plugins - language-nix + - liquid-fixpoint + - liquidhaskell - logging-facade-syslog - nix-paths - pandoc @@ -2474,7 +2478,6 @@ unsupported-platforms: gi-ostree: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux ] hcwiid: [ x86_64-darwin ] - hfsevents: [ x86_64-darwin ] HFuse: [ x86_64-darwin ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-fs: [ x86_64-darwin ] @@ -2817,6 +2820,7 @@ broken-packages: - applicative-parsec - applicative-quoters - applicative-splice + - approveapi - ApproxFun-hs - arb-fft - arbb-vm @@ -3004,6 +3008,7 @@ broken-packages: - beam - beam-core - beam-migrate + - beam-mysql - beam-newtype-field - beam-postgres - beam-sqlite @@ -3093,6 +3098,7 @@ broken-packages: - BiobaseBlast - BiobaseDotP - BiobaseEnsembl + - BiobaseFasta - BiobaseFR3D - BiobaseHTTP - BiobaseHTTPTools @@ -3101,6 +3107,7 @@ broken-packages: - BiobaseNewick - BiobaseTrainingData - BiobaseTurner + - BiobaseTypes - BiobaseVienna - BiobaseXNA - biocore @@ -3424,6 +3431,7 @@ broken-packages: - Checked - checked - checkmate + - chessIO - chevalier-common - chiasma - chitauri @@ -5529,6 +5537,7 @@ broken-packages: - hist-pl-types - historian - hit-graph + - hit-on - HJavaScript - hjcase - hjs @@ -6320,6 +6329,7 @@ broken-packages: - Ketchup - keter - kevin + - keycloak-hs - keyed - keyring - keysafe @@ -6569,8 +6579,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquid-fixpoint - - liquidhaskell - liquidhaskell-cabal - liquidhaskell-cabal-demo - list-fusion-probe @@ -6773,6 +6781,7 @@ broken-packages: - matplotlib - matrix-as-xyz - matsuri + - matterhorn - maude - maxent - maxent-learner-hw @@ -6984,6 +6993,8 @@ broken-packages: - more-containers - morfette - morfeusz + - morley + - morley-prelude - morph - morphisms-functors - morphisms-functors-inventory @@ -7178,6 +7189,7 @@ broken-packages: - neural - neural-network-blashs - neural-network-hmatrix + - newhope - newports - newt - newtype-deriving @@ -7862,6 +7874,7 @@ broken-packages: - quickcheck-state-machine - quickcheck-state-machine-distributed - quickcheck-webdriver + - quickcheck-with-counterexamples - QuickCheckVariant - QuickPlot - quickpull @@ -7995,6 +8008,7 @@ broken-packages: - reflection-extras - reflex - reflex-animation + - reflex-basic-host - reflex-dom-core - reflex-gloss - reflex-gloss-scene @@ -8264,6 +8278,7 @@ broken-packages: - scholdoc-citeproc - scholdoc-texmath - scholdoc-types + - SciBaseTypes - science-constants-dimensional - scion - scion-browser @@ -8530,6 +8545,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skype4hs @@ -8872,7 +8888,6 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles - - superbuffer - supercollider-ht - supercollider-midi - superconstraints @@ -8908,6 +8923,7 @@ broken-packages: - symantic - symantic-cli - symantic-grammar + - symantic-http-test - symantic-lib - symengine - symengine-hs @@ -8950,6 +8966,7 @@ broken-packages: - Tablify - tabloid - tabs + - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -8974,6 +8991,7 @@ broken-packages: - tamper - Tape - target + - tart - task - task-distribution - taskell @@ -8998,6 +9016,7 @@ broken-packages: - tcp-streams-openssl - tdd-util - tdigest-Chart + - tds - TeaHS - teams - teeth @@ -9030,6 +9049,7 @@ broken-packages: - terminal-punch - terminal-text - termination-combinators + - termonad - termplot - terntup - terrahs @@ -9201,6 +9221,7 @@ broken-packages: - traced - tracetree - tracker + - trackit - traction - tracy - traildb @@ -9224,6 +9245,7 @@ broken-packages: - trasa - trasa-client - trasa-server + - trasa-th - travis - travis-meta-yaml - trawl @@ -9754,6 +9776,7 @@ broken-packages: - xml-tydom-core - xml2json - xml2x + - xmlbf-xmlhtml - XmlHtmlWriter - XMLParser - xmltv diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 11cede5771a9..af5bd2220d47 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -94,6 +94,8 @@ self: super: builtins.intersectAttrs super { # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; + cachix = enableSeparateBinOutput super.cachix; + hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; @@ -536,10 +538,7 @@ self: super: builtins.intersectAttrs super { let path = stdenv.lib.makeBinPath [ gcc ]; in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { postInstall = '' - wrapProgram $out/bin/futhark-c \ - --prefix PATH : "${path}" - - wrapProgram $out/bin/futhark-opencl \ + wrapProgram $out/bin/futhark \ --prefix PATH : "${path}" \ --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ diff --git a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix index a6fd7bb0ba96..a8d530516a5e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix +++ b/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix @@ -73,6 +73,7 @@ in , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false , hardeningDisable ? stdenv.lib.optional (ghc.isHaLVM or false) "all" +, enableSeparateBinOutput ? false , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock , # Don't fail at configure time if there are multiple versions of the @@ -80,6 +81,10 @@ in # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false , maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 +, # Build a pre-linked .o file for this Haskell library. This can make it + # slightly faster to load this library into GHCi, but takes extra disk space + # and compile time. + enableLibraryForGhci ? true } @ args: assert editedCabalFile != null -> revision != null; @@ -111,6 +116,8 @@ let # the target dir for haddock documentation docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version; + binDir = if enableSeparateBinOutput then "$bin/bin" else "$out/bin"; + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { url = newCabalFileUrl; @@ -143,7 +150,10 @@ let buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags); defaultConfigureFlags = [ - "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$abi/\\$libname" + "--verbose" + "--prefix=$out" + "--libdir=\\$prefix/lib/\\$compiler" + "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") "--with-gcc=$CC" # Clang won't work without that extra information. @@ -163,7 +173,7 @@ let (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) (enableFeature doBenchmark "benchmarks") "--enable-library-vanilla" # TODO: Should this be configurable? - "--enable-library-for-ghci" # TODO: Should this be configurable? + (enableFeature enableLibraryForGhci "library-for-ghci") ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals dontStrip [ @@ -173,7 +183,8 @@ let "--ghcjs" ] ++ optionals isCross ([ "--configure-option=--host=${stdenv.hostPlatform.config}" - ] ++ crossCabalFlags); + ] ++ crossCabalFlags + ) ++ optionals enableSeparateBinOutput ["--bindir=${binDir}"]; setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") @@ -233,7 +244,10 @@ assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ name = "${pname}-${version}"; - outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"); + outputs = [ "out" ] + ++ (optional enableSeparateDataOutput "data") + ++ (optional enableSeparateDocOutput "doc") + ++ (optional enableSeparateBinOutput "bin"); setOutputFlags = false; pos = builtins.unsafeGetAttrPos "pname" args; @@ -414,7 +428,7 @@ stdenv.mkDerivation ({ find $packageConfDir -maxdepth 0 -empty -delete; ''} ${optionalString isGhcjs '' - for exeDir in "$out/bin/"*.jsexe; do + for exeDir in "${binDir}/"*.jsexe; do exe="''${exeDir%.jsexe}" printWords '#!${nodejs}/bin/node' > "$exe" echo >> "$exe" @@ -424,7 +438,7 @@ stdenv.mkDerivation ({ ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' - for exe in "$out/bin/"* ; do + for exe in "${binDir}/"* ; do install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe" done ''} diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 20968e540378..107625226945 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -1570,26 +1570,29 @@ self: { }) {}; "BiobaseFasta" = callPackage - ({ mkDerivation, base, BiobaseTypes, bytestring, deepseq, filepath - , lens, QuickCheck, resourcet, streaming, streaming-bytestring - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, tasty-silver - , tasty-th, text + ({ mkDerivation, base, BiobaseTypes, bytestring, filepath, lens + , QuickCheck, resourcet, streaming, streaming-bytestring + , string-conversions, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-silver, tasty-th, text }: mkDerivation { pname = "BiobaseFasta"; - version = "0.2.0.0"; - sha256 = "1ilsq8wjvmz1pw00rfk78f1si7s4ld3gbbp6w8nfq051hgg5ydsh"; + version = "0.3.0.0"; + sha256 = "0ka04dfgqv031k17dwnxkrq77r7xzmmbj8byrdrqr7r0z0ad0ns1"; libraryHaskellDepends = [ - base BiobaseTypes bytestring deepseq lens resourcet streaming - streaming-bytestring + base BiobaseTypes bytestring lens resourcet streaming + streaming-bytestring string-conversions ]; testHaskellDepends = [ - base bytestring filepath QuickCheck resourcet streaming - streaming-bytestring tasty tasty-golden tasty-hunit - tasty-quickcheck tasty-silver tasty-th text + base BiobaseTypes bytestring filepath lens QuickCheck resourcet + streaming streaming-bytestring string-conversions tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-silver tasty-th + text ]; description = "streaming FASTA parser"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseHTTP" = callPackage @@ -1764,8 +1767,8 @@ self: { }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.4.0"; - sha256 = "1ih3l72i9ahgxb261y43gncdrha3jpzkpavvhbsyqv6vi7pgcj4r"; + version = "0.2.0.0"; + sha256 = "16irdkcrih8b1mnjmnzq1bz2hbn02ayzhsmx97fqvy9py21mvrgv"; libraryHaskellDepends = [ aeson attoparsec base bimaps binary bytestring cereal cereal-text cereal-vector containers data-default deepseq ForestStructures @@ -1778,6 +1781,8 @@ self: { ]; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "BiobaseVienna" = callPackage @@ -2784,8 +2789,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.9"; - sha256 = "1f5azj17y8xsb3gjhf7gg1gnnlq12rxkmfjmgcly314d7vghs05z"; + version = "1.9.1"; + sha256 = "1pn735k9ifxlb9mdh8xy7wi22cxni8xyr28n8zx9w0j6vprcg89l"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2802,8 +2807,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.9"; - sha256 = "0iany6lfyfb1cw0pxfs5aw5k0a6x41m6ql9ad9w59biwdckbsyqr"; + version = "1.9.1"; + sha256 = "0hknj4rsjf2m8p5pyq5zff8ai7v80yvmxb5c6n0bkgxs4317nbl9"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2822,8 +2827,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.9"; - sha256 = "1n1fa6198yp5iv7xy0fdxfj794kkll0w7kn2zdq7g52rfx6nkall"; + version = "1.9.1"; + sha256 = "188zy20ahz51c8jwp41ij1pp8vanpmfv77bjzafwcib6gjbjlp77"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers @@ -2843,8 +2848,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.9"; - sha256 = "1p8nf50q031xa1mhv4w3zbyv61i2jyhvd8bq7dqkcqhgknxxpkv0"; + version = "1.9.1"; + sha256 = "1lhl7ayyydg5z5zwpr3k4313565p4za3z2f3ngd4hpicp7zbmhx0"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -3833,27 +3838,35 @@ self: { "DPutils" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , criterion, kan-extensions, lens, mtl, parallel, pipes - , pipes-bytestring, pipes-parse, QuickCheck, streaming - , streaming-bytestring, stringsearch, tasty, tasty-quickcheck - , tasty-th, timeit, transformers, vector + , pipes-bytestring, pipes-parse, primitive, QuickCheck, smallcheck + , streaming, streaming-bytestring, stringsearch, tasty + , tasty-quickcheck, tasty-smallcheck, tasty-th, timeit + , transformers, vector }: mkDerivation { pname = "DPutils"; - version = "0.0.2.0"; - sha256 = "0axavxxg0n1dsdby8306yrinjhbfrvy5a27kkwiw75xvjprk4w5w"; + version = "0.1.0.0"; + sha256 = "153g1rr13jjwqkvfj85nwjhaa0zq8khn24n3dib80nyk0scd4w62"; libraryHaskellDepends = [ - attoparsec base bytestring containers kan-extensions parallel pipes - QuickCheck streaming streaming-bytestring stringsearch transformers + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th transformers vector ]; testHaskellDepends = [ - base bytestring containers lens mtl pipes pipes-bytestring - pipes-parse QuickCheck streaming streaming-bytestring tasty - tasty-quickcheck tasty-th vector + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th transformers + vector ]; benchmarkHaskellDepends = [ - base bytestring criterion streaming streaming-bytestring timeit - vector + attoparsec base bytestring containers criterion kan-extensions lens + mtl parallel pipes pipes-bytestring pipes-parse primitive + QuickCheck smallcheck streaming streaming-bytestring stringsearch + tasty tasty-quickcheck tasty-smallcheck tasty-th timeit + transformers vector ]; description = "utilities for DP"; license = stdenv.lib.licenses.bsd3; @@ -8553,6 +8566,8 @@ self: { pname = "HPDF"; version = "1.4.10"; sha256 = "1m072rc03yx5y4djmvj87kn6n23d9378v3ipl8lj3vzfjgfzsayy"; + revision = "1"; + editedCabalFile = "1djn0a9rk3qrbz31bxj115r65p28fi3wzcrkrnjvzibl3450pq30"; libraryHaskellDepends = [ array base base64-bytestring binary bytestring containers errors mtl random vector zlib @@ -9030,24 +9045,20 @@ self: { }) {}; "HTTP" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive, conduit - , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl - , network, network-uri, parsec, pureMD5, split, test-framework - , test-framework-hunit, time, wai, warp + ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed + , HUnit, mtl, network, network-uri, parsec, pureMD5, split + , test-framework, test-framework-hunit, time }: mkDerivation { pname = "HTTP"; - version = "4000.3.12"; - sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; - revision = "2"; - editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c"; + version = "4000.3.13"; + sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; testHaskellDepends = [ - base bytestring case-insensitive conduit conduit-extra deepseq - http-types httpd-shed HUnit mtl network network-uri pureMD5 split - test-framework test-framework-hunit wai warp + base bytestring deepseq httpd-shed HUnit mtl network network-uri + pureMD5 split test-framework test-framework-hunit ]; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; @@ -10305,23 +10316,22 @@ self: { }) {}; "HsHTSLib" = callPackage - ({ mkDerivation, base, bytestring, bytestring-lexing, conduit - , containers, inline-c, mtl, tasty, tasty-golden, tasty-hunit - , template-haskell, vector, zlib + ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, conduit + , containers, tasty, tasty-golden, tasty-hunit, vector, zlib }: mkDerivation { pname = "HsHTSLib"; - version = "1.3.2.4"; - sha256 = "07zgbmk7511n0r7z7zdiryqxrxp000pq5wjdlhnr2ljahz53qnsq"; + version = "1.9.2"; + sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit containers inline-c mtl - template-haskell + base bytestring bytestring-lexing conduit containers ]; librarySystemDepends = [ zlib ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bytestring conduit mtl tasty tasty-golden tasty-hunit vector + base bytestring conduit tasty tasty-golden tasty-hunit vector ]; - description = "High level bindings to htslib"; + description = "Bindings to htslib"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -12817,8 +12827,10 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2018.11.6"; - sha256 = "0zv8n80qmdykj40nqbrxb29grmy4kzjfhjxbyy3d7ylb64rq514n"; + version = "0.2019.3.29"; + sha256 = "1lix2p2ly6pjag1gkqfjfdm1jnq5rd9hqgr940jbkgyna75hk9a9"; + revision = "1"; + editedCabalFile = "1hiz5g69n1fwknwq7lhq01kzn4cm53zd6l62r747pdc30xm04rqr"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -13103,8 +13115,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; - revision = "1"; - editedCabalFile = "14izcj2myfsvfwiy1w78q5zddxd6za77yy6b8zwb1x49lnw7jpck"; + revision = "2"; + editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -13542,8 +13554,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, vector }: mkDerivation { pname = "Naperian"; - version = "0.1.0.1"; - sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc"; + version = "0.1.1.0"; + sha256 = "1i9hc1pdp9mg9x1xd4wrv06cbhjxw0yhyk2xhsm8jz6rgksa22j7"; libraryHaskellDepends = [ base containers ghc-prim vector ]; description = "Naperian Functors for APL-like programming"; license = "unknown"; @@ -15336,16 +15348,19 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.9.0.0"; - sha256 = "0zhv17cjdppli5q66j1yabbgx3ad172w4jj4zhn0va2wsc9fs5vi"; + version = "0.9.1.0"; + sha256 = "1kz3jvq4bc7hap7633a87nbgp9gi081qnnhmld26j8rj7wdzkrbp"; libraryHaskellDepends = [ - aeson base binary bits cereal cereal-vector deepseq DPutils - hashable lens log-domain mtl OrderedBits primitive QuickCheck - smallcheck text vector vector-binary-instances vector-th-unbox + aeson base binary bits cereal cereal-vector containers deepseq + DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th text vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ - base containers QuickCheck smallcheck tasty tasty-quickcheck - tasty-smallcheck tasty-th + aeson base binary bits cereal cereal-vector containers deepseq + DPutils hashable lens log-domain mtl OrderedBits primitive + QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th text vector vector-binary-instances vector-th-unbox ]; description = "Efficient multidimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -15719,6 +15734,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_13_1" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.13.1"; + sha256 = "1inri6n4rr7v7wrmajikcqmbjh77lvf9m4fw2ib6szdgwyb3lim6"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -17074,23 +17107,30 @@ self: { "SciBaseTypes" = callPackage ({ mkDerivation, aeson, base, binary, cereal, deepseq, hashable - , lens, log-domain, mtl, QuickCheck, tasty, tasty-quickcheck - , tasty-th, vector, vector-th-unbox + , lens, log-domain, mtl, QuickCheck, semirings, tasty + , tasty-quickcheck, tasty-th, vector, vector-th-unbox }: mkDerivation { pname = "SciBaseTypes"; - version = "0.0.0.1"; - sha256 = "14xzlyca61jhfak1vjll5k2ac2hq55hfvbmqbpk8ls56amlyal5j"; + version = "0.1.0.0"; + sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr"; libraryHaskellDepends = [ aeson base binary cereal deepseq hashable lens log-domain mtl - vector vector-th-unbox + semirings vector vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck tasty tasty-quickcheck tasty-th + aeson base binary cereal deepseq hashable lens log-domain mtl + QuickCheck semirings tasty tasty-quickcheck tasty-th vector + vector-th-unbox + ]; + benchmarkHaskellDepends = [ + aeson base binary cereal deepseq hashable lens log-domain mtl + semirings vector vector-th-unbox ]; - benchmarkHaskellDepends = [ base ]; description = "Base types and classes for statistics, sciences and humanities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SciFlow" = callPackage @@ -18553,6 +18593,24 @@ self: { broken = true; }) {}; + "TaskMonad" = callPackage + ({ mkDerivation, base, containers, mtl, process, random, unix, X11 + , X11-xft, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "TaskMonad"; + version = "1.0.1"; + sha256 = "1kvhb0863kfbi63q0j9jzi3yr97r8zd5vhh5cqgpkra4rjb4qx1r"; + revision = "1"; + editedCabalFile = "1gsnl1sbnjh4j51mfniq6x2k9k6054frzxrdkqycmp0cpwhaijwi"; + libraryHaskellDepends = [ + base containers mtl process random unix X11 X11-xft xmonad + xmonad-contrib + ]; + description = "A collection of tools which can be used to access taskwarrior from xmonad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Taxonomy" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl , graphviz, parsec, text, vector @@ -22553,6 +22611,26 @@ self: { broken = true; }) {}; + "aern2-mp_0_1_4" = callPackage + ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens + , mixed-types-num, QuickCheck, regex-tdfa, rounded + , template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.1.4"; + sha256 = "1q4ygvpxndvj0lsxb7aqw754nkxj1r2037f263g79vpjczkzzfwf"; + libraryHaskellDepends = [ + base convertible hspec integer-logarithms lens mixed-types-num + QuickCheck regex-tdfa rounded template-haskell + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Multi-precision ball (interval) arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers , convertible, hspec, lens, mixed-types-num, QuickCheck, random @@ -22560,8 +22638,8 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.1.1.0"; - sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15"; + version = "0.1.2"; + sha256 = "1br2glj89xcm3iyb32yi1xwgzkva9mmvl9gih38kgg4ldidflvn8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22714,6 +22792,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-casing_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck + , tasty-th + }: + mkDerivation { + pname = "aeson-casing"; + version = "0.2.0.0"; + sha256 = "0cwjy46ac7vzdvkw6cm5xcbcljf2a4lcvc2xbsh8iwd3fdb0f8rp"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ + aeson base tasty tasty-hunit tasty-quickcheck tasty-th + ]; + description = "Tools to change the formatting of field names in Aeson instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-coerce" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text }: mkDerivation { @@ -22922,13 +23017,13 @@ self: { }) {}; "aeson-gadt-th" = callPackage - ({ mkDerivation, aeson, base, dependent-sum, markdown-unlit - , template-haskell, transformers + ({ mkDerivation, aeson, aeson-qq, base, dependent-sum, hspec, HUnit + , markdown-unlit, template-haskell, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.1.2.1"; - sha256 = "0i5ld955dw6i5sf1j4cby6xfqf29r9gy1r6lh4901m6xcgh812jv"; + version = "0.2.0.0"; + sha256 = "111bx44s451qmnk70bvmf4f1z3wmi2pnwxqmmarvaz8zl4sw91c5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -22936,6 +23031,9 @@ self: { ]; executableHaskellDepends = [ aeson base dependent-sum ]; executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + aeson aeson-qq base dependent-sum hspec HUnit + ]; description = "Derivation of Aeson instances for GADTs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -27433,8 +27531,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.4.0"; - sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84"; + version = "0.3.6.0"; + sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28184,14 +28282,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_6_4_0" = callPackage + "antiope-athena_7_0_0" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "6.4.0"; - sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk"; + version = "7.0.0"; + sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28200,6 +28298,7 @@ self: { amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28208,11 +28307,12 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.4.0"; - sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd"; + version = "7.0.0"; + sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28240,25 +28340,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_6_4_0" = callPackage - ({ mkDerivation, amazonka, amazonka-core, base, bytestring - , exceptions, generic-lens, http-client, http-types, lens - , monad-logger, mtl, resourcet, text, transformers, unliftio-core + "antiope-core_7_0_0" = callPackage + ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base + , bytestring, exceptions, generic-lens, hedgehog, hspec + , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet + , scientific, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "6.4.0"; - sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss"; + version = "7.0.0"; + sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr"; libraryHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text + aeson amazonka amazonka-core base bytestring exceptions + generic-lens http-client http-types lens mtl resourcet text transformers unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core + aeson aeson-lens amazonka amazonka-core base bytestring exceptions + generic-lens hedgehog hspec http-client http-types + hw-hspec-hedgehog lens mtl resourcet scientific text transformers + unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28283,15 +28386,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_6_4_0" = callPackage + "antiope-dynamodb_7_0_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.4.0"; - sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai"; + version = "7.0.0"; + sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28300,6 +28403,7 @@ self: { amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28328,25 +28432,26 @@ self: { broken = true; }) {}; - "antiope-messages_6_4_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson - , monad-loops, network-uri, text, unliftio-core + "antiope-messages_7_0_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring + , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens + , lens-aeson, monad-loops, network-uri, scientific, text + , unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "6.4.0"; - sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9"; + version = "7.0.0"; + sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core + aeson amazonka amazonka-core base bytestring generic-lens lens + lens-aeson monad-loops network-uri text unliftio-core ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core + aeson amazonka amazonka-core base bytestring generic-lens hedgehog + hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri + scientific text unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28379,29 +28484,30 @@ self: { broken = true; }) {}; - "antiope-s3_6_4_0" = callPackage + "antiope-s3_7_0_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , antiope-core, attoparsec, base, bytestring, conduit - , conduit-extra, exceptions, generic-lens, hedgehog, hspec - , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl - , network-uri, resourcet, text, time, unliftio-core + , antiope-core, antiope-messages, attoparsec, base, bytestring + , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec + , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet + , text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.4.0"; - sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2"; + version = "7.0.0"; + sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec - base bytestring conduit conduit-extra exceptions generic-lens - http-types lens monad-logger mtl network-uri resourcet text time - unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-messages attoparsec base bytestring conduit conduit-extra + exceptions generic-lens http-types lens mtl network-uri resourcet + text time unliftio-core ]; testHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec base bytestring conduit conduit-extra exceptions generic-lens - hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text time unliftio-core + hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri + resourcet text time unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28426,22 +28532,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_6_4_0" = callPackage + "antiope-sns_7_0_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, time, unliftio-core + , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog + , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "6.4.0"; - sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03"; + version = "7.0.0"; + sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text time unliftio-core + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens lens text time unliftio-core ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text time unliftio-core + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens hedgehog hspec hw-hspec-hedgehog lens text time + unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28470,26 +28579,27 @@ self: { broken = true; }) {}; - "antiope-sqs_6_4_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-messages, antiope-s3, base, conduit - , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri - , text, unliftio-core + "antiope-sqs_7_0_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base + , bytestring, conduit, generic-lens, hedgehog, hspec + , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl + , network-uri, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "6.4.0"; - sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j"; + version = "7.0.0"; + sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base conduit generic-lens lens - lens-aeson monad-loops mtl network-uri text unliftio-core + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens lens lens-aeson monad-loops mtl network-uri text + unliftio-core unordered-containers ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base conduit generic-lens lens - lens-aeson monad-loops mtl network-uri text unliftio-core + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson + monad-loops mtl network-uri text time unliftio-core ]; + description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -29520,6 +29630,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "approveapi" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "approveapi"; + version = "0.1.3.0"; + sha256 = "1ylqv8vgz1nzndgms1rjn2fcqjymlx80xfyil0si2h0jxwxbwfr5"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + description = "ApproveAPI Haskell Client"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "approx-rand-test" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit , containers, data-default, data-default-class, filepath, HUnit @@ -29644,17 +29783,17 @@ self: { "arbor-datadog" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder , bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network - , random, resourcet, text, time, transformers, unordered-containers - , vector + , optparse-applicative, random, resourcet, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "arbor-datadog"; - version = "0.0.0.1"; - sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv"; + version = "0.1.0.0"; + sha256 = "1w7bg8vj10mplfq39klhivj8hfb2cbgw9vhj1h64gm9v2xw25wlq"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring dlist generic-lens - lens mtl network random resourcet text time transformers - unordered-containers vector + lens mtl network optparse-applicative random resourcet text time + transformers unordered-containers vector ]; testHaskellDepends = [ base Cabal generic-lens hspec lens network resourcet time @@ -29700,16 +29839,16 @@ self: { "arbor-monad-logger" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hedgehog, hspec - , hw-hspec-hedgehog, monad-logger, mtl, text + , hw-hspec-hedgehog, monad-logger, mtl, optparse-applicative, text }: mkDerivation { pname = "arbor-monad-logger"; - version = "0.1.0.0"; - sha256 = "0m6gi36ckaq4v5mzpp6abcq93hyvvr0f7fdh4v87c4n044757agn"; + version = "0.1.1.1"; + sha256 = "13lgpr2j2vq2d4mbxl72h86iw5n028m5q0n2hbiz4hgk2yn2f2hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring fast-logger monad-logger text + base bytestring fast-logger monad-logger optparse-applicative text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; @@ -29749,10 +29888,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "1.0.0"; - sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc"; - revision = "2"; - editedCabalFile = "0x8dp7xh1rpd9db2kiya8sr9nc7wzka256jxsvxqfmphd08yc4ad"; + version = "1.1.0"; + sha256 = "1ly7vn630vm256jg1b6h39vzd7zv658h7j4vfv4jkdrrcl3jmbr0"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -30214,8 +30351,8 @@ self: { pname = "arithmoi"; version = "0.8.0.0"; sha256 = "17nk0n89fb0qh6w8535ll45mq4msir32w6fhqzpzhlpbily3mlw2"; - revision = "2"; - editedCabalFile = "1jv5ch28pjiq3a83hyvknzfwmsbwgqs6g9618z79ss3385k0cwl9"; + revision = "3"; + editedCabalFile = "1cn6axcdiahaqnq1rsm0snr78lrypay6cxh3yxw3vrrwilavri1i"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers deepseq exact-pi ghc-prim integer-gmp @@ -30588,6 +30725,22 @@ self: { license = "LGPL"; }) {}; + "asap" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, jwt, lens, mtl + , semigroups, text, time, uuid + }: + mkDerivation { + pname = "asap"; + version = "0.0.4"; + sha256 = "08yfangqxmdh2w39fqnicn16jnb1x9f263f99253khx3sv4q7qrf"; + libraryHaskellDepends = [ + base bytestring jwt lens mtl semigroups text time uuid + ]; + testHaskellDepends = [ base hedgehog jwt mtl text time ]; + description = "Atlassian Service Authentication Protocol"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascetic" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -30845,37 +30998,37 @@ self: { broken = true; }) {}; - "asif_4_1_0" = callPackage + "asif_5_0_2" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits - , hw-hspec-hedgehog, hw-ip, iproute, lens, network, old-locale + , hw-hspec-hedgehog, hw-ip, lens, network, old-locale , optparse-applicative, profunctors, resourcet, temporary-resourcet , text, thyme, transformers, vector }: mkDerivation { pname = "asif"; - version = "4.1.0"; - sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3"; + version = "5.0.2"; + sha256 = "19wsjpk3jnij6b4ap84g5jaka734za2381yz4x5ahm4f1nvc6gdf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu either exceptions foldl generic-lens - hw-bits hw-ip iproute lens network old-locale profunctors resourcet + hw-bits hw-ip lens network old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; executableHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu directory either exceptions foldl - generic-lens hw-bits hw-ip iproute lens network old-locale + generic-lens hw-bits hw-ip lens network old-locale optparse-applicative profunctors resourcet temporary-resourcet text thyme transformers vector ]; testHaskellDepends = [ attoparsec base binary bytestring conduit conduit-combinators conduit-extra containers cpu either exceptions foldl generic-lens - hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip iproute lens network + hedgehog hspec hw-bits hw-hspec-hedgehog hw-ip lens network old-locale profunctors resourcet temporary-resourcet text thyme transformers vector ]; @@ -31914,24 +32067,24 @@ self: { "ats-pkg" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib , Cabal, cli-setup, composition-prelude, containers, cpphs - , dependency, dhall, directory, file-embed, filepath, http-client - , http-client-tls, libarchive, lzma, microlens, mtl + , dependency, dhall, directory, file-embed, filemanip, filepath + , http-client, http-client-tls, lzma, microlens, mtl , optparse-applicative, parallel-io, process, shake, shake-ats - , shake-c, shake-ext, temporary, text, unix, zip-archive, zlib + , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.3"; - sha256 = "0imd4xikj15cb066713c38ik7a5r4dgdw95wgynjpi39clv4rmbz"; + version = "3.2.5.12"; + sha256 = "174nxhkfb1qvlfxjifrb1pqfrh4na64wvfrnblzpfp03di0hbh3m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed filepath http-client http-client-tls libarchive lzma + file-embed filemanip filepath http-client http-client-tls lzma microlens mtl parallel-io process shake shake-ats shake-c shake-ext - text unix zip-archive zlib + tar text unix zip-archive zlib ]; libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ @@ -33583,19 +33736,19 @@ self: { "aws-lambda-haskell-runtime" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit - , directory, filepath, hspec, microlens-platform, mtl + , directory, filepath, hspec, http-client, microlens-platform, mtl , optparse-generic, process, template-haskell, text, uuid, wreq }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "1.0.9"; - sha256 = "0cx59jmqzjz1ff1mng63pf008mxmfffpv9nlcmrisjliginjh2v3"; + version = "1.0.10"; + sha256 = "09rd4jfw59j003q14y76isdb5dg23r0vxqkg8jqf49c9gap7wqsq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit directory filepath - microlens-platform mtl optparse-generic process template-haskell - text uuid wreq + http-client microlens-platform mtl optparse-generic process + template-haskell text uuid wreq ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; @@ -34089,8 +34242,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.68"; - sha256 = "13v843lma4yrlcsx60ils1j0h8q4aj6p09phqrfc0r1zc25a5ssv"; + version = "0.5.68.2"; + sha256 = "1frinivjzyyjn9w3xqyr659wrjniv5598frdf9526g7ab484di8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34527,6 +34680,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbies_1_1_2_1" = callPackage + ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "barbies"; + version = "1.1.2.1"; + sha256 = "0svcdjs03i4ryhg3qzrp3l7ck0ilgnhxwc2h69qnzknqjklz7p1y"; + libraryHaskellDepends = [ base bifunctors ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Classes for working with types that can change clothes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "barchart" = callPackage ({ mkDerivation, base, cmdargs, csv, diagrams, filepath }: mkDerivation { @@ -34782,6 +34952,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8_1" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.1"; + sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -34939,6 +35124,29 @@ self: { broken = true; }) {}; + "base64-bytestring-type_1_0_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , binary, bytestring, cereal, deepseq, hashable, http-api-data + , QuickCheck, serialise, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "base64-bytestring-type"; + version = "1.0.1"; + sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring binary bytestring cereal + deepseq hashable http-api-data QuickCheck serialise text + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal http-api-data serialise tasty + tasty-quickcheck + ]; + description = "A newtype around ByteString, for base64 encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "base64-conduit" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , hspec, QuickCheck, transformers @@ -35568,16 +35776,17 @@ self: { "beam-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty - , tasty-hunit, text, time, vector-sized + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized }: mkDerivation { pname = "beam-core"; - version = "0.7.2.3"; - sha256 = "1pas3hjj8x4yzwwqazydnvv59rjmddy70g6iip6fgm7sg4114rkh"; + version = "0.8.0.0"; + sha256 = "1l71xvmny0nf6fdhsffvfj764h4d97icgc291kfqz25n511b74r8"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri tagged text time vector-sized + microlens mtl network-uri scientific tagged text time vector + vector-sized ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text time @@ -35591,18 +35800,18 @@ self: { "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable - , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text - , time, unordered-containers, uuid-types, vector + , haskell-src-exts, microlens, mtl, parallel, pqueue, pretty + , scientific, text, time, unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.3.2.2"; - sha256 = "15vkxj93c3zhraj94v8n9sgkjlm6idawbzxqqgcx05yhy0dyh0c9"; + version = "0.4.0.1"; + sha256 = "12c5yibargwrw9z806bik7rly9njq0qa60gsqlh8pbzaaji5fknf"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map - dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel - pqueue pretty scientific text time unordered-containers uuid-types - vector + dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl + parallel pqueue pretty scientific text time unordered-containers + uuid-types vector ]; description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; @@ -35610,6 +35819,25 @@ self: { broken = true; }) {}; + "beam-mysql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, bytestring + , case-insensitive, free, hashable, mtl, mysql, network-uri + , scientific, text, time + }: + mkDerivation { + pname = "beam-mysql"; + version = "0.2.0.0"; + sha256 = "14h0cfzzfbdh18impfvlz3ba3ycig5g7adv17h2ag1x6yyx5h259"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core bytestring case-insensitive free + hashable mtl mysql network-uri scientific text time + ]; + description = "Connection layer between beam and MySQL/MariaDB"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "beam-newtype-field" = callPackage ({ mkDerivation, base, beam-core, beam-migrate, lens , postgresql-simple @@ -35628,21 +35856,26 @@ self: { }) {}; "beam-postgres" = callPackage - ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring - , case-insensitive, conduit, free, hashable, haskell-src-exts - , lifted-base, monad-control, mtl, network-uri, postgresql-libpq - , postgresql-simple, scientific, tagged, text, time - , unordered-containers, uuid-types, vector + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, case-insensitive, conduit, directory, filepath, free + , hashable, haskell-src-exts, hedgehog, lifted-base, monad-control + , mtl, network-uri, postgresql-libpq, postgresql-simple, process + , scientific, tagged, tasty, tasty-hunit, temporary, text, time + , unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.3.2.3"; - sha256 = "17aplr20rclah3wk7b978zgn55fp61s8x7a5qf449nvfs97cs00b"; + version = "0.4.0.0"; + sha256 = "0dxnp6zsyy30vrlv15iw4qwyzwawg468zqqsjnzk9h3g9k9xzj3v"; libraryHaskellDepends = [ - aeson base beam-core beam-migrate bytestring case-insensitive - conduit free hashable haskell-src-exts lifted-base monad-control - mtl network-uri postgresql-libpq postgresql-simple scientific - tagged text time unordered-containers uuid-types vector + aeson attoparsec base beam-core beam-migrate bytestring + case-insensitive conduit free hashable haskell-src-exts lifted-base + monad-control mtl network-uri postgresql-libpq postgresql-simple + scientific tagged text time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + base beam-core beam-migrate bytestring directory filepath hedgehog + postgresql-simple process tasty tasty-hunit temporary text uuid ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; @@ -35657,8 +35890,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.2.4"; - sha256 = "14s1s7i9l95nbz4nis3fc4zh8cln6vj2p4y5bk235l088i4z6qfj"; + version = "0.4.0.0"; + sha256 = "09va580nv05xavcrqw9drh86xgqgzl98bvh707xjn1d6wh3miizw"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix @@ -38140,30 +38373,30 @@ self: { }) {}; "bioinformatics-toolkit" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , bytestring-lexing, case-insensitive, clustering, conduit - , conduit-combinators, containers, criterion, data-default-class - , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit - , IntervalMap, lens, math-functions, matrices, mtl, parallel - , primitive, random, split, statistics, tasty, tasty-golden - , tasty-hunit, text, transformers, unordered-containers, vector - , vector-algorithms, word8 + , conduit-combinators, conduit-extra, containers, criterion + , data-default-class, data-ordlist, double-conversion, hexpat + , HsHTSLib, http-conduit, IntervalMap, lens, math-functions + , matrices, mtl, parallel, primitive, random, split, statistics + , tasty, tasty-golden, tasty-hunit, text, transformers + , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.5.1"; - sha256 = "1lpcbzapinfbd7s4hz2yj3nwp1hm4fy514hqnqil4ijndyknlk3n"; + version = "0.6.0"; + sha256 = "1w6c8gi8vss8wz94hwv5vap2ss6qzm7la9p9dxplcw7yz3q5c47w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-lexing - case-insensitive clustering conduit containers data-default-class - data-ordlist double-conversion hexpat HsHTSLib http-conduit - IntervalMap lens math-functions matrices mtl parallel primitive - split statistics text transformers unordered-containers vector - vector-algorithms word8 + aeson aeson-pretty attoparsec base bytestring bytestring-lexing + case-insensitive clustering conduit conduit-extra containers + data-default-class data-ordlist double-conversion hexpat HsHTSLib + http-conduit IntervalMap lens math-functions matrices mtl parallel + primitive split statistics text transformers unordered-containers + vector vector-algorithms word8 ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default-class + base bytestring conduit conduit-combinators data-default-class lens matrices mtl random tasty tasty-golden tasty-hunit unordered-containers vector ]; @@ -38313,17 +38546,18 @@ self: { }) {}; "bisc" = callPackage - ({ mkDerivation, base, directory, filepath, selda, selda-sqlite - , text, xdg-basedir + ({ mkDerivation, base, configurator, directory, filepath, mtl + , selda, selda-sqlite, text, xdg-basedir }: mkDerivation { pname = "bisc"; - version = "0.1.0.0"; - sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + version = "0.2.0.0"; + sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath selda selda-sqlite text xdg-basedir + base configurator directory filepath mtl selda selda-sqlite text + xdg-basedir ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; @@ -41181,8 +41415,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.46"; - sha256 = "1alfv1z0adp74d7vcqp92c73y8rkhv96s3lj4dqjxkqk044zgd9p"; + version = "0.47"; + sha256 = "1glj71qajc2rdn9akhhh0yryhps57s33x0i2fb4mf12zg8pp5kj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41453,10 +41687,8 @@ self: { }: mkDerivation { pname = "broadcast-chan"; - version = "0.2.0.1"; - sha256 = "0kbs3yz53x7117fykapy70qlmaxkj9zr5r4n9wf126n4g0i6gcpf"; - revision = "2"; - editedCabalFile = "1vvs1m5n6lflmp8hdxksxa4ibllfx609y791wg21lvyz5m208hp9"; + version = "0.2.0.2"; + sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv"; libraryHaskellDepends = [ base unliftio-core ]; benchmarkHaskellDepends = [ async base criterion deepseq stm ]; description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; @@ -41471,8 +41703,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-conduit"; - version = "0.2.0.1"; - sha256 = "0q3kikryj38macxnwmlk6xijcmvxys0acryj419n7749n7bpc59s"; + version = "0.2.0.2"; + sha256 = "1xnf1ibgnzi4xbmfgrkkfg3pkig7v8vv0xpfhhcdmnybwm2yhlli"; libraryHaskellDepends = [ base broadcast-chan conduit resourcet transformers unliftio-core ]; @@ -41491,8 +41723,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-pipes"; - version = "0.2.0.1"; - sha256 = "0m2g14rlqladhwfvphmnpsddlbc5bhsjdsb4a9r475vkib30gdp2"; + version = "0.2.0.2"; + sha256 = "1brr0vjrsd53qji8pmns003m3k1s28hvr2w8875hv2fznmm8x1g7"; libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; testHaskellDepends = [ base broadcast-chan-tests containers foldl pipes pipes-safe @@ -41511,8 +41743,8 @@ self: { }: mkDerivation { pname = "broadcast-chan-tests"; - version = "0.2.0.1"; - sha256 = "1l3zqc693jmvxmb5lln6fmwn01rjpwhvlllkrn3v6hs2bwibrp5n"; + version = "0.2.0.2"; + sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym"; libraryHaskellDepends = [ async base broadcast-chan clock containers optparse-applicative paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis @@ -42510,18 +42742,18 @@ self: { "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , prettyclass, QuickCheck, random + , pretty, QuickCheck, random }: mkDerivation { pname = "bv-sized"; - version = "0.5.0"; - sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6"; + version = "0.6.0"; + sha256 = "0bhci00l4946z3b6ynzpi3k17bnawir88kqpp36jai8filb0znc5"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils prettyclass QuickCheck + base containers lens mtl parameterized-utils pretty QuickCheck random ]; testHaskellDepends = [ - base lens parameterized-utils prettyclass QuickCheck random + base lens parameterized-utils pretty QuickCheck random ]; description = "a BitVector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; @@ -43790,8 +44022,8 @@ self: { pname = "cabal-install"; version = "2.4.1.0"; sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39"; - revision = "1"; - editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p"; + revision = "2"; + editedCabalFile = "18llmvfaf8gcz2dvhhs3j0a6kzzisajh1bms7wwnrl0hi4xyx012"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -45423,8 +45655,8 @@ self: { }: mkDerivation { pname = "capability"; - version = "0.1.0.0"; - sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51"; + version = "0.2.0.0"; + sha256 = "0jssnbqrhkkfkjzya8qprk89r8vqzzy45sm9bwhw2rwx8mrbn40q"; libraryHaskellDepends = [ base dlist exceptions generic-lens lens monad-control monad-unlift mtl mutable-containers primitive safe-exceptions streaming @@ -47959,13 +48191,27 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.4.11"; - sha256 = "0f1dhiymdihrnpz9h9p4mi8iica07qv3wm47acvdkhxrc4sjsq6h"; + version = "0.4.14"; + sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "checkers_0_5_0" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.5.0"; + sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -48049,6 +48295,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "chessIO" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, directory, haskeline + , megaparsec, mtl, parallel, parser-combinators, process, split + , stm, time, unordered-containers, vector + }: + mkDerivation { + pname = "chessIO"; + version = "0.1.0.0"; + sha256 = "1rxna3jy50fddw33cjg603gdcmq89qr21q8syz60lm8rri0rg6bh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring megaparsec parser-combinators process + stm unordered-containers vector + ]; + executableHaskellDepends = [ + attoparsec base bytestring haskeline megaparsec mtl + parser-combinators process split stm unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring directory megaparsec parallel + parser-combinators process stm time unordered-containers vector + ]; + description = "Basic chess move generation and UCI client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chesshs" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers }: mkDerivation { @@ -48936,6 +49211,34 @@ self: { broken = true; }) {}; + "circuit-breaker" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances + , random, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "circuit-breaker"; + version = "0.1.0.0"; + sha256 = "1yg6d0676z94070rwqzf13bpg1qzqyh5wk38yqcp7w1aib304mw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + executableHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base mtl QuickCheck quickcheck-instances random tasty tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + unordered-containers + ]; + description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -49269,8 +49572,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.3"; - sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n"; + version = "0.2.0.4"; + sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-c process ]; @@ -50100,8 +50403,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.6"; - sha256 = "10w251gvlyqvzg2ffs2mdfkd6lla8v0zkaibpnbaz5iy1cajr65z"; + version = "0.2.0.7"; + sha256 = "1fp1m48rpgnq3db4nvcnry3h46m7k07g8blivv0mb62w8fdm9smq"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -51087,19 +51390,19 @@ self: { }) {cmph = null;}; "cmt" = callPackage - ({ mkDerivation, attoparsec, base, classy-prelude, directory - , file-embed, filepath, process, tasty, tasty-discover + ({ mkDerivation, attoparsec, base, classy-prelude, containers + , directory, file-embed, filepath, process, tasty, tasty-discover , tasty-expected-failure, tasty-hunit, terminal-size, text }: mkDerivation { pname = "cmt"; - version = "0.4.0.0"; - sha256 = "17faw3g078i2a15zl1d31wd0ag3hk347hf23widdkcnf6bs4qmr6"; + version = "0.5.0.0"; + sha256 = "0wnnqzcqxk976q0zy35gi9l46w2fdjvqnx2nxijmfsxj3f221ggx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base classy-prelude directory filepath process - terminal-size text + attoparsec base classy-prelude containers directory filepath + process terminal-size text ]; executableHaskellDepends = [ base classy-prelude ]; testHaskellDepends = [ @@ -51510,6 +51813,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coerce-role" = callPackage + ({ mkDerivation, base, unliftio }: + mkDerivation { + pname = "coerce-role"; + version = "0.1.0.0"; + sha256 = "1qllw5wrpk328n2kjxbry3w85fwwkrdxd3cgl3z160ij200mxcyp"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base unliftio ]; + description = "Having trouble deriving instances because of type roles? Solve it here!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "coerce-util" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -53224,8 +53539,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "2.0.2.1"; - sha256 = "0vxgy13k0ca3bi7rh9wc1pdrlpdjbm6va95djmmysdw8a9yyp9wi"; + version = "2.0.4.0"; + sha256 = "1siz9jbwp33i32qwqyyz4yydbmsg35jfw7x7c82arpy401kmk1hk"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -53697,6 +54012,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_7_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.7.0.0"; + sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrency-benchmarks" = callPackage ({ mkDerivation, async, base, bench-graph, bytestring, Chart , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics @@ -55105,8 +55437,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.2"; - sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja"; + version = "0.4.2.3"; + sha256 = "165ay133dxr0midy8yhsnsw5pf1lqh6pg4x63gjip945hfjl0lwq"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -55321,8 +55653,8 @@ self: { }: mkDerivation { pname = "constraints-deriving"; - version = "1.0.0.0"; - sha256 = "0a1r5pd1npfahx8hpr5kzw9xvla7f4d6463j80ar35vz854llxhm"; + version = "1.0.1.0"; + sha256 = "0jsqm1d8341i98vg98l01sg0vhw398z1x3lf68kz380qiy7paz4c"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -55360,8 +55692,8 @@ self: { }: mkDerivation { pname = "constraints-extras"; - version = "0.2.3.3"; - sha256 = "1399jah0lh127z56wv0h2c94s26fanw58x0x8imakjlj2dlg8km1"; + version = "0.2.3.4"; + sha256 = "1xkivpkjgnnrs5fyg0g77f84zh3sxqgxif0l2rhcq1wdad709q55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -55659,8 +55991,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.2.0"; - sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7"; + version = "0.3.3.0"; + sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -56309,23 +56641,17 @@ self: { }) {}; "copilot" = callPackage - ({ mkDerivation, base, copilot-c99, copilot-cbmc, copilot-core - , copilot-language, copilot-libraries, copilot-sbv, copilot-theorem - , directory, random + ({ mkDerivation, base, copilot-c99, copilot-core, copilot-language + , copilot-libraries, copilot-theorem, directory, filepath + , optparse-applicative }: mkDerivation { pname = "copilot"; - version = "2.2.1"; - sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9"; - isLibrary = true; - isExecutable = true; + version = "3.0"; + sha256 = "0i28vqzg7pgff0y8ill8zj8qbf1vqk3yfscvhrv5mcywp2fm6f31"; libraryHaskellDepends = [ - base copilot-c99 copilot-cbmc copilot-core copilot-language - copilot-libraries copilot-sbv copilot-theorem - ]; - executableHaskellDepends = [ - base copilot-c99 copilot-cbmc copilot-core copilot-language - copilot-libraries copilot-sbv copilot-theorem directory random + base copilot-c99 copilot-core copilot-language copilot-libraries + copilot-theorem directory filepath optparse-applicative ]; description = "A stream DSL for writing embedded C programs"; license = stdenv.lib.licenses.bsd3; @@ -56334,22 +56660,17 @@ self: { }) {}; "copilot-c99" = callPackage - ({ mkDerivation, atom, base, bytestring, containers, copilot-core - , csv, directory, pretty, process, QuickCheck, random, text, vector + ({ mkDerivation, base, containers, copilot-core, directory + , filepath, language-c99, language-c99-simple, language-c99-util + , mtl, pretty }: mkDerivation { pname = "copilot-c99"; - version = "2.2.1"; - sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq"; - isLibrary = true; - isExecutable = true; + version = "3.0"; + sha256 = "11v8py8hgp76dlp2n3nw4gqw4s0jnq51vd26y8vi5k71jiwwp0k9"; libraryHaskellDepends = [ - atom base bytestring containers copilot-core csv directory pretty - process QuickCheck random text vector - ]; - executableHaskellDepends = [ - atom base bytestring containers copilot-core csv directory pretty - process QuickCheck random text vector + base containers copilot-core directory filepath language-c99 + language-c99-simple language-c99-util mtl pretty ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; @@ -56376,15 +56697,13 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, pretty, pretty-ncols - , random - }: + ({ mkDerivation, base, containers, dlist, mtl, pretty, random }: mkDerivation { pname = "copilot-core"; - version = "2.2.1"; - sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105"; + version = "3.0"; + sha256 = "0n6vczrc56hlgkya53apg0g64mvm648xhqqi174gxs45zlb23n9y"; libraryHaskellDepends = [ - base containers dlist mtl pretty pretty-ncols random + base containers dlist mtl pretty random ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; @@ -56398,8 +56717,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "2.2.1"; - sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8"; + version = "3.0"; + sha256 = "094yfrg0szfmskznznlsiqi8ms6pbny7agc2w2qvsmlxn6rdhsk9"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -56411,15 +56730,15 @@ self: { }) {}; "copilot-libraries" = callPackage - ({ mkDerivation, array, base, containers, copilot-language, mtl - , parsec + ({ mkDerivation, array, base, containers, copilot-language + , data-reify, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "2.2.1"; - sha256 = "0ashnay40kkbysnbz8ay0r7ljzwkx07m4z960kfjnh3y6s5qk6ww"; + version = "3.0"; + sha256 = "0xrv37m770qnc722iv5x67kjic11q2sd1bcx2b0gr93p54frbjs4"; libraryHaskellDepends = [ - array base containers copilot-language mtl parsec + array base containers copilot-language data-reify mtl parsec ]; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; @@ -56447,15 +56766,15 @@ self: { "copilot-theorem" = callPackage ({ mkDerivation, ansi-terminal, base, bimap, containers , copilot-core, data-default, directory, mtl, parsec, pretty - , process, random, smtlib2, transformers, xml + , process, random, transformers, xml }: mkDerivation { pname = "copilot-theorem"; - version = "2.2.1"; - sha256 = "1qw46k26f6cisyjmjn0d9g7sjkx67vpydiqm7l9f1hib4dygcznx"; + version = "3.0"; + sha256 = "1h8gjlfhl473d6h8zafmqv3dzdhmgpyp8bsvysfzb7s2ga5hwnrq"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default - directory mtl parsec pretty process random smtlib2 transformers xml + directory mtl parsec pretty process random transformers xml ]; description = "k-induction for Copilot"; license = stdenv.lib.licenses.bsd3; @@ -56968,10 +57287,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.1.1.0"; - sha256 = "1qmz4m9kbkmcb0i7iy1ay1hkkqh826v98lpqf0zpk7sin686xjv4"; - revision = "1"; - editedCabalFile = "004178xsld8mmy07z23x51vzbjrjprv17k8mq29vgibkm5kd1l5r"; + version = "0.1.1.1"; + sha256 = "06nwkys90i0rdhg1nvwzii88z5f3ijn9kjwrg6lgy2m973zr8668"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57100,8 +57417,8 @@ self: { ({ mkDerivation, base, containers, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.1"; - sha256 = "04hvb1z483gh7mb5q1mvsiym8jg29512wnrfdssl8y9c90qhk2sp"; + version = "3.6.2"; + sha256 = "0byrfj9lqv4k5d0s3d7ib6bwcz50bl23qnk2nk8bzk9s1356g6yi"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -57241,6 +57558,8 @@ self: { pname = "cql-io"; version = "1.1.0"; sha256 = "1pqqq31f9xcpn5rykkgrakgl17dm1nnskh1m88fxaynzjj485pkw"; + revision = "1"; + editedCabalFile = "0zxc28i4c26qi6xpgsyhn0f539ni6wv6c1pixh056bzm9pwp60d7"; libraryHaskellDepends = [ async auto-update base bytestring containers cql cryptonite data-default-class exceptions hashable HsOpenSSL iproute lens mtl @@ -58865,15 +59184,15 @@ self: { "cryptostore" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, basement , bytestring, cryptonite, hourglass, memory, pem, tasty - , tasty-hunit, tasty-quickcheck, x509 + , tasty-hunit, tasty-quickcheck, x509, x509-validation }: mkDerivation { pname = "cryptostore"; - version = "0.1.0.0"; - sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz"; + version = "0.2.0.0"; + sha256 = "1j7pk42mivwlcrjyrjdkldidhsv3k5myqq0ld8sksgkbkn1k1z7w"; libraryHaskellDepends = [ asn1-encoding asn1-types base basement bytestring cryptonite - hourglass memory pem x509 + hourglass memory pem x509 x509-validation ]; testHaskellDepends = [ asn1-types base bytestring cryptonite hourglass memory pem tasty @@ -58985,8 +59304,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.2"; - sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx"; + version = "0.7.3"; + sha256 = "18xn06drza3pwyhidlkr478hvn8ss93f3f30wmfrh79ngabip4kp"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -59588,23 +59907,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "curl-cookiejar" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, http-client, time + }: + mkDerivation { + pname = "curl-cookiejar"; + version = "0.1.0.0"; + sha256 = "0fflf6p1qnr7h4dhpv8d1pm1whfphz1dva2yk6s2wk8dv6wbbdfj"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra http-client time + ]; + description = "Parsing and pretty-printing of cURL/wget cookie jars"; + license = stdenv.lib.licenses.mit; + }) {}; + "curl-runnings" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs , connection, directory, hspec, hspec-expectations, http-client-tls - , http-conduit, http-types, megaparsec, pretty-simple, regex-posix - , tar, text, unordered-containers, vector, yaml, zlib + , http-conduit, megaparsec, pretty-simple, regex-posix, tar, text + , unordered-containers, vector, yaml, zlib }: mkDerivation { pname = "curl-runnings"; - version = "0.10.0"; - sha256 = "11mzxsqiikwa0xjiiq4mk4r850zdp9q75x0qz5wrjq4ks4743wp3"; + version = "0.11.0"; + sha256 = "18vbb0k9gfi528za6wdw4m8997ks5s6vlwz4c9rjziq5ab0xdcfr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring case-insensitive connection directory hspec - hspec-expectations http-client-tls http-conduit http-types - megaparsec pretty-simple regex-posix text unordered-containers - vector yaml + hspec-expectations http-client-tls http-conduit megaparsec + pretty-simple regex-posix text unordered-containers vector yaml ]; executableHaskellDepends = [ aeson base bytestring cmdargs directory http-conduit tar text zlib @@ -62435,21 +62768,22 @@ self: { "datadog-tracing" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ffunctor - , generic-random, hspec-golden-aeson, mtl, prettyprinter - , QuickCheck, quickcheck-text, refined, servant, servant-client - , servant-server, tasty, tasty-discover, tasty-hspec, text, time - , warp + , generic-random, hspec-golden-aeson, http-media, msgpack, mtl + , prettyprinter, QuickCheck, quickcheck-text, refined, scientific + , servant, servant-client, servant-server, tasty, tasty-discover + , tasty-hspec, text, time, unordered-containers, vector, warp }: mkDerivation { pname = "datadog-tracing"; - version = "1.2.0"; - sha256 = "1227rkrmlbqbxbvmyhm5yg5wd0jbbiy7vjyqq6vzksvpx2kifsdy"; + version = "1.3.2"; + sha256 = "0gag5cga8an4hd63n3vyjxrvgw309a8iw5if22j1dlc972qrzgs1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers ffunctor generic-random mtl - prettyprinter QuickCheck quickcheck-text refined servant - servant-client text time + aeson base bytestring containers ffunctor generic-random http-media + msgpack mtl prettyprinter QuickCheck quickcheck-text refined + scientific servant servant-client text time unordered-containers + vector ]; executableHaskellDepends = [ aeson base bytestring containers mtl servant servant-server text @@ -64219,14 +64553,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_2_0_0_1" = callPackage + "dejafu_2_1_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "2.0.0.1"; - sha256 = "0hdw4y81inxq4ivkfb4b7sj68ysb8n9czfyhifmhkqfaddg5inzg"; + version = "2.1.0.0"; + sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -64580,6 +64914,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "dependent-sum_0_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dependent-sum"; + version = "0.5"; + sha256 = "1n5ln2fain1x9zkrzy1sknwm528lrdsnsg52z1d0hfpy5sngndsr"; + revision = "2"; + editedCabalFile = "1vxg9v2b5479qm7q9qzjyh9rmcdpr634s3kpjx0skqq0r68bc36s"; + libraryHaskellDepends = [ base ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-sum-aeson-orphans" = callPackage ({ mkDerivation, aeson, base, constraints, constraints-extras , dependent-map, dependent-sum @@ -64719,14 +65067,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "deque_0_4_0_2" = callPackage + "deque_0_4_2" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "deque"; - version = "0.4.0.2"; - sha256 = "01ipk4dw8lgc5r3d224va9imli8wa5i8dknk7xzfv64pmm6gh6wa"; + version = "0.4.2"; + sha256 = "0zqz8akmkrkwcfkqmspr5dbk5dzhlsh7raxfvda40xhiwyni1cpf"; libraryHaskellDepends = [ base mtl strict-list ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -65409,6 +65757,8 @@ self: { pname = "dhall"; version = "1.21.0"; sha256 = "03nzp79mmivnyg6s179abf8bj8j60hkng9kgbmfjzvwlfrpwq8lv"; + revision = "1"; + editedCabalFile = "0ap1490jks9hmwf73vlrj7bsfrf4m5yvgqxx3ix57w23ia5gy662"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66988,8 +67338,8 @@ self: { pname = "dimensional"; version = "1.3"; sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9"; - revision = "1"; - editedCabalFile = "1p6bn0xcxapm9r9b692l6kkijw0r41p1naiyx523pi5r0njs33k1"; + revision = "2"; + editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk semigroups vector ]; @@ -67625,17 +67975,19 @@ self: { }) {}; "disjoint-containers" = callPackage - ({ mkDerivation, aeson, base, containers, doctest, QuickCheck - , quickcheck-classes, semigroups, transformers + ({ mkDerivation, aeson, base, containers, doctest, enum-types + , QuickCheck, quickcheck-classes, quickcheck-enum-instances + , semigroups, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.3"; - sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw"; + version = "0.2.4"; + sha256 = "0x64x327842da1a3bhbkrc88za300f3c2wd9fyci3qqm0mv7fdjk"; libraryHaskellDepends = [ aeson base containers transformers ]; testHaskellDepends = [ - aeson base containers doctest QuickCheck quickcheck-classes - semigroups + aeson base containers doctest enum-types QuickCheck + quickcheck-classes quickcheck-enum-instances semigroups tasty + tasty-quickcheck ]; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; @@ -67803,8 +68155,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.4.1"; - sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny"; + version = "0.4.1.1"; + sha256 = "0w3n13a0rdi6cw5h3sivrfnr96qizd2hk0gma7b9c7hdh0sxw89r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68655,6 +69007,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_6" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.6"; + sha256 = "0gy70df86pfmqwbmnafdw2w5jnflvn5mca8npxzfg23f3p4ll2vq"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -69393,12 +69758,16 @@ self: { }) {}; "dom-lt" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, criterion, deepseq }: mkDerivation { pname = "dom-lt"; - version = "0.1.3"; - sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga"; + version = "0.2.0"; + sha256 = "15jf1csnqwd56izw5zk6kbp2kk6y0zkgm9ddbwrk0k3ngmdqzkli"; + revision = "1"; + editedCabalFile = "1rkjm9ssi7j2klf11b8w1wlw3hg4ybcfxdi2klik6lm5mpb52x7w"; libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers ]; + benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -70979,6 +71348,22 @@ self: { broken = true; }) {}; + "dynamic" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava + , containers, http-conduit, text, unordered-containers, vector + }: + mkDerivation { + pname = "dynamic"; + version = "0.0.6"; + sha256 = "0z2mc09iffwh2wxp8j0kqpfh5nflnf3wzk554rx0l54sbszvxvw1"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring cassava containers http-conduit + text unordered-containers vector + ]; + description = "A dynamic type for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dynamic-cabal" = callPackage ({ mkDerivation, base, containers, data-default, directory, doctest , filepath, ghc, ghc-paths, haskell-generate, haskell-src-exts @@ -71451,8 +71836,8 @@ self: { ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }: mkDerivation { pname = "easytensor"; - version = "1.0.0.1"; - sha256 = "0ih92gikf67bq9p599vdb9p9dh4b8p7a687n3xiv3q9qm4pdc8aa"; + version = "1.0.1.0"; + sha256 = "0s1w8ldd25m3jlqysikhzs4ygv4ar476iynbcy18nfn5qh8dvf8k"; libraryHaskellDepends = [ base dimensions ]; testHaskellDepends = [ base Cabal dimensions QuickCheck ]; benchmarkHaskellDepends = [ base dimensions time ]; @@ -71466,8 +71851,8 @@ self: { ({ mkDerivation, base, dimensions, easytensor, vulkan-api }: mkDerivation { pname = "easytensor-vulkan"; - version = "1.0.0.0"; - sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3"; + version = "1.0.1.0"; + sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9"; libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; @@ -72310,8 +72695,8 @@ self: { pname = "either"; version = "5.0.1"; sha256 = "064hjfld7dkzs78sy30k5qkiva3hx24rax6dvzz5ygr2c0zypdkc"; - revision = "1"; - editedCabalFile = "1kf0dy6nki64kkmjw8214jz3n086g1pghfm26f012b6qv0iakzca"; + revision = "2"; + editedCabalFile = "0859h2dc77fq0f14jh11h4i89hrg3iqvzk0yrk78516k6m7n96zc"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids semigroups ]; @@ -72782,8 +73167,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.5.0"; - sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3"; + version = "0.5.1"; + sha256 = "0d9544s892rhy0dkhzz6w3nryhbl26yahs4k1nkpgdqsxsnv4rvn"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -73082,10 +73467,8 @@ self: { }: mkDerivation { pname = "elm-street"; - version = "0.0.0"; - sha256 = "0my3f08h019rhmyvcbf5xz87wnrd52fsqpiqj6jv1544psczc2sq"; - revision = "1"; - editedCabalFile = "1a6xx0an11kljw5l5y2mgpsll5515lz18nvpzxa0rc927nnpnf2y"; + version = "0.0.1"; + sha256 = "09rc10k6g23wf7b095rk6i2d9h5axlcmfpimhmbpqhm8vyqg72l7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73189,8 +73572,8 @@ self: { }: mkDerivation { pname = "elocrypt"; - version = "2.0.0"; - sha256 = "0dz5vdcg68fbwhvwz68zlsz5h2aaj1q6gacp1005hkxfb8156lp3"; + version = "2.0.1"; + sha256 = "1sb0xb4dx39vmr60slrlr85hwi6drmqdibv0faiw7k48rxvcz1ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base MonadRandom random ]; @@ -73205,19 +73588,19 @@ self: { }) {}; "elsa" = callPackage - ({ mkDerivation, array, base, dequeue, directory, filepath - , hashable, json, megaparsec, mtl, tasty, tasty-hunit + ({ mkDerivation, ansi-terminal, array, base, dequeue, directory + , filepath, hashable, json, megaparsec, mtl, tasty, tasty-hunit , unordered-containers }: mkDerivation { pname = "elsa"; - version = "0.2.0.1"; - sha256 = "1ipi0vi3mwxmcmqmjk93ips7z3casqxzbls80aw2ysj43ii89m21"; + version = "0.2.1.2"; + sha256 = "0qg80wck4zsia9fsih06283c47f3waiskgj1r5s0s4fms9rwg06y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base dequeue directory filepath hashable json megaparsec mtl - unordered-containers + ansi-terminal array base dequeue directory filepath hashable json + megaparsec mtl unordered-containers ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; @@ -73340,6 +73723,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_11" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.11"; + sha256 = "051h1l6x4dpk2jg1bsxy32zswf8ridlix3k78k0h237gcassrfpb"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -73352,26 +73752,28 @@ self: { }) {}; "email-validator" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, dns, doctest + ({ mkDerivation, base, bytestring, cmdargs, dns, doctest , email-validate, HUnit, parallel-io, pcre-light, tasty , tasty-hunit }: mkDerivation { pname = "email-validator"; - version = "0.0.3"; - sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n"; + version = "1.0.0"; + sha256 = "0l8c87kv80y1cpifcg80zhmdi884n7409w22akvc7kb9vvyp3b4v"; + revision = "1"; + editedCabalFile = "08ncdqjmgxlzsxfj8z0xaj1p5nnx4ndj4490gvfhj50kv2wx47iw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cmdargs directory dns email-validate HUnit - parallel-io pcre-light tasty tasty-hunit + base bytestring cmdargs dns email-validate HUnit parallel-io + pcre-light tasty tasty-hunit ]; testHaskellDepends = [ - base bytestring cmdargs directory dns doctest email-validate HUnit + base bytestring cmdargs dns doctest email-validate HUnit parallel-io pcre-light tasty tasty-hunit ]; description = "Perform basic syntax and deliverability checks on email addresses"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -74464,18 +74866,22 @@ self: { }) {}; "erd" = callPackage - ({ mkDerivation, base, bytestring, containers, graphviz, parsec - , text + ({ mkDerivation, base, bytestring, containers, graphviz, hspec + , parsec, QuickCheck, raw-strings-qq, tasty, tasty-hunit, text }: mkDerivation { pname = "erd"; - version = "0.1.3.0"; - sha256 = "00cf1q7472kkl12z48dwnhixvyk99451by577qmfj0vhlnl1dc09"; + version = "0.2.0.0"; + sha256 = "1lxqjvsmkqhqaw63r6qp6z9kjz73ki6y3vr85bjs5i0m7ff87799"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers graphviz parsec text ]; + testHaskellDepends = [ + base bytestring containers graphviz hspec parsec QuickCheck + raw-strings-qq tasty tasty-hunit text + ]; description = "An entity-relationship diagram generator from a plain text description"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -76268,6 +76674,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_1" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers, transformers-compat + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.1"; + sha256 = "17fz74bi6qy3w7li7ifkcvsy3f9zyj69956jvaqvl5diyqnh791v"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + transformers-compat + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -77541,8 +77969,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "1.2.0.0"; - sha256 = "0iihl34739aq8y1fbgimyksjlaqf3ggw7q13zihd1bsa7jy255y9"; + version = "1.2.0.1"; + sha256 = "18lb0g4fi02mffhi61wd4rfcfx2ilrbrpl5wkyianw5mixjqlxms"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -77590,6 +78018,21 @@ self: { broken = true; }) {}; + "fair" = callPackage + ({ mkDerivation, base, criterion, smallcheck, tasty + , tasty-smallcheck, util + }: + mkDerivation { + pname = "fair"; + version = "0.1.0.0"; + sha256 = "0x8nz1476pdmcaq99gvzs0ila78z1zhvdkyw886ly8ivfp49ix17"; + libraryHaskellDepends = [ base util ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Lists with fair choice"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fair-predicates" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -77659,6 +78102,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fakefs" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, QuickCheck }: + mkDerivation { + pname = "fakefs"; + version = "0.2.0.0"; + sha256 = "0r20w8grmcfr5vwh8j2kfg9lm9pkcq9cvgnrw1sj2vi38s96icwx"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "Extensible fake file system for testing"; + license = stdenv.lib.licenses.asl20; + }) {}; + "faker" = callPackage ({ mkDerivation, base, gimlh, random, split }: mkDerivation { @@ -78088,8 +78543,8 @@ self: { }: mkDerivation { pname = "fastparser"; - version = "0.3.1.1"; - sha256 = "0wj50rpjr69sl4kkw6zybh2s9iq9ysv6sc83k50l5kq12p28yc5d"; + version = "0.3.1.2"; + sha256 = "0hyai0v9h4zlbr8fnal6l4z9y8zrh4ghhp2wymhf6fg23lahscid"; libraryHaskellDepends = [ base bytestring bytestring-lexing containers kan-extensions microlens thyme transformers vector-space @@ -80348,8 +80803,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "2.1.0"; - sha256 = "1qi877cpfkp7lzdjwq2q6gqqkbvby63z6r22f3ydkx5362ins6kh"; + version = "2.2.0"; + sha256 = "0nwl9gxaxjdvgr0ji7r0hh9z43s473rb69dgb3p8ab3kdc3mld11"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80499,8 +80954,8 @@ self: { ({ mkDerivation, async, base, clock, time }: mkDerivation { pname = "fixed-timestep"; - version = "0.1.0.0"; - sha256 = "1zhqh6y4j5v8vwf417jjgix5z1z67zrxgdpcrsyk4i8pi69892hv"; + version = "0.2.0.1"; + sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl"; libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; license = stdenv.lib.licenses.mit; @@ -81325,6 +81780,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "flow_1_0_18" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: + mkDerivation { + pname = "flow"; + version = "1.0.18"; + sha256 = "1cyac1la7pg7hkpdd2lhk4clh6g1zd2n0f479xvgn14ibs6ki3ph"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck template-haskell ]; + description = "Write more understandable Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "flow-er" = callPackage ({ mkDerivation, base, doctest, flow, QuickCheck }: mkDerivation { @@ -81747,6 +82215,21 @@ self: { broken = true; }) {inherit (pkgs) fluidsynth;}; + "flush-queue" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, deepseq + , hspec, old-time, QuickCheck, stm + }: + mkDerivation { + pname = "flush-queue"; + version = "1.0.0"; + sha256 = "17b6izgpn9rdk3zdhp4kzsna6lv1lhdr8jr6yn2xcwznddb0zb69"; + libraryHaskellDepends = [ atomic-primops base containers stm ]; + testHaskellDepends = [ async base hspec QuickCheck stm ]; + benchmarkHaskellDepends = [ async base deepseq old-time stm ]; + description = "Concurrent bouded blocking queues optimized for flushing. Both IO and STM implementations."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "flux-monoid" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -81892,10 +82375,8 @@ self: { }: mkDerivation { pname = "focuslist"; - version = "0.1.0.1"; - sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx"; - revision = "2"; - editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49"; + version = "0.1.0.2"; + sha256 = "06s8655l7nzpmwf6z8p11g9mngb9a0kw10riii67sq8jcanpllkq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -84983,6 +85464,22 @@ self: { broken = true; }) {}; + "fungll-combinators" = callPackage + ({ mkDerivation, array, base, containers, gll, pretty + , regex-applicative, text, time, TypeCompose + }: + mkDerivation { + pname = "fungll-combinators"; + version = "0.1.0.1"; + sha256 = "111cjr8jznm3jrf70jr89jhy36yhvikzdgv2vybqj43b1l2g8v4q"; + libraryHaskellDepends = [ + array base containers gll pretty regex-applicative text time + TypeCompose + ]; + description = "GLL parser with simple combinator interface"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "funion" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, haskell98 , HFuse, unix @@ -85053,6 +85550,17 @@ self: { broken = true; }) {}; + "funspection" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "funspection"; + version = "0.1.0.0"; + sha256 = "1bq7gj8kcgz8ccy6skkqbrfkxavkg3s511shm8fd9s8syqwdglr8"; + libraryHaskellDepends = [ base ]; + description = "Type-level function utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fused-effects" = callPackage ({ mkDerivation, base, deepseq, doctest, hspec, MonadRandom , QuickCheck, random @@ -85067,15 +85575,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fused-effects_0_2_0_1" = callPackage + "fused-effects_0_3_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest, hspec - , MonadRandom, QuickCheck, random + , MonadRandom, QuickCheck, random, transformers }: mkDerivation { pname = "fused-effects"; - version = "0.2.0.1"; - sha256 = "1n5ywp07s4fhpjwnk15y72flwaxjd9dingr4xlrpkp00cgfh1ax8"; - libraryHaskellDepends = [ base deepseq MonadRandom random ]; + version = "0.3.0.0"; + sha256 = "1plivl5vdgzpb2pbbhyiv2i6jk39l43bwa574qs9nb5jx5i7n056"; + libraryHaskellDepends = [ + base deepseq MonadRandom random transformers + ]; testHaskellDepends = [ base doctest hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion ]; description = "A fast, flexible, fused effect system"; @@ -85112,57 +85622,38 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base - , bifunctors, binary, blaze-html, bytestring, containers - , data-binary-ieee754, directory, directory-tree, dlist, extra - , file-embed, filepath, free, gitrev, happy, haskeline, http-client - , http-client-tls, http-conduit, HUnit, language-c-quote - , mainland-pretty, markdown, megaparsec, mtl, neat-interpolation - , parallel, parser-combinators, process, process-extras, QuickCheck - , random, raw-strings-qq, regex-tdfa, srcloc, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text - , th-lift-instances, time, transformers, vector + ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary + , blaze-html, bytestring, containers, data-binary-ieee754 + , directory, directory-tree, dlist, file-embed, filepath, free + , gitrev, happy, haskeline, http-client, http-client-tls + , http-conduit, language-c-quote, mainland-pretty, markdown + , megaparsec, mtl, neat-interpolation, parallel, parser-combinators + , process, process-extras, QuickCheck, random, regex-tdfa, srcloc + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , text, time, transformers, utf8-string, vector , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.9.1"; - sha256 = "1l7i4xxh9zb53qqzznqj6kkh6p67a11kkr5839c9kkjwnb6sc86k"; + version = "0.10.1"; + sha256 = "03lmzl9z75vfy0phr1vkcxjkqhl1n9avkib7awflib90a6jhpl15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client + aeson ansi-terminal array base binary blaze-html bytestring + containers data-binary-ieee754 directory directory-tree dlist + file-embed filepath free gitrev haskeline http-client http-client-tls http-conduit language-c-quote mainland-pretty markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random raw-strings-qq - regex-tdfa srcloc template-haskell temporary text th-lift-instances - time transformers vector vector-binary-instances versions - zip-archive zlib + parser-combinators process process-extras random regex-tdfa srcloc + template-haskell temporary text time transformers utf8-string + vector vector-binary-instances versions zip-archive zlib ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random raw-strings-qq - regex-tdfa srcloc template-haskell temporary text th-lift-instances - time transformers vector vector-binary-instances versions - zip-archive zlib - ]; + executableHaskellDepends = [ base text ]; testHaskellDepends = [ - aeson ansi-terminal array base bifunctors binary blaze-html - bytestring containers data-binary-ieee754 directory directory-tree - dlist extra file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit HUnit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras QuickCheck random - raw-strings-qq regex-tdfa srcloc tasty tasty-hunit tasty-quickcheck - template-haskell temporary text th-lift-instances time transformers - vector vector-binary-instances versions zip-archive zlib + base containers megaparsec mtl parser-combinators QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = stdenv.lib.licenses.isc; @@ -86309,10 +86800,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.9"; - sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "4"; - editedCabalFile = "0m2m2wfv9nhq8m7xl1nrmj4wy3yip3s31b4448za58ryrwkdgjzd"; + version = "0.2.0.10"; + sha256 = "0dz7kib81234xmp7lzwww4vfnbpkq1pdalzvxxxqcjj31l0i803c"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -86380,21 +86869,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_5_0_0" = callPackage + "generic-data_0_6_0_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, generic-lens , one-liner, show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.5.0.0"; - sha256 = "1hy43a1f5y1ymszilz908sl7an7hj7sz7yzchhxh83ki2sf0ya7s"; + version = "0.6.0.0"; + sha256 = "0aiz7m78ysmx31754g28x0zls1kds12p2h3n35k7mxf7g1lla6fx"; libraryHaskellDepends = [ base base-orphans contravariant show-combinators ]; testHaskellDepends = [ base generic-lens one-liner tasty tasty-hunit ]; - description = "Utilities for GHC.Generics"; + description = "Deriving instances with GHC.Generics and related utilities"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -86711,6 +87200,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generics-mrsop_2_0_0" = callPackage + ({ mkDerivation, base, containers, mtl, template-haskell }: + mkDerivation { + pname = "generics-mrsop"; + version = "2.0.0"; + sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml"; + libraryHaskellDepends = [ base containers mtl template-haskell ]; + description = "Generic Programming with Mutually Recursive Sums of Products"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell @@ -88147,8 +88648,8 @@ self: { }: mkDerivation { pname = "ghc-events"; - version = "0.8.0.1"; - sha256 = "1658lr4av48y8m0p5fs3sjxkkbdkwdf6m02byzw69gqg3xzz1i99"; + version = "0.8.0.2"; + sha256 = "1cg2p0scnjk4ijr1kjp41d2kls2v7ixsfhdv5331bs04nah06ddy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88812,6 +89313,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_3_1" = callPackage + ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.3.1"; + sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -90600,8 +91116,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190219"; - sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2"; + version = "7.20190322"; + sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -92442,8 +92958,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.6.2"; - sha256 = "063y0q6iz4s5hqjc4cpd2y49w9zq6w3lcnvxlv73miysb9q16a4b"; + version = "0.6.3"; + sha256 = "12lvq3lc52ggflcb8m6j8xxxi4p5mspfwbc4fxb34h1076gxhdd1"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92468,8 +92984,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.6.2"; - sha256 = "0z6il1ff3cgzk0bvgp2c1lp7qn4ws0nd2asm1x15cb8498iyqlaa"; + version = "0.6.3"; + sha256 = "06bjmhnm2g9vmxjrw661ips3c6160xbw1qj4527radif51lskf6i"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92494,8 +93010,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.6.2"; - sha256 = "10a2ma35mk3plwcsn80ccc879ajz0ifyl8xqifn0kfz3dpk7g0y7"; + version = "0.6.3"; + sha256 = "1z93jflgnj5ja17gpa8ab0i8lvm2x4vcqbmil3zca2djnbg61257"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92519,8 +93035,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.6.2"; - sha256 = "182ky7k17wfc0cijyhib8j0ajw963yrbq9y91lsvvd7vnjfwds1x"; + version = "0.6.3"; + sha256 = "0pczlmny8brmr24v6zfdkarx4sy530j4454p9agswrc7s37fhf5n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96457,8 +96973,8 @@ self: { }: mkDerivation { pname = "graphmod"; - version = "1.4.2"; - sha256 = "196647zh8cz7gpm7z18wqsx0rad3mvq7qrl20varvi34hxck6fwq"; + version = "1.4.3"; + sha256 = "1hcj1pmb65a4wkdn2d1p6b7hf91p4dqb9gprihrldfc6xii3hc3z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96901,6 +97417,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-core_0_1_2_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.2.5"; + sha256 = "1lxz9l968f8jgyyqvph3rvsfnh0kqdmnam95cn97jrfwcndc0wmp"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -99526,8 +100064,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "4"; - editedCabalFile = "1mkk6vkq681rgq159rgr73vlkch0z5cj3vbmz0n6540y8i3zs3mp"; + revision = "5"; + editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -100080,8 +100618,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.16.1"; - sha256 = "1g71s2bzj9w97nd3pjyk8ldi4kd5j4pnxy9rmvnwz645zl998fny"; + version = "1.16.3"; + sha256 = "0wpgj4gp6xjgk2564219cg3w54a3lfb9p3bmgdkf1pm6ilbzbf2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102698,8 +103236,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "has"; - version = "0.5.0.1"; - sha256 = "0zydwhr2ac66knmrlf0b9vsys61w6370g9rid2gag2dvmy7xqp2s"; + version = "0.6.0.1"; + sha256 = "1w2pdc4vyxd0wl700ba077d5aw7nkjw7nqhm8ydnsjgrv3xvhgah"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base QuickCheck ]; @@ -103813,8 +104351,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.12.0"; - sha256 = "0n1abvz7a03d3xgkykkk2ggm74lsh1kg0jv0z1k9874pncxx4li4"; + version = "0.0.13.0"; + sha256 = "1hyy1jx5b7k3rhk3xmr4nsx2ay7jgq70nxy01a7ap1y4gzy9pjns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -106251,24 +106789,28 @@ self: { "haskoin-node" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , data-default, hashable, haskoin-core, hspec, hspec-discover - , HUnit, monad-logger, mtl, network, nqe, random, resourcet - , rocksdb-haskell, rocksdb-query, safe, string-conversions, text - , time, transformers, unliftio, unordered-containers + , containers, data-default, hashable, haskoin-core, hspec + , hspec-discover, HUnit, monad-logger, mtl, network, nqe, random + , resourcet, rocksdb-haskell, rocksdb-query, safe + , string-conversions, text, time, transformers, unliftio + , unordered-containers }: mkDerivation { pname = "haskoin-node"; - version = "0.9.5"; - sha256 = "1c0nms9q9x0fsg1hkn5kz8jpal79b0143yca156nb563bdlx0pfd"; + version = "0.9.6"; + sha256 = "1mcncj4j5xa650y36irffrbpb5r79xna84vpjyc21nkdqag0yqa3"; libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra data-default hashable - haskoin-core monad-logger mtl network nqe random resourcet - rocksdb-haskell rocksdb-query string-conversions text time - transformers unliftio unordered-containers + base bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core monad-logger mtl network nqe + random resourcet rocksdb-haskell rocksdb-query string-conversions + text time transformers unliftio unordered-containers ]; testHaskellDepends = [ - base bytestring cereal haskoin-core hspec HUnit monad-logger mtl - network nqe random rocksdb-haskell safe unliftio + base bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core hspec HUnit monad-logger mtl + network nqe random resourcet rocksdb-haskell rocksdb-query safe + string-conversions text time transformers unliftio + unordered-containers ]; testToolDepends = [ hspec-discover ]; description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; @@ -106324,34 +106866,41 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cereal, conduit + ({ mkDerivation, aeson, base, bytestring, cereal, conduit , containers, data-default, directory, filepath, hashable , haskoin-core, haskoin-node, hspec, http-types, monad-logger, mtl - , network, nqe, optparse-applicative, random, rocksdb-haskell + , network, nqe, optparse-applicative, protocol-buffers + , protocol-buffers-descriptor, random, rocksdb-haskell , rocksdb-query, scotty, string-conversions, text, time , transformers, unliftio, unordered-containers }: mkDerivation { pname = "haskoin-store"; - version = "0.11.2"; - sha256 = "0jjpr2a1p88dkz17q84yp7y2as2j0i5bj0x0prl1hd9yy4y3aql4"; + version = "0.13.0"; + sha256 = "0b34x0z44dw7k9dqn9qx66sy33jfgg7ky1ysh7cv25g1w6v7slqy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - hashable haskoin-core haskoin-node monad-logger mtl network nqe - random rocksdb-haskell rocksdb-query string-conversions text time + hashable haskoin-core haskoin-node http-types monad-logger mtl + network nqe protocol-buffers protocol-buffers-descriptor random + rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio unordered-containers ]; executableHaskellDepends = [ - aeson base binary bytestring cereal conduit data-default directory - filepath haskoin-core haskoin-node http-types monad-logger nqe - optparse-applicative rocksdb-haskell scotty string-conversions text - transformers unliftio unordered-containers + aeson base bytestring cereal conduit containers data-default + directory filepath hashable haskoin-core haskoin-node http-types + monad-logger mtl network nqe optparse-applicative protocol-buffers + protocol-buffers-descriptor random rocksdb-haskell rocksdb-query + scotty string-conversions text time transformers unliftio + unordered-containers ]; testHaskellDepends = [ - base data-default haskoin-core haskoin-node hspec monad-logger mtl - nqe rocksdb-haskell transformers unliftio unordered-containers + aeson base bytestring cereal conduit containers data-default + hashable haskoin-core haskoin-node hspec http-types monad-logger + mtl network nqe protocol-buffers protocol-buffers-descriptor random + rocksdb-haskell rocksdb-query scotty string-conversions text time + transformers unliftio unordered-containers ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; license = stdenv.lib.licenses.publicDomain; @@ -109401,16 +109950,14 @@ self: { "hedgehog-classes" = callPackage ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show - , transformers, wl-pprint-annotated + , semirings, transformers, wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.1.1.0"; - sha256 = "1fi4n7g6daf9a8dzc876830jqdlc6pl5nyb9q7q9rffiv43sbmv2"; - revision = "2"; - editedCabalFile = "0m1ajqbg5k9k7xmgq5xm7s6l3lckr634bfsnbm9ydkr0cgs8rwcc"; + version = "0.1.2"; + sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv"; libraryHaskellDepends = [ - aeson base containers hedgehog pretty-show transformers + aeson base containers hedgehog pretty-show semirings transformers wl-pprint-annotated ]; testHaskellDepends = [ aeson base containers hedgehog ]; @@ -111226,7 +111773,7 @@ self: { libraryToolDepends = [ CoreServices ]; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + platforms = [ "x86_64-darwin" ]; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; @@ -111372,6 +111919,8 @@ self: { pname = "hgeometry"; version = "0.8.0.0"; sha256 = "0hypd5936kssw435lcvqj9d7whdzfdfbhvi5hhbi90k5x89xfx6f"; + revision = "1"; + editedCabalFile = "1hln65kfw2ji43pkwipyg12i0lq9ly6p3hv2xd7vzp4pzkcpy3zz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -112578,8 +113127,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "0.9.0"; - sha256 = "0hkz9p3ljfqvmf07pkkijav3lppvwvyp5hvlqbqcfplmv9n84wdb"; + version = "0.10.0"; + sha256 = "0a89h3vn8arms93fj3p3ip208wamljkdxikkg7dlrf143iymcs8n"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -113005,6 +113554,8 @@ self: { executableHaskellDepends = [ base ]; description = "Haskell Git Helper Tool"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hjcase" = callPackage @@ -113300,10 +113851,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.14.1"; - sha256 = "139iqa7kpnn2r9r3awbpmhbgn7nvybppmx648fjk6hgsivggjpay"; - revision = "1"; - editedCabalFile = "1ivk3hdzhlb5xdkmiqvbnhj7hjfv7kx4h70q14xrxp0wl8jpiqvd"; + version = "1.14.2"; + sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113481,8 +114030,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.14"; - sha256 = "0nj8qrqkvmxmq0sqhq1z5i3zfivb7glsnv37g9k5ag6vcr48r7i8"; + version = "1.14.1"; + sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -113504,6 +114053,27 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "hledger-makeitso" = callPackage + ({ mkDerivation, base, containers, foldl, HUnit, stm, text, time + , turtle + }: + mkDerivation { + pname = "hledger-makeitso"; + version = "0.9.0.1"; + sha256 = "1114yxv9n7zpay1yn962jjrdmaryv3f4p4aiqph1h0b2zj4bli0r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers foldl stm text time turtle + ]; + executableHaskellDepends = [ base text turtle ]; + testHaskellDepends = [ + base containers foldl HUnit stm text turtle + ]; + description = "An hledger workflow focusing on automated statement import and classification"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hledger-ui" = callPackage ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, filepath @@ -113513,8 +114083,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.14"; - sha256 = "1pnzbc4myyqlz4rc1lm1acyynvkhxwdd82fl2rrwc31phj1b46jk"; + version = "1.14.2"; + sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113559,8 +114129,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.14"; - sha256 = "15ajph5cmc1a44lqw42020pb4znkrpgx3wk5dl26pbynilm5247b"; + version = "1.14.1"; + sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113917,8 +114487,10 @@ self: { ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { pname = "hmatrix-banded"; - version = "0.0.0.2"; - sha256 = "0civscp7bqqcdfnz33ypg86ly98d42f1jhyz3fyi667g9rfq4fyb"; + version = "0.0.0.3"; + sha256 = "1vmvgxvyllqgp7cb2yrfqir99gcxn50s7gc9117g2fq8m3dqq34f"; + revision = "1"; + editedCabalFile = "0q58d297a555xb9mrpri9p30wyr5jmi46afixrh3hlvldddkw663"; libraryHaskellDepends = [ base hmatrix transformers ]; librarySystemDepends = [ liblapack ]; description = "HMatrix interface to LAPACK functions for banded matrices"; @@ -114508,58 +115080,62 @@ self: { }) {inherit (pkgs) netcdf;}; "hnix" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, array, base - , base16-bytestring, binary, bytestring, containers, criterion - , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff - , directory, exceptions, filepath, generic-random, Glob, hashable - , hashing, haskeline, hedgehog, hspec-discover, http-client + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, comonad, containers, criterion, cryptohash-md5 + , cryptohash-sha1, cryptohash-sha256, cryptohash-sha512, data-fix + , deepseq, dependent-sum, deriving-compat, Diff, directory + , exceptions, filepath, free, generic-random, Glob, hashable + , hashing, haskeline, hedgehog, hnix-store-core, http-client , http-client-tls, http-types, interpolate, lens-family - , lens-family-core, lens-family-th, logict, megaparsec, monadlist - , mtl, optparse-applicative, pretty-show, process, regex-tdfa - , regex-tdfa-text, repline, scientific, semigroups, serialise - , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, these, time, transformers, unix - , unordered-containers, vector, xml + , lens-family-core, lens-family-th, logict, megaparsec + , monad-control, monadlist, mtl, optparse-applicative + , parser-combinators, pretty-show, prettyprinter, process, ref-tf + , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups + , serialise, split, syb, tasty, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, text, these, time + , transformers, transformers-base, unix, unordered-containers + , vector, xml }: mkDerivation { pname = "hnix"; - version = "0.5.2"; - sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk"; + version = "0.6.0"; + sha256 = "1yirs9q2hm7h8zahc053q129s5iab6c24745hin4hik0ghdqw6k7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base base16-bytestring binary bytestring + aeson array base base16-bytestring binary bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq deriving-compat directory - exceptions filepath hashable hashing haskeline http-client - http-client-tls http-types interpolate lens-family lens-family-core - lens-family-th logict megaparsec monadlist mtl optparse-applicative - pretty-show process regex-tdfa regex-tdfa-text scientific - semigroups serialise split syb template-haskell text these time - transformers unix unordered-containers vector xml + cryptohash-sha512 data-fix deepseq dependent-sum deriving-compat + directory exceptions filepath free hashable hashing haskeline + hnix-store-core http-client http-client-tls http-types interpolate + lens-family lens-family-core lens-family-th logict megaparsec + monad-control monadlist mtl optparse-applicative parser-combinators + pretty-show prettyprinter process ref-tf regex-tdfa regex-tdfa-text + scientific semigroups serialise split syb template-haskell text + these time transformers transformers-base unix unordered-containers + vector xml ]; executableHaskellDepends = [ - aeson ansi-wl-pprint base base16-bytestring bytestring containers + aeson base base16-bytestring bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq exceptions filepath hashing haskeline mtl - optparse-applicative pretty-show repline serialise template-haskell - text time transformers unordered-containers + optparse-applicative pretty-show prettyprinter ref-tf repline + serialise template-haskell text time transformers + unordered-containers ]; testHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring containers - cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq Diff directory exceptions filepath generic-random - Glob hashing hedgehog interpolate megaparsec mtl - optparse-applicative pretty-show process serialise split tasty - tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + base base16-bytestring bytestring containers cryptohash-md5 + cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix + deepseq dependent-sum Diff directory exceptions filepath + generic-random Glob hashing hedgehog interpolate megaparsec mtl + optparse-applicative pretty-show prettyprinter process serialise + split tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th template-haskell text time transformers unix unordered-containers ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring containers - criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl + base base16-bytestring bytestring containers criterion + cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 + data-fix deepseq exceptions filepath hashing mtl optparse-applicative serialise template-haskell text time transformers unordered-containers ]; @@ -114569,6 +115145,56 @@ self: { broken = true; }) {}; + "hnix-store-core" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary + , bytestring, containers, cryptohash-md5, cryptohash-sha1 + , cryptohash-sha256, directory, filepath, hashable, mtl, process + , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec + , tasty-hunit, tasty-quickcheck, temporary, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "hnix-store-core"; + version = "0.1.0.0"; + sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers cryptohash-md5 + cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl + regex-base regex-tdfa-text text unix unordered-containers vector + ]; + testHaskellDepends = [ + base base64-bytestring binary bytestring containers directory + process tasty tasty-discover tasty-hspec tasty-hunit + tasty-quickcheck temporary text + ]; + testToolDepends = [ tasty-discover ]; + description = "Core effects for interacting with the Nix store"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "hnix-store-remote" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, hnix-store-core, mtl, network, pretty-simple, text + , unix, unordered-containers + }: + mkDerivation { + pname = "hnix-store-remote"; + version = "0.1.0.0"; + sha256 = "04dmql5235z05hq36wnbgc3sk0izqryv7n8dh8r3dq2j87zvv3y8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers hnix-store-core + mtl network text unix unordered-containers + ]; + executableHaskellDepends = [ + base bytestring hnix-store-core mtl pretty-simple + unordered-containers + ]; + description = "Remote hnix store"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hnn" = callPackage ({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random , random, vector, vector-binary-instances, zlib @@ -115540,8 +116166,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.17.5"; - sha256 = "1vpx6v8b0jixn82iqz085w2qpyj5pl2qyhrcd0a4p0vs5qmplf60"; + version = "5.0.17.6"; + sha256 = "0kgcgadrp02pcwp0pp56p09kvw3k9i6n4r7qsms3lagq1wcar4dv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -117462,6 +118088,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-functors_0_1_4_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hs-functors"; + version = "0.1.4.0"; + sha256 = "0crih1v1zg0w1m4xcsz1v00j4x2w82fdd17bkhiqa1d56kx3d1af"; + libraryHaskellDepends = [ base transformers ]; + description = "Functors from products of Haskell and its dual to Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -117733,6 +118371,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-profunctors" = callPackage + ({ mkDerivation, base, hs-functors }: + mkDerivation { + pname = "hs-profunctors"; + version = "0.1.0.0"; + sha256 = "09iylf1xjxsikjyaib9902na33bkfs8nv3wasyvikg4g82xqay5y"; + libraryHaskellDepends = [ base hs-functors ]; + description = "Profunctors from Haskell to Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-re" = callPackage ({ mkDerivation, array, base, regex-base, regex-posix }: mkDerivation { @@ -118092,6 +118741,8 @@ self: { pname = "hsaml2"; version = "0.1"; sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; + revision = "1"; + editedCabalFile = "0xvyzq2y94za0ggrlcxvpz4g29jxdcjp3ga8f77hr0f4hfz4z10l"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring cryptonite data-default http-types hxt hxt-charproperties @@ -120040,14 +120691,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_7_0" = callPackage + "hspec_2_7_1" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.7.0"; - sha256 = "1qbikvd91cimbn439zwsdcrz0hsl7n2w4cl0vlcw8kbf94nm6z7z"; + version = "2.7.1"; + sha256 = "1x8rcr7j1azcaw0fg1xzp8j0gr4ias36z09aj24i4xp8pnyfp341"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -120127,7 +120778,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_7_0" = callPackage + "hspec-core_2_7_1" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -120135,8 +120786,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.7.0"; - sha256 = "1y4j0ivngz7jrff1riyy2iirnb5kc9p4cr619wdrsrvrm3blgzrz"; + version = "2.7.1"; + sha256 = "08vk8588lap00hsln8zl64dazbb28lzk4b4h5vnm7xvhg7r21k1c"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -120192,13 +120843,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_7_0" = callPackage + "hspec-discover_2_7_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.7.0"; - sha256 = "1n3by0dn3x3kfy7vnyfdz0dr2wwwj82m0ijlm9s1n6aa976xddhw"; + version = "2.7.1"; + sha256 = "0r47fm94wa6qrhp8cc1zzkjrxc32rnagfn9m9ga4dm6p6ydw4c8b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -123330,8 +123981,8 @@ self: { }: mkDerivation { pname = "http2-client-grpc"; - version = "0.5.0.4"; - sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv"; + version = "0.6.0.0"; + sha256 = "0cf6asfh8wmjh1j0i1ldh557n33q1k1kfj604rz7rrrcarmn0m5h"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class http2 http2-client http2-grpc-types lens proto-lens text tls @@ -123349,10 +124000,8 @@ self: { }: mkDerivation { pname = "http2-grpc-types"; - version = "0.3.0.0"; - sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5"; - revision = "2"; - editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c"; + version = "0.4.0.0"; + sha256 = "1h15smbncifn0c9n0dmwzpwr0fnb3jby9zch71rmsnsirclycsb5"; libraryHaskellDepends = [ base binary bytestring case-insensitive proto-lens zlib ]; @@ -123375,6 +124024,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "httpd-shed_0_4_1_0" = callPackage + ({ mkDerivation, base, network, network-bsd, network-uri }: + mkDerivation { + pname = "httpd-shed"; + version = "0.4.1.0"; + sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base network network-bsd network-uri ]; + description = "A simple web-server with an interact style API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "https-everywhere-rules" = callPackage ({ mkDerivation, attoparsec, base, errors, functor-infix, hspec , http-client, https-everywhere-rules-raw, lens, network, pipes @@ -123761,12 +124424,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_2_0_0_0" = callPackage + "hunit-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.0"; - sha256 = "0j48wg6nq90hgl3jfdiy020az5m8vcpbnfvxcpjci3vzd24c4gx9"; + version = "2.0.0.1"; + sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -124198,6 +124861,30 @@ self: { broken = true; }) {}; + "hw-bits_0_7_0_6" = callPackage + ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim + , hw-string-parse, QuickCheck, safe, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.7.0.6"; + sha256 = "0c3bfr4x52fvvp3yin54xbfxz7nq936v2ac89vcim1gscyw51hvm"; + libraryHaskellDepends = [ + base bytestring hw-int hw-prim hw-string-parse safe vector + ]; + testHaskellDepends = [ + base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim QuickCheck + vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit , conduit-combinators, criterion, hspec, mmap, time, transformers @@ -124397,8 +125084,8 @@ self: { ({ mkDerivation, base, hedgehog, vector }: mkDerivation { pname = "hw-hedgehog"; - version = "0.1.0.2"; - sha256 = "0fk5qgn011j7cb75xi434vk0vq4bl8w9lrs6hpf45c8mv4c48vby"; + version = "0.1.0.3"; + sha256 = "0cck3kxxc7fxfqji9jv15vc9v1zpqz7rzacxfcjc0i6s1ll9vbv2"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base ]; description = "Extra hedgehog functionality"; @@ -124469,6 +125156,27 @@ self: { broken = true; }) {}; + "hw-ip_2_3_1_0" = callPackage + ({ mkDerivation, appar, base, containers, generic-lens, hedgehog + , hspec, hw-bits, hw-hspec-hedgehog, iproute, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.3.1.0"; + sha256 = "19a2z6lx064y4y2qzhfzzwwpy4hisf86a57ah1f9jjjrvnxr1363"; + libraryHaskellDepends = [ + appar base containers generic-lens hw-bits iproute text + ]; + testHaskellDepends = [ + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text + ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, containers, criterion, directory, dlist, hspec @@ -124767,6 +125475,32 @@ self: { broken = true; }) {}; + "hw-prim_0_6_2_23" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, mmap + , QuickCheck, semigroups, transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.23"; + sha256 = "1kilyiq6gj44gz9hqy11ab1sm4j399rkz5k0a98fpzjd6b7ndrmy"; + libraryHaskellDepends = [ + base bytestring mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -124824,6 +125558,42 @@ self: { broken = true; }) {}; + "hw-rankselect_0_13_0_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog + , hw-prim, hw-rankselect-base, lens, mmap, mtl + , optparse-applicative, QuickCheck, resourcet, transformers, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.13.0.0"; + sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base + vector + ]; + executableHaskellDepends = [ + base directory generic-lens hw-bits hw-prim hw-rankselect-base lens + mmap mtl optparse-applicative vector + ]; + testHaskellDepends = [ + base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog + hw-prim hw-rankselect-base mmap QuickCheck transformers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector + ]; + description = "Rank-select"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-rankselect-base" = callPackage ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim @@ -125109,23 +125879,22 @@ self: { "hwormhole" = callPackage ({ mkDerivation, aeson, async, base, binary, binary-conduit , bytestring, conduit, conduit-extra, containers, cryptonite - , directory, filepath, haskeline, hedgehog, hex, hspec - , magic-wormhole, memory, mtl, network, network-info - , optparse-applicative, pathwalk, protolude, random, saltine - , spake2, temporary, text, transformers, unix-compat, zip + , directory, filepath, haskeline, hedgehog, hspec, magic-wormhole + , memory, mtl, network, network-info, optparse-applicative + , pathwalk, pgp-wordlist, protolude, random, saltine, spake2 + , temporary, text, transformers, unix-compat, zip }: mkDerivation { pname = "hwormhole"; - version = "0.2.0.0"; - sha256 = "0y0wg4zxq8wzym8x7b103h0ai2z5ji22vvqz4i64pnzq83ksmxym"; + version = "0.2.0.1"; + sha256 = "1y3x13lh1g048a1myk5kkm078b34p4rdfhjcvfc991ys5zc46sir"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base binary bytestring conduit conduit-extra containers - cryptonite directory filepath haskeline hex magic-wormhole memory - mtl network network-info pathwalk protolude random saltine spake2 - temporary text transformers unix-compat zip + cryptonite directory filepath haskeline magic-wormhole memory mtl + network network-info pathwalk pgp-wordlist protolude random saltine + spake2 temporary text transformers unix-compat zip ]; executableHaskellDepends = [ aeson base binary bytestring optparse-applicative protolude text @@ -127788,8 +128557,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.7.1"; - sha256 = "0cia9yq5z7h3024kwhwjzzaq97281aib1nwimj6b4rp425yfybfr"; + version = "0.8"; + sha256 = "0mz6yy472wvcg4ywjhaaqi0cxyy9l437pw4rkwd2j392n6hlfbar"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -128196,6 +128965,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_3_2_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.3.2.2"; + sha256 = "0mnqi0fnh5sl1fp74gcwvfm6mxhzrs1x7yl235yl0dhcyjp3vfx7"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -128647,6 +129436,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_6_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, scientific, tagged + , template-haskell, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.6.1.3"; + sha256 = "1l03bwmwxb42cha8v3fj616ks927mcklxrmqxrr1ms53m7bsa587"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -130368,8 +131181,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.4.2"; - sha256 = "0r1ipv6mcbxpzwkfhr6hm2srr01wr5np20axgvqvplaskai9cj87"; + version = "1.4.2.1"; + sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector @@ -130389,6 +131202,36 @@ self: { broken = true; }) {}; + "ip_1_5_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, hspec, hspec-discover, HUnit + , primitive, QuickCheck, quickcheck-classes, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + , wide-word + }: + mkDerivation { + pname = "ip"; + version = "1.5.0"; + sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable primitive text + vector wide-word + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text wide-word + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -132164,8 +133007,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "japanese-calendar"; - version = "0.1.0.2"; - sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy"; + version = "0.1.1.0"; + sha256 = "0nii20qc7w0m2kjbbhg91iad497hlrd35l29xri0lrjmk9s1hsnw"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Data type of Japanese Calendar (Wareki)"; @@ -132173,17 +133016,14 @@ self: { }) {}; "japanese-holidays" = callPackage - ({ mkDerivation, base, doctest, hspec, QuickCheck - , quickcheck-instances, time - }: + ({ mkDerivation, base, doctest, hspec, hspec-discover, time }: mkDerivation { pname = "japanese-holidays"; - version = "0.1.1.0"; - sha256 = "1xcamcv6n6k2pmbhxy9dbzff94cr2ijf2ykvyrc3s2idk6jhd2bh"; + version = "0.2.0.0"; + sha256 = "13v8ibbz0sb7rw8y8v1dnyfpc3mc83x63dijnrl45xglwmi2qnjk"; libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ - base doctest hspec QuickCheck quickcheck-instances time - ]; + testHaskellDepends = [ base doctest hspec time ]; + testToolDepends = [ hspec-discover ]; description = "Japanese holidays utility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133651,8 +134491,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "9"; - editedCabalFile = "04b65m8lhk2g2d5x5i637ff3wkgvf4z6dhn5x1pizsj9y3aq35zm"; + revision = "10"; + editedCabalFile = "19vf7gibvqgcm27b5n0ls4s7wi1kr87crn776ifqc9gbr2l9bfpi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134455,10 +135295,10 @@ self: { }: mkDerivation { pname = "jwt"; - version = "0.9.0"; - sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395"; + version = "0.10.0"; + sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w"; revision = "1"; - editedCabalFile = "1vpd4pq8mh4dha7i2pfv4iqpw411yachzkf7p9rnfyicipj53pw2"; + editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite http-types memory network-uri scientific semigroups text time unordered-containers @@ -134944,7 +135784,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_8_1_0" = callPackage + "katip_0_8_2_0" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , filepath, hostname, microlens, microlens-th, monad-control, mtl @@ -134956,8 +135796,8 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.1.0"; - sha256 = "1x03k700c59icr049685y0lpyqjg27mpm1z5g69zy3gh3b87sb0j"; + version = "0.8.2.0"; + sha256 = "064i2dbl52i2z7lyvk01ayvf6dzzn20bac3fwh0dlvr5bn49wran"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -135823,6 +136663,17 @@ self: { broken = true; }) {}; + "key" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "key"; + version = "0.1.1.0"; + sha256 = "15n53kq13hhc659s1hq9wdr530da3h2mg5psncq1d2snkkdswqxf"; + libraryHaskellDepends = [ base transformers ]; + description = "Type-safe unconstrained dynamic typing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "key-state" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -135852,6 +136703,8 @@ self: { ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "keycode" = callPackage @@ -136950,14 +137803,17 @@ self: { }) {}; "lambda-options" = callPackage - ({ mkDerivation, base, containers, mtl, read-bounded }: + ({ mkDerivation, base, containers, funspection, mtl, read-bounded + }: mkDerivation { pname = "lambda-options"; - version = "0.9.1.0"; - sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n"; - libraryHaskellDepends = [ base containers mtl read-bounded ]; - description = "Declarative command line parser using type-driven pattern matching"; - license = stdenv.lib.licenses.bsd2; + version = "1.0.0.0"; + sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx"; + libraryHaskellDepends = [ + base containers funspection mtl read-bounded + ]; + description = "Declarative command-line parser using type-driven pattern matching"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -137764,8 +138620,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.0.6"; - sha256 = "0d2bjha52jph49jiac045igpxarrksihvv46s047qigs435linck"; + version = "1.7.1.1"; + sha256 = "0zqvr8z0mdjjdd9wx3ghf4aiv61brs52wk04d2vqar8nvv2wpzn4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -137903,6 +138759,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c99" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "language-c99"; + version = "0.1.1"; + sha256 = "1a6n9n3jzplwgm6136rvhm6zmkvnhxz0nw1bfplikg8kkfgbp5al"; + libraryHaskellDepends = [ base pretty ]; + description = "An implementation of the C99 AST that strictly follows the standard"; + license = stdenv.lib.licenses.mit; + }) {}; + + "language-c99-simple" = callPackage + ({ mkDerivation, base, language-c99, language-c99-util, mtl }: + mkDerivation { + pname = "language-c99-simple"; + version = "0.1.1"; + sha256 = "15as36j4bsxxy59683h5p6k0r9d21pv5kr90nr82d2lmnwf46xic"; + libraryHaskellDepends = [ + base language-c99 language-c99-util mtl + ]; + description = "C-like AST to simplify writing C99 programs"; + license = stdenv.lib.licenses.mit; + }) {}; + + "language-c99-util" = callPackage + ({ mkDerivation, base, language-c99 }: + mkDerivation { + pname = "language-c99-util"; + version = "0.1.1"; + sha256 = "0rdwb29d2aa9mqkn5b4acwviymxy18sjfmzr01j7n3j4n3q4d2lz"; + libraryHaskellDepends = [ base language-c99 ]; + description = "Utilities for language-c99"; + license = stdenv.lib.licenses.mit; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -137973,8 +138864,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "8.0.1"; - sha256 = "0wmnwsf2avdygd3mnz9bd53hlmasgh6cbmzxir2b2ycnp21a1ily"; + version = "8.0.2"; + sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -140352,8 +141243,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "2"; - editedCabalFile = "1b14fcncz2yby0d4jhx2h0ma6nx0fd1z7hrg1va4h7zn06m99482"; + revision = "3"; + editedCabalFile = "1ll8j0zymxnr2xxp2h1aaqfcwd6ihjdllk5b7q02r5kw2b8a266b"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -140539,10 +141430,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.1.1.1"; - sha256 = "00ydjvvpqil044wjb52cf804qn8fdqvf3rn3jghinb10y8i4a62k"; - revision = "1"; - editedCabalFile = "1vamkgjrngsdq8k820xkr0h613ly2s3lpf0hdqkvqkynywmd2ing"; + version = "1.1.2.0"; + sha256 = "1zhn8wpm1hd50j0nc776d9f3jq46lk5d62srrd66abfkvqxfxw6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -140582,8 +141471,8 @@ self: { pname = "lenz-template"; version = "0.2.0.0"; sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn"; - revision = "2"; - editedCabalFile = "0vd1xir15fizd2j575lgbr99gdm83n998w645cr0pzv3li6a56jq"; + revision = "3"; + editedCabalFile = "1ydlnn3cppjr3c0ink0k0668dmxk057gild2k84j8f27hcyb0w2j"; libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; @@ -140891,13 +141780,18 @@ self: { }) {}; "libarchive" = callPackage - ({ mkDerivation, base, bytestring, filepath, libarchive }: + ({ mkDerivation, base, bytestring, c2hs, composition-prelude, dlist + , filepath, libarchive + }: mkDerivation { pname = "libarchive"; - version = "0.2.1.2"; - sha256 = "1fwiwfqknndfnq55psdbj2swf1y5cm971lah4dgayg8vn76n961x"; - libraryHaskellDepends = [ base bytestring filepath ]; + version = "1.0.5.0"; + sha256 = "0ndla9nkrgc3q10dp2c407whqfwcwjv95rd22cmjx70c3609mm9r"; + libraryHaskellDepends = [ + base bytestring composition-prelude dlist filepath + ]; libraryPkgconfigDepends = [ libarchive ]; + libraryToolDepends = [ c2hs ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libarchive;}; @@ -141398,46 +142292,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "libraft_0_4_1_0" = callPackage + "libraft_0_5_0_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers - , cryptohash-sha256, dejafu, directory, exceptions, file-embed - , haskeline, hunit-dejafu, lifted-base, monad-control, mtl, network - , network-simple, parsec, postgresql-simple, process, protolude - , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty - , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-base - , tree-diff, word8 + , cryptohash-sha256, dejafu, directory, ekg, ekg-core, exceptions + , file-embed, filepath, haskeline, lifted-base, monad-control + , monad-metrics, mtl, network, network-simple, optparse-applicative + , parsec, postgresql-simple, postgresql-simple-url, process + , protolude, QuickCheck, quickcheck-state-machine, random, repline + , stm, tasty, tasty-dejafu, tasty-discover, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-base, tree-diff, unordered-containers, word8 }: mkDerivation { pname = "libraft"; - version = "0.4.1.0"; - sha256 = "03f76ysn1r8nvxzd21lrnhg1dy1fikq0jwbjz0x6z4w8q8vik38i"; + version = "0.5.0.0"; + sha256 = "13wk2dk0hs3ds5sa301v35i4g7frq1d7nj6c2957cbd9xwwyrksc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline lifted-base monad-control mtl - network network-simple parsec postgresql-simple protolude random - repline stm text time transformers transformers-base word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple parsec + postgresql-simple protolude random repline stm text time + transformers transformers-base unordered-containers word8 ]; executableHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline lifted-base monad-control mtl - network network-simple parsec postgresql-simple protolude random - repline stm text time transformers transformers-base word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple + optparse-applicative parsec postgresql-simple postgresql-simple-url + protolude random repline stm text time transformers + transformers-base unordered-containers word8 ]; testHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline hunit-dejafu lifted-base - monad-control mtl network network-simple parsec postgresql-simple - process protolude QuickCheck quickcheck-state-machine random - repline stm tasty tasty-dejafu tasty-discover - tasty-expected-failure tasty-hunit tasty-quickcheck text time - transformers transformers-base tree-diff word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple parsec + postgresql-simple process protolude QuickCheck + quickcheck-state-machine random repline stm tasty tasty-dejafu + tasty-discover tasty-expected-failure tasty-hunit tasty-quickcheck + text time transformers transformers-base tree-diff + unordered-containers word8 ]; testToolDepends = [ tasty-discover ]; description = "Raft consensus algorithm"; @@ -143101,8 +144000,7 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -143145,8 +144043,7 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -145722,8 +146619,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "6"; - editedCabalFile = "1zkf8ss6siai3py4drb5hr0m3np2kk3vrzb6kcxhq0vxxz3xynjh"; + revision = "7"; + editedCabalFile = "0bwl2hpj0w1wg86az52iwz0afs1h99b599vdn0fgygw2ivhbvqjv"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -147208,8 +148105,8 @@ self: { }: mkDerivation { pname = "main-tester"; - version = "0.2.0.0"; - sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc"; + version = "0.2.0.1"; + sha256 = "0hkqllckiq74mhnd76jd0cv5az6n0cf70xncy9r1jkip9s9za1ng"; libraryHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck text @@ -148516,6 +149413,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_3_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, cabal-doctest + , containers, data-default, data-default-class, deepseq, doctest + , exceptions, hspec, primitive, QuickCheck, scheduler + , template-haskell, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.3.0.0"; + sha256 = "17hi5n8jg15kljnhbl3crqpkqfm4wj2rdz6r9fyqqh2ky8l50c6j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + async base bytestring containers data-default deepseq doctest hspec + QuickCheck scheduler template-haskell unliftio vector + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, directory , filepath, JuicyPixels, massiv, netpbm, process, vector @@ -148532,6 +149453,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-io_0_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, directory + , filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.6.0"; + sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; + libraryHaskellDepends = [ + base bytestring data-default deepseq directory filepath JuicyPixels + massiv netpbm process vector + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "massiv-scheduler" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell + , unliftio, unliftio-core + }: + mkDerivation { + pname = "massiv-scheduler"; + version = "0.1.1.0"; + sha256 = "1i2j1gapkpx4n7x2s3nnsmns55hl4nrk4csgxak05gnj66p938v3"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest hspec QuickCheck template-haskell unliftio + ]; + description = "Work stealing scheduler for Massiv (Массив) and other parallel applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -148806,20 +149764,21 @@ self: { "matplotlib" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq - , filepath, process, random, raw-strings-qq, split, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, temporary + , directory, filepath, process, random, raw-strings-qq, split + , tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "matplotlib"; - version = "0.6.0"; - sha256 = "105rqbqpqgnsgqxvzqgp203bp4bckf35z7cncqg7nwypgf10ipvd"; + version = "0.7.4"; + sha256 = "0vpvi0iigmajz3dn0kx5kk9i7ccpbxs1f9fg4qymy3v18zd3wiqg"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary ]; testHaskellDepends = [ - ad base bytestring process random raw-strings-qq split tasty - tasty-expected-failure tasty-golden tasty-hunit temporary + ad base bytestring directory process random raw-strings-qq split + tasty tasty-expected-failure tasty-golden tasty-hunit temporary ]; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; @@ -149020,6 +149979,8 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mattermost-api" = callPackage @@ -150316,8 +151277,8 @@ self: { }: mkDerivation { pname = "menshen"; - version = "0.0.1"; - sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; + version = "0.0.2"; + sha256 = "05z6vmxgxfsl4s5bsxrkd929mfml0yk51gwinhwv9c090f5yvbli"; libraryHaskellDepends = [ base regex-tdfa scientific text ]; testHaskellDepends = [ aeson base hspec QuickCheck regex-tdfa scientific text @@ -150326,6 +151287,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "menshen_0_0_3" = callPackage + ({ mkDerivation, aeson, base, hspec, QuickCheck, regex-tdfa + , scientific, text + }: + mkDerivation { + pname = "menshen"; + version = "0.0.3"; + sha256 = "0zx530ksb0zmczbl6k70xg6pxgr2wfga2pg0ghgmpgd9f307xrwb"; + libraryHaskellDepends = [ base regex-tdfa scientific text ]; + testHaskellDepends = [ + aeson base hspec QuickCheck regex-tdfa scientific text + ]; + description = "Data Validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mercury-api" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, clock, directory , hashable, HUnit, optparse-applicative, text, unordered-containers @@ -154162,12 +155140,12 @@ self: { }) {}; "monadacme" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, transformers }: mkDerivation { pname = "monadacme"; - version = "0.0.2"; - sha256 = "1qam6k3gax2kf9zbf0q2mbsknkmx8y73i9qshbylj8wrpf896y97"; - libraryHaskellDepends = [ base ]; + version = "0.1.0.0"; + sha256 = "1k1jqi0q2n34xd07qp3fd4jw48iq4909m1pq2dm90sg46n6003sr"; + libraryHaskellDepends = [ base transformers ]; description = "The Acme and AcmeT monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155075,6 +156053,58 @@ self: { broken = true; }) {morfeusz = null;}; + "morley" = callPackage + ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude + , base16-bytestring, base58-bytestring, bifunctors, bytestring + , containers, cryptonite, data-default, directory, filepath, fmt + , formatting, hspec, hspec-golden-aeson, HUnit, lens, megaparsec + , memory, morley-prelude, mtl, named, optparse-applicative + , parser-combinators, pretty-simple, QuickCheck + , quickcheck-arbitrary-adt, quickcheck-instances, singletons, text + , time, timerep, transformers-compat, universum, vinyl + }: + mkDerivation { + pname = "morley"; + version = "0.1.0.5"; + sha256 = "1ymkr805wmwd3vpsyjwbfwryvixz3lpl8g24ygsv1ipc4v3cvxj4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-options aeson-pretty base-noprelude base16-bytestring + base58-bytestring bifunctors bytestring containers cryptonite + data-default directory fmt formatting hspec lens megaparsec memory + morley-prelude mtl named parser-combinators QuickCheck singletons + text time timerep transformers-compat vinyl + ]; + executableHaskellDepends = [ + base-noprelude fmt megaparsec morley-prelude named + optparse-applicative pretty-simple text + ]; + testHaskellDepends = [ + aeson base-noprelude containers directory filepath fmt formatting + hspec hspec-golden-aeson HUnit lens megaparsec morley-prelude + QuickCheck quickcheck-arbitrary-adt quickcheck-instances text time + universum vinyl + ]; + description = "Developer tools for the Michelson Language"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "morley-prelude" = callPackage + ({ mkDerivation, base-noprelude, universum }: + mkDerivation { + pname = "morley-prelude"; + version = "0.1.0.3"; + sha256 = "0rrh3zdrdyxi8hhf4iw6rxgz4cfbfm25a906k9lfxlp668nbn2si"; + libraryHaskellDepends = [ base-noprelude universum ]; + description = "A custom prelude used in Morley"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morph" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , optparse-applicative, postgresql-simple, text, yaml @@ -155689,23 +156719,20 @@ self: { }) {}; "msgpack" = callPackage - ({ mkDerivation, base, binary, blaze-builder, bytestring - , containers, data-binary-ieee754, deepseq, hashable, mtl - , QuickCheck, tasty, tasty-quickcheck, text, unordered-containers - , vector + ({ mkDerivation, async, base, binary, bytestring, containers + , data-binary-ieee754, deepseq, hashable, mtl, QuickCheck, tasty + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "msgpack"; - version = "1.0.0"; - sha256 = "0kk6nqn290sh0l0hhglccs0cqgk0fb3xdjzqz19yw9wb8aw01xh8"; - revision = "1"; - editedCabalFile = "0fg5hragvpil7212w7pyyiws0zlf4imas9sjj235lb1wjpka52qp"; + version = "1.0.1.0"; + sha256 = "1ljb9rdhdbxqs32brrwd42c8v3z7yrl6pr4mzmid1rfqdipard77"; libraryHaskellDepends = [ - base binary blaze-builder bytestring containers data-binary-ieee754 - deepseq hashable mtl text unordered-containers vector + base binary bytestring containers data-binary-ieee754 deepseq + hashable mtl text unordered-containers vector ]; testHaskellDepends = [ - base bytestring QuickCheck tasty tasty-quickcheck + async base bytestring QuickCheck tasty tasty-quickcheck ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -155765,6 +156792,8 @@ self: { pname = "msgpack-rpc"; version = "1.0.0"; sha256 = "00m5hpj5cd521j3jzsaw49asbpxvka0x1zi2qs26si82wxgnpjkn"; + revision = "2"; + editedCabalFile = "10vhvch66vk12gxgvivzz7x829ml8v08qcw9phylf4icwrgirn0p"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra exceptions monad-control msgpack mtl network random text @@ -158179,6 +159208,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "named_0_3_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.3.0.0"; + sha256 = "03pg2xdx86c7ns8p04gn8l4nwpjx538545f0fjq0j3mlhn09qrh7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -159479,10 +160521,8 @@ self: { }: mkDerivation { pname = "netpbm"; - version = "1.0.2"; - sha256 = "1my2zi26wspzh0pplfhgwj9vmkv41hwvrzl8k1virqsbm6y08sl4"; - revision = "1"; - editedCabalFile = "1vhwjv5c5gxn9l9982da54nzczbmj8rl09xn8ac7rix0zmmyvl50"; + version = "1.0.3"; + sha256 = "17cxh15wf7m9ljg0scd5i71ki95fiz8qhrfk4w1zvk4pf2gb7z38"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox @@ -159759,15 +160799,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_3_0_1_0" = callPackage + "network_3_0_1_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec - , hspec-discover, HUnit, unix + , hspec-discover, HUnit }: mkDerivation { pname = "network"; - version = "3.0.1.0"; - sha256 = "1dk1dabj779sppjl8vbi4kw8l5da5yfc7x5yn0mjy9zrzlfwqq3l"; - libraryHaskellDepends = [ base bytestring deepseq unix ]; + version = "3.0.1.1"; + sha256 = "1xacvl5wf47cz61igb94zf961b9ks0yhr02myxgjf53clm70dg6j"; + libraryHaskellDepends = [ base bytestring deepseq ]; testHaskellDepends = [ base bytestring directory hspec HUnit ]; testToolDepends = [ hspec-discover ]; description = "Low-level networking interface"; @@ -159936,6 +160976,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; + revision = "1"; + editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database (<netdb.h>) API"; license = stdenv.lib.licenses.bsd3; @@ -160725,12 +161767,12 @@ self: { }) {}; "network-uri-lenses" = callPackage - ({ mkDerivation, base, lens, network-uri }: + ({ mkDerivation, base, network-uri }: mkDerivation { pname = "network-uri-lenses"; - version = "0.2.0.0"; - sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p"; - libraryHaskellDepends = [ base lens network-uri ]; + version = "0.2.1.0"; + sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w"; + libraryHaskellDepends = [ base network-uri ]; description = "Lenses for network-uri"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -160897,6 +161939,39 @@ self: { broken = true; }) {inherit (pkgs) blas;}; + "newhope" = callPackage + ({ mkDerivation, AES, base, bytestring, containers, deepseq, hspec + , HUnit, mtl, parallel, QuickCheck, raw-strings-qq, statistics + , system-fileio, system-filepath, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, text, trifecta, vector + }: + mkDerivation { + pname = "newhope"; + version = "0.1.0.0"; + sha256 = "1yqxdir74mdi2dkccl1wcr2xzxrvg6y8ssskdq0laxb3q8xyzpwa"; + revision = "1"; + editedCabalFile = "18508knx0m46k9wpcxdvb1kahg5vrqc734ifwam9q5kljpm9l0sy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + AES base bytestring containers deepseq mtl vector + ]; + executableHaskellDepends = [ + AES base bytestring containers deepseq mtl system-fileio + system-filepath tasty-quickcheck text vector + ]; + testHaskellDepends = [ + AES base bytestring containers deepseq hspec HUnit mtl parallel + QuickCheck raw-strings-qq statistics system-fileio system-filepath + tasty tasty-expected-failure tasty-hunit tasty-quickcheck text + trifecta vector + ]; + description = "Library implementing the NewHope cryptographic key-exchange protocol"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "newports" = callPackage ({ mkDerivation, base, directory, old-time }: mkDerivation { @@ -161290,12 +162365,12 @@ self: { }) {}; "nimber" = callPackage - ({ mkDerivation, arithmoi, base }: + ({ mkDerivation, base, integer-logarithms }: mkDerivation { pname = "nimber"; - version = "0.1.3"; - sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w"; - libraryHaskellDepends = [ arithmoi base ]; + version = "0.1.4"; + sha256 = "1k177w8lccpqq4mwj089v7fbqvbrqskqxqj0gaingm0kmskggaaj"; + libraryHaskellDepends = [ base integer-logarithms ]; description = "Finite nimber arithmetic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163582,8 +164657,8 @@ self: { }: mkDerivation { pname = "ocaml-export"; - version = "0.9.0.0"; - sha256 = "1wqgvaf8198p1avq3vlmi256a6wk5w76m4hvlhvmdv0kzad3iw25"; + version = "0.13.0"; + sha256 = "1pfy648qrx7s0qmli9cjs0c0bnnvirilicaydy08zj3w4rvjfdb4"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec hspec-golden-aeson mtl QuickCheck @@ -165957,8 +167032,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.1.1"; - sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a"; + version = "0.2.1"; + sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -166068,21 +167143,22 @@ self: { ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes , bytestring, colour, containers, data-default, diagrams-lib , diagrams-svg, directory, exceptions, filepath, fmt, formatting - , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple - , orgmode-parse, QuickCheck, quickcheck-text, text, time - , transformers, turtle, universum, yaml + , hashable, hspec, HUnit, lens, mtl, optparse-simple, orgmode-parse + , process, QuickCheck, quickcheck-text, text, time, transformers + , turtle, universum, yaml }: mkDerivation { pname = "orgstat"; - version = "0.1.5"; - sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz"; + version = "0.1.6"; + sha256 = "1w6nbgq29bdx0skqsy7h46x46g6rzpsgp2n5ldxv2nmbwbhq6bib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base boxes bytestring colour containers data-default diagrams-lib diagrams-svg directory - exceptions filepath fmt formatting hashable lens linear mtl - optparse-simple orgmode-parse text time turtle universum yaml + exceptions filepath fmt formatting hashable lens mtl + optparse-simple orgmode-parse process text time turtle universum + yaml ]; executableHaskellDepends = [ base bytestring directory exceptions filepath formatting @@ -167434,25 +168510,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pandoc-pyplot_1_1_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hspec - , hspec-expectations, pandoc-types, tasty, tasty-hspec, tasty-hunit - , temporary, typed-process + "pandoc-pyplot_2_0_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , hspec, hspec-expectations, pandoc-types, random, tasty + , tasty-hspec, tasty-hunit, temporary, text, typed-process }: mkDerivation { pname = "pandoc-pyplot"; - version = "1.1.0.0"; - sha256 = "0c04ayg4rnlycsw16gafiwvixxwc66wxfm4nk25bclbl67zyw8qj"; + version = "2.0.0.0"; + sha256 = "0mh934ab65fbncva9nmgs8mifsjkh57ay952wl5rn9s6037fj5m5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath pandoc-types temporary - typed-process + base containers directory filepath hashable pandoc-types random + temporary text typed-process ]; executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base directory filepath hspec hspec-expectations pandoc-types tasty - tasty-hspec tasty-hunit temporary + tasty-hspec tasty-hunit temporary text ]; description = "A Pandoc filter for including figures generated from Matplotlib"; license = stdenv.lib.licenses.mit; @@ -167500,6 +168576,8 @@ self: { pname = "pandoc-types"; version = "1.17.5.4"; sha256 = "09wk2zskr0r2llsyif3s0x7vix05l1ya7qacsmmkrlhba5naib1j"; + revision = "1"; + editedCabalFile = "0bpd2iqmriajl5qg44j4z9c4agb9gsdwbn5l4c5yry6flivysq3c"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb transformers @@ -168913,8 +169991,8 @@ self: { }: mkDerivation { pname = "parsix"; - version = "0.1.0.3"; - sha256 = "0b3lzdyr2zbj4rnqkk4nxg2ix2ymvy3cfa7rqay31k637v441c75"; + version = "0.1.0.4"; + sha256 = "0ay3a07sj52r413s921519crvd3kf7i4zdmpqy6k1spzqnwzc9nc"; libraryHaskellDepends = [ base containers fingertree mtl parsers prettyprinter prettyprinter-ansi-terminal text transformers @@ -169178,6 +170256,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "password" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, quickcheck-instances + , scrypt, text + }: + mkDerivation { + pname = "password"; + version = "0.1.0.0"; + sha256 = "097zpb3brl7qib2a7di4y5lpkgzyqanhcyfchpf1xng199k2bwp3"; + libraryHaskellDepends = [ base scrypt text ]; + testHaskellDepends = [ + base doctest QuickCheck quickcheck-instances + ]; + description = "plain-text password and hashed password datatypes and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "password-instances" = callPackage + ({ mkDerivation, aeson, base, doctest, http-api-data, password + , persistent, QuickCheck, quickcheck-instances + }: + mkDerivation { + pname = "password-instances"; + version = "0.3.0.0"; + sha256 = "1ll5c9dpw23v4r3zf3v7rc6y5cjh55myjdg5mvyi1d5kb95pbwp9"; + libraryHaskellDepends = [ + aeson base http-api-data password persistent + ]; + testHaskellDepends = [ + base doctest QuickCheck quickcheck-instances + ]; + description = "typeclass instances for password package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -169541,6 +170653,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pattern-matcher" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck }: + mkDerivation { + pname = "pattern-matcher"; + version = "0.1.0.0"; + sha256 = "03adnzwcpc2mqqvfd2akiln0pfq6fn451an8vwxgx9gff0y85x5q"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl QuickCheck ]; + description = "A library for compiling pattern-matching to decision trees"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pattern-trie" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , doctest, hashable, mtl, QuickCheck, tasty, tasty-quickcheck, text @@ -171325,18 +172449,19 @@ self: { }) {}; "persistent-relational-record" = callPackage - ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl - , persistable-record, persistent, persistent-template - , relational-query, resourcet, template-haskell, test-framework - , test-framework-hunit, test-framework-th, text, time + ({ mkDerivation, array, base, conduit, containers, hlint, HUnit + , mtl, names-th, persistable-record, persistent + , persistent-template, relational-query, resourcet + , template-haskell, test-framework, test-framework-hunit + , test-framework-th, text, time }: mkDerivation { pname = "persistent-relational-record"; - version = "0.1.2.0"; - sha256 = "1xbrkf7vw872hxk6g7bv4c5hx0708x6sqf38a4qm0m9bf2qiakgd"; + version = "0.3.0"; + sha256 = "0cbm9klj9z7lrkp8b9s3z6ij1apbmjxqmxaakmykz1fqc483h9g1"; libraryHaskellDepends = [ - base conduit containers mtl persistable-record persistent - relational-query resourcet template-haskell text + array base conduit containers mtl names-th persistable-record + persistent relational-query resourcet template-haskell text ]; testHaskellDepends = [ base hlint HUnit persistent-template relational-query @@ -172510,8 +173635,8 @@ self: { ({ mkDerivation, base, unix }: mkDerivation { pname = "pidfile"; - version = "0.1.0.3"; - sha256 = "12m477kinanyxi5612wz0n72qb0cymjb2x9pp0ggsngfpkqzp1j6"; + version = "0.1.0.4"; + sha256 = "0z0k923gb0b01r35x1qp4i1743mcn84cj3m12ss7jbxql768jigf"; libraryHaskellDepends = [ base unix ]; description = "Run an IO action protected by a pidfile"; license = stdenv.lib.licenses.bsd3; @@ -175018,8 +176143,8 @@ self: { }: mkDerivation { pname = "pointfree-fancy"; - version = "1.1.1.11"; - sha256 = "0kxk9kxqlxl0j1cq5jvcsgcfggc3xz0qi7a1qw6w1l83gs2vjjrk"; + version = "1.1.1.12"; + sha256 = "14ds1bqz82pdij0771q3z524x8qv11dd4gkrn5r0mafrvfw2q6as"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178372,8 +179497,8 @@ self: { }: mkDerivation { pname = "primitive-containers"; - version = "0.3.1"; - sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3"; + version = "0.3.3"; + sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; libraryHaskellDepends = [ aeson base contiguous deepseq hashable primitive primitive-sort quantification text unordered-containers vector @@ -180823,22 +181948,26 @@ self: { }) {}; "publish" = callPackage - ({ mkDerivation, base, bytestring, chronologique, directory - , filepath, hinotify, pandoc, pandoc-types, template-haskell, text - , typed-process, unbeliever, unix, unordered-containers + ({ mkDerivation, base, bytestring, chronologique, deepseq + , directory, filepath, hinotify, hspec, pandoc, pandoc-types + , template-haskell, text, typed-process, unbeliever, unix + , unordered-containers }: mkDerivation { pname = "publish"; - version = "0.3.2"; - sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l"; - revision = "1"; - editedCabalFile = "136hi1c3ap2dvhn79dqdn29dfq5ncilg6qap41d0wf4jp7p419a8"; + version = "0.4.4"; + sha256 = "1a75pqz9gvzda70182gvfwjjzsrqdspngj00mlma1ayr9jy4sxr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique directory filepath hinotify pandoc - pandoc-types template-haskell text typed-process unbeliever unix - unordered-containers + base bytestring chronologique deepseq directory filepath hinotify + pandoc pandoc-types template-haskell text typed-process unbeliever + unix unordered-containers + ]; + testHaskellDepends = [ + base bytestring chronologique deepseq directory filepath hinotify + hspec pandoc pandoc-types template-haskell text typed-process + unbeliever unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = stdenv.lib.licenses.bsd3; @@ -182852,6 +183981,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_20" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, splitmix, tagged, text, time, transformers + , transformers-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.20"; + sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific splitmix tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -183177,11 +184331,13 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "quickcheck-with-counterexamples"; - version = "1.1"; - sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd"; + version = "1.2"; + sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "quicklz" = callPackage @@ -183603,8 +184759,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.2.0"; - sha256 = "0841p4yw0hd1mjx0ida662n6apfhmjyw76ar9gaysivbgh75dw4y"; + version = "0.2.1"; + sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq vector ]; @@ -185114,10 +186270,8 @@ self: { }: mkDerivation { pname = "raw-feldspar"; - version = "0.2.1"; - sha256 = "1z2qk62p6bjcj5p7r9xdc992cacdi9f5bwxzrxiqz3m3zj7qn63w"; - revision = "1"; - editedCabalFile = "1y7n3l959ydvwypb27vdkkkgfglk2jwkjblnq8kqn3540jl7qfhr"; + version = "0.3"; + sha256 = "0kxnl7vvqkmrq2cjwgrb4342bvr8a57v652f2pd5yvndamcz5m3w"; libraryHaskellDepends = [ array base constraints containers data-default-class data-hash imperative-edsl language-c-quote mtl operational-alacarte @@ -185873,8 +187027,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.1"; - sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx"; + version = "0.1.1.2"; + sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -186149,6 +187303,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_3_1" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.3.1"; + sha256 = "1vnwc12dp8w1sbh4z8wh451nqrlp94jml4kakvj4vscsv6c14dy4"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -186221,6 +187397,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2"; + sha256 = "1k2bdinvygn00l12am5n8m2i3vqp6h555mcj6d8xshy320v85np8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -186264,6 +187458,18 @@ self: { broken = true; }) {}; + "record-hasfield" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "record-hasfield"; + version = "1.0"; + sha256 = "1jlyhj4nlj4hrypdcv7393nccjmfjnh1311incgqhm5wzigjygaj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A version of GHC.Records as available in future GHCs."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-preprocessor" = callPackage ({ mkDerivation, base, base-prelude, basic-lens, conversion , conversion-text, record, record-syntax, text @@ -186310,6 +187516,18 @@ self: { broken = true; }) {}; + "record-wrangler" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "record-wrangler"; + version = "0.1.1.0"; + sha256 = "1lxbmb73k2ah663na2r7rgj6gxa6z971f6k8gcjbkbf095di1xlc"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Alter your records with ease"; + license = stdenv.lib.licenses.asl20; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -186878,16 +188096,16 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter - , template-haskell, transformers + ({ mkDerivation, aeson, base, deepseq, exceptions, mtl + , prettyprinter, QuickCheck, template-haskell, these, transformers }: mkDerivation { pname = "refined"; - version = "0.3.0.0"; - sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks"; + version = "0.4"; + sha256 = "1cq06zlrfk2rbpbwxqqybqs5474gfvgx1dmqvzriha7zmd68wcx2"; libraryHaskellDepends = [ - base deepseq exceptions mtl prettyprinter template-haskell - transformers + aeson base deepseq exceptions mtl prettyprinter QuickCheck + template-haskell these transformers ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; @@ -186942,19 +188160,19 @@ self: { , monoidal-containers, mtl, prim-uniq, primitive, process, random , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb , template-haskell, these, time, transformers, transformers-compat - , unbounded-delays + , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.5.0.1"; - sha256 = "0al49xxy8zr28v0c9crjwp8khkrm04sbcq98dgkf8c95fi2mrxnb"; + version = "0.6.1"; + sha256 = "1ggp2bpil2ig6rs45fn754kpqnp45lp069nc6ib4isj0dgzb9gpn"; libraryHaskellDepends = [ base bifunctors comonad containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta lens MemoTrie monad-control monoidal-containers mtl prim-uniq primitive random ref-tf reflection semigroupoids semigroups stm syb template-haskell these time transformers - transformers-compat unbounded-delays + transformers-compat unbounded-delays witherable ]; testHaskellDepends = [ base bifunctors containers deepseq dependent-map dependent-sum @@ -186989,14 +188207,34 @@ self: { broken = true; }) {}; + "reflex-basic-host" = callPackage + ({ mkDerivation, base, dependent-map, dependent-sum, mtl, primitive + , ref-tf, reflex, stm + }: + mkDerivation { + pname = "reflex-basic-host"; + version = "0.1"; + sha256 = "0fxd46i6jp71dcdmgl1r5hbd9a85fkl5bxhi0dr1gzhy1b9aqc1g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dependent-map dependent-sum mtl primitive ref-tf reflex stm + ]; + executableHaskellDepends = [ base mtl reflex ]; + description = "A basic `reflex` host for backend work"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-dom" = callPackage ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex , reflex-dom-core, text }: mkDerivation { pname = "reflex-dom"; - version = "0.4"; - sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z"; + version = "0.5"; + sha256 = "167yghrwf6fay03y46xf87p9bhr6s3rlxn0yk5vnx1s5i95ps1x5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187045,35 +188283,42 @@ self: { "reflex-dom-core" = callPackage ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder - , bytestring, constraints, containers, contravariant, data-default - , dependent-map, dependent-sum, dependent-sum-template, directory - , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp - , keycode, lens, linux-namespaces, monad-control, mtl, network-uri - , primitive, process, ref-tf, reflex, semigroups, stm - , template-haskell, temporary, text, these, transformers, unix - , zenc + , bytestring, chrome-test-utils, constraints, constraints-extras + , containers, contravariant, data-default, dependent-map + , dependent-sum, dependent-sum-template, directory + , exception-transformers, exceptions, filepath, ghcjs-dom, hlint + , hspec, hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp + , keycode, lens, lifted-base, monad-control, mtl, network + , network-uri, primitive, process, random, ref-tf, reflex + , semigroups, silently, stm, template-haskell, temporary, text + , these, transformers, unix, wai, wai-websockets, warp, webdriver + , websockets, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.4"; - sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv"; + version = "0.5"; + sha256 = "1vzlrqgl48krvm58w4mg5s3xwyc565rgjy7f2g1rxxljr30z95p4"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring constraints containers contravariant data-default dependent-map dependent-sum dependent-sum-template directory exception-transformers ghcjs-dom - jsaddle keycode lens monad-control mtl network-uri primitive ref-tf - reflex semigroups stm template-haskell text these transformers unix - zenc + jsaddle keycode lens monad-control mtl network-uri primitive random + ref-tf reflex semigroups stm template-haskell text these + transformers unix zenc ]; testHaskellDepends = [ - base hlint jsaddle jsaddle-warp linux-namespaces process reflex - temporary unix + aeson base bytestring chrome-test-utils constraints + constraints-extras containers dependent-map dependent-sum + dependent-sum-template directory exceptions filepath ghcjs-dom + hlint hspec hspec-webdriver http-types HUnit jsaddle jsaddle-warp + lens lifted-base network process random ref-tf reflex silently + temporary text wai wai-websockets warp webdriver websockets ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {chrome-test-utils = null;}; "reflex-dom-fragment-shader-canvas" = callPackage ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens @@ -187196,15 +188441,15 @@ self: { }: mkDerivation { pname = "reflex-sdl2"; - version = "0.2.0.0"; - sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; + version = "0.3.0.0"; + sha256 = "1mjynfdxnjdd308jp2gcpl8x00pmzshm81ramls7hzmkkvfm2xdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base containers dependent-sum exception-transformers mtl primitive ref-tf reflex sdl2 stm ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base mtl reflex ]; description = "SDL2 and reflex FRP"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -188076,6 +189321,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "registry_0_1_3_1" = callPackage + ({ mkDerivation, async, base, containers, exceptions, generic-lens + , hashable, hedgehog, hedgehog-corpus, io-memoize, MonadRandom, mtl + , multimap, protolude, random, resourcet, semigroupoids, semigroups + , tasty, tasty-discover, tasty-hedgehog, tasty-th, template-haskell + , text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.1.3.1"; + sha256 = "0qwylp0ajmpz17qiah8cpp6c4jl9bc9040vkm0v45afg0paanp7i"; + libraryHaskellDepends = [ + base containers exceptions hashable mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base containers exceptions generic-lens hashable hedgehog + hedgehog-corpus io-memoize MonadRandom mtl multimap protolude + random resourcet semigroupoids semigroups tasty tasty-discover + tasty-hedgehog tasty-th template-haskell text transformers-base + universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -188503,6 +189776,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm + , tasty, tasty-hedgehog, text, transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "0.5.0"; + sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog QuickCheck tasty + tasty-hedgehog text + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -189508,6 +190806,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rerebase_1_3_1" = callPackage + ({ mkDerivation, rebase }: + mkDerivation { + pname = "rerebase"; + version = "1.3.1"; + sha256 = "076gzpgkw19lknk8z7qidxwvg9n432934bnvc843chif075g6r0y"; + libraryHaskellDepends = [ rebase ]; + description = "Reexports from \"base\" with a bunch of other standard libraries"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reroute" = callPackage ({ mkDerivation, base, criterion, deepseq, graph-core, hashable , hspec, http-api-data, hvect, mtl, random, regex-compat, text @@ -193194,8 +194504,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.7"; - sha256 = "1cwha4s0dckdb7xrh1snxrismzr5gq586l9vmih9gmy2nrrw69y9"; + version = "0.8.1"; + sha256 = "0yncqrdawf0p7y9qrcz6mc2xd265r3w5kj9lzwqybid8xqbaclij"; libraryHaskellDepends = [ base binary constraints deepseq hashable QuickCheck text vector-space @@ -193216,8 +194526,8 @@ self: { }: mkDerivation { pname = "safe-money-aeson"; - version = "0.1"; - sha256 = "0qifhkyjgxfnfmbmysc4ma3hvyi2l0c238c75wlf5x1hz8q1ka8p"; + version = "0.1.1"; + sha256 = "1m8wwgxz632l5palqzjigk34c62qkbhqdy36wfnj50vh3d675c23"; libraryHaskellDepends = [ aeson base safe-money text ]; testHaskellDepends = [ aeson base bytestring safe-money tasty tasty-hunit tasty-quickcheck @@ -193235,8 +194545,8 @@ self: { }: mkDerivation { pname = "safe-money-cereal"; - version = "0.1"; - sha256 = "02bzl1r4vymnb0xyagzrcgb2kxr892wivyasp7dkn41shgafaqzb"; + version = "0.1.1"; + sha256 = "0ppsaryp1pzbikjf3v5v73gjy8dg3h73yk72xcm3xmhna4msvia4"; libraryHaskellDepends = [ base cereal safe-money ]; testHaskellDepends = [ base bytestring cereal safe-money tasty tasty-hunit @@ -193254,8 +194564,8 @@ self: { }: mkDerivation { pname = "safe-money-serialise"; - version = "0.1"; - sha256 = "16h8yf622szzc3v5xa2s7fsjaxk7cx9hqngjn796sdcg681g7xf5"; + version = "0.1.1"; + sha256 = "1v3pqsnjid6fyxr7ybxdyn6f4c3z9kh2s1f3hh75q5adgw80pbp6"; libraryHaskellDepends = [ base bytestring safe-money serialise ]; testHaskellDepends = [ base bytestring safe-money serialise tasty tasty-hunit @@ -193273,8 +194583,8 @@ self: { }: mkDerivation { pname = "safe-money-store"; - version = "0.1"; - sha256 = "0hbqichsmxd3xw1abcdyyyg1rrzfkfmywgj47f4yv6pmmvihrkh8"; + version = "0.1.1"; + sha256 = "1hav6sk8vnfpn773a1baqclklq04c4dhz6ihirwlbxaz7wdl78qj"; libraryHaskellDepends = [ base bytestring safe-money store ]; testHaskellDepends = [ base bytestring safe-money store tasty tasty-hunit tasty-quickcheck @@ -193292,8 +194602,8 @@ self: { }: mkDerivation { pname = "safe-money-xmlbf"; - version = "0.1"; - sha256 = "022mcl1gwvwjpjv56938bpklc15r9m6xvsyjhxmnb6d8apjzhpxk"; + version = "0.1.1"; + sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6"; libraryHaskellDepends = [ base safe-money text xmlbf ]; testHaskellDepends = [ base bytestring safe-money tasty tasty-hunit tasty-quickcheck text @@ -193612,22 +194922,22 @@ self: { broken = true; }) {}; - "salak_0_2_3" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, hspec, menshen - , mtl, QuickCheck, scientific, stm, text, transformers - , unordered-containers, vector, yaml + "salak_0_2_8" = callPackage + ({ mkDerivation, attoparsec, base, containers, data-default + , directory, filepath, hspec, menshen, mtl, pqueue, QuickCheck + , scientific, text, time }: mkDerivation { pname = "salak"; - version = "0.2.3"; - sha256 = "1ifa4gvwm3sri6nmgqsi7vrl7vafyzraz9v2y3a8k7gmn0izkmb5"; + version = "0.2.8"; + sha256 = "094avciwjwqvgs8d9779w0bbr7vx46dyqq2lwkk5w55k812pndxd"; libraryHaskellDepends = [ - aeson base directory filepath menshen mtl scientific stm text - transformers unordered-containers vector yaml + attoparsec base containers data-default directory filepath menshen + mtl pqueue scientific text time ]; testHaskellDepends = [ - aeson base directory filepath hspec menshen mtl QuickCheck - scientific stm text transformers unordered-containers vector yaml + attoparsec base containers data-default directory filepath hspec + menshen mtl pqueue QuickCheck scientific text time ]; description = "Configuration Loader"; license = stdenv.lib.licenses.bsd3; @@ -193635,6 +194945,44 @@ self: { broken = true; }) {}; + "salak-toml" = callPackage + ({ mkDerivation, base, hspec, mtl, QuickCheck, salak, text, time + , tomland, unordered-containers + }: + mkDerivation { + pname = "salak-toml"; + version = "0.2.8"; + sha256 = "02bnynil1b9y1fhk3h40iqgc8r151i112r90nwfbqsgdrzbhwfss"; + libraryHaskellDepends = [ + base mtl salak text time tomland unordered-containers + ]; + testHaskellDepends = [ + base hspec mtl QuickCheck salak text time tomland + unordered-containers + ]; + description = "Configuration Loader for toml"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "salak-yaml" = callPackage + ({ mkDerivation, aeson, base, hspec, mtl, QuickCheck, salak, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "salak-yaml"; + version = "0.2.8"; + sha256 = "0nbn0n19651r5hv3qbxg6ym354sm5170mi99pi60xgb4jgw2zjbw"; + libraryHaskellDepends = [ + aeson base mtl salak unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base hspec mtl QuickCheck salak text unordered-containers + vector yaml + ]; + description = "Configuration Loader for yaml"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "saltine" = callPackage ({ mkDerivation, base, bytestring, libsodium, profunctors , QuickCheck, semigroups, test-framework @@ -194804,6 +196152,26 @@ self: { broken = true; }) {}; + "scheduler" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell + , unliftio, unliftio-core + }: + mkDerivation { + pname = "scheduler"; + version = "1.0.0"; + sha256 = "1l8ifgdfzn8w6sd0d9pmlhipbmqs16krzicixf4rxxvr2pl8a2ld"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest hspec QuickCheck template-haskell unliftio + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -198165,8 +199533,8 @@ self: { }: mkDerivation { pname = "servant-client-namedargs"; - version = "0.1.1.0"; - sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg"; + version = "0.1.1.1"; + sha256 = "1byk3baams1kg1zfnp0y02s2kbg1w62gsri0z43x56g33pgwbsrp"; libraryHaskellDepends = [ base named servant servant-client-core servant-namedargs text ]; @@ -198848,8 +200216,8 @@ self: { pname = "servant-mock"; version = "0.8.5"; sha256 = "10bvqwyp5ca53k47a1xfbihdv22gjlj97spr1bn5plf5vlk70m5f"; - revision = "1"; - editedCabalFile = "0jn1inj9rc6dwf1lml3blwf1kx2d73zpwarn6jwd4j4mf7wvak4a"; + revision = "2"; + editedCabalFile = "0269d0yr8sa043wc2ymg3fv60c9pr4jxfy9sar2qqccvngpa1vf5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198913,8 +200281,8 @@ self: { ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: mkDerivation { pname = "servant-namedargs"; - version = "0.1.1.0"; - sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1"; + version = "0.1.1.1"; + sha256 = "15fdqk89si2ri63cpdndvp8kjlanf783fwgra899ldwizf637ka7"; libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; @@ -199203,6 +200571,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-rawm_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, filepath, Glob + , hspec-wai, http-client, http-media, http-types, lens, resourcet + , servant, servant-client, servant-client-core, servant-docs + , servant-server, tasty, tasty-hspec, tasty-hunit, text + , transformers, wai, wai-app-static, warp + }: + mkDerivation { + pname = "servant-rawm"; + version = "0.3.1.0"; + sha256 = "055ys4gkywy1ld0d736fsmc39fix2b4ad4myb7qn0sbax6y9zn3q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring filepath http-client http-media http-types lens + resourcet servant-client servant-client-core servant-docs + servant-server wai wai-app-static + ]; + testHaskellDepends = [ + base bytestring doctest Glob hspec-wai http-client http-media + http-types servant servant-client servant-client-core + servant-server tasty tasty-hspec tasty-hunit text transformers wai + warp + ]; + description = "Embed a raw 'Application' in a Servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-reflex" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, ghcjs-dom, http-api-data, http-media @@ -199377,8 +200774,8 @@ self: { }: mkDerivation { pname = "servant-server-namedargs"; - version = "0.1.1.0"; - sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda"; + version = "0.1.1.1"; + sha256 = "16lgnsq66rrjnky409c49pdr1dfq6d8p96gd1dhph2vwq2156fsd"; libraryHaskellDepends = [ base bytestring http-api-data http-types named servant servant-namedargs servant-server string-conversions text wai @@ -200875,31 +202272,34 @@ self: { "shake" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, filepattern, hashable, heaps, js-flot, js-jquery - , primitive, process, QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string + , extra, filepath, filepattern, hashable, heaps, js-dgtable + , js-flot, js-jquery, primitive, process, QuickCheck, random, time + , transformers, unix, unordered-containers, utf8-string }: mkDerivation { pname = "shake"; - version = "0.17.6"; - sha256 = "17vyd7qd9x2ild3mpwbqhsy9270bl5pdpjrhracs9p83isw4sa1k"; + version = "0.17.7"; + sha256 = "09gp3469lljgqmlkznpxl87l1wc91vdv2q6phh65jpkfjdhjp0rv"; + revision = "1"; + editedCabalFile = "1ld0k6vv8v8znnihps4z93555hs2n77ga6xk8g642bmrg67fnb7j"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process random time - transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process random time - transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string ]; testHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process QuickCheck - random time transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + QuickCheck random time transformers unix unordered-containers + utf8-string ]; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; @@ -200912,8 +202312,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.2.0"; - sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8"; + version = "1.10.2.1"; + sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -200926,23 +202326,24 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.0.0"; - sha256 = "1n8pm0431dxbrk3fqn1mijgvqbz4i7jcc8pqy60cj76p88kdn24q"; + version = "0.4.2.0"; + sha256 = "13ma1mavah98rmxisd4hw5ja96kzbcd36gzxlrsdsjz72i7k9xlh"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; }) {}; "shake-cabal" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, directory - , filepath, shake + ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq + , directory, filepath, hashable, shake }: mkDerivation { pname = "shake-cabal"; - version = "0.2.0.0"; - sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555"; + version = "0.2.1.1"; + sha256 = "0d3c1v7pj568fj65fz7dd4h72wpnzz75n1k974nmjbx12vphfd1i"; libraryHaskellDepends = [ - base Cabal composition-prelude directory filepath shake + base binary Cabal composition-prelude deepseq directory filepath + hashable shake ]; description = "Shake library for use with cabal"; license = stdenv.lib.licenses.bsd3; @@ -202624,12 +204025,12 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process }: + ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.1.3"; - sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; - libraryHaskellDepends = [ base directory filepath process ]; + version = "0.1.3.1"; + sha256 = "075fcidyq93cm1y8ag5z50n7zvv0fmi9c6j1wmrzj2972cr16g9p"; + libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -204101,6 +205502,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -204522,6 +205925,18 @@ self: { broken = true; }) {}; + "slist" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "slist"; + version = "0.0.0"; + sha256 = "0w9rgy0afma2gk36jbk7r8kyvl4vfhd0pfbv6ank2pr6kd5a4a0z"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Sized list"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -208590,6 +210005,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix_0_0_2" = callPackage + ({ mkDerivation, async, base, base-compat-batteries, bytestring + , containers, criterion, deepseq, process, random, tf-random, time + , vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.0.2"; + sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; + libraryHaskellDepends = [ base deepseq random time ]; + testHaskellDepends = [ + async base base-compat-batteries bytestring deepseq process random + tf-random vector + ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -211268,8 +212705,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "1"; - editedCabalFile = "03ga9vwaxsf0c73fciavkm925l7lkgya1a6xghyb8ainrav0bfq4"; + revision = "2"; + editedCabalFile = "074399mj4p0sk49rqc9a3fikpsly95mndnmm71ya7wy34nxyafzv"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -211290,6 +212727,23 @@ self: { broken = true; }) {}; + "stern-brocot" = callPackage + ({ mkDerivation, alg, base, criterion, smallcheck, tasty + , tasty-smallcheck, universe-base + }: + mkDerivation { + pname = "stern-brocot"; + version = "0.1.0.0"; + sha256 = "0x3d6k1vbwa0gn41z3lq877l70mghq1gic37l6vg1v4s5cyx0w6m"; + libraryHaskellDepends = [ alg base universe-base ]; + testHaskellDepends = [ + base smallcheck tasty tasty-smallcheck universe-base + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Positive rational numbers represented as paths in the Stern-Brocot tree"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stgi" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , deepseq, parsers, prettyprinter, prettyprinter-ansi-terminal @@ -212049,15 +213503,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_34_0" = callPackage + "stratosphere_0_36_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.34.0"; - sha256 = "0nrpwc17pmvrd8r0l6k142ihc51vwi2j55009lw1dph4n54zgs4h"; + version = "0.36.0"; + sha256 = "0890g86djpwg9nisqbb5nxxj42r2r8rh98vd5a0dk7lc72navp3k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212773,22 +214227,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_6_0" = callPackage - ({ mkDerivation, atomic-primops, base, clock, containers, deepseq + "streamly_0_6_1" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers , transformers-base }: mkDerivation { pname = "streamly"; - version = "0.6.0"; - sha256 = "05gwyzp03lz2gv5civg5dkqx1vab261iasrvfvr7sqi4xyj0kzns"; + version = "0.6.1"; + sha256 = "141xc4c4ng0cxwlmjcw7v9a7wpi6kdidzwr4wify571ghql75gf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - atomic-primops base clock containers deepseq exceptions ghc-prim - heaps lockfree-queue monad-control mtl transformers - transformers-base + atomic-primops base containers deepseq exceptions ghc-prim heaps + lockfree-queue monad-control mtl transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck random transformers @@ -213002,8 +214455,8 @@ self: { }: mkDerivation { pname = "strict-list"; - version = "0.1.0.1"; - sha256 = "13s3bwg9zslh04i5djvlf7wfs3ckn3sscxvlawj9nsi3md4fsvdz"; + version = "0.1.4"; + sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -213160,14 +214613,14 @@ self: { "string-interpolate" = callPackage ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-meta, hspec, interpolate, QuickCheck - , quickcheck-instances, quickcheck-text, template-haskell, text - , text-conversions, utf8-string + , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + , Interpolation, QuickCheck, quickcheck-instances, quickcheck-text + , template-haskell, text, text-conversions, utf8-string }: mkDerivation { pname = "string-interpolate"; - version = "0.0.1.0"; - sha256 = "1mc2xg1aybqjrsqlk0w7vkdydxzxr1vknbh6ad3w355svrb6krxm"; + version = "0.1.0.0"; + sha256 = "1q80rkp7qhha1swz47rkjmpnmnr4p5837s1179l43v1117ck0yqa"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text text-conversions utf8-string @@ -213177,9 +214630,10 @@ self: { quickcheck-text text ]; benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate text + base bytestring criterion formatting interpolate + interpolatedstring-perl6 Interpolation QuickCheck text ]; - description = "Haskell string interpolation that just works"; + description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213622,6 +215076,8 @@ self: { pname = "strongswan-sql"; version = "1.2.2.0"; sha256 = "0dv52cf6v84f8q6kckwbgw85iqckd17q3gqif6fh7xrx1z4vhimb"; + revision = "1"; + editedCabalFile = "138pksvpff0qggfsiv8s9r45z1ph4779flfm5hxb9br7bh5klslc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214522,8 +215978,6 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "supercollider-ht" = callPackage @@ -214847,6 +216301,8 @@ self: { pname = "sv-core"; version = "0.4"; sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + revision = "1"; + editedCabalFile = "0qzklsb21ha7jgfgx3h565pc3659hd3h1l0ci1yr0mdmj08ignbs"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -215508,6 +216964,134 @@ self: { broken = true; }) {}; + "symantic-http" = callPackage + ({ mkDerivation, base, bytestring, http-api-data, http-media + , http-types, network-uri, stm, text, time, transformers + }: + mkDerivation { + pname = "symantic-http"; + version = "0.0.0.20190324"; + sha256 = "0fvj527b5wjq0wfvzd0n8zna4cy5x1ngj47ysrvyv30ddvh94r4c"; + libraryHaskellDepends = [ + base bytestring http-api-data http-media http-types network-uri stm + text time transformers + ]; + description = "Symantic combinators for deriving clients or a server from an HTTP API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-client" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network-uri, stm, symantic-http, text, time, transformers, word8 + }: + mkDerivation { + pname = "symantic-http-client"; + version = "0.0.0.20190324"; + sha256 = "0y7va5gnf285h2hv82jfjq63k141mwgy8h4s1wbdqmjirrh75d1d"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network-uri stm + symantic-http text time transformers word8 + ]; + description = "symantic-http applied to the derivation of HTTP clients"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-demo" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network, network-uri, pipes, pipes-bytestring, pipes-safe + , symantic-http, symantic-http-client, symantic-http-pipes + , symantic-http-server, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "symantic-http-demo"; + version = "0.0.0.0"; + sha256 = "09fkni3zal4bvhf00b57qpf83bk7azcxps4s9nd01zsmnzvhlfs7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes symantic-http text ]; + executableHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network network-uri + pipes pipes-bytestring pipes-safe symantic-http + symantic-http-client symantic-http-pipes symantic-http-server text + time transformers wai wai-extra warp + ]; + description = "Demo for symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-pipes" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, lens-family-core + , monad-classes, network-uri, pipes, pipes-bytestring, pipes-group + , pipes-parse, pipes-safe, stm, symantic-http, text, time + , transformers, word8 + }: + mkDerivation { + pname = "symantic-http-pipes"; + version = "0.0.0.20190324"; + sha256 = "0c44vcvcpjlpj2wc58mqaaky68s3cjqa8gimv3nnj634m2avmsll"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types lens-family-core monad-classes network-uri + pipes pipes-bytestring pipes-group pipes-parse pipes-safe stm + symantic-http text time transformers word8 + ]; + description = "Streaming support through pipes for symantic-http"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-server" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, monad-classes, network-uri + , stm, symantic-http, text, time, transformers, wai, warp, word8 + }: + mkDerivation { + pname = "symantic-http-server"; + version = "0.0.0.20190324"; + sha256 = "0drng8xsafq5xm08frjg4fc206lxwb7wq2jj6n7zlv8k3nfnzvzy"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types monad-classes network-uri stm symantic-http + text time transformers wai warp word8 + ]; + description = "symantic-http applied to the derivation of HTTP servers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-test" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , deepseq, filepath, hashable, hspec, hspec-wai, http-api-data + , http-client, http-media, http-types, monad-classes, network + , network-uri, pipes, pipes-bytestring, pipes-safe, symantic-http + , symantic-http-client, symantic-http-pipes, symantic-http-server + , tasty, tasty-hspec, tasty-hunit, text, time, transformers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "symantic-http-test"; + version = "0.0.0.20190324"; + sha256 = "0ppxdy1m1a0y3jbkbcaf1syknk5ybri1scs5vhkphvm50fa21qcj"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base base64-bytestring bytestring containers deepseq filepath + hashable hspec hspec-wai http-api-data http-client http-media + http-types monad-classes network network-uri pipes pipes-bytestring + pipes-safe symantic-http symantic-http-client symantic-http-pipes + symantic-http-server tasty tasty-hspec tasty-hunit text time + transformers wai wai-extra warp + ]; + description = "Test symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "symantic-lib" = callPackage ({ mkDerivation, base, bytestring, containers, megaparsec , monad-classes, mono-traversable, symantic, symantic-grammar @@ -215739,20 +217323,20 @@ self: { "syntactic" = callPackage ({ mkDerivation, base, constraints, containers, criterion , data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty - , tasty-golden, tasty-quickcheck, tasty-th, template-haskell - , tree-view, utf8-string + , tasty-golden, tasty-hunit, tasty-quickcheck, tasty-th + , template-haskell, tree-view, utf8-string }: mkDerivation { pname = "syntactic"; - version = "3.7.1"; - sha256 = "06k2n84dn9rp59rcv29hqkrm5mri6hyhh0hdbh7qfqxa7m06sl6w"; + version = "3.8"; + sha256 = "1vwr2wfa9b4782k3v4bp0p5qqy14mwx9mmlax0jskpqwzx0azxvi"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view ]; testHaskellDepends = [ base containers mtl QuickCheck tagged tasty tasty-golden - tasty-quickcheck tasty-th utf8-string + tasty-hunit tasty-quickcheck tasty-th utf8-string ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Generic representation and manipulation of abstract syntax"; @@ -216858,6 +218442,8 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -217682,6 +219268,8 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "task" = callPackage @@ -217744,27 +219332,28 @@ self: { }) {}; "taskell" = callPackage - ({ mkDerivation, aeson, base, brick, bytestring, classy-prelude - , config-ini, containers, directory, file-embed, fold-debounce - , http-client, http-conduit, http-types, lens, mtl, tasty - , tasty-discover, tasty-expected-failure, tasty-hunit - , template-haskell, text, time, vty + ({ mkDerivation, aeson, attoparsec, base, brick, bytestring + , classy-prelude, config-ini, containers, directory, file-embed + , fold-debounce, http-client, http-conduit, http-types, lens, mtl + , raw-strings-qq, tasty, tasty-discover, tasty-expected-failure + , tasty-hunit, template-haskell, text, time, vty }: mkDerivation { pname = "taskell"; - version = "1.3.6.0"; - sha256 = "1s7wgn9ixmk5h9s5a977ddj1a0fsjmpifl0i97pak35rk92ca7wc"; + version = "1.4.0.0"; + sha256 = "1l0q1wyhkh271rpd6qw12j1kkzdqqcvp2xvqwykn98jwmnhswm4m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base brick bytestring classy-prelude config-ini containers - directory file-embed fold-debounce http-client http-conduit - http-types lens mtl template-haskell text time vty + aeson attoparsec base brick bytestring classy-prelude config-ini + containers directory file-embed fold-debounce http-client + http-conduit http-types lens mtl template-haskell text time vty ]; executableHaskellDepends = [ base classy-prelude ]; testHaskellDepends = [ - aeson base classy-prelude containers file-embed lens tasty - tasty-discover tasty-expected-failure tasty-hunit text time + aeson base classy-prelude containers file-embed lens raw-strings-qq + tasty tasty-discover tasty-expected-failure tasty-hunit text time + vty ]; testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; @@ -217876,12 +219465,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_2_0_0_0" = callPackage + "tasty-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.0"; - sha256 = "1jy1rh26xr64kwvywcfmb55x088hbrg8dhcixy9lhw76xrzjpkia"; + version = "2.0.0.1"; + sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -218677,6 +220266,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tds" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , hostname, mtl, network, stm, streaming, streaming-attoparsec + , streaming-bytestring, tardis, text, transformers, unix, vector + }: + mkDerivation { + pname = "tds"; + version = "0.1.0.0"; + sha256 = "1irgp0sv20vlzvyc09wa8ycf3k120ab623r901n638hrwvrwmz43"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bytestring hostname mtl network + stm streaming streaming-attoparsec streaming-bytestring tardis text + transformers unix vector + ]; + executableHaskellDepends = [ base ]; + description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "teams" = callPackage ({ mkDerivation, base, containers, fgl, graphviz }: mkDerivation { @@ -218724,6 +220336,21 @@ self: { broken = true; }) {}; + "telega" = callPackage + ({ mkDerivation, aeson, base, http-client, lens, text, transformers + , wreq + }: + mkDerivation { + pname = "telega"; + version = "0.1.0"; + sha256 = "1ixdac26mkd98apfq3h4xihlwdj8y1mjrcz8f17pkxkb4cmra3cd"; + libraryHaskellDepends = [ + aeson base http-client lens text transformers wreq + ]; + description = "Telegram Bot API binding"; + license = stdenv.lib.licenses.mit; + }) {}; + "telegram" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default , http-conduit, url, utf8-string @@ -219537,6 +221164,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tensors_0_1_3" = callPackage + ({ mkDerivation, base, criterion, hspec, QuickCheck, reflection + , vector + }: + mkDerivation { + pname = "tensors"; + version = "0.1.3"; + sha256 = "1ca289878jfwhwlawdwbf0mii8y117ha7hyqrlqx651qsswlwwcf"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec QuickCheck reflection vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Tensor in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -219777,6 +221420,8 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -219998,6 +221643,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; + revision = "1"; + editedCabalFile = "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -221216,6 +222863,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_8" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.8"; + sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi"; + revision = "1"; + editedCabalFile = "03q739smdz7z0nnx6pg7d58mmq65y7abhdxwy57akf7pichnw13b"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -221229,6 +222911,8 @@ self: { pname = "text-show-instances"; version = "3.7"; sha256 = "1bwpj8fdrfhmhlgdql59f75bkcfng7fx9m409m8k0dq9ymawmj5c"; + revision = "1"; + editedCabalFile = "0rw9xbyinjrp0rgqwklsv4552k0g0n2nnq7n02i0015q8psfdz6z"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -221942,6 +223626,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_7" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.7"; + sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -222279,6 +223983,8 @@ self: { pname = "these"; version = "0.8"; sha256 = "145m71z43rqgps0nh29hcfkr3cbs9l82y3dfycf7i5fjr2472rga"; + revision = "1"; + editedCabalFile = "0y7q2bzqgd2ii47kqy6fij1qd0l7immgcx6lkq9bswkgvdband11"; libraryHaskellDepends = [ aeson assoc base base-compat bifunctors binary containers data-default-class deepseq hashable keys lens mtl QuickCheck @@ -222936,24 +224642,6 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.0.8"; - sha256 = "0mxwaalbc23rmk163r40vqw15f3kjg5bagpq7f6rn3nyks7095qz"; - libraryHaskellDepends = [ - base bifunctors colour containers hosc mwc-random network parsec - template-haskell text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_0_10" = callPackage - ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, template-haskell, text - , transformers, vector - }: - mkDerivation { - pname = "tidal"; version = "1.0.10"; sha256 = "1pays7hjsv7rpc0ldmzhavxkyp3avcwz912zfm9y80fyhhyyf4jp"; libraryHaskellDepends = [ @@ -222963,7 +224651,6 @@ self: { testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -225055,8 +226742,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.3.1"; - sha256 = "0av2fr2y1b70rxfqsz1kfgkfj7i5j76zpn351r2s8navwa4pf116"; + version = "0.1.4.0"; + sha256 = "1wg5gx7iydwhnp8xj72lmgpa7n5dd62cxjswlkplj944c2szdmdp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225638,6 +227325,8 @@ self: { ]; description = "A command-line tool for live monitoring"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "traction" = callPackage @@ -225906,6 +227595,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-compat_0_6_3" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "transformers-compat"; + version = "0.6.3"; + sha256 = "08gpfib5s92rxq50y1in9zw2nbi2wm8k3xq7y6s0iahsn4vl5i5i"; + libraryHaskellDepends = [ base ghc-prim transformers ]; + description = "A small compatibility shim for the transformers library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-compose" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -226172,44 +227873,36 @@ self: { "trasa" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hashable - , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, vinyl + , http-media, http-types, quantification, text + , unordered-containers }: mkDerivation { pname = "trasa"; - version = "0.3"; - sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6"; + version = "0.4"; + sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q"; libraryHaskellDepends = [ - base binary bytestring hashable http-media http-types text - unordered-containers vinyl - ]; - testHaskellDepends = [ - base bytestring doctest tasty tasty-hunit tasty-quickcheck text - vinyl + base binary bytestring hashable http-media http-types + quantification text unordered-containers ]; + testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "trasa-client" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, http-client, http-media, http-types, ip, text, trasa - , unordered-containers + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, http-client, http-media, http-types, text, trasa }: mkDerivation { pname = "trasa-client"; - version = "0.3"; - sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns"; + version = "0.4"; + sha256 = "0xfqjvc1a4vbm8kvw1s11n174sc33hb7psd5lwpa6hipifw3kmb1"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers http-client http-media http-types text trasa ]; - testHaskellDepends = [ - aeson base http-client http-types ip text trasa - unordered-containers - ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -226235,23 +227928,36 @@ self: { "trasa-server" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , doctest, http-client, http-media, http-types, mtl, tasty - , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp + , http-media, http-types, mtl, text, trasa, wai }: mkDerivation { pname = "trasa-server"; - version = "0.2"; - sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy"; + version = "0.4"; + sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-media http-types mtl text trasa wai ]; - testHaskellDepends = [ - base bytestring doctest http-client tasty tasty-hunit - tasty-quickcheck text trasa vinyl warp - ]; description = "Type safe web server"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "trasa-th" = callPackage + ({ mkDerivation, base, containers, megaparsec, template-haskell + , trasa + }: + mkDerivation { + pname = "trasa-th"; + version = "0.4"; + sha256 = "1jfnm0im5qk6s6a9fbdrz228mic5ribi53fyl7nnk8gsr5lrl22z"; + libraryHaskellDepends = [ + base containers megaparsec template-haskell trasa + ]; + testHaskellDepends = [ base trasa ]; + description = "Template Haskell to generate trasa routes"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -226381,8 +228087,8 @@ self: { pname = "tree-diff"; version = "0.0.2"; sha256 = "0zlviaikyk50l577q7h06w5z058v1ngjlhwzfn965xkp978hnsgq"; - revision = "1"; - editedCabalFile = "1rl12a2ydg744s289lna4zb0sj0b16abmrngp6qd1kfkih2ygml0"; + revision = "2"; + editedCabalFile = "07pz7mhzvh7iwgn2rvw29valfdm4y845zqqffxb89ywbb6gnm8x8"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -227206,8 +228912,10 @@ self: { }: mkDerivation { pname = "tttool"; - version = "1.8"; - sha256 = "0j4lgkjg28i7wlz5rnlrii6mzx2bqsagrg3wiiw1z2ncik6qm472"; + version = "1.8.1"; + sha256 = "0y33vflq6l51yvv7ilkvra75lhia18gmif0jc5gaqigxl1adfkw1"; + revision = "1"; + editedCabalFile = "1rppvnlrgc6kk5k8m0jn0ckyv0bq0l3h2r4gvkbjbd25mj0ls7gh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -229266,6 +230974,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typerep-map_0_3_2" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, primitive, QuickCheck, tasty, tasty-discover + , tasty-hedgehog, tasty-hspec, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.3.2"; + sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover + tasty-hedgehog tasty-hspec + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -229977,33 +231713,35 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal - , chronologique, containers, deepseq, directory, exceptions - , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter + ({ mkDerivation, aeson, async, base, bytestring, chronologique + , containers, deepseq, directory, exceptions, fingertree, gauge + , hashable, hourglass, hspec, mtl, prettyprinter , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm , template-haskell, terminal-size, text, text-short, transformers , unix, unordered-containers, vector }: mkDerivation { pname = "unbeliever"; - version = "0.9.2.0"; - sha256 = "0fy9slvc0gvxr6z7zmz1xyk5qkxrfq4nbs9q8z11viqp0qg0yssx"; + version = "0.9.3.2"; + sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b"; + revision = "1"; + editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72"; libraryHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; testHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass hspec mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree gauge hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short @@ -232659,8 +234397,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.12.0"; - sha256 = "0qm7bm5dmcz7kn9p882fwpihj5azm2baxz68jnimmw1mp5w66fw2"; + version = "0.1.13.0"; + sha256 = "15b5m2v1v4ab65cfd6ppwinq2pnv5212g1qwnyw6rwyiaac8k3gd"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -233303,6 +235041,17 @@ self: { broken = true; }) {}; + "valid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "valid"; + version = "0.1.0.0"; + sha256 = "10nrr48ki8vxckbz1q24nn2x8vwflj4ndgvlj99ishyypb1ijx37"; + libraryHaskellDepends = [ base ]; + description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -234268,8 +236017,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.1"; - sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz"; + version = "0.2.1.1"; + sha256 = "0q5wm0hfk84hr9rgbb084d222ys0k1hab5cydwnnrpb7wy42199p"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -234901,8 +236650,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.27"; - sha256 = "0yfrh7ifgn4vw9yqn0rif040sabbgs2j42rkds48fam30cdr12v6"; + version = "0.0.0.28"; + sha256 = "1l2cjisay7vbqb64xd4lkz594x2ji2gs249h9j4anbifzg6bbjb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235756,8 +237505,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.3.0"; - sha256 = "1sd7rasg7305dlfq1mwyxw45gwy4ria0cbcd18pnilwjgsla7kvc"; + version = "1.1.4.0"; + sha256 = "10q98v71miyb1yhnpvz9dlhjs38m4pbz7x1hndz8cfsnjk3n5b22"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; @@ -236379,6 +238128,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-lambda" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , directory, http-types, iproute, network, temporary, text + , unliftio, unordered-containers, vault, wai + }: + mkDerivation { + pname = "wai-lambda"; + version = "0.1.0.0"; + sha256 = "1m77i3zazvpa4jirvgxjdik5fnzarrbmavvi48d72c8a8jjwsx9x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring case-insensitive directory http-types + iproute network temporary text unliftio unordered-containers vault + wai + ]; + executableHaskellDepends = [ + aeson base binary bytestring case-insensitive directory http-types + iproute network temporary text unliftio unordered-containers vault + wai + ]; + description = "Haskell Webapps on AWS Lambda"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-lens" = callPackage ({ mkDerivation, base, bytestring, http-types, lens, network, text , vault, wai @@ -238553,6 +240327,30 @@ self: { broken = true; }) {}; + "webby" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, fast-logger + , formatting, http-api-data, http-types, monad-logger, protolude + , resourcet, tasty, tasty-hunit, tasty-quickcheck, text, unliftio + , unordered-containers, wai + }: + mkDerivation { + pname = "webby"; + version = "0.1.0.1"; + sha256 = "0xscyd06zc4sjmhrf4l8cc9qmpw2vx2vydvlv0mw47hk660as67v"; + libraryHaskellDepends = [ + aeson base binary bytestring fast-logger formatting http-api-data + http-types monad-logger protolude resourcet text unliftio + unordered-containers wai + ]; + testHaskellDepends = [ + aeson base binary bytestring fast-logger formatting http-api-data + http-types monad-logger protolude resourcet tasty tasty-hunit + tasty-quickcheck text unliftio unordered-containers wai + ]; + description = "A super-simple web server framework"; + license = stdenv.lib.licenses.asl20; + }) {}; + "webcloud" = callPackage ({ mkDerivation, base, bytestring, cgi, optparse-applicative }: mkDerivation { @@ -239210,8 +241008,8 @@ self: { ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.13"; - sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4"; + version = "0.0.14"; + sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g"; libraryHaskellDepends = [ base deepseq mtl process split temporary ]; @@ -239748,6 +241546,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "winery_1_0_1" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , containers, cpu, deepseq, directory, fast-builder, gauge + , hashable, HUnit, megaparsec, mtl, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances + , scientific, semigroups, serialise, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "winery"; + version = "1.0.1"; + sha256 = "03g397c7s13brm5jsdzrwg5vyanvj6yznhn95aax7a8dwvhphk2n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers cpu fast-builder hashable HUnit + megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck + scientific semigroups text time transformers unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson base bytestring megaparsec prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring containers fast-builder QuickCheck + quickcheck-instances scientific text time unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + aeson base binary bytestring cereal deepseq directory gauge + serialise text + ]; + description = "Sustainable serialisation library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "winio" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, kernel32 , network, winerror, ws2_32 @@ -239881,8 +241717,8 @@ self: { }: mkDerivation { pname = "withdependencies"; - version = "0.2.4.2"; - sha256 = "04pk5giqlnls1p62fz9p0sb1288c9qk3ivsq2kb5207cjifyslgz"; + version = "0.2.4.3"; + sha256 = "1km9mrasxpzpkrm1cb5s06iwmqd33dmiwld8syx1f7rq9l3pk8d7"; libraryHaskellDepends = [ base conduit containers mtl profunctors ]; @@ -242998,6 +244834,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "xmlbf_0_5" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "xmlbf"; + version = "0.5"; + sha256 = "1wm7xypplnz9sl6ckh8kjsb66pd2cqgr412sdhdm0d7y0yixv2zy"; + libraryHaskellDepends = [ + base bytestring containers deepseq text transformers + unordered-containers + ]; + testHaskellDepends = [ + base bytestring deepseq QuickCheck quickcheck-instances tasty + tasty-hunit tasty-quickcheck text transformers unordered-containers + ]; + description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlbf-xeno" = callPackage ({ mkDerivation, base, bytestring, html-entities, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -243018,6 +244876,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "xmlbf-xeno_0_2" = callPackage + ({ mkDerivation, base, bytestring, html-entities, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , unordered-containers, xeno, xmlbf + }: + mkDerivation { + pname = "xmlbf-xeno"; + version = "0.2"; + sha256 = "1x33885kjddmc39p2jxafypcgpm5fajdxzdd6l9z5bpihlpgk7ig"; + libraryHaskellDepends = [ + base bytestring html-entities text unordered-containers xeno xmlbf + ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck text unordered-containers xmlbf + ]; + description = "xeno backend support for the xmlbf library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmlbf-xmlhtml" = callPackage ({ mkDerivation, base, bytestring, html-entities, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text @@ -243025,8 +244904,8 @@ self: { }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.1.1"; - sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; + version = "0.2"; + sha256 = "1h2w98jdr3r9isbl5g39gd3fxlm4vqib15grqgarhx2gj1k9vlxd"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml @@ -243037,6 +244916,8 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "xmlgen" = callPackage @@ -244006,6 +245887,39 @@ self: { broken = true; }) {}; + "yam_0_5_16" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring + , data-default, fast-logger, hspec, http-client, http-types, lens + , menshen, monad-logger, mtl, mwc-random, QuickCheck, reflection + , salak, scientific, servant-client, servant-server + , servant-swagger, servant-swagger-ui, swagger2, text + , unliftio-core, unordered-containers, vault, vector, wai, warp + }: + mkDerivation { + pname = "yam"; + version = "0.5.16"; + sha256 = "107wnnb8q47kl78gl92b6w6z6pvjqqwpisvwcw0xipmisk5d6nzv"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + fast-logger http-client http-types lens menshen monad-logger mtl + mwc-random reflection salak scientific servant-client + servant-server servant-swagger servant-swagger-ui swagger2 text + unliftio-core unordered-containers vault vector wai warp + ]; + testHaskellDepends = [ + aeson base base16-bytestring binary bytestring data-default + fast-logger hspec http-client http-types lens menshen monad-logger + mtl mwc-random QuickCheck reflection salak scientific + servant-client servant-server servant-swagger servant-swagger-ui + swagger2 text unliftio-core unordered-containers vault vector wai + warp + ]; + description = "Yam Web"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-app" = callPackage ({ mkDerivation, aeson, base, conduit, containers, ctrie , data-default, directory, exceptions, fast-logger, monad-control @@ -244062,6 +245976,23 @@ self: { broken = true; }) {}; + "yam-datasource_0_5_16" = callPackage + ({ mkDerivation, base, conduit, persistent, resource-pool + , resourcet, unliftio-core, yam + }: + mkDerivation { + pname = "yam-datasource"; + version = "0.5.16"; + sha256 = "0361nlw1fy8kb7wmkksp42zfx7fd7vdjxwvmx5j8mac4mgwyarzq"; + libraryHaskellDepends = [ + base conduit persistent resource-pool resourcet unliftio-core yam + ]; + description = "Yam DataSource Middleware"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yam-job" = callPackage ({ mkDerivation, base, cron, yam-app }: mkDerivation { @@ -245645,26 +247576,27 @@ self: { "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, rio, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 }: mkDerivation { pname = "yesod-core"; - version = "1.6.12"; - sha256 = "1zyvjbphzkhch4wv8lj019dd3jnyicdj514fhy1ggwqkff3kyblj"; + version = "1.6.13"; + sha256 = "0a7rsm71d8a0snbx6x9hj4ba0f0vg51rwzchsgvrh6fdfm0clkgq"; libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring + aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet rio + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 ]; testHaskellDepends = [ async base bytestring clientsession conduit conduit-extra @@ -245739,6 +247671,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-csp_0_2_5_0" = callPackage + ({ mkDerivation, attoparsec, base, case-insensitive, hspec + , mono-traversable, network-uri, semigroups, syb, template-haskell + , text, wai, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-csp"; + version = "0.2.5.0"; + sha256 = "16b569jwxw7rim9fmjkl3slddclcp1x75jf8czjj89d1wp202x15"; + libraryHaskellDepends = [ + attoparsec base case-insensitive mono-traversable network-uri + semigroups syb template-haskell text wai yesod yesod-core + ]; + testHaskellDepends = [ + attoparsec base hspec network-uri semigroups template-haskell yesod + yesod-test + ]; + description = "Add CSP headers to Yesod apps"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-datatables" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default , HUnit, monad-control, persistent, persistent-sqlite @@ -248003,15 +249957,16 @@ self: { }) {}; "z3" = callPackage - ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3 + ({ mkDerivation, base, containers, gomp, hspec, QuickCheck + , transformers, z3 }: mkDerivation { pname = "z3"; - version = "4.3.1"; - sha256 = "0fsddp5267bpmccg2hhra4z8isqmrdgcp0i0amrxsacgyqa4iqbv"; + version = "408.0"; + sha256 = "13qkzy9wc17rm60i24fa9sx15ywbxq4a80g33w20887gvqyc0q53"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers mtl ]; + libraryHaskellDepends = [ base containers transformers ]; librarySystemDepends = [ gomp z3 ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings for the Z3 Theorem Prover"; diff --git a/nixpkgs/pkgs/development/haskell-modules/lib.nix b/nixpkgs/pkgs/development/haskell-modules/lib.nix index 9f18db1e6e95..41ce20373d62 100644 --- a/nixpkgs/pkgs/development/haskell-modules/lib.nix +++ b/nixpkgs/pkgs/development/haskell-modules/lib.nix @@ -181,6 +181,8 @@ rec { enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; }); disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; }); + enableSeparateBinOutput = drv: overrideCabal drv (drv: { enableSeparateBinOutput = true; }); + appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); diff --git a/nixpkgs/pkgs/development/haskell-modules/patches/clock-0.7.2.patch b/nixpkgs/pkgs/development/haskell-modules/patches/clock-0.7.2.patch new file mode 100644 index 000000000000..8354c7fa5890 --- /dev/null +++ b/nixpkgs/pkgs/development/haskell-modules/patches/clock-0.7.2.patch @@ -0,0 +1,59 @@ +diff --git a/System/Clock.hsc b/System/Clock.hsc +index 297607b..c21196b 100644 +--- a/System/Clock.hsc ++++ b/System/Clock.hsc +@@ -41,7 +41,9 @@ import GHC.Generics (Generic) + # endif + #endif + +-#let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) ++#if __GLASGOW_HASKELL__ < 800 ++# let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__) ++#endif + + -- | Clock types. A clock may be system-wide (that is, visible to all processes) + -- or per-process (measuring time that is meaningful only within a process). +diff --git a/cbits/hs_clock_win32.c b/cbits/hs_clock_win32.c +index 5dcc2a9..ebdb7fe 100644 +--- a/cbits/hs_clock_win32.c ++++ b/cbits/hs_clock_win32.c +@@ -28,12 +28,22 @@ static void to_timespec_from_100ns(ULONGLONG t_100ns, long long *t) + t[1] = 100*(long)(t_100ns % 10000000UL); + } + ++/* See https://ghc.haskell.org/trac/ghc/ticket/15094 */ ++#if defined(_WIN32) && !defined(_WIN64) ++__attribute__((optimize("-fno-expensive-optimizations"))) ++#endif + void hs_clock_win32_gettime_monotonic(long long* t) + { + LARGE_INTEGER time; +- LARGE_INTEGER frequency; ++ static LARGE_INTEGER frequency; ++ static int hasFreq = 0; ++ + QueryPerformanceCounter(&time); +- QueryPerformanceFrequency(&frequency); ++ if (!hasFreq) ++ { ++ hasFreq = 1; ++ QueryPerformanceFrequency(&frequency); ++ } + // seconds + t[0] = time.QuadPart / frequency.QuadPart; + // nanos = +diff --git a/clock.cabal b/clock.cabal +index 0f2d18a..67d232e 100644 +--- a/clock.cabal ++++ b/clock.cabal +@@ -41,8 +41,8 @@ description: A package for convenient access to high-resolution clock and + copyright: Copyright © Cetin Sert 2009-2016, Eugene Kirpichov 2010, Finn Espen Gundersen 2013, Gerolf Seitz 2013, Mathieu Boespflug 2014 2015, Chris Done 2015, Dimitri Sabadie 2015, Christian Burger 2015, Mario Longobardi 2016 + license: BSD3 + license-file: LICENSE +-author: Cetin Sert <cetin@corsis.eu>, Corsis Research +-maintainer: Cetin Sert <cetin@corsis.eu>, Corsis Research ++author: Cetin Sert <cetin@corsis.tech>, Corsis Research ++maintainer: Cetin Sert <cetin@corsis.tech>, Corsis Research + homepage: https://github.com/corsis/clock + bug-reports: https://github.com/corsis/clock/issues + category: System diff --git a/nixpkgs/pkgs/development/interpreters/guile/1.8.nix b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix index fd270dedefcc..158987d4e0ef 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/1.8.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/1.8.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkgconfig , libtool, readline, gmp }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile_1_8; + pkgsBuildBuild.guile_1_8; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool ]; diff --git a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix index 433271d9c85e..17ca1d1dcd95 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/2.0.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -22,7 +22,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile_2_0; + pkgsBuildBuild.guile_2_0; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; diff --git a/nixpkgs/pkgs/development/interpreters/guile/default.nix b/nixpkgs/pkgs/development/interpreters/guile/default.nix index 1943b10bdcaf..5e458c6e2ccc 100644 --- a/nixpkgs/pkgs/development/interpreters/guile/default.nix +++ b/nixpkgs/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -23,7 +23,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile; + pkgsBuildBuild.guile; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; diff --git a/nixpkgs/pkgs/development/interpreters/janet/default.nix b/nixpkgs/pkgs/development/interpreters/janet/default.nix new file mode 100644 index 000000000000..00acfd0df8c1 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/janet/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "janet"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "janet-lang"; + repo = "janet"; + rev = "v${version}"; + sha256 = "1590f1fxb6qfhf1vp2xhbvdn2jfrgipn5572cckk1ma7f13jnkpy"; + }; + + JANET_BUILD=''\"release\"''; + PREFIX = placeholder "out"; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Janet programming language"; + homepage = https://janet-lang.org/; + license = stdenv.lib.licenses.mit; + platforms = platforms.all; + maintainers = with stdenv.lib.maintainers; [ andrewchambers ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index f6990fd29d01..9adc72f941a2 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -185,7 +185,7 @@ in rec { # the latest Devel version perldevel = common { - version = "5.29.6"; - sha256 = "0wj2bia8s30788f69mf5s533l72zbhqpdr85kkk97yrh1c9sgcd6"; + version = "5.29.9"; + sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; }; } diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix index f1461d784be0..ea755b234cfb 100644 --- a/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -63,10 +63,10 @@ in { sourceVersion = { major = "3"; minor = "5"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0pqmf51zy2lzhbaj4yya2py2qr653j9152d0rg3p7wi1yl2dwp7m"; + sha256 = "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -153,4 +153,4 @@ in { ncurses = ncurses5; }; -}) \ No newline at end of file +}) diff --git a/nixpkgs/pkgs/development/libraries/aravis/default.nix b/nixpkgs/pkgs/development/libraries/aravis/default.nix index e147a05d3cd8..2fbf7a0be2cf 100644 --- a/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -7,6 +7,7 @@ , gst-plugins-bad ? null , libnotify ? null , gnome3 ? null +, gtk3 ? null , enableUsb ? true , enablePacketSocket ? true , enableViewer ? true @@ -26,19 +27,19 @@ in assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; assert enableViewer -> gnome3 != null; + assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.5.13"; - name = "${pname}-${version}"; + version = "0.6.1"; src = fetchFromGitHub { owner = "AravisProject"; - repo = "aravis"; - rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48"; - sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy"; + repo = pname; + rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga"; }; outputs = [ "bin" "dev" "out" "lib" ]; @@ -55,7 +56,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; @@ -80,7 +81,7 @@ in longDescription = '' Implements the gigabit ethernet and USB3 protocols used by industrial cameras. ''; - homepage = https://aravisproject.github.io/docs/aravis-0.5; + homepage = "https://aravisproject.github.io/docs/aravis-0.5"; license = stdenv.lib.licenses.lgpl2; maintainers = []; platforms = stdenv.lib.platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/avahi/default.nix b/nixpkgs/pkgs/development/libraries/avahi/default.nix index 297883ecd0a4..f276d0bf12ee 100644 --- a/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; - patches = [ ./no-mkdir-localstatedir.patch ]; + patches = [ + ./no-mkdir-localstatedir.patch + (fetchpatch { + name ="CVE-2017-6519-CVE-2018-100084.patch"; + url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; + }) + ]; buildInputs = [ libdaemon dbus glib expat libiconv ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix new file mode 100644 index 000000000000..12fc1834e905 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut +, Cocoa, OpenGL +}: + +stdenv.mkDerivation rec { + name = "bullet-${version}"; + version = "2019-03-27"; + + src = fetchFromGitHub { + owner = "olegklimov"; + repo = "bullet3"; + # roboschool needs the HEAD of a specific branch of this fork, see + # https://github.com/openai/roboschool/issues/126#issuecomment-421643980 + # https://github.com/openai/roboschool/pull/62 + # https://github.com/openai/roboschool/issues/124 + rev = "3687507ddc04a15de2c5db1e349ada3f2b34b3d6"; + sha256 = "1wd7vj9136dl7lfb8ll0rc2fdl723y3ls9ipp7657yfl2xrqhvkb"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + + patches = [ ./gwen-narrowing.patch ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/FIND_PACKAGE(OpenGL)//' CMakeLists.txt + sed -i 's/FIND_LIBRARY(COCOA_LIBRARY Cocoa)//' CMakeLists.txt + ''; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_CPU_DEMOS=OFF" + "-DINSTALL_EXTRA_LIBS=ON" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOPENGL_FOUND=true" + "-DOPENGL_LIBRARIES=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DOPENGL_gl_LIBRARY=${OpenGL}/Library/Frameworks/OpenGL.framework" + "-DCOCOA_LIBRARY=${Cocoa}/Library/Frameworks/Cocoa.framework" + "-DBUILD_BULLET2_DEMOS=OFF" + "-DBUILD_UNIT_TESTS=OFF" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A professional free 3D Game Multiphysics Library"; + longDescription = '' + Bullet 3D Game Multiphysics Library provides state of the art collision + detection, soft body and rigid body dynamics. + ''; + homepage = http://bulletphysics.org; + license = licenses.zlib; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/catch2/default.nix b/nixpkgs/pkgs/development/libraries/catch2/default.nix index 54f1c459212d..1fbee74f5dbb 100644 --- a/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="1p2y6fhxfmb48nl03xdg62nfrwssaaiw10vzr194z6srcj90n2r7"; + sha256="05j01v4hmw0vv5vcj11pbngl200b3j2yvawk08fw9a249jzx6v1a"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cimg/default.nix b/nixpkgs/pkgs/development/libraries/cimg/default.nix index c294647b35de..a647c84016ba 100644 --- a/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.7.9"; + version = "2.5.5"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s"; + sha256 = "12jwis90ijakfiqngcd8s4a22wzr32f6midszja9ry41ilv63nic"; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/libraries/cmocka/default.nix b/nixpkgs/pkgs/development/libraries/cmocka/default.nix index 995844524dcf..ae110846ff06 100644 --- a/nixpkgs/pkgs/development/libraries/cmocka/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmocka/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "cmocka-${version}"; + pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.1"; + version = "${majorVersion}.5"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389"; + sha256 = "1dm8pdvkyfa8dsbz9bpq7wwgixjij4sii9bbn5sgvqjm5ljdik7h"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cpptest/default.nix b/nixpkgs/pkgs/development/libraries/cpptest/default.nix index 56b23153dcf2..e663c87f799e 100644 --- a/nixpkgs/pkgs/development/libraries/cpptest/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpptest/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "cpptest-1.1.2"; + name = "cpptest-2.0.0"; src = fetchurl { url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz"; - sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy"; + sha256 = "0lpy3f2fjx1srh02myanlp6zfi497whlldcrnij39ghfhm0arcnm"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix new file mode 100644 index 000000000000..c8aa70d08923 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitLab, meson, ninja, nasm }: + +stdenv.mkDerivation rec { + pname = "dav1d"; + version = "0.2.1"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + rev = version; + sha256 = "0diihk7lcdxxbfqp79dpvj14008zfzmayamh4vj310i524lqnkb6"; + }; + + nativeBuildInputs = [ meson ninja nasm ]; + # TODO: doxygen (currently only HTML and not build by default). + + meta = with stdenv.lib; { + description = "A cross-platform AV1 decoder focused on speed and correctness"; + longDescription = '' + The goal of this project is to provide a decoder for most platforms, and + achieve the highest speed possible to overcome the temporary lack of AV1 + hardware decoder. It supports all features from AV1, including all + subsampling and bit-depth parameters. + ''; + inherit (src.meta) homepage; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/dee/default.nix b/nixpkgs/pkgs/development/libraries/dee/default.nix index fb7ec512319e..f0f31ae1ffc4 100644 --- a/nixpkgs/pkgs/development/libraries/dee/default.nix +++ b/nixpkgs/pkgs/development/libraries/dee/default.nix @@ -1,27 +1,57 @@ -{ stdenv, fetchurl, python, pkgconfig -, glib, icu, gobject-introspection }: +{ stdenv +, fetchgit +, pkgconfig +, glib +, icu +, gobject-introspection +, dbus-glib +, vala +, python3 +, autoreconfHook +}: stdenv.mkDerivation rec { - name = "dee-${version}"; - version = "1.2.7"; + pname = "dee"; + version = "unstable-2017-06-16"; - src = fetchurl { - url = "https://launchpad.net/dee/1.0/${version}/+download/${name}.tar.gz"; - sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v"; + outputs = [ "out" "dev" "py" ]; + + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/dee"; + rev = "import/1.2.7+17.10.20170616-4ubuntu1"; + sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394"; }; - buildInputs = [ glib gobject-introspection icu ]; - nativeBuildInputs = [ python pkgconfig ]; + patches = [ + "${src}/debian/patches/gtkdocize.patch" + "${src}/debian/patches/strict-prototype.patch" + "${src}/debian/patches/icu-pkg-config.patch" + ]; + + nativeBuildInputs = [ + pkgconfig + vala + autoreconfHook + gobject-introspection + python3 + ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6 + buildInputs = [ + glib + icu + dbus-glib + ]; - enableParallelBuilding = true; + configureFlags = [ + "--disable-gtk-doc" + "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + ]; meta = with stdenv.lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; homepage = https://launchpad.net/dee; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar worldofpeace ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/dlib/default.nix b/nixpkgs/pkgs/development/libraries/dlib/default.nix index a88b3f1b9b68..67a56855bb79 100644 --- a/nixpkgs/pkgs/development/libraries/dlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/dlib/default.nix @@ -1,5 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, libpng, libjpeg , guiSupport ? false, libX11 + + # see http://dlib.net/compile.html +, avxSupport ? true }: stdenv.mkDerivation rec { @@ -17,6 +20,8 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; + cmakeFlags = [ "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; + enableParallelBuilding = true; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libpng libjpeg ] ++ lib.optional guiSupport libX11; diff --git a/nixpkgs/pkgs/development/libraries/eclib/default.nix b/nixpkgs/pkgs/development/libraries/eclib/default.nix index 2a43cbe8ee53..681062cd6713 100644 --- a/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -16,7 +16,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20180815"; # upgrade might break the sage interface + version = "20190226"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "12syn83lnzx0xc4r1v3glfimbzndyilkpdmx50xrihbjz1hzczif"; + sha256 = "1910np1xzyjzszay24xn4b81qhpsvhp5aix9vdpknplni2mq8kwb"; }; buildInputs = [ pari diff --git a/nixpkgs/pkgs/development/libraries/enet/default.nix b/nixpkgs/pkgs/development/libraries/enet/default.nix index 292fba1ace02..c0df404e60eb 100644 --- a/nixpkgs/pkgs/development/libraries/enet/default.nix +++ b/nixpkgs/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.13"; + name = "enet-1.3.14"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73"; + sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq"; }; meta = { diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index f7968380e29b..306b4e22cfc9 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -75,7 +75,7 @@ , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -#, libmfx ? null # Hardware acceleration vis libmfx +, libmfx ? null # Hardware acceleration vis libmfx , libmodplug ? null # ModPlug support , libmysofa ? null # HRTF support via SOFAlizer #, libnut ? null # NUT (de)muxer, native (de)muser exists @@ -156,12 +156,13 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame + * libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg, - * pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs + * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh + * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab + * wavpack x265 xavs * * Not supported: * stagefright-h264(android only) @@ -231,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp"; + sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr"; }; prePatch = '' @@ -343,7 +344,7 @@ stdenv.mkDerivation rec { (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (libiconv != null) "iconv") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - #(enableFeature (libmfx != null) "libmfx") + (enableFeature (if isLinux then libmfx != null else false) "libmfx") (enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") @@ -416,6 +417,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optional (isLinux && libmfx != null) libmfx ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix index f8343e668a67..5db1e0a47cfc 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.5"; - sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; + branch = "3.4.6"; + sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 738411d398df..d8a13a9c384d 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.1"; - sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c"; + branch = "4.1.2"; + sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/nixpkgs/pkgs/development/libraries/fstrm/default.nix b/nixpkgs/pkgs/development/libraries/fstrm/default.nix index 372cb50d05cf..3fcf218d6b56 100644 --- a/nixpkgs/pkgs/development/libraries/fstrm/default.nix +++ b/nixpkgs/pkgs/development/libraries/fstrm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fstrm-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "farsightsec"; repo = "fstrm"; rev = "v${version}"; - sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny"; + sha256 = "1vm880h6vpnxqh7v0x17yfim6f2fbxwkm03ms58s2h9akmph9xm5"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/nixpkgs/pkgs/development/libraries/gdcm/default.nix index 91c384b249a4..a1d623c7b98d 100644 --- a/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.8"; + version = "2.8.9"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b"; + sha256 = "1za252d1chv40d78bkjngrg1p2yx0vya8y9q3vqmz66ip2zilvx7"; }; dontUseCmakeBuildDir = true; diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index fc98af8b2cae..ed2c3e6b8002 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -3,6 +3,7 @@ , autoreconfHook, fetchpatch , git , texinfo +, buildPackages , qtbase ? null , pythonSupport ? false, swig2 ? null, python ? null }: @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + patches = [ (fetchpatch { name = "fix-key-expiry.patch"; @@ -46,6 +49,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libassuan-prefix=${libassuan.dev}" ] ++ lib.optional pythonSupport "--enable-languages=python"; NIX_CFLAGS_COMPILE = diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix index d4e7b8c5da42..247a74e3a325 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/good/default.nix @@ -6,6 +6,9 @@ , libsoup, libpulseaudio, libintl , darwin, lame, mpg123, twolame , gtkSupport ? false, gtk3 ? null +, libXdamage +, libXext +, libXfixes , ncurses }: @@ -49,6 +52,11 @@ stdenv.mkDerivation rec { libdv libvpx speex flac taglib cairo gdk_pixbuf aalib libcaca libsoup libshout lame mpg123 twolame libintl + # TODO: Remove the comments once https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/commit/e234932dc703e51a0e1aa3b9c408f12758b12335 + # is merged and available in nixpkgs. + libXdamage # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 + libXext # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 + libXfixes # present feature but undeclared in meson_options.txt, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/553 ncurses ] ++ optional gtkSupport gtk3 # for gtksink diff --git a/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix new file mode 100644 index 000000000000..6ab10c24d3dc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, autoPatchelfHook, cmake, pkgconfig, libdrm, libpciaccess +, libva , libX11, libXau, libXdmcp, libpthreadstubs +}: + +stdenv.mkDerivation rec { + name = "intel-media-sdk-${version}"; + version = "18.4.1"; + + src = fetchurl { + url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; + sha256 = "0yqqw6hyjn28zk4f4wznqpyiz9vinnjj8067dim64bz1f4pjhyra"; + }; + + # patchelf is needed for binaries in $out/share/samples + nativeBuildInputs = [ autoPatchelfHook cmake pkgconfig ]; + buildInputs = [ + libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + description = "Intel Media SDK."; + license = licenses.mit; + maintainers = with maintainers; [ midchildan ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index ce41ffa4929f..f240ad124c8b 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.54/ ) diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index 5566b1f4f0e2..12f7b176bb7b 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { cmocka ]; + patches = [ + # CVE-2019-3824 + # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to + # https://bugzilla.samba.org/attachment.cgi?id=14857 + (fetchurl { + name = "CVE-2019-3824.patch"; + url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; + sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; + }) + ]; + preConfigure = '' sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf ''; diff --git a/nixpkgs/pkgs/development/libraries/libb2/default.nix b/nixpkgs/pkgs/development/libraries/libb2/default.nix index f7fffa8b2987..6a7720b99bcc 100644 --- a/nixpkgs/pkgs/development/libraries/libb2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libb2/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { name = "libb2-${version}"; - version = "0.98"; + version = "0.98.1"; - src = fetchurl { - url = "https://blake2.net/${name}.tar.gz"; - sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal"; + src = fetchFromGitHub { + owner = "BLAKE2"; + repo = "libb2"; + rev = "v${version}"; + sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; preConfigure = '' @@ -16,14 +18,15 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; doCheck = true; meta = with stdenv.lib; { description = "The BLAKE2 family of cryptographic hash functions"; + homepage = https://blake2.net/; platforms = platforms.all; - maintainers = with maintainers; [ dfoxfranke ]; + maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; }; } diff --git a/nixpkgs/pkgs/development/libraries/libcaca/default.nix b/nixpkgs/pkgs/development/libraries/libcaca/default.nix index 04e1af2326b6..8949ea8e390e 100644 --- a/nixpkgs/pkgs/development/libraries/libcaca/default.nix +++ b/nixpkgs/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: +{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +, x11Support ? !stdenv.isDarwin, libX11, libXext +}: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,8 +15,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] - ++ stdenv.lib.optional stdenv.isDarwin libXext; + configureFlags = [ + (if x11Support then "--enable-x11" else "--disable-x11") + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext]; postInstall = '' mkdir -p $dev/bin diff --git a/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/nixpkgs/pkgs/development/libraries/libconfig/default.nix index 7c569b2e92d1..cdc225c8bf73 100644 --- a/nixpkgs/pkgs/development/libraries/libconfig/default.nix +++ b/nixpkgs/pkgs/development/libraries/libconfig/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libconfig-${version}"; - version = "1.5"; + pname = "libconfig"; + version = "1.7.2"; src = fetchurl { - url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz"; - sha256 = "e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6"; + url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; + sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; }; + doCheck = true; + meta = with stdenv.lib; { homepage = http://www.hyperrealm.com/libconfig; description = "A simple library for processing structured configuration files"; diff --git a/nixpkgs/pkgs/development/libraries/libdap/default.nix b/nixpkgs/pkgs/development/libraries/libdap/default.nix index c0ec9d927a83..067144ddfa0c 100644 --- a/nixpkgs/pkgs/development/libraries/libdap/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.2"; + version = "3.20.3"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0"; + sha256 = "0n6ciicaa7sn88gvg5sgcq0438i3vh6xbl9lxgafjqiznli1k5i9"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix index 59651af2b8cf..6a26910c8bd6 100644 --- a/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libebml-${version}"; - version = "1.3.6"; + pname = "libebml"; + version = "1.3.7"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs"; + sha256 = "0pdfl83nbbdddbxajx34srg4mcfcz8ca21qyvlnpw81hfnrhmjkv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/nixpkgs/pkgs/development/libraries/libextractor/default.nix index b2d9af657a93..bc371423e439 100644 --- a/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.8"; + name = "libextractor-1.9"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2"; + sha256 = "1zz2zvikvfibxnk1va3kgzs7djsmiqy7bmk8y01vbsf54ryjb3zh"; }; preConfigure = diff --git a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix index bbc694619d4c..6df996f30999 100644 --- a/nixpkgs/pkgs/development/libraries/libmatroska/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmatroska/default.nix @@ -2,14 +2,14 @@ , libebml }: stdenv.mkDerivation rec { - name = "libmatroska-${version}"; - version = "1.4.9"; + pname = "libmatroska"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86"; + sha256 = "01kp48ih9pqkm518ylbxicjmknqvb3njb71il2h2wa37whsaals8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix new file mode 100644 index 000000000000..3c55a6b036cc --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmicrodns/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +}: + +stdenv.mkDerivation rec { + version = "0.0.10"; + pname = "libmicrodns"; + + src = fetchFromGitHub { + owner = "videolabs"; + repo = pname; + rev = version; + sha256 = "1xvl9k49ng35wbsqmnjnyqvkyjf8dcq2ywsq3jp3wh0rgmxhq2fh"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + meta = with stdenv.lib; { + description = "Minimal mDNS resolver library, used by VLC"; + homepage = https://github.com/videolabs/libmicrodns; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.shazow ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix index 10bd7af7fadd..d1ee30698a09 100644 --- a/nixpkgs/pkgs/development/libraries/libmodbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmodbus/default.nix @@ -8,6 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0drnil8bzd4n4qb0wv3ilm9zvypxvwmzd65w96d6kfm7x6q65j68"; }; + configureFlags = [ + # when cross-compiling we assume that the host system will return a valid + # pointer for calls to malloc(0) or realloc(0) + # https://www.uclibc.org/FAQ.html#gnu_malloc + # https://www.gnu.org/software/autoconf/manual/autoconf.html#index-AC_005fFUNC_005fMALLOC-454 + # the upstream source should be patched to avoid needing this + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = with stdenv.lib; { description = "Library to send/receive data according to the Modbus protocol"; homepage = http://libmodbus.org/; diff --git a/nixpkgs/pkgs/development/libraries/libndctl/default.nix b/nixpkgs/pkgs/development/libraries/libndctl/default.nix index 0a36b9bb2ddb..ae12bd03813c 100644 --- a/nixpkgs/pkgs/development/libraries/libndctl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libndctl/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt + which ]; buildInputs = @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs test - substituteInPlace configure.ac --replace "which" "${which}/bin/which" substituteInPlace git-version --replace /bin/bash ${stdenv.shell} substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell} diff --git a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index ff7b7a1af1f3..fc753fe76696 100644 --- a/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.3.3"; + version = "6.4.2"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1gfi4ghnhzlkdza2ifvg6b2rk5qn0swq7ykphwmwalb166vj2wlx"; + sha256 = "1s9gbznhak4nvpv56v38pgyki37rlmr0rgc1249ahhv0yfbcf74j"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 96b926d3d2b9..4aa33236a9eb 100644 --- a/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -2,14 +2,14 @@ autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { - name = "libqalculate-${version}"; - version = "2.9.0"; + pname = "libqalculate"; + version = "3.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i"; + sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q"; }; outputs = [ "out" "dev" "doc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace libqalculate/Calculator.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ - --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"' + --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' '' + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace src/qalc.cc \ --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' diff --git a/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 875e0a97ae2e..918335597c9b 100644 --- a/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librealsense-${version}"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "IntelRealSense"; repo = "librealsense"; rev = "v${version}"; - sha256 = "09s0rhjpvaa89767m58wk1bqcmdkjk7brwj32k083f2wsdbbzb11"; + sha256 = "03ljn4igi8l1fd1nvpn448d3sqvxyl0r0l9sbkimlx77g52wjv2j"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix index 7803b2a5ff11..f53db7241cf7 100644 --- a/nixpkgs/pkgs/development/libraries/libsoundio/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoundio/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio, AudioUnit }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "2.0.0"; name = "libsoundio-${version}"; src = fetchFromGitHub { owner = "andrewrk"; repo = "libsoundio"; rev = "${version}"; - sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; + sha256 = "12l4rvaypv87vigdrmjz48d4d6sq4gfxf5asvnc4adyabxb73i4x"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libunity/default.nix b/nixpkgs/pkgs/development/libraries/libunity/default.nix index 52f01229c4af..a0ec3b74cc17 100644 --- a/nixpkgs/pkgs/development/libraries/libunity/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunity/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool -, glib, vala, dee, gobject-introspection, libdbusmenu -, gtk3, intltool, gnome-common, python3, icu }: +{ stdenv +, fetchgit +, pkgconfig +, glib +, vala +, dee +, gobject-introspection +, libdbusmenu +, gtk3 +, intltool +, python3 +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "libunity"; - version = "7.1.4"; + version = "unstable-2019-03-19"; - name = "${pname}-${version}"; + outputs = [ "out" "dev" "py" ]; - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; - sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libunity"; + rev = "import/7.1.4+19.04.20190319-0ubuntu1"; + sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; }; nativeBuildInputs = [ - autoconf - automake - gnome-common + autoreconfHook gobject-introspection intltool - libtool pkgconfig python3 vala @@ -32,17 +38,20 @@ stdenv.mkDerivation rec { gtk3 ]; - propagatedBuildInputs = [ dee libdbusmenu ]; + propagatedBuildInputs = [ + dee + libdbusmenu + ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + preConfigure = '' + intltoolize + ''; configureFlags = [ "--disable-static" - "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" ]; - NIX_LDFLAGS = "-L${icu}/lib"; - meta = with stdenv.lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; homepage = https://launchpad.net/libunity; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index 1293b0af8cce..12fd972b8719 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gfortran, perl }: let - version = "4.2.3"; + version = "4.3.4"; in stdenv.mkDerivation { name = "libxc-${version}"; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02"; + sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8"; }; buildInputs = [ gfortran ]; diff --git a/nixpkgs/pkgs/development/libraries/libxl/default.nix b/nixpkgs/pkgs/development/libraries/libxl/default.nix index 471789d3e0f6..44949cf2deb4 100644 --- a/nixpkgs/pkgs/development/libraries/libxl/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.1"; + version = "3.8.4"; src = fetchurl { url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm"; + sha256 = "0jnvc9ilir3lvs81l6ldnyf6jbfsy7bcs5pkc75qfnvz01y7p6as"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/nixpkgs/pkgs/development/libraries/libykclient/default.nix new file mode 100644 index 000000000000..9aa189586f05 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libykclient/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, curl }: + +stdenv.mkDerivation rec { + pname = "libykclient"; + version = "unstable-2019-03-18"; + src = fetchFromGitHub { + owner = "Yubico"; + repo = "yubico-c-client"; + rev = "ad9eda6aac4c3f81784607c30b971f4a050b5c2e"; + sha256 = "01b19jgv2lypih6lhw9yjjsfl8q1ahl955vhr2ai8ccshh0050yj"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig help2man ]; + buildInputs = [ curl ]; + + meta = with stdenv.lib; { + description = "Yubikey C client library"; + homepage = https://developers.yubico.com/yubico-c-client; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/live555/default.nix b/nixpkgs/pkgs/development/libraries/live555/default.nix index 531261a58ca5..f9d07d8d7373 100644 --- a/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -3,14 +3,14 @@ # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { name = "live555-${version}"; - version = "2019.02.03"; + version = "2019.03.06"; src = fetchurl { # the upstream doesn't provide a stable URL urls = [ "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" ]; - sha256 = "04474r1drvgjpk33yjj79dq2hq15ncw8y3w6g9625zryan8qv4qw"; + sha256 = "1gasdl95yjabv811knkmy5laj21a54z1jdfq36jdj984k1nw5l0b"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/matio/default.nix b/nixpkgs/pkgs/development/libraries/matio/default.nix index f28ff1b0a21f..72743efeb8ef 100644 --- a/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.13"; + name = "matio-1.5.14"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy"; + sha256 = "0vhzh0idzlm0m28gxsnv1dcfp0229vdj49d749qn4xfdyncbnfhb"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/minixml/default.nix b/nixpkgs/pkgs/development/libraries/minixml/default.nix index c2a61ec6fc1c..972cc3e738c7 100644 --- a/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mxml-${version}"; - version = "2.12"; + version = "3.0"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "1m8z503vnfpm576gjpp1h7zmx09n50if2i28v24yx80j820ip94s"; + sha256 = "0madp2v2md3xq96aham91byns6qy4byd5pbg28q827fdahfhpmq7"; }; enableParallelBuilding = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small XML library"; homepage = https://www.msweet.org/mxml/; - license = licenses.lgpl2; + license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; }; diff --git a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 15c82cb12825..3ab1e0a79749 100644 --- a/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig , boost, openssl, zlib, libsodium, olm, gtest, spdlog, nlohmann_json }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "19v1qa6mzvc65m7wy7x0g4i24bcg9xk31y1grwvd3zr0l4v6xcgs"; }; + patches = [ + # remove on the next mtxclient update + (fetchpatch { + url = "https://github.com/Nheko-Reborn/mtxclient/commit/41314809da7eb17ec00cff1795af6a528c5e904a.diff"; + sha256 = "17pzrkdhd4jr8xwd7hhyzak880k8yb9nkg3vcbyjfp5si89dha5j"; + }) + ]; + postPatch = '' ln -s ${nlohmann_json}/include/nlohmann/json.hpp include/json.hpp ''; diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index eb737c0757d9..129cc7ed84c3 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,14 +2,14 @@ }: stdenv.mkDerivation rec { - name = "nlohmann_json-${version}"; - version = "3.5.0"; + pname = "nlohmann_json"; + version = "3.6.1"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji"; + sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/nuspell/default.nix b/nixpkgs/pkgs/development/libraries/nuspell/default.nix index 1d92a15ce005..b667dea8d49f 100644 --- a/nixpkgs/pkgs/development/libraries/nuspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/nuspell/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, boost, icu, catch2 }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2 }: stdenv.mkDerivation rec { name = "nuspell-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "0gcw3p1agnx474r7kv27y9jyab20p4j4xx7j9a2yssg54qabm71j"; + sha256 = "17khkb1sxn1p6rfql72l7a4lxafbxj0dwi95hsmyi6wajvfrg9sy"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost icu ]; enableParallelBuilding = true; - preBuild = '' - ln -s ${catch2}/include/catch2/*.hpp tests/ + postPatch = '' + rm -rf external/Catch2 + ln -sf ${catch2.src} external/Catch2 ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix index 3b0354b9fe8e..c11098c52ab8 100644 --- a/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/opentracing-cpp/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "opentracing-cpp-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "opentracing"; repo = "opentracing-cpp"; rev = "v${version}"; - sha256 = "09hxj59vvz1ncbx4iblgfc3b5i74hvb3vx5245bwwwfkx5cnj1gg"; + sha256 = "04kw19g8qrv3kd40va3sqbfish7kfczkdpxdwraifk9950wfs3gx"; }; buildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/osip/default.nix b/nixpkgs/pkgs/development/libraries/osip/default.nix index 6ee934c60c3a..ce917ccbe7f4 100644 --- a/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "00yznbrm9q04wgd4b831km8iwlvwvsnwv87igf79g5vj9yakr88q"; + sha256 = "0igic785fh458ck33kxb6i34l7bzdp9zpfjy5dxrcvv5gacklms0"; }; name = "libosip2-${version}"; diff --git a/nixpkgs/pkgs/development/libraries/pcl/default.nix b/nixpkgs/pkgs/development/libraries/pcl/default.nix index 14eff45e4a17..08a1613c2feb 100644 --- a/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -4,23 +4,15 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.8.1"; + name = "pcl-1.9.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq"; + sha256 = "0g0am3bf14sadfw231l5nmf5d2g1p9i7yq12c6q8rl7nw501ny9j"; }; - patches = [ - # boost-1.67 compatibility - (fetchpatch { - url = "https://github.com/PointCloudLibrary/pcl/commit/2309bdab20fb2a385d374db6a87349199279db18.patch"; - sha256 = "112p4687xrm0vsm0magmkvsm1hpks9hj42fm0lncy3yy2j1v3r4h"; - name = "boost167-random.patch"; - })]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix index 773478f4dc03..829ecdb86e06 100644 --- a/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/nixpkgs/pkgs/development/libraries/phonon/backends/vlc.nix @@ -7,7 +7,7 @@ with lib; let - v = "0.10.1"; + v = "0.10.2"; pname = "phonon-backend-vlc"; in @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; - sha256 = "0b87mzkw9fdkrwgnh1kw5i5wnrd05rl42hynlykb7cfymsk6v5h9"; + sha256 = "163jqq5p9n0yfw2fqk0cqn3c6mqycxsvc4956zhkw5345g81a2a9"; }; buildInputs = diff --git a/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch b/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch index c1c8f618fbb3..e90000efe2db 100644 --- a/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch +++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/bad_code.patch @@ -37,3 +37,14 @@ index d25288e..be354df 100644 }; typedef double (igrid::*transform_t)(double) const; +diff --git a/src/lumi_pdf.cxx b/src/lumi_pdf.cxx +--- a/src/lumi_pdf.cxx ++++ b/src/lumi_pdf.cxx +@@ -235,6 +235,6 @@ void lumi_pdf::write(const std::string& filename) const { + // std::string lumi_pdf::summary(std::ostream& s=std::cout) const { + std::string lumi_pdf::summary() const { + std::stringstream s; +- s << "lumi_pdf::lumi_pdf() " << s << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this; ++ s << "lumi_pdf::lumi_pdf() " << "\tsize " << m_combinations.size() << " lookup size " << m_lookup.size() << " " << this; + return s.str(); + } diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 722dccaea7be..7a146bb7309a 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.1.4"; + version = "7.1.5"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx"; + sha256 = "0jnrv59zfa41gc37pqr3vaiz5jkh7w0k0alcax37b3mlbsnacr9r"; }; nativeBuildInputs = [ autoconf automake libtool ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); postPatch = '' - patchShebangs ./cat_with_cpplines + patchShebangs ./ ''; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index 63bc3c06e102..046413c64f49 100644 --- a/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "thepeg-${version}"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320"; + sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6"; }; buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ]; diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix new file mode 100644 index 000000000000..06444e776703 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchurl, cmake, pkgconfig, gtest, doxygen +, graphviz, lcov, writeText }: + +stdenv.mkDerivation rec { + pname = "properties-cpp"; + version = "0.0.1"; + + src = let srcver = version+"+14.10.20140730"; in + fetchurl { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz"; + sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w"; + }; + + buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ]; + + patchPhase = '' + sed -i "/add_subdirectory(tests)/d" CMakeLists.txt + ''; + + meta = with stdenv.lib; { + homepage = https://launchpad.net/properties-cpp; + description = "A very simple convenience library for handling properties and signals in C++11."; + license = licenses.lgpl3; + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix index 32245929ce62..379c370e1fcc 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix @@ -64,7 +64,11 @@ let qttools = [ ./qttools.patch ]; qtwebengine = [ ./qtwebengine-no-build-skip.patch ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch - ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; + ++ optionals stdenv.isDarwin [ + ./qtwebengine-darwin-no-platform-check.patch + ./qtwebengine-darwin-sdk-10.10.patch + ./qtwebengine-darwin-old-sdk.patch + ]; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh index dc1088fc371c..2ab3dd71c24f 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..3e1a8762b361 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,37 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(7, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch new file mode 100644 index 000000000000..b065c2211017 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch @@ -0,0 +1,21 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm +@@ -45,7 +45,7 @@ NSString *RTCFieldTrialTrendlineFilterValue( + return [NSString stringWithFormat:format, windowSize, smoothingCoeff, thresholdGain]; + } + +-void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials) { ++void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) { + if (!fieldTrials) { + RTCLogWarning(@"No fieldTrials provided."); + return; +diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h ++++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h +@@ -40,4 +40,4 @@ RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue( + * Must be called before any other call into WebRTC. See: + * webrtc/system_wrappers/include/field_trial_default.h + */ +-RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials); ++RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials); diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index bc6432b5ca5a..6d0e241d7a54 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -63,7 +63,8 @@ let qtwebengine = [ ./qtwebengine-no-build-skip.patch ./qtwebengine-CVE-2019-5786.patch - ]; + ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] ++ optionals stdenv.isDarwin [ ./qtwebkit-darwin-no-readline.patch diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh index b77a58cafa2e..aa3a0fe94898 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.0/submodules/ ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..364330169bf1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,21 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh index ee3a5ddf8deb..bb9eb66a01dc 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/fetch.sh @@ -1,3 +1,2 @@ WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/ \ - http://download.qt.io/community_releases/5.6/5.6.3/ \ - -A '*.tar.xz' ) + http://download.qt.io/community_releases/5.6/5.6.3/ ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix index 589f175efd9c..be84691e6c33 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,7 +43,9 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ] + ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ]; qtvirtualkeyboard = [ (fetchpatch { diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh index e631d3ae9b00..17ebe1e532df 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ \ - -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ ) diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch new file mode 100644 index 000000000000..cf082cddd11a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-clang-fix.patch @@ -0,0 +1,38 @@ +Fix a following build error: + +In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7: +In file included from ../../3rdparty/chromium/base/bind.h:8: +../../3rdparty/chromium/base/bind_internal.h:214:31: error: cannot initialize a parameter of type 'NSError *' with an lvalue of type 'const long' + return (receiver.*method)(std::forward<RunArgs>(args)...); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +../../3rdparty/chromium/base/bind_internal.h:285:20: note: in instantiation of function template specialization 'base::internal::FunctorTraits<void (device::BluetoothRemoteGat +tCharacteristicMac::*)(NSError *), void>::Invoke<device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here + return Traits::Invoke(std::forward<Functor>(functor), + ^ +../../3rdparty/chromium/base/bind_internal.h:361:43: note: in instantiation of function template specialization 'base::internal::InvokeHelper<false, void>::MakeItSo<void (devi +ce::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), device::BluetoothRemoteGattCharacteristicMac *, const long &>' requested here + return InvokeHelper<is_weak_call, R>::MakeItSo( + ^ +../../3rdparty/chromium/base/bind_internal.h:339:12: note: in instantiation of function template specialization 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::RunImpl<void (device::BluetoothRemoteGattCharacteristicMac::*const &)(NSError *), const std::__1::tuple<base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long> &, 0, 1>' requested here + return RunImpl(storage->functor_, + ^ +../../3rdparty/chromium/base/bind.h:62:45: note: in instantiation of member function 'base::internal::Invoker<base::internal::BindState<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>, void ()>::Run' requested here + PolymorphicInvoke invoke_func = &Invoker::Run; + ^ +../../3rdparty/chromium/base/bind.h:77:10: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + return BindRepeating(std::forward<Functor>(functor), + ^ +../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:241:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::internal::UnretainedWrapper<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, + +--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm ++++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm +@@ -239,7 +239,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic( + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, + base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue, +- base::Unretained(this), nil)); ++ base::Unretained(this), nullptr)); + } + } + diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 000000000000..7156c41c5ec1 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,50 @@ +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -194,9 +194,6 @@ defineTest(runConfigure) { + } else { + log("Native Spellchecker .............. Not enabled (Default, enable with WEBENGINE_CONFIG+=use_native_spellchecker)$${EOL}") + } +- !isMinOSXSDKVersion(10, 10, 3) { +- log(" Force Touch API usage .............. Not enabled (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}") +- } + } + } + +diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf +--- a/mkspecs/features/functions.prf ++++ b/mkspecs/features/functions.prf +@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) { + return(false) + } + } else:osx { +- !isMinXcodeVersion(5, 1) { +- skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.") +- return(false) +- } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") + return(false) +@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) { + skipBuild("Qt WebEngine requires OS X version 10.10 or newer.") + return(false) + } +- !isMinOSXSDKVersion(10, 10): { +- skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) +- } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.") + return(false) +diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri +--- a/src/core/config/mac_osx.pri ++++ b/src/core/config/mac_osx.pri +@@ -5,8 +5,6 @@ load(functions) + # otherwise query for it. + QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) + isEmpty(QMAKE_MAC_SDK_VERSION) { +- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") + } + + QMAKE_CLANG_DIR = "/usr" diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index ddb828323371..91b7acf43654 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -67,32 +67,12 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + optionalString stdenv.isDarwin ('' - # Remove annoying xcode check - substituteInPlace mkspecs/features/platform.prf \ - --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false \ - --replace "/usr/bin/xcodebuild" "xcodebuild" - - substituteInPlace src/3rdparty/chromium/build/mac_toolchain.py \ - --replace "/usr/bin/xcode-select" "xcode-select" - substituteInPlace src/core/config/mac_osx.pri \ - --replace /usr ${stdenv.cc} \ - --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false - + --replace /usr ${stdenv.cc} '' - # TODO remove when new Apple SDK is in - + (if lib.versionOlder qtCompatVersion "5.11" then '' - substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \ - --replace "NSArray<NSString*>*" "NSArray*" - substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \ - --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \ - --replace "NSArray<VNRequest*>*" "NSArray*" \ - --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption" - '' else '' - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm \ - --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" - substituteInPlace src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h \ - --replace "NSDictionary<NSString *, NSString *> *" "NSDictionary*" + + (optionalString (lib.versionAtLeast qtCompatVersion "5.11") '' + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ + --replace '$sysroot/usr' "${darwin.xnu}" '') + '' @@ -114,9 +94,6 @@ print('sdk_platform_path=""') print('sdk_build="17B41"') EOF - substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ - --replace '$sysroot/usr' "${darwin.xnu}" - # Apple has some secret stuff they don't share with OpenBSM substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index d7967d409792..840891d55ef9 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.11.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "17fah3x71ipnzvlj0yg8hfmqkk91s942z34p681r4k8giv7avm30"; + sha256 = "1k4lk2vvvni87brs3j51by3j69ff2892jiq2f4979sxncq0apzlg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 2a6c4af43fc3..05373cd1cbda 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,32 +1,48 @@ -{ stdenv, fetchurl, autoconf, automake, gettext, libtool -, gfortran, openblas }: +{ stdenv, fetchFromGitHub, cmake +, gfortran, openblas, eigen }: with stdenv.lib; let - version = "3.6.3"; + version = "3.7.0"; in stdenv.mkDerivation { name = "arpack-${version}"; - src = fetchurl { - url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4"; + src = fetchFromGitHub { + owner = "opencollab"; + repo = "arpack-ng"; + rev = version; + sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr"; }; - nativeBuildInputs = [ autoconf automake gettext libtool ]; - buildInputs = [ gfortran openblas ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ gfortran openblas eigen ]; doCheck = true; BLAS_LIBS = "-L${openblas}/lib -lopenblas"; - INTERFACE64 = optional openblas.blas64 "1"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DINTERFACE64=${optionalString openblas.blas64 "1"}" + ]; + + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + '' else '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib + '' + '' + # Prevent tests from using all cores + export OMP_NUM_THREADS=2 + ''; - preConfigure = '' - ./bootstrap + postInstall = '' + mkdir -p $out/lib/pkgconfig + cp arpack.pc $out/lib/pkgconfig/ ''; + meta = { homepage = https://github.com/opencollab/arpack-ng; description = '' diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index 7a653a58eb2a..40dbfc53e2cb 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix @@ -8,21 +8,20 @@ , ocl-icd , opencl-headers , Accelerate, CoreGraphics, CoreVideo, OpenCL -, gtest }: stdenv.mkDerivation rec { - name = "clblas-${version}"; + name = "clblas-${version}"; version = "2.12"; src = fetchFromGitHub { - owner = "clMathLibraries"; + owner = "clMathLibraries"; repo = "clBLAS"; rev = "v${version}"; sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs"; - }; + }; - patches = [ ./platform.patch ]; + patches = [ ./platform.patch ]; postPatch = '' sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DUSE_SYSTEM_GTEST=ON" + "-DBUILD_TEST=OFF" ]; buildInputs = [ @@ -42,7 +41,6 @@ stdenv.mkDerivation rec { blas python boost - gtest ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ ocl-icd opencl-headers @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/clMathLibraries/clBLAS"; description = "A software library containing BLAS functions written in OpenCL"; longDescription = '' - This package contains a library of BLAS functions on top of OpenCL. + This package contains a library of BLAS functions on top of OpenCL. ''; license = licenses.asl20; maintainers = with maintainers; [ artuuge ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 0801238fb121..1e166427a265 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -6,19 +6,19 @@ stdenvNoCC.mkDerivation rec { name = "mkl-${version}"; version = "${date}.${rel}"; - date = "2019.0"; - rel = "117"; + date = "2019.3"; + rel = "199"; src = if stdenvNoCC.isDarwin then (fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13565/m_mkl_${version}.dmg"; - sha256 = "1f1jppac7vqwn00hkws0p4njx38ajh0n25bsjyb5d7jcacwfvm02"; + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15235/m_mkl_${version}.dmg"; + sha256 = "14b3ciz7995sqcd6jz7hc8g2x4zwvqxmgxgni46vrlb7n523l62f"; }) else (fetchurl { - url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13575/l_mkl_${version}.tgz"; - sha256 = "1bf7i54iqlf7x7fn8kqwmi06g30sxr6nq3ac0r871i6g0p3y47sf"; + url = "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15275/l_mkl_${version}.tgz"; + sha256 = "13rb2v2872jmvzcqm4fqsvhry0j2r5cn4lqql4wpqbl1yia2pph6"; }); buildInputs = if stdenvNoCC.isDarwin then [ undmg ] else [ rpmextract ]; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { '' else '' rpmextract rpm/intel-mkl-common-c-${date}-${rel}-${date}-${rel}.noarch.rpm rpmextract rpm/intel-mkl-core-rt-${date}-${rel}-${date}-${rel}.x86_64.rpm - rpmextract rpm/intel-openmp-19.0.0-${rel}-19.0.0-${rel}.x86_64.rpm + rpmextract rpm/intel-openmp-19.0.3-${rel}-19.0.3-${rel}.x86_64.rpm ''; installPhase = if stdenvNoCC.isDarwin then '' @@ -60,8 +60,8 @@ stdenvNoCC.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = if stdenvNoCC.isDarwin - then "00d49ls9vcjan1ngq2wx2q4p6lnm05zwh67hsmj7bnq43ykrfibw" - else "1amagcaan0hk3x9v7gg03gkw02n066v4kmjb32yyzsy5rfrivb1a"; + then "0rwm46v9amq2clm6wxhr98zzbafr485dz05pihlqsbrbabmlfw30" + else "101krzh2mjbfx8kvxim2zphdvgg7iijhbf9xdz3ad3ncgybxbdvw"; meta = with stdenvNoCC.lib; { description = "Intel Math Kernel Library"; diff --git a/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix new file mode 100644 index 000000000000..40d272fd07d6 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/spirv-headers/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + name = "spirv-headers-${version}"; + version = "2019.1"; # spirv-tools version whose DEPS file calls for this commit + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; # from spirv-tools' DEPS + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Machine-readable components of the Khronos SPIR-V Registry"; + license = licenses.mit; + maintainers = [ maintainers.ralith ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/tbb/default.nix b/nixpkgs/pkgs/development/libraries/tbb/default.nix index d8a74bdf591d..615ac4fa690c 100644 --- a/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U5"; + version = "2019_U5"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp"; + sha256 = "0390da1iya2mvn3ribjb1f8yvzsqsf5b16wn6dqbjxcz0crmwlzk"; }; makeFlags = concatStringsSep " " ( @@ -19,11 +19,10 @@ with stdenv.lib; stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; installPhase = '' - mkdir -p $out/{lib,share/doc} + mkdir -p $out/lib cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ mv include $out/ rm $out/include/index.html - mv doc/html $out/share/doc/tbb ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/tepl/default.nix b/nixpkgs/pkgs/development/libraries/tepl/default.nix index 7501f9ab6f15..0ca382baeca3 100644 --- a/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: +, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: let version = "4.2.0"; pname = "tepl"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { libxml2 gtksourceview4 libuchardet - gnome3.gtk + gtk3 ]; doCheck = false; diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index d7dd0f76cd59..b092a973bc21 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "194k0gg75ygclwhb205zr26qrnx4hsik7pbazs39yf15js55bksv"; + sha256 = "0bbi1vpca5j7jbvy2z76jilpf5km5as1k37bkb2mwzmpibnypmf1"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/uthash/default.nix b/nixpkgs/pkgs/development/libraries/uthash/default.nix index 57a1cbf73c2c..b80984303d76 100644 --- a/nixpkgs/pkgs/development/libraries/uthash/default.nix +++ b/nixpkgs/pkgs/development/libraries/uthash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl }: let - version = "2.0.2"; + version = "2.1.0"; in stdenv.mkDerivation rec { name = "uthash-${version}"; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; - sha256 = "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl"; + sha256 = "17k6k97n20jpi9zj3lzvqfw8pv670r6rdqrjf8vrbx6hcj7csb0m"; }; dontBuild = false; diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix index ecc6b7c30fc7..abdf9fbeed3c 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "vapoursynth-mvtools-${version}"; - version = "20"; + version = "21"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "0nbq04wbmz7xqfcfpdvgg0p8xhh2xdcwhhx5gwr4j8bm611v0npz"; + sha256 = "0vjxpp4jmmjhcp8z81idsbgq6jyx0l4r4i32b8alnp6c9fahjh6p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix index c93ba1b12909..5a3216583085 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "vulkan-headers-${version}"; - version = "1.1.85"; + version = "1.1.101.0"; buildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "2fd5a24ec4a6df303b2155b3f85b6b8c1d56f6c0"; - sha256 = "0cj4bd396qddh3nxvr7grnpfz89g3sbvm21cx4k3ga52sp1rslpb"; + rev = "sdk-${version}"; + sha256 = "1rrpkibi4lnd9j63aarjk74z0xf4sy30zh8psq1vj92r21hfjr6m"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix index 6f720857f7cf..04266361ea52 100644 --- a/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix +++ b/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix @@ -2,7 +2,7 @@ , xlibsWrapper, libxcb, libXrandr, libXext, wayland, libGL_driver }: let - version = "1.1.85"; + version = "1.1.101.0"; in assert version == vulkan-headers.version; @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "b02f64293680c484e1d7ff6ecb88f89277c0dc8c"; - sha256 = "1n4vjyxlmi2ygx34srwbvalc5gz95gcsrmdw0k10353xja755gmj"; + rev = "sdk-${version}"; + sha256 = "0x891bha9mlsh4cvq59d1qnb4fnalwf6ml2b9y221cr7hikilamw"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,10 +28,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - postInstall = '' - cp -r "${vulkan-headers}/include" "$dev" - ''; - meta = with stdenv.lib; { description = "LunarG Vulkan loader"; homepage = https://www.lunarg.com; diff --git a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 8f3808bffcbc..e7feaabc739a 100644 --- a/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.15.7"; + version = "4.0.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "128z1f7nry278kdjzq950cr81bml8p17fgdchmpvy0awhh7r20y9"; + sha256 = "155lmgz81ky0x04c8m2yzlsm58i9jk6hiw1ajc3wizvbpczbca57"; }; configureFlags = [ "--enable-all" ]; diff --git a/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix new file mode 100644 index 000000000000..5d7d0e664c64 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, asciidoc, libxslt, docbook_xsl +, pam, yubikey-personalization, libyubikey, libykclient }: + +stdenv.mkDerivation rec { + pname = "yubico-pam"; + version = "unstable-2019-03-19"; + src = fetchFromGitHub { + owner = "Yubico"; + repo = pname; + rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704"; + sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ]; + buildInputs = [ pam yubikey-personalization libyubikey libykclient ]; + + meta = with stdenv.lib; { + description = "Yubico PAM module"; + homepage = https://developers.yubico.com/yubico-pam; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index face797fe2a3..3343f22b7b0b 100644 --- a/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/nixpkgs/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -10,11 +10,13 @@ in { stumpwm = x:{ overrides = y: (x.overrides y) // { + linkedSystems = []; preConfigure = '' export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \ + '(function stumpwm:stumpwm)' '$linkedSystems'" "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" diff --git a/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix new file mode 100644 index 000000000000..a6f84bc86d7d --- /dev/null +++ b/nixpkgs/pkgs/development/misc/msp430/gcc-support.nix @@ -0,0 +1,31 @@ +{ stdenvNoCC, fetchzip }: + +let + mspgccVersion = "6_1_0_0"; + version = "1.206"; +in stdenvNoCC.mkDerivation { + name = "msp430-gcc-support-files-${version}"; + src = fetchzip { + url = "http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/${mspgccVersion}/exports/msp430-gcc-support-files-${version}.zip"; + sha256 = "0h297jms3gkmdcqmfpr3cg6v9wxnms34qbwvwl2fkmrz20vk766q"; + }; + + buildCommand = '' + find $src/include -name '*.ld' | xargs install -Dm0644 -t $out/lib + find $src/include -name '*.h' | xargs install -Dm0644 -t $out/include + install -Dm0644 -t $out/include $src/include/devices.csv + + # appease bintoolsWrapper_addLDVars, search path needed for ld scripts + touch $out/lib/lib + ''; + + meta = with stdenvNoCC.lib; { + description = '' + Development headers and linker scripts for TI MSP430 microcontrollers + ''; + homepage = https://www.ti.com/tool/msp430-gcc-opensource; + license = licenses.bsd3; + platforms = [ "msp430-none" ]; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix new file mode 100644 index 000000000000..0456c8eae769 --- /dev/null +++ b/nixpkgs/pkgs/development/misc/msp430/mspdebug.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libusb, readline ? null }: + +let + version = "0.25"; +in stdenv.mkDerivation { + name = "mspdebug-${version}"; + src = fetchFromGitHub { + owner = "dlbeer"; + repo = "mspdebug"; + rev = "v${version}"; + sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; + }; + + buildInputs = [ libusb readline ]; + makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ + (if readline == null then [ "WITHOUT_READLINE=1" ] else []); + + meta = with stdenv.lib; { + description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; + homepage = https://dlbeer.co.nz/mspdebug/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ aerialx ]; + }; +} diff --git a/nixpkgs/pkgs/development/misc/msp430/newlib.nix b/nixpkgs/pkgs/development/misc/msp430/newlib.nix new file mode 100644 index 000000000000..4ea98bfc8b2e --- /dev/null +++ b/nixpkgs/pkgs/development/misc/msp430/newlib.nix @@ -0,0 +1,25 @@ +{ stdenvNoCC, lndir, newlib, msp430GccSupport }: + +stdenvNoCC.mkDerivation { + name = "msp430-${newlib.name}"; + inherit newlib; + inherit msp430GccSupport; + + preferLocalBuild = true; + allowSubstitutes = false; + + buildCommand = '' + mkdir $out + ${lndir}/bin/lndir -silent $newlib $out + ${lndir}/bin/lndir -silent $msp430GccSupport/include $out/${newlib.incdir} + ${lndir}/bin/lndir -silent $msp430GccSupport/lib $out/${newlib.libdir} + ''; + + passthru = { + inherit (newlib) incdir libdir; + }; + + meta = { + platforms = [ "msp430-none" ]; + }; +} diff --git a/nixpkgs/pkgs/development/node-packages/default-v10.nix b/nixpkgs/pkgs/development/node-packages/default-v10.nix index 56312f198e09..25fd7dbb4253 100644 --- a/nixpkgs/pkgs/development/node-packages/default-v10.nix +++ b/nixpkgs/pkgs/development/node-packages/default-v10.nix @@ -94,5 +94,4 @@ nodePackages // { webtorrent-cli = nodePackages.webtorrent-cli.override { buildInputs = [ nodePackages.node-gyp-build ]; }; - } diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v10.json b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json index 76edc76f445c..54261521a34d 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v10.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.json @@ -20,6 +20,7 @@ , "dhcp" , "dnschain" , "elasticdump" +, "elm-doc-preview" , "elm-live" , "elm-oracle" , "elm-test" @@ -44,6 +45,7 @@ , "ionic" , "ios-deploy" , "imapnotify" +, "indium" , "jake" , "javascript-typescript-langserver" , "jsdoc" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix index b0580d49c3fc..ea5dd14b8c2d 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v10.nix @@ -13,40 +13,40 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.3" = { + "@angular-devkit/architect-0.13.6" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.13.3"; + version = "0.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.3.tgz"; - sha512 = "89VL75bq3+h3m0jhzWNqXqW+HQcrihnM3i6eiUE6P81LcllP159JMlusAvB1LHLNc6Cc62wTq4BJr7KDILkPOA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.6.tgz"; + sha512 = "Cg9z4lmCvjt5uD00E/0tBRz3ESjYicmqT3NL/BIsNVNb+s1GwCCoPSOIM8Ss4nyGDtrdono1XKSOmkJnlzF3Cw=="; }; }; - "@angular-devkit/core-7.3.3" = { + "@angular-devkit/core-7.3.6" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "7.3.3"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.3.tgz"; - sha512 = "fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.6.tgz"; + sha512 = "aoarMK0DJIdwjVA0OuQIN7b8nKPcF9n5vSMF7MFmhKpTw5/uV3SynQZbm3YCgylu/2CMuiTzKuAunnWWdli//g=="; }; }; - "@angular-devkit/schematics-7.3.3" = { + "@angular-devkit/schematics-7.3.6" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "7.3.3"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.3.tgz"; - sha512 = "SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.6.tgz"; + sha512 = "YXF7QusmMy3D9H0vNczc1n5BkuEHLwt7cW33euNeGNgTIsD0n6DrUhgClurXicnr2GNPSDYE5+3115lmJkhyrg=="; }; }; - "@apollographql/apollo-tools-0.3.3" = { + "@apollographql/apollo-tools-0.3.5" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.3.3"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.3.tgz"; - sha512 = "/vLzZjloWB4xzgw2MRs9TUDIdCzS+No1hEClkEKqcnH86c2EgE/W0Dv2nkCTH9WxDrfryziJWbNMurYYkm61Zw=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.3.5.tgz"; + sha512 = "5ySiiNT2EIwxGKWyoAOnibCPUXvbxKOVxiPMK4uIXmvF+qbGNleQWP+vekciiAmCCESPmGd5szscRwDm4G/NNg=="; }; }; "@apollographql/graphql-playground-html-1.6.6" = { @@ -94,6 +94,15 @@ let sha512 = "jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA=="; }; }; + "@babel/core-7.4.0" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.4.0.tgz"; + sha512 = "Dzl7U0/T69DFOTwqz/FJdnOSWS57NpjNfCwMKHABr589Lg8uX1RrlBIJ7L5Dubt/xkLsx0xH5EBFzlBVes1ayA=="; + }; + }; "@babel/generator-7.0.0-beta.38" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -112,6 +121,15 @@ let sha512 = "8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg=="; }; }; + "@babel/generator-7.4.0" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.4.0.tgz"; + sha512 = "/v5I+a1jhGSKLgZDcmAUZ4K/VePi43eRkUs3yePW1HB1iANOD5tqJXwGSG4BZhSksP8J9ejSlwGeTiiOFZOrXQ=="; + }; + }; "@babel/helper-annotate-as-pure-7.0.0" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -139,31 +157,31 @@ let sha512 = "MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw=="; }; }; - "@babel/helper-call-delegate-7.1.0" = { + "@babel/helper-call-delegate-7.4.0" = { name = "_at_babel_slash_helper-call-delegate"; packageName = "@babel/helper-call-delegate"; - version = "7.1.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz"; - sha512 = "YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ=="; + url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.0.tgz"; + sha512 = "SdqDfbVdNQCBp3WhK2mNdDvHd3BD6qbmIc43CAyjnsfCmgHMeqgDcM3BzY2lchi7HBJGJ2CVdynLWbezaE4mmQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.3.4" = { + "@babel/helper-create-class-features-plugin-7.4.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz"; - sha512 = "uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.0.tgz"; + sha512 = "2K8NohdOT7P6Vyp23QH4w2IleP8yG3UJsbRKwA4YP6H8fErcLkFuuEEqbF2/BYBKSNci/FWJiqm6R3VhM/QHgw=="; }; }; - "@babel/helper-define-map-7.1.0" = { + "@babel/helper-define-map-7.4.0" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.1.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz"; - sha512 = "yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.0.tgz"; + sha512 = "wAhQ9HdnLIywERVcSvX40CEJwKdAa1ID4neI9NXQPDOHwwA+57DqwLiPEVy2AIyWzAk0CQ8qx4awO0VUURwLtA=="; }; }; "@babel/helper-explode-assignable-expression-7.1.0" = { @@ -193,13 +211,13 @@ let sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; }; }; - "@babel/helper-hoist-variables-7.0.0" = { + "@babel/helper-hoist-variables-7.4.0" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.0.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz"; - sha512 = "Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.0.tgz"; + sha512 = "/NErCuoe/et17IlAQFKWM24qtyYYie7sFIrW/tIQXpck6vAu2hhtYYsKLBWQV+BQZMbcIYPU/QMYuTufrY4aQw=="; }; }; "@babel/helper-member-expression-to-functions-7.0.0" = { @@ -265,13 +283,13 @@ let sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; }; }; - "@babel/helper-replace-supers-7.3.4" = { + "@babel/helper-replace-supers-7.4.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz"; - sha512 = "pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.0.tgz"; + sha512 = "PVwCVnWWAgnal+kJ+ZSAphzyl58XrFeSKSAJRiqg5QToTsjL+Xu1f9+RJ+d+Q0aPhPfBGaYfkox66k86thxNSg=="; }; }; "@babel/helper-simple-access-7.1.0" = { @@ -283,13 +301,13 @@ let sha512 = "Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w=="; }; }; - "@babel/helper-split-export-declaration-7.0.0" = { + "@babel/helper-split-export-declaration-7.4.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.0.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz"; - sha512 = "MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz"; + sha512 = "7Cuc6JZiYShaZnybDmfwhY4UYHzI6rlqhWjaIqbsJGsIqPimEYy5uh3akSRLMg65LSdSEnJ8a8/bWQN6u2oMGw=="; }; }; "@babel/helper-wrap-function-7.2.0" = { @@ -301,13 +319,13 @@ let sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; }; }; - "@babel/helpers-7.3.1" = { + "@babel/helpers-7.4.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.3.1"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.3.1.tgz"; - sha512 = "Q82R3jKsVpUV99mgX50gOPCWwco9Ec5Iln/8Vyu4osNIOQgSrd9RFrQeUvmvddFNoLwMyOUWU+5ckioEKpDoGA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.2.tgz"; + sha512 = "gQR1eQeroDzFBikhrCccm5Gs2xBjZ57DNjGbqTaHo911IpmSxflOQWMAHPw/TXk8L3isv7s9lYzUkexOeTQUYg=="; }; }; "@babel/highlight-7.0.0" = { @@ -328,6 +346,15 @@ let sha512 = "tXZCqWtlOOP4wgCp6RjRvLmfuhnqTLy9VHwRochJBCP2nDm27JnnuFEnXFASVyQNHk36jD1tAammsCEEqgscIQ=="; }; }; + "@babel/parser-7.4.2" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.4.2.tgz"; + sha512 = "9fJTDipQFvlfSVdD/JBtkiY0br9BtfvW2R8wo6CX/Ej2eMuV0gWPk1M67Mt3eggQvBqYW1FCEk8BN7WvGm/g5g=="; + }; + }; "@babel/plugin-external-helpers-7.0.0" = { name = "_at_babel_slash_plugin-external-helpers"; packageName = "@babel/plugin-external-helpers"; @@ -346,13 +373,13 @@ let sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.3.4" = { + "@babel/plugin-proposal-class-properties-7.4.0" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz"; - sha512 = "lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.0.tgz"; + sha512 = "t2ECPNOXsIeK1JxJNKmgbzQtoG27KIlVE61vTqX0DKR9E9sZlVVxWUtEW9D5FlZ8b8j7SBNCHY47GgPKCKlpPg=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -364,13 +391,13 @@ let sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.3.4" = { + "@babel/plugin-proposal-object-rest-spread-7.4.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz"; - sha512 = "j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.0.tgz"; + sha512 = "uTNi8pPYyUH2eWHyYWWSYJKwKg34hhgl4/dbejEjL+64OhbHjTX7wEVWMQl82tEmdDsGeu77+s8HHLS627h6OQ=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { @@ -382,13 +409,13 @@ let sha512 = "mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.2.0" = { + "@babel/plugin-proposal-unicode-property-regex-7.4.0" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.2.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz"; - sha512 = "LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.0.tgz"; + sha512 = "h/KjEZ3nK9wv1P1FSNb9G079jXrNYR0Ko+7XkOx85+gM24iZbPn0rh4vCftk+5QKY7y1uByFataBTmX7irEF1w=="; }; }; "@babel/plugin-syntax-async-generators-7.2.0" = { @@ -454,13 +481,13 @@ let sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.3.4" = { + "@babel/plugin-transform-async-to-generator-7.4.0" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz"; - sha512 = "Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.0.tgz"; + sha512 = "EeaFdCeUULM+GPFEsf7pFcNSxM7hYjoj5fiYbyuiXobW4JhFnjAv9OWzNwHyHcKoPNpAfeRDuW6VyaXEDUBa7g=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.2.0" = { @@ -472,22 +499,22 @@ let sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; }; }; - "@babel/plugin-transform-block-scoping-7.3.4" = { + "@babel/plugin-transform-block-scoping-7.4.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz"; - sha512 = "blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.0.tgz"; + sha512 = "AWyt3k+fBXQqt2qb9r97tn3iBwFpiv9xdAiG+Gr2HpAZpuayvbL55yWrsV3MyHvXk/4vmSiedhDRl1YI2Iy5nQ=="; }; }; - "@babel/plugin-transform-classes-7.3.4" = { + "@babel/plugin-transform-classes-7.4.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz"; - sha512 = "J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.0.tgz"; + sha512 = "XGg1Mhbw4LDmrO9rSTNe+uI79tQPdGs0YASlxgweYRLZqo/EQktjaOV4tchL/UZbM0F+/94uOipmdNGoaGOEYg=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -499,13 +526,13 @@ let sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; }; }; - "@babel/plugin-transform-destructuring-7.3.2" = { + "@babel/plugin-transform-destructuring-7.4.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.3.2"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz"; - sha512 = "Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.0.tgz"; + sha512 = "HySkoatyYTY3ZwLI8GGvkRWCFrjAGXUHur5sMecmCIdIharnlcWWivOqDJI76vvmVZfzwb6G08NREsrY96RhGQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.2.0" = { @@ -544,13 +571,13 @@ let sha512 = "PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA=="; }; }; - "@babel/plugin-transform-for-of-7.2.0" = { + "@babel/plugin-transform-for-of-7.4.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.2.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz"; - sha512 = "Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.0.tgz"; + sha512 = "vWdfCEYLlYSxbsKj5lGtzA49K3KANtb8qCPQ1em07txJzsBwY+cKJzBHizj5fl3CCx7vt+WPdgDLTHmydkbQSQ=="; }; }; "@babel/plugin-transform-function-name-7.2.0" = { @@ -589,13 +616,22 @@ let sha512 = "V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.3.4" = { + "@babel/plugin-transform-modules-commonjs-7.4.0" = { + name = "_at_babel_slash_plugin-transform-modules-commonjs"; + packageName = "@babel/plugin-transform-modules-commonjs"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.0.tgz"; + sha512 = "iWKAooAkipG7g1IY0eah7SumzfnIT3WNhT4uYB2kIsvHnNSB6MDYVa5qyICSwaTBDBY2c4SnJ3JtEa6ltJd6Jw=="; + }; + }; + "@babel/plugin-transform-modules-systemjs-7.4.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz"; - sha512 = "VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.0.tgz"; + sha512 = "gjPdHmqiNhVoBqus5qK60mWPp1CmYWp/tkh11mvb0rrys01HycEGD7NvvSoKXlWEfSM9TcL36CpsK8ElsADptQ=="; }; }; "@babel/plugin-transform-modules-umd-7.2.0" = { @@ -607,22 +643,22 @@ let sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.3.0" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.4.2" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.3.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz"; - sha512 = "NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.2.tgz"; + sha512 = "NsAuliSwkL3WO2dzWTOL1oZJHm0TM8ZY8ZSxk2ANyKkt5SQlToGA4pzctmq1BEjoacurdwZ3xp2dCQWJkME0gQ=="; }; }; - "@babel/plugin-transform-new-target-7.0.0" = { + "@babel/plugin-transform-new-target-7.4.0" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.0.0"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz"; - sha512 = "yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.0.tgz"; + sha512 = "6ZKNgMQmQmrEX/ncuCwnnw1yVGoaOW5KpxNhoWI7pCQdA0uZ0HqHGqenCUIENAnxRjy2WwNQ30gfGdIgqJXXqw=="; }; }; "@babel/plugin-transform-object-super-7.2.0" = { @@ -634,13 +670,13 @@ let sha512 = "VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg=="; }; }; - "@babel/plugin-transform-parameters-7.3.3" = { + "@babel/plugin-transform-parameters-7.4.0" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.3.3"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz"; - sha512 = "IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.0.tgz"; + sha512 = "Xqv6d1X+doyiuCGDoVJFtlZx0onAX0tnc3dY8w71pv/O0dODAbusVv2Ale3cGOwfiyi895ivOBhYa9DhAM8dUA=="; }; }; "@babel/plugin-transform-react-jsx-7.3.0" = { @@ -652,22 +688,22 @@ let sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; }; }; - "@babel/plugin-transform-regenerator-7.3.4" = { + "@babel/plugin-transform-regenerator-7.4.0" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz"; - sha512 = "hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.0.tgz"; + sha512 = "SZ+CgL4F0wm4npojPU6swo/cK4FcbLgxLd4cWpHaNXY/NJ2dpahODCqBbAwb2rDmVszVb3SSjnk9/vik3AYdBw=="; }; }; - "@babel/plugin-transform-runtime-7.3.4" = { + "@babel/plugin-transform-runtime-7.4.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.3.4"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz"; - sha512 = "PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.0.tgz"; + sha512 = "1uv2h9wnRj98XX3g0l4q+O3jFM6HfayKup7aIu4pnnlzGz0H+cYckGBC74FZIWJXJSXAmeJ9Yu5Gg2RQpS4hWg=="; }; }; "@babel/plugin-transform-shorthand-properties-7.2.0" = { @@ -742,6 +778,15 @@ let sha512 = "2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA=="; }; }; + "@babel/preset-env-7.4.2" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.2.tgz"; + sha512 = "OEz6VOZaI9LW08CWVS3d9g/0jZA6YCn1gsKIy/fut7yZCJti5Lm1/Hi+uo/U+ODm7g4I6gULrCP+/+laT8xAsA=="; + }; + }; "@babel/preset-stage-2-7.0.0" = { name = "_at_babel_slash_preset-stage-2"; packageName = "@babel/preset-stage-2"; @@ -769,6 +814,15 @@ let sha512 = "IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g=="; }; }; + "@babel/runtime-7.4.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.2.tgz"; + sha512 = "7Bl2rALb7HpvXFL7TETNzKSAeBVCPHELzc0C//9FCxN8nsiueWSJBqaF+2oIJScyILStASR/Cx5WMkXGYTiJFA=="; + }; + }; "@babel/template-7.2.2" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -778,6 +832,15 @@ let sha512 = "zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g=="; }; }; + "@babel/template-7.4.0" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.4.0.tgz"; + sha512 = "SOWwxxClTTh5NdbbYZ0BmaBVzxzTh2tO/TeLTbF6MO6EzVhHTnff8CdBXx3mEtazFBoysmEM6GU/wF+SuSx4Fw=="; + }; + }; "@babel/traverse-7.3.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; @@ -787,6 +850,15 @@ let sha512 = "TvTHKp6471OYEcE/91uWmhR6PrrYywQntCHSaZ8CM8Vmp+pjAusal4nGB2WCCQd0rvI7nOMKn9GnbcvTUz3/ZQ=="; }; }; + "@babel/traverse-7.4.0" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.0.tgz"; + sha512 = "/DtIHKfyg2bBKnIN+BItaIlEg5pjAnzHOIQe5w+rHAw/rg9g0V7T4rqPX8BJPfW11kt3koyjAnTNwCzb28Y1PA=="; + }; + }; "@babel/types-7.0.0-beta.38" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -805,6 +877,15 @@ let sha512 = "WEkp8MsLftM7O/ty580wAmZzN1nDmCACc5+jFzUt+GUFNNIi3LdRlueYz0YIlmJhlZx1QYDMZL5vdWCL0fNjFQ=="; }; }; + "@babel/types-7.4.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz"; + sha512 = "aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA=="; + }; + }; "@calebboyd/semaphore-1.3.1" = { name = "_at_calebboyd_slash_semaphore"; packageName = "@calebboyd/semaphore"; @@ -832,6 +913,15 @@ let sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA=="; }; }; + "@cnakazawa/watch-1.0.3" = { + name = "_at_cnakazawa_slash_watch"; + packageName = "@cnakazawa/watch"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz"; + sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="; + }; + }; "@comandeer/babel-plugin-banner-4.1.0" = { name = "_at_comandeer_slash_babel-plugin-banner"; packageName = "@comandeer/babel-plugin-banner"; @@ -922,40 +1012,94 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-1.6.1" = { + "@ionic/cli-framework-1.7.0" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.6.1.tgz"; - sha512 = "lj2QyM4PtV8t00LkspQPAOtTUHBahWTfrA1V5DpJUWvndiExxUOeEsEMJpUCwZgFtNjTtXQALTzPNpAwdHaksw=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-1.7.0.tgz"; + sha512 = "2GtZiwZHyuuTLWK8I3loE1QQyjALAonDJsxRjUUZN+uY8pce6jWx5LHY3jCAio97zCZp5ZfAM9c2FCJ3Alh7Lg=="; }; }; - "@ionic/discover-1.0.12" = { + "@ionic/discover-1.0.13" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "1.0.12"; + version = "1.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.13.tgz"; + sha512 = "9YNEfrspfJX8xnraqdkuYgS4amF/1yYmEjbK4DvkmcSODnx1caiJhJBakhP9z44GNutGwysWlb9RRmur2ULoDA=="; + }; + }; + "@ionic/utils-array-0.0.1" = { + name = "_at_ionic_slash_utils-array"; + packageName = "@ionic/utils-array"; + version = "0.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-1.0.12.tgz"; - sha512 = "HDMleKI387g0t+w8uC6aFL45YCN/CK3sGwvw8gxXa/IvFDU2J/BK+3c1hOlGWsZ06xnMwd8dBejcCGbabpqlxw=="; + url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-0.0.1.tgz"; + sha512 = "gdqnX69PKOrPZHQRDNbE6pRuATZpYSjaL1WcEWZqw8w1k5X9lsLnVQrFcz77XCTGcXoizQDy+YIrWFhw+xVpMg=="; }; }; - "@ionic/utils-fs-1.1.0" = { + "@ionic/utils-fs-1.2.0" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.1.0.tgz"; - sha512 = "r8odH1OLEYVioGZlwF3xUm7ZkyBaG9/VZoT9tXlXeytdAWad2se+vVotn4Fnyz5vwGU7CUgymdkBvDjyAVAtyw=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-1.2.0.tgz"; + sha512 = "31RPQlxfaIPf3QQgHZGLEDPZrf+AQY0CNgReCp+qZ1pm6mWvOerH17QOSylzcun0J3gPBt1EgiTHRcVJrLljPA=="; }; }; - "@ionic/utils-network-0.0.7" = { + "@ionic/utils-network-0.0.8" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "0.0.7"; + version = "0.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.7.tgz"; - sha512 = "JR9VPZcUGhDJdASRgM2Xu7UHmEEFX31nFJwu7afKYkJXV4o/34dQyZkVGd5XJG68Gm5jwOiRbOVluooXKF33gg=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-0.0.8.tgz"; + sha512 = "DbaiXCYA+V/bgxlgfUdsbwxPgbKY9VQ7tLZGp5MySmN6L1r946b2brOvewpVBUA8k7tJ6ea/Ieb5CU9Ed6ohmg=="; + }; + }; + "@ionic/utils-object-0.0.1" = { + name = "_at_ionic_slash_utils-object"; + packageName = "@ionic/utils-object"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-0.0.1.tgz"; + sha512 = "ZnP1Gcj9NZkqOG6XRT+H5G7DCfDFH9NFwhcDneO4EkiDJRqV5ryZeVBoVoXgS3dAw1NY02pB1tXvopU+u0aGWQ=="; + }; + }; + "@ionic/utils-process-0.1.0" = { + name = "_at_ionic_slash_utils-process"; + packageName = "@ionic/utils-process"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-0.1.0.tgz"; + sha512 = "CXPX8Nujqy8UFfzx9gvbQAuD9JIm6FihssenmmFiNgO+Xw8fyPxdrex21vVbnuD75V+qNivCGpuvy8gI7gtznw=="; + }; + }; + "@ionic/utils-stream-0.0.1" = { + name = "_at_ionic_slash_utils-stream"; + packageName = "@ionic/utils-stream"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-0.0.1.tgz"; + sha512 = "IHzLDcmbA2T/60Y/zTTf6golse75ZQHwXvXe6h7myApShcDScQ199tixAasHkJUdmyrAZFrREi4UNtIt07g9tg=="; + }; + }; + "@ionic/utils-subprocess-0.1.0" = { + name = "_at_ionic_slash_utils-subprocess"; + packageName = "@ionic/utils-subprocess"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-0.1.0.tgz"; + sha512 = "8yEHmVrkOipUwUdQU8aqy2e+HEhBbMuoNCf68wBdT9BeJ4gH3E5UeZuo27rMpdfJ4v6MKxsQRpxEcuKIq6Qxmg=="; + }; + }; + "@ionic/utils-terminal-0.0.1" = { + name = "_at_ionic_slash_utils-terminal"; + packageName = "@ionic/utils-terminal"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-0.0.1.tgz"; + sha512 = "xsunHhcKEJT0SIU3PXKn4Of4WcFN2JKqtOmJuN8/1+gWjuwJ/JqmMKsfEbMGUYHOrenf1VwUnK3VxsUzX1bAmg=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -967,13 +1111,13 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.13.0" = { + "@lerna/add-3.13.1" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.13.0.tgz"; - sha512 = "5srUGfZHjqa5BW3JODHpzbH1ayweGqqrxH8qOzf/E/giNfzigdfyCSkbGh/iiLTXGu7BBE+3/OFfycoqYbalgg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.13.1.tgz"; + sha512 = "cXk42YbuhzEnADCK8Qte5laC9Qo03eJLVnr0qKY85jQUM/T4URe3IIUemqpg0CpVATrB+Vz+iNdeqw9ng1iALw=="; }; }; "@lerna/batch-packages-3.13.0" = { @@ -985,22 +1129,22 @@ let sha512 = "TgLBTZ7ZlqilGnzJ3xh1KdAHcySfHytgNRTdG9YomfriTU6kVfp1HrXxKJYVGs7ClPUNt2CTFEOkw0tMBronjw=="; }; }; - "@lerna/bootstrap-3.13.0" = { + "@lerna/bootstrap-3.13.1" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.13.0.tgz"; - sha512 = "wdwBzvwEdzGERwpiY6Zu/T+tntCfXeXrL9cQIxP+K2M07jL5M00ZRdDoFcP90sGn568AjhvRhD2ExA5wPECSgA=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.13.1.tgz"; + sha512 = "mKdi5Ds5f82PZwEFyB9/W60I3iELobi1i87sTeVrbJh/um7GvqpSPy7kG/JPxyOdMpB2njX6LiJgw+7b6BEPWw=="; }; }; - "@lerna/changed-3.13.0" = { + "@lerna/changed-3.13.1" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.13.0.tgz"; - sha512 = "BNUVfEzhrY+XEQJI0fFxEAN7JrguXMGNX5rqQ2KWyGQB4fZ1mv4FStJRjK0K/gcCvdHnuR65uexc/acxBnBi9w=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.13.1.tgz"; + sha512 = "BRXitEJGOkoudbxEewW7WhjkLxFD+tTk4PrYpHLyCBk63pNTWtQLRE6dc1hqwh4emwyGncoyW6RgXfLgMZgryw=="; }; }; "@lerna/check-working-tree-3.13.0" = { @@ -1021,13 +1165,13 @@ let sha512 = "0iDS8y2jiEucD4fJHEzKoc8aQJgm7s+hG+0RmDNtfT0MM3n17pZnf5JOMtS1FJp+SEXOjMKQndyyaDIPFsnp6A=="; }; }; - "@lerna/clean-3.13.0" = { + "@lerna/clean-3.13.1" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.13.0.tgz"; - sha512 = "eFkqVsOmybUIjak2NyGfk78Mo8rNyNiSDFh2+HGpias3PBdEbkGYtFi/JMBi9FvqCsBSiVnHCTUcnZdLzMz69w=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.13.1.tgz"; + sha512 = "myGIaXv7RUO2qCFZXvx8SJeI+eN6y9SUD5zZ4/LvNogbOiEIlujC5lUAqK65rAHayQ9ltSa/yK6Xv510xhZXZQ=="; }; }; "@lerna/cli-3.13.0" = { @@ -1048,13 +1192,13 @@ let sha512 = "uR3u6uTzrS1p46tHQ/mlHog/nRJGBqskTHYYJbgirujxm6FqNh7Do+I1Q/7zSee407G4lzsNxZdm8IL927HemQ=="; }; }; - "@lerna/command-3.13.0" = { + "@lerna/command-3.13.1" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.13.0.tgz"; - sha512 = "34Igk99KKeDt1ilzHooVUamMegArFz8AH9BuJivIKBps1E2A5xkwRd0mJFdPENzLxOqBJlt+cnL7LyvaIM6tRQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.13.1.tgz"; + sha512 = "SYWezxX+iheWvzRoHCrbs8v5zHPaxAx3kWvZhqi70vuGsdOVAWmaG4IvHLn11ztS+Vpd5PM+ztBWSbnykpLFKQ=="; }; }; "@lerna/conventional-commits-3.13.0" = { @@ -1066,13 +1210,13 @@ let sha512 = "BeAgcNXuocmLhPxnmKU2Vy8YkPd/Uo+vu2i/p3JGsUldzrPC8iF3IDxH7fuXpEFN2Nfogu7KHachd4tchtOppA=="; }; }; - "@lerna/create-3.13.0" = { + "@lerna/create-3.13.1" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.13.0.tgz"; - sha512 = "0Vrl6Z1NEQFKd1uzWBFWii59OmMNKSNXxgKYoh3Ulu/ekMh90BgnLJ0a8tE34KK4lG5mVTQDlowKFEF+jZfYOA=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.13.1.tgz"; + sha512 = "pLENMXgTkQuvKxAopjKeoLOv9fVUCnpTUD7aLrY5d95/1xqSZlnsOcQfUYcpMf3GpOvHc8ILmI5OXkPqjAf54g=="; }; }; "@lerna/create-symlink-3.13.0" = { @@ -1093,22 +1237,22 @@ let sha512 = "UJefF5mLxLae9I2Sbz5RLYGbqbikRuMqdgTam0MS5OhXnyuuKYBUpwBshCURNb1dPBXTQhSwc7+oUhORx8ojCg=="; }; }; - "@lerna/diff-3.13.0" = { + "@lerna/diff-3.13.1" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.13.0.tgz"; - sha512 = "fyHRzRBiqXj03YbGY5/ume1N0v0wrWVB7XPHPaQs/e/eCgMpcmoQGQoW5r97R+xaEoy3boByr/ham4XHZv02ZQ=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.13.1.tgz"; + sha512 = "cKqmpONO57mdvxtp8e+l5+tjtmF04+7E+O0QEcLcNUAjC6UR2OSM77nwRCXDukou/1h72JtWs0jjcdYLwAmApg=="; }; }; - "@lerna/exec-3.13.0" = { + "@lerna/exec-3.13.1" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.13.0.tgz"; - sha512 = "Dc8jr1jL6YrfbI1sUZ3+px00HwcZLKykl7AC8A+vvCzYLa4MeK3UJ7CPg4kvBN1mX7yhGrSDSfxG0bJriHU5nA=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.13.1.tgz"; + sha512 = "I34wEP9lrAqqM7tTXLDxv/6454WFzrnXDWpNDbiKQiZs6SIrOOjmm6I4FiQsx+rU3o9d+HkC6tcUJRN5mlJUgA=="; }; }; "@lerna/filter-options-3.13.0" = { @@ -1147,13 +1291,13 @@ let sha512 = "EgSim24sjIjqQDC57bgXD9l22/HCS93uQBbGpkzEOzxAVzEgpZVm7Fm1t8BVlRcT2P2zwGnRadIvxTbpQuDPTg=="; }; }; - "@lerna/github-client-3.13.0" = { + "@lerna/github-client-3.13.1" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.13.0.tgz"; - sha512 = "4/003z1g7shg21nl06ku5/yqYbQfNsQkeWuWEd+mjiTtGH6OhzJ8XcmBOq6mhZrfDAlA4OLeXypd1QIK1Y7arA=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-3.13.1.tgz"; + sha512 = "iPLUp8FFoAKGURksYEYZzfuo9TRA+NepVlseRXFaWlmy36dCQN20AciINpoXiXGoHcEUHXUKHQvY3ARFdMlf3w=="; }; }; "@lerna/global-options-3.13.0" = { @@ -1174,40 +1318,40 @@ let sha512 = "Oqu7DGLnrMENPm+bPFGOHnqxK8lCnuYr6bk3g/CoNn8/U0qgFvHcq6Iv8/Z04TsvleX+3/RgauSD2kMfRmbypg=="; }; }; - "@lerna/import-3.13.0" = { + "@lerna/import-3.13.1" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.13.0.tgz"; - sha512 = "uQ+hoYEC6/B8VqQ9tecA1PVCFiqwN+DCrdIBY/KX3Z5vip94Pc8H/u+Q2dfBymkT6iXnvmPR/6hsMkpMOjBQDg=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.13.1.tgz"; + sha512 = "A1Vk1siYx1XkRl6w+zkaA0iptV5TIynVlHPR9S7NY0XAfhykjztYVvwtxarlh6+VcNrO9We6if0+FXCrfDEoIg=="; }; }; - "@lerna/init-3.13.0" = { + "@lerna/init-3.13.1" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.13.0.tgz"; - sha512 = "4MBaNaitr9rfzwHK4d0Y19WIzqL5RTk719tIlVtw+IRE2qF9/ioovNIZuoeISyi84mTKehsFtPsHoxFIulZUhQ=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.13.1.tgz"; + sha512 = "M59WACqim8WkH5FQEGOCEZ89NDxCKBfFTx4ZD5ig3LkGyJ8RdcJq5KEfpW/aESuRE9JrZLzVr0IjKbZSxzwEMA=="; }; }; - "@lerna/link-3.13.0" = { + "@lerna/link-3.13.1" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.13.0.tgz"; - sha512 = "0PAZM1kVCmtJfiQUzy6TT1aemIg9pxejGxFBYMB+IAxR5rcgLlZago1R52/8HyNGa07bLv0B6CkRgrdQ/9bzCg=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.13.1.tgz"; + sha512 = "N3h3Fj1dcea+1RaAoAdy4g2m3fvU7m89HoUn5X/Zcw5n2kPoK8kTO+NfhNAatfRV8VtMXst8vbNrWQQtfm0FFw=="; }; }; - "@lerna/list-3.13.0" = { + "@lerna/list-3.13.1" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.13.0.tgz"; - sha512 = "nKSqGs4ZJe7zB6SJmBEb7AfGLzqDOwJwbucC3XVgkjrXlrX4AW4+qnPiGpEdz8OFmzstkghQrWUUJvsEpNVTjw=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.13.1.tgz"; + sha512 = "635iRbdgd9gNvYLLIbYdQCQLr+HioM5FGJLFS0g3DPGygr6iDR8KS47hzCRGH91LU9NcM1mD1RoT/AChF+QbiA=="; }; }; "@lerna/listable-3.13.0" = { @@ -1282,13 +1426,13 @@ let sha512 = "7ZnQ9nvUDu/WD+bNsypmPG5MwZBwu86iRoiW6C1WBuXXDxM5cnIAC1m2WxHeFnjyMrYlRXM9PzOQ9VDD+C15Rg=="; }; }; - "@lerna/pack-directory-3.13.0" = { + "@lerna/pack-directory-3.13.1" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.13.0.tgz"; - sha512 = "p5lhLPvpRptms08uSTlDpz8R2/s8Z2Vi0Hc8+yIAP74YD8gh/U9Diku9EGkkgkLfV+P0WhnEO8/Gq/qzNVbntA=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-3.13.1.tgz"; + sha512 = "kXnyqrkQbCIZOf1054N88+8h0ItC7tUN5v9ca/aWpx298gsURpxUx/1TIKqijL5TOnHMyIkj0YJmnH/PyBVLKA=="; }; }; "@lerna/package-3.13.0" = { @@ -1309,13 +1453,13 @@ let sha512 = "3mRF1zuqFE1HEFmMMAIggXy+f+9cvHhW/jzaPEVyrPNLKsyfJQtpTNzeI04nfRvbAh+Gd2aNksvaW/w3xGJnnw=="; }; }; - "@lerna/project-3.13.0" = { + "@lerna/project-3.13.1" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-3.13.0.tgz"; - sha512 = "hxRvln8Dks3T4PBALC9H3Kw6kTne70XShfqSs4oJkMqFyDj4mb5VCUN6taCDXyF8fu75d02ETdTFZhhBgm1x6w=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-3.13.1.tgz"; + sha512 = "/GoCrpsCCTyb9sizk1+pMBrIYchtb+F1uCOn3cjn9yenyG/MfYEnlfrbV5k/UDud0Ei75YBLbmwCbigHkAKazQ=="; }; }; "@lerna/prompt-3.13.0" = { @@ -1327,13 +1471,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.13.0" = { + "@lerna/publish-3.13.1" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.13.0.tgz"; - sha512 = "WuO7LWWQ+8F+ig48RtUxWrVdOfpqDBOv6fXz0/2heQf/rJQoJDTzJZ0rk5ymaGCFz1Av2CbP0zoP7PAQQ2BeKg=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.13.1.tgz"; + sha512 = "KhCJ9UDx76HWCF03i5TD7z5lX+2yklHh5SyO8eDaLptgdLDQ0Z78lfGj3JhewHU2l46FztmqxL/ss0IkWHDL+g=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1363,13 +1507,13 @@ let sha512 = "kte+pMemulre8cmPqljxIYjCmdLByz8DgHBHXB49kz2EiPf8JJ+hJFt0PzEubEyJZ2YE2EVAx5Tv5+NfGNUQyQ=="; }; }; - "@lerna/run-3.13.0" = { + "@lerna/run-3.13.1" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.13.0.tgz"; - sha512 = "KSpEStp5SVzNB7+3V5WnyY4So8aEyDhBYvhm7cJr5M7xesKf/IE5KFywcI+JPYzyqnIOGXghfzBf9nBZRHlEUQ=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.13.1.tgz"; + sha512 = "nv1oj7bsqppWm1M4ifN+/IIbVu9F4RixrbQD2okqDGYne4RQPAXyb5cEZuAzY/wyGTWWiVaZ1zpj5ogPWvH0bw=="; }; }; "@lerna/run-lifecycle-3.13.0" = { @@ -1426,13 +1570,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.13.0" = { + "@lerna/version-3.13.1" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.13.0.tgz"; - sha512 = "YdLC208tExVpV77pdXpokGt9MAtTE7Kt93a2jcfjqiMoAI1VmXgGA+7drgBSTVtzfjXExPgi2//hJjI5ObckXA=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.13.1.tgz"; + sha512 = "WpfKc5jZBBOJ6bFS4atPJEbHSiywQ/Gcd+vrwaEGyQHWHQZnPTvhqLuq3q9fIb9sbuhH5pSY6eehhuBrKqTnjg=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1453,6 +1597,60 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; + "@node-red/editor-api-0.20.3" = { + name = "_at_node-red_slash_editor-api"; + packageName = "@node-red/editor-api"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-0.20.3.tgz"; + sha512 = "FQtWytVp3JrsDz9m7KIUwKh3TFwi+8yuBZ9y5sx7v6vj9LICcaLH5CZALH9SSeWUBLpwJ6ZesKEm2fGVCgty4Q=="; + }; + }; + "@node-red/editor-client-0.20.3" = { + name = "_at_node-red_slash_editor-client"; + packageName = "@node-red/editor-client"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-0.20.3.tgz"; + sha512 = "5R0A2vqv36fSWkoiU3LMg4Q1Arvvy5iq7nFlowlZlcw3/RJBUdw+EJjd05RRBfnUkgk/Z2ycwus23G9BbIyCAw=="; + }; + }; + "@node-red/nodes-0.20.3" = { + name = "_at_node-red_slash_nodes"; + packageName = "@node-red/nodes"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-0.20.3.tgz"; + sha512 = "ZqFQPPn2lMxhELuzftm7K7YJ7NOm83iFWNe9IV89B0+8eRxcLjNHKLFp4SN/CzDvN/EM/vNadpUC8wNLtSLVcA=="; + }; + }; + "@node-red/registry-0.20.3" = { + name = "_at_node-red_slash_registry"; + packageName = "@node-red/registry"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/registry/-/registry-0.20.3.tgz"; + sha512 = "KiQ39lxNJEHz3tce0c/ipe1HsKtU49u4xte+cjCqne0GECwEeMWie+L+WYL1dK05LoURxm0TFFnNCWRHmqq+Gg=="; + }; + }; + "@node-red/runtime-0.20.3" = { + name = "_at_node-red_slash_runtime"; + packageName = "@node-red/runtime"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-0.20.3.tgz"; + sha512 = "eIVf5VonAHGf9MI4XBdRlNUIbgy4WJsHZWjEYYZ5AdqV5+mv9R4nXoeZLWHHWcHXmoQrWuW+1EEITss9z90W4w=="; + }; + }; + "@node-red/util-0.20.3" = { + name = "_at_node-red_slash_util"; + packageName = "@node-red/util"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-red/util/-/util-0.20.3.tgz"; + sha512 = "dvUkwhf9jXp8ME9cRWsgeN7IOKa678BtKBmWvSZEbCfyhrLZ6ng3EncaPvwNYIdW2YU2hX03z6tWt7PsYxuG0A=="; + }; + }; "@nodelib/fs.stat-1.1.3" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; @@ -1462,40 +1660,40 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@octokit/endpoint-3.1.3" = { + "@octokit/endpoint-3.2.3" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "3.1.3"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-3.1.3.tgz"; - sha512 = "vAWzeoj9Lzpl3V3YkWKhGzmDUoMfKpyxJhpq74/ohMvmLXDoEuAGnApy/7TRi3OmnjyX2Lr+e9UGGAD0919ohA=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-3.2.3.tgz"; + sha512 = "yUPCt4vMIOclox13CUxzuKiPJIFo46b/6GhUnUTw5QySczN1L0DtSxgmIZrZV4SAb9EyAqrceoyrWoYVnfF2AA=="; }; }; - "@octokit/plugin-enterprise-rest-2.1.1" = { + "@octokit/plugin-enterprise-rest-2.2.2" = { name = "_at_octokit_slash_plugin-enterprise-rest"; packageName = "@octokit/plugin-enterprise-rest"; - version = "2.1.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.1.1.tgz"; - sha512 = "DJNXHH0LptKCLpJ8y3vCA/O+s+3/sDU4JNN2V0M04tsMN0hVGLPzoGgejPJgaxGP8Il5aw+jA5Nl5mTfdt9NrQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-2.2.2.tgz"; + sha512 = "CTZr64jZYhGWNTDGlSJ2mvIlFsm9OEO3LqWn9I/gmoHI4jRBp4kpHoFYNemG4oA75zUAcmbuWblb7jjP877YZw=="; }; }; - "@octokit/request-2.3.0" = { + "@octokit/request-2.4.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-2.3.0.tgz"; - sha512 = "5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-2.4.2.tgz"; + sha512 = "lxVlYYvwGbKSHXfbPk5vxEA8w4zHOH1wobado4a9EfsyD3Cbhuhus1w0Ye9Ro0eMubGO8kNy5d+xNFisM3Tvaw=="; }; }; - "@octokit/rest-16.16.0" = { + "@octokit/rest-16.20.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.16.0"; + version = "16.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.16.0.tgz"; - sha512 = "Q6L5OwQJrdJ188gLVmUHLKNXBoeCU0DynKPYW8iZQQoGNGws2hkP/CePVNlzzDgmjuv7o8dCrJgecvDcIHccTA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.20.0.tgz"; + sha512 = "tN5j64P6QymlMzKo94DG1LRNHCwMnLg5poZlVhsCfkHhEWKpofZ1qBDr2/0w6qDLav4EA1XXMmZdNpvGhc9BDQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -1525,13 +1723,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/watcher-1.11.0" = { + "@parcel/watcher-1.12.0" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-1.11.0.tgz"; - sha512 = "1ySF0sH06jyhpaErW1UWC7BNgkAl6PJyBjuu2cLTW1o71J2iQqgGt95cbuqmfmjI3l0xYN+nauDFqHERaj7Z8A=="; + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-1.12.0.tgz"; + sha512 = "yijGiAqG7Tjf5WnFwOkiNWwerfZQDNABldiiqRDtr7vDWLO+F/DIncyB7tTcaD5Loevrr5mzzGo8Ntf3d2GIPg=="; }; }; "@parcel/workers-1.11.0" = { @@ -1633,22 +1831,22 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.3" = { + "@schematics/angular-7.3.6" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "7.3.3"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.3.tgz"; - sha512 = "HbH8vajYPka0xGcFAN5IUBx8n8SFMQLFb9di2dJCOBaEakbKVkk8qtOpil54oFQbx7DFCvutq/p0u42JfEbuMQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.6.tgz"; + sha512 = "Q4VXAjVaCDb2zXFXoIdOfNPsn+EQjqDBHK4a97omytnSNAmu1erl3l2FkEMi6x/VuzK2mQSzBbmHJIgauMmOAA=="; }; }; - "@schematics/update-0.13.3" = { + "@schematics/update-0.13.6" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.13.3"; + version = "0.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.3.tgz"; - sha512 = "sCOFQ62dd7VdEGiSUJNZshNI31ODwpJjn2WIvFgZLt6sdHHun67s/JOvOUq4mxx6I74oD6RPJPF4AP5sigVxxg=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.6.tgz"; + sha512 = "TkeigdQTHG40ZGj4CAAzQHh7/rSotg0J6nkBBtc4Y+9md7IGg6dzSFJAvYbDX5JZ9tk7DpukdRHOVVopS/J0AQ=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -1804,13 +2002,13 @@ let sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; }; }; - "@types/bluebird-3.5.25" = { + "@types/bluebird-3.5.26" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; - version = "3.5.25"; + version = "3.5.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.25.tgz"; - sha512 = "yfhIBix+AIFTmYGtkC0Bi+XGjSkOINykqKvO/Wqdz/DuXlAKK7HmhLAXdPIGsV4xzKcL3ev/zYc4yLNo+OvGaw=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.26.tgz"; + sha512 = "aj2mrBLn5ky0GmAg6IPXrQjnN0iB/ulozuJ+oZdrHRAzRbXjGmu4UXsNCjFvPbSaaPZmniocdOzsM392qLOlmQ=="; }; }; "@types/body-parser-1.17.0" = { @@ -1876,13 +2074,22 @@ let sha512 = "V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg=="; }; }; - "@types/express-serve-static-core-4.16.1" = { + "@types/express-serve-static-core-4.16.2" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.1"; + version = "4.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.2.tgz"; + sha512 = "qgc8tjnDrc789rAQed8NoiFLV5VGcItA4yWNFphqGU0RcuuQngD00g3LHhWIK3HQ2XeDgVCmlNPDlqi3fWBHnQ=="; + }; + }; + "@types/glob-7.1.1" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.1.tgz"; - sha512 = "QgbIMRU1EVRry5cIu1ORCQP4flSYqLM1lS5LYyGWfKnFT3E58f0gKto7BR13clBFVrVZ0G0rbLZ1hUpSkgQQOA=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; "@types/long-4.0.0" = { @@ -1903,49 +2110,58 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/node-10.12.27" = { + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-10.14.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.12.27"; + version = "10.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.12.27.tgz"; - sha512 = "e9wgeY6gaY21on3ve0xAjgBVjGDWq/xUteK0ujsE53bUoxycMkqfnkUgMt6ffZtykZ5X12Mg3T7Pw4TRCObDKg=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.14.1.tgz"; + sha512 = "Rymt08vh1GaW4vYB6QP61/5m/CFLGnFZP++bJpWbiNxceNa6RBipDmb413jvtSf/R1gg5a/jQVl2jY4XVRscEA=="; }; }; - "@types/node-11.9.5" = { + "@types/node-11.11.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.9.5"; + version = "11.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.9.5.tgz"; - sha512 = "vVjM0SVzgaOUpflq4GYBvCpozes8OgIIS5gVXVka+OfK3hvnkC1i93U8WiY2OtNE4XUWyyy/86Kf6e0IHTQw1Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.11.4.tgz"; + sha512 = "02tIL+QIi/RW4E5xILdoAMjeJ9kYq5t5S2vciUdFPXv/ikFTb0zK8q9vXkg4+WAJuYXGiVT1H28AkD2C+IkXVw=="; }; }; - "@types/node-6.14.3" = { + "@types/node-6.14.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.3"; + version = "6.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.3.tgz"; - sha512 = "V2VrQBCKo4U0rni6tW4AASRDqIO5ZTLDN/Xzrm4mNBr9SGQYZ+7zZJn+hMs89Q8ZCIHzp4aWQPyCpK+rux1YGA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.4.tgz"; + sha512 = "UqB7h2dVJr/KdZXRMJIhNUWT0HXVe9UNvfLCOsqiSGKAVaAp0QniYHlU9yegxyG6Ug2rc7VdAD4hYj3VghqvAw=="; }; }; - "@types/node-8.10.40" = { + "@types/node-8.10.44" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.40"; + version = "8.10.44"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz"; - sha512 = "RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.44.tgz"; + sha512 = "HY3SK7egERHGUfY8p6ztXIEQWcIPHouYhCGcLAPQin7gE2G/fALFz+epnMwcxKUS6aKqTVoAFdi+t1llQd3xcw=="; }; }; - "@types/q-1.5.1" = { + "@types/q-1.5.2" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz"; - sha512 = "eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz"; + sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; "@types/range-parser-1.2.3" = { @@ -1957,15 +2173,6 @@ let sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; }; }; - "@types/semver-5.5.0" = { - name = "_at_types_slash_semver"; - packageName = "@types/semver"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz"; - sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; - }; - }; "@types/serve-static-1.13.2" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -2002,40 +2209,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-3.4.1" = { + "@vue/cli-shared-utils-3.5.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.4.1.tgz"; - sha512 = "IbAQP1J48+q1ChjcHGnE06SdcCEeO77BERcPapjqZl3qJ6aPnq7z8VrNrZxo6oOnBJm7elGOvz4kJ6hirK9aPA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.5.1.tgz"; + sha512 = "hCB7UbKeeC41w2Q8+Q7jmw3gHdq+ltRqp80S3uDRRGxwiOhxrSmdBHMzKUjh01L8bXOBRgvLey+BERi1Nj9n6Q=="; }; }; - "@vue/cli-ui-3.4.1" = { + "@vue/cli-ui-3.5.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.4.1.tgz"; - sha512 = "VzYw+pWlzK9U3SbNFQiAnaVbtNRtb7bIuHjmistZmnipo5GQYt8i5JwxtjP3ZvqojBBOWmU5Mb9S8JYfE6B0Lg=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-3.5.1.tgz"; + sha512 = "/yobVdHcQ8/t13YmDmJylrlHXiItl5PLkm2AYc4HrSSbl/jAc/ws3vr3oVqwtLGem2o54nF99sBhxK0L7uhOrw=="; }; }; - "@vue/cli-ui-addon-webpack-3.4.1" = { + "@vue/cli-ui-addon-webpack-3.5.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.4.1.tgz"; - sha512 = "pNpnu04fHDE+h8I+L6tz16uT3zKEjqZN4rqyWyIHyE6Dcpjk4Ru8/ge0bMfz89AOoYwpuBPh28FSJWtkSxTlAw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-3.5.1.tgz"; + sha512 = "PaS6m6ipAJefjwngx3WVJ1B4ZxOH4yAGxbQzJcweG98CUppAzBQVvXWQNjqlMDaizMjIUdmpfWhmr5Z6dQ8tJg=="; }; }; - "@vue/cli-ui-addon-widgets-3.4.1" = { + "@vue/cli-ui-addon-widgets-3.5.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.4.1.tgz"; - sha512 = "E41HRQep+KfOye7LqHl+WiAQmS7noaJUxtVek6IjbWXrzNj4xmZvi7tW7FMj2l3ezZpwUU6mGTSCPz8Ct0EN+A=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-3.5.1.tgz"; + sha512 = "wGKDhmqvknLvQWdNHJEDPD5nRsaC7XspNiCkOXZg7Qm+uutFcu0I83ChKnvYRijhp4Mpmv0o5G50P7UKutM+AQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -2047,15 +2254,6 @@ let sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw=="; }; }; - "@webassemblyjs/ast-1.8.3" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.3.tgz"; - sha512 = "xy3m06+Iu4D32+6soz6zLnwznigXJRuFNTovBX2M4GqVqLb0dnyWLbPnpcXvUSdEN+9DVyDeaq2jyH1eIL2LZQ=="; - }; - }; "@webassemblyjs/ast-1.8.5" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -2074,15 +2272,6 @@ let sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ=="; }; }; - "@webassemblyjs/floating-point-hex-parser-1.8.3" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.3.tgz"; - sha512 = "vq1TISG4sts4f0lDwMUM0f3kpe0on+G3YyV5P0IySHFeaLKRYZ++n2fCFfG4TcCMYkqFeTUYFxm75L3ddlk2xA=="; - }; - }; "@webassemblyjs/floating-point-hex-parser-1.8.5" = { name = "_at_webassemblyjs_slash_floating-point-hex-parser"; packageName = "@webassemblyjs/floating-point-hex-parser"; @@ -2101,15 +2290,6 @@ let sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w=="; }; }; - "@webassemblyjs/helper-api-error-1.8.3" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.3.tgz"; - sha512 = "BmWEynI4FnZbjk8CaYZXwcv9a6gIiu+rllRRouQUo73hglanXD3AGFJE7Q4JZCoVE0p5/jeX6kf5eKa3D4JxwQ=="; - }; - }; "@webassemblyjs/helper-api-error-1.8.5" = { name = "_at_webassemblyjs_slash_helper-api-error"; packageName = "@webassemblyjs/helper-api-error"; @@ -2128,13 +2308,13 @@ let sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg=="; }; }; - "@webassemblyjs/helper-buffer-1.8.3" = { + "@webassemblyjs/helper-buffer-1.8.5" = { name = "_at_webassemblyjs_slash_helper-buffer"; packageName = "@webassemblyjs/helper-buffer"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.3.tgz"; - sha512 = "iVIMhWnNHoFB94+/2l7LpswfCsXeMRnWfExKtqsZ/E2NxZyUx9nTeKK/MEMKTQNEpyfznIUX06OchBHQ+VKi/Q=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; + sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q=="; }; }; "@webassemblyjs/helper-code-frame-1.8.1" = { @@ -2146,15 +2326,6 @@ let sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA=="; }; }; - "@webassemblyjs/helper-code-frame-1.8.3" = { - name = "_at_webassemblyjs_slash_helper-code-frame"; - packageName = "@webassemblyjs/helper-code-frame"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.3.tgz"; - sha512 = "K1UxoJML7GKr1QXR+BG7eXqQkvu+eEeTjlSl5wUFQ6W6vaOc5OwSxTcb3oE9x/3+w4NHhrIKD4JXXCZmLdL2cg=="; - }; - }; "@webassemblyjs/helper-code-frame-1.8.5" = { name = "_at_webassemblyjs_slash_helper-code-frame"; packageName = "@webassemblyjs/helper-code-frame"; @@ -2191,15 +2362,6 @@ let sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw=="; }; }; - "@webassemblyjs/helper-fsm-1.8.3" = { - name = "_at_webassemblyjs_slash_helper-fsm"; - packageName = "@webassemblyjs/helper-fsm"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.3.tgz"; - sha512 = "387zipfrGyO77/qm7/SDUiZBjQ5KGk4qkrVIyuoubmRNIiqn3g+6ijY8BhnlGqsCCQX5bYKOnttJobT5xoyviA=="; - }; - }; "@webassemblyjs/helper-fsm-1.8.5" = { name = "_at_webassemblyjs_slash_helper-fsm"; packageName = "@webassemblyjs/helper-fsm"; @@ -2218,15 +2380,6 @@ let sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ=="; }; }; - "@webassemblyjs/helper-module-context-1.8.3" = { - name = "_at_webassemblyjs_slash_helper-module-context"; - packageName = "@webassemblyjs/helper-module-context"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.3.tgz"; - sha512 = "lPLFdQfaRssfnGEJit5Sk785kbBPPPK4ZS6rR5W/8hlUO/5v3F+rN8XuUcMj/Ny9iZiyKhhuinWGTUuYL4VKeQ=="; - }; - }; "@webassemblyjs/helper-module-context-1.8.5" = { name = "_at_webassemblyjs_slash_helper-module-context"; packageName = "@webassemblyjs/helper-module-context"; @@ -2245,15 +2398,6 @@ let sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w=="; }; }; - "@webassemblyjs/helper-wasm-bytecode-1.8.3" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.3.tgz"; - sha512 = "R1nJW7bjyJLjsJQR5t3K/9LJ0QWuZezl8fGa49DZq4IVaejgvkbNlKEQxLYTC579zgT4IIIVHb5JA59uBPHXyw=="; - }; - }; "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; packageName = "@webassemblyjs/helper-wasm-bytecode"; @@ -2272,13 +2416,13 @@ let sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w=="; }; }; - "@webassemblyjs/helper-wasm-section-1.8.3" = { + "@webassemblyjs/helper-wasm-section-1.8.5" = { name = "_at_webassemblyjs_slash_helper-wasm-section"; packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.3.tgz"; - sha512 = "P6F7D61SJY73Yz+fs49Q3+OzlYAZP86OfSpaSY448KzUy65NdfzDmo2NPVte+Rw4562MxEAacvq/mnDuvRWOcg=="; + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; + sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA=="; }; }; "@webassemblyjs/ieee754-1.8.1" = { @@ -2290,15 +2434,6 @@ let sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ=="; }; }; - "@webassemblyjs/ieee754-1.8.3" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.3.tgz"; - sha512 = "UD4HuLU99hjIvWz1pD68b52qsepWQlYCxDYVFJQfHh3BHyeAyAlBJ+QzLR1nnS5J6hAzjki3I3AoJeobNNSZlg=="; - }; - }; "@webassemblyjs/ieee754-1.8.5" = { name = "_at_webassemblyjs_slash_ieee754"; packageName = "@webassemblyjs/ieee754"; @@ -2317,15 +2452,6 @@ let sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw=="; }; }; - "@webassemblyjs/leb128-1.8.3" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.3.tgz"; - sha512 = "XXd3s1BmkC1gpGABuCRLqCGOD6D2L+Ma2BpwpjrQEHeQATKWAQtxAyU9Z14/z8Ryx6IG+L4/NDkIGHrccEhRUg=="; - }; - }; "@webassemblyjs/leb128-1.8.5" = { name = "_at_webassemblyjs_slash_leb128"; packageName = "@webassemblyjs/leb128"; @@ -2344,15 +2470,6 @@ let sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw=="; }; }; - "@webassemblyjs/utf8-1.8.3" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.3.tgz"; - sha512 = "Wv/WH9Zo5h5ZMyfCNpUrjFsLZ3X1amdfEuwdb7MLdG3cPAjRS6yc6ElULlpjLiiBTuzvmLhr3ENsuGyJ3wyCgg=="; - }; - }; "@webassemblyjs/utf8-1.8.5" = { name = "_at_webassemblyjs_slash_utf8"; packageName = "@webassemblyjs/utf8"; @@ -2371,13 +2488,13 @@ let sha512 = "nEpaI0D9A9IgaRfqPlG/8/hyZ91q62US/36gRsl7gFOZuJykL/5UI37OVFm8uL5V120amdiN6s+yCzIzmefvkg=="; }; }; - "@webassemblyjs/wasm-edit-1.8.3" = { + "@webassemblyjs/wasm-edit-1.8.5" = { name = "_at_webassemblyjs_slash_wasm-edit"; packageName = "@webassemblyjs/wasm-edit"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.3.tgz"; - sha512 = "nB19eUx3Yhi1Vvv3yev5r+bqQixZprMtaoCs1brg9Efyl8Hto3tGaUoZ0Yb4Umn/gQCyoEGFfUxPLp1/8+Jvnw=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; + sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q=="; }; }; "@webassemblyjs/wasm-gen-1.8.1" = { @@ -2389,22 +2506,22 @@ let sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug=="; }; }; - "@webassemblyjs/wasm-gen-1.8.3" = { + "@webassemblyjs/wasm-gen-1.8.5" = { name = "_at_webassemblyjs_slash_wasm-gen"; packageName = "@webassemblyjs/wasm-gen"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.3.tgz"; - sha512 = "sDNmu2nLBJZ/huSzlJvd9IK8B1EjCsOl7VeMV9VJPmxKYgTJ47lbkSP+KAXMgZWGcArxmcrznqm7FrAPQ7vVGg=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; + sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg=="; }; }; - "@webassemblyjs/wasm-opt-1.8.3" = { + "@webassemblyjs/wasm-opt-1.8.5" = { name = "_at_webassemblyjs_slash_wasm-opt"; packageName = "@webassemblyjs/wasm-opt"; - version = "1.8.3"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.3.tgz"; - sha512 = "j8lmQVFR+FR4/645VNgV4R/Jz8i50eaPAj93GZyd3EIJondVshE/D9pivpSDIXyaZt+IkCodlzOoZUE4LnQbeA=="; + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; + sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q=="; }; }; "@webassemblyjs/wasm-parser-1.8.1" = { @@ -2416,15 +2533,6 @@ let sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA=="; }; }; - "@webassemblyjs/wasm-parser-1.8.3" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.3.tgz"; - sha512 = "NBI3SNNtRoy4T/KBsRZCAWUzE9lI94RH2nneLwa1KKIrt/2zzcTavWg6oY05ArCbb/PZDk3OUi63CD1RYtN65w=="; - }; - }; "@webassemblyjs/wasm-parser-1.8.5" = { name = "_at_webassemblyjs_slash_wasm-parser"; packageName = "@webassemblyjs/wasm-parser"; @@ -2443,15 +2551,6 @@ let sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ=="; }; }; - "@webassemblyjs/wast-parser-1.8.3" = { - name = "_at_webassemblyjs_slash_wast-parser"; - packageName = "@webassemblyjs/wast-parser"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.3.tgz"; - sha512 = "gZPst4CNcmGtKC1eYQmgCx6gwQvxk4h/nPjfPBbRoD+Raw3Hs+BS3yhrfgyRKtlYP+BJ8LcY9iFODEQofl2qbg=="; - }; - }; "@webassemblyjs/wast-parser-1.8.5" = { name = "_at_webassemblyjs_slash_wast-parser"; packageName = "@webassemblyjs/wast-parser"; @@ -2470,15 +2569,6 @@ let sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA=="; }; }; - "@webassemblyjs/wast-printer-1.8.3" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.3.tgz"; - sha512 = "DTA6kpXuHK4PHu16yAD9QVuT1WZQRT7079oIFFmFSjqjLWGXS909I/7kiLTn931mcj7wGsaUNungjwNQ2lGQ3Q=="; - }; - }; "@webassemblyjs/wast-printer-1.8.5" = { name = "_at_webassemblyjs_slash_wast-printer"; packageName = "@webassemblyjs/wast-printer"; @@ -2605,6 +2695,15 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; + "abab-2.0.0" = { + name = "abab"; + packageName = "abab"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.0.tgz"; + sha512 = "sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w=="; + }; + }; "abbrev-1.1.1" = { name = "abbrev"; packageName = "abbrev"; @@ -2722,13 +2821,13 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.1.0" = { + "acorn-6.1.1" = { name = "acorn"; packageName = "acorn"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz"; - sha512 = "MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz"; + sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA=="; }; }; "acorn-dynamic-import-4.0.0" = { @@ -2749,6 +2848,15 @@ let sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; }; }; + "acorn-globals-4.3.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.0.tgz"; + sha512 = "hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw=="; + }; + }; "acorn-jsx-3.0.1" = { name = "acorn-jsx"; packageName = "acorn-jsx"; @@ -2839,15 +2947,6 @@ let sha512 = "bA+dyydTNuQtrEDJ0g9eR7XabNhvrM5yZY0hvTbNK3yvoeC73ZqMES6E1cEqH9WPxs4uMtMsOjfwS4FmluhsAA=="; }; }; - "addressparser-0.3.2" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; - }; - }; "addressparser-1.0.1" = { name = "addressparser"; packageName = "addressparser"; @@ -2965,22 +3064,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.5.3" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "6.5.3"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz"; - sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; - "ajv-6.5.4" = { + "ajv-6.5.3" = { name = "ajv"; packageName = "ajv"; - version = "6.5.4"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz"; - sha512 = "4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz"; + sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; "ajv-6.9.1" = { @@ -2992,15 +3091,6 @@ let sha512 = "XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA=="; }; }; - "ajv-6.9.2" = { - name = "ajv"; - packageName = "ajv"; - version = "6.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; - sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; - }; - }; "ajv-errors-1.0.1" = { name = "ajv-errors"; packageName = "ajv-errors"; @@ -3226,13 +3316,13 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-4.0.0" = { + "ansi-regex-4.1.0" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz"; - sha512 = "iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; "ansi-split-1.0.1" = { @@ -3361,13 +3451,13 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-cache-1.1.26" = { + "apollo-cache-1.2.1" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.1.26"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.26.tgz"; - sha512 = "JKFHijwkhXpcQ3jOat+ctwiXyjDhQgy0p6GSaj7zG+or+ZSalPqUnPzFRgRwFLVbYxBKJgHCkWX+2VkxWTZzQQ=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.2.1.tgz"; + sha512 = "nzFmep/oKlbzUuDyz6fS6aYhRmfpcHWqNkkA9Bbxwk18RD6LXC4eZkuE0gXRX0IibVBHNjYVK+Szi0Yied4SpQ=="; }; }; "apollo-cache-control-0.5.2" = { @@ -3379,22 +3469,22 @@ let sha512 = "uehXDUrd3Qim+nzxqqN7XT1YTbNSyumW3/FY5BxbKZTI8d4oPG4eyVQKqaggooSjswKQnOoIQVes3+qg9tGAkw=="; }; }; - "apollo-cache-inmemory-1.4.3" = { + "apollo-cache-inmemory-1.5.1" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.4.3"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.3.tgz"; - sha512 = "p9KGtEZ9Mlb+FS0UEaxR8WvKOijYV0c+TXlhC/XZ3/ltYvP1zL3b1ozSOLGR9SawN2895Fc7QDV5nzPpihV0rA=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz"; + sha512 = "D3bdpPmWfaKQkWy8lfwUg+K8OBITo3sx0BHLs1B/9vIdOIZ7JNCKq3EUcAgAfInomJUdN0QG1yOfi8M8hxkN1g=="; }; }; - "apollo-client-2.4.13" = { + "apollo-client-2.5.1" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.4.13"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.13.tgz"; - sha512 = "7mBdW/CW1qHB8Mj4EFAG3MTtbRc6S8aUUntUdrKfRWV1rZdWa0NovxsgVD/R4HZWZjRQ2UOM4ENsHdM5g1uXOQ=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.5.1.tgz"; + sha512 = "MNcQKiqLHdGmNJ0rZ0NXaHrToXapJgS/5kPk0FygXt+/FmDCdzqcujI7OPxEC6e9Yw5S/8dIvOXcRNuOMElHkA=="; }; }; "apollo-codegen-0.20.2" = { @@ -3478,13 +3568,13 @@ let sha512 = "qdEUeonc9pPZvYwXK36h2NZoT7Pddmy0HYOzdV0ON5pcG1YtNmUyyYi83Q60V5wTWjuaCjyJ9hOY6wr0BMvQuA=="; }; }; - "apollo-engine-reporting-1.0.5" = { + "apollo-engine-reporting-1.0.7" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.5.tgz"; - sha512 = "G4KcA6/eKWtH/WwvOtLoH7o4c1l3EuZsX6ZscBIEPYI78LmhjztG+UI+i3FW1BodURsqimBrbSM+h/JsYIrj+Q=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.0.7.tgz"; + sha512 = "mFsXvd+1/o5jSa9tI2RoXYGcvCLcwwcfLwchjSTxqUd4ViB8RbqYKynzEZ+Omji7PBRM0azioBm43f7PSsQPqA=="; }; }; "apollo-engine-reporting-protobuf-0.2.1" = { @@ -3496,58 +3586,58 @@ let sha512 = "5pYR84uWeylRS2OJowtkTczT3bWTwOErWtfnkRKccUi/wZ/AZJBP+D5HKNzM7xoFcz9XvrJyS+wBTz1oBi0Jiw=="; }; }; - "apollo-env-0.3.3" = { + "apollo-env-0.4.0" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.3.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.3.3.tgz"; - sha512 = "VsUX14bfQCJpKmTyYNBTeLrdeFabjmpSPVQ2y4IKnwqaxVqZuRca3WFE8ercszO1tLwS6HMM7mFw+IIbtQXo/w=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.4.0.tgz"; + sha512 = "TZpk59RTbXd8cEqwmI0KHFoRrgBRplvPAP4bbRrX4uDSxXvoiY0Y6tQYUlJ35zi398Hob45mXfrZxeRDzoFMkQ=="; }; }; - "apollo-graphql-0.1.1" = { + "apollo-graphql-0.1.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.1.1"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.1.1.tgz"; - sha512 = "UImgDIeB0n0fryYqtdz0CwJ9uDtXwg/3Q6rXzRAqgqBYz46VkmWa7nu2LX9GmDtiXB5VUOVCtyMEnvFwC3o27g=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.1.3.tgz"; + sha512 = "bYgDh71jFfHKO9ioGlxnnoSYgpNp6LRl+/QHTx6tktQEN0Z+AdpkOKFNCHO/pRU/4vSqV5wuIhxhnCecxJQrMA=="; }; }; - "apollo-link-1.2.8" = { + "apollo-link-1.2.11" = { name = "apollo-link"; packageName = "apollo-link"; - version = "1.2.8"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.8.tgz"; - sha512 = "lfzGRxhK9RmiH3HPFi7TIEBhhDY9M5a2ZDnllcfy5QDk7cCQHQ1WQArcw1FK0g1B+mV4Kl72DSrlvZHZJEolrA=="; + url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.11.tgz"; + sha512 = "PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA=="; }; }; - "apollo-link-context-1.0.14" = { + "apollo-link-context-1.0.17" = { name = "apollo-link-context"; packageName = "apollo-link-context"; - version = "1.0.14"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.14.tgz"; - sha512 = "l6SIN7Fwqhgg5C5eA8xSrt8gulHBmYTE3J4z5/Q2hP/8Kok0rQ/z5q3uy42/hkdYlnaktOvpz+ZIwEFzcXwujQ=="; + url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.17.tgz"; + sha512 = "W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q=="; }; }; - "apollo-link-dedup-1.0.15" = { + "apollo-link-dedup-1.0.18" = { name = "apollo-link-dedup"; packageName = "apollo-link-dedup"; - version = "1.0.15"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.15.tgz"; - sha512 = "14/+Tg7ogcYVrvZa8C7uBQIvX2B/dCKSnojI41yDYGp/t2eWD5ITCWdgjhciXpi0Ij6z+NRyMEebACz3EOwm4w=="; + url = "https://registry.npmjs.org/apollo-link-dedup/-/apollo-link-dedup-1.0.18.tgz"; + sha512 = "1rr54wyMTuqUmbWvcXbwduIcaCDcuIgU6MqQ599nAMuTrbSOXthGfoAD8BDTxBGQ9roVlM7ABP0VZVEWRoHWSg=="; }; }; - "apollo-link-http-common-0.2.10" = { + "apollo-link-http-common-0.2.13" = { name = "apollo-link-http-common"; packageName = "apollo-link-http-common"; - version = "0.2.10"; + version = "0.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.10.tgz"; - sha512 = "KY9nhpAurw3z48OIYV0sCZFXrzWp/wjECsveK+Q9GUhhSe1kEbbUjFfmi+qigg+iELgdp5V8ioRJhinl1vPojw=="; + url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz"; + sha512 = "Uyg1ECQpTTA691Fwx5e6Rc/6CPSu4TB4pQRTGIpwZ4l5JDOQ+812Wvi/e3IInmzOZpwx5YrrOfXrtN8BrsDXoA=="; }; }; "apollo-link-persisted-queries-0.2.2" = { @@ -3568,13 +3658,13 @@ let sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; }; }; - "apollo-link-ws-1.0.14" = { + "apollo-link-ws-1.0.17" = { name = "apollo-link-ws"; packageName = "apollo-link-ws"; - version = "1.0.14"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.14.tgz"; - sha512 = "KwHVnhKKDUA5PmmzpiqkyahjBcwGdf2eFlTZg4DIwgH1R0KcBmn/A6rkZnmClBbUNgV6t+kR46dW2fyx64Jm3A=="; + url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.17.tgz"; + sha512 = "0PKgahM2BOcUiI3QSJMYXOoUylWKzar5NTZLgMLEW4K/CczOTzC4CTXvKMjh/cx57Jto/U2xzKRy9BEoNfnK5Q=="; }; }; "apollo-server-caching-0.3.1" = { @@ -3586,13 +3676,13 @@ let sha512 = "mfxzikYXbB/OoEms77AGYwRh7FF3Oim5v5XWAL+VL49FrkbZt5lopVa4bABi7Mz8Nt3Htl9EBJN8765s/yh8IA=="; }; }; - "apollo-server-core-2.4.6" = { + "apollo-server-core-2.4.8" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.4.6"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.6.tgz"; - sha512 = "sz/a9AKCx5ifnQAehmgXhnmEWv43LCbRnL1V1Z2P5C8xSmWubCskgu6jKPMc2cG1QFLWAXaA8cF4gD9sNGOFTQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.4.8.tgz"; + sha512 = "N+5UOzHhMOnHizEiArJtNvEe/cGhSHQyTn5tlU4RJ36FDBJ/WlYZfPbGDMLISSUCJ6t+aP8GLL4Mnudt9d2PDQ=="; }; }; "apollo-server-env-2.2.0" = { @@ -3613,22 +3703,22 @@ let sha512 = "wY/YE3iJVMYC+WYIf8QODBjIP4jhI+oc7kiYo9mrz7LdYPKAgxr/he+NteGcqn/0Ea9K5/ZFTGJDbEstSMeP8g=="; }; }; - "apollo-server-express-2.4.6" = { + "apollo-server-express-2.4.8" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.4.6"; + version = "2.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.6.tgz"; - sha512 = "YlWUjxrveKFSOCyExTa5rTwePeELhjolzP6cAlFIak+kJTnOiJWoTCYzaftkpwmK+c4IyA5XUgC0YhowcrIgEw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.4.8.tgz"; + sha512 = "i60l32mfVe33jnKDPNYgUKUKu4Al0xEm2HLOSMgtJ9Wbpe/MbOx5X8M5F27fnHYdM+G5XfAErsakAyRGnQJ48Q=="; }; }; - "apollo-server-plugin-base-0.3.5" = { + "apollo-server-plugin-base-0.3.7" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.3.5"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.5.tgz"; - sha512 = "z6xAgQip1RAXf0lQ2T8szCAbD8bCcbcwq4gGJ37ELcMGGTCTp2XOAz/PwIe9Re2Hzuk+OPlKK0AZng7qpXtDkg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.3.7.tgz"; + sha512 = "hW1jaLKf9qNOxMTwRq2CSqz3eqXsZuEiCc8/mmEtOciiVBq1GMtxFf19oIYM9HQuPvQU2RWpns1VrYN59L3vbg=="; }; }; "apollo-tracing-0.5.2" = { @@ -3649,13 +3739,13 @@ let sha512 = "N0SENiEkZXoY4nl9xxrXFcj/cL0AVkSNQ4aYXSaruCBWE0aKpK6aCe4DBmiEHrK3FAsMxZPEJxBRIWNbsXT8dw=="; }; }; - "apollo-utilities-1.1.3" = { + "apollo-utilities-1.2.1" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.1.3"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.1.3.tgz"; - sha512 = "pF9abhiClX5gfj/WFWZh8DiI33nOLGxRhXH9ZMquaM1V8bhq1WLFPt2QjShWH3kGQVeIGUK+FQefnhe+ZaaAYg=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.2.1.tgz"; + sha512 = "Zv8Udp9XTSFiN8oyXOjf6PMHepD4yxxReLsl6dPUy5Ths7jti3nmlBzZUOxuTWRwZn0MoclqL7RQ5UEJN8MAxg=="; }; }; "app-builder-5.2.0" = { @@ -3820,6 +3910,15 @@ let sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; + "arg-4.1.0" = { + name = "arg"; + packageName = "arg"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz"; + sha512 = "ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg=="; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -4333,15 +4432,6 @@ let sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; }; }; - "async-0.8.0" = { - name = "async"; - packageName = "async"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; - }; - }; "async-0.9.2" = { name = "async"; packageName = "async"; @@ -4423,13 +4513,13 @@ let sha512 = "R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg=="; }; }; - "async-each-1.0.1" = { + "async-each-1.0.2" = { name = "async-each"; packageName = "async-each"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"; - sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.2.tgz"; + sha512 = "6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg=="; }; }; "async-limiter-1.0.0" = { @@ -4549,15 +4639,6 @@ let sha1 = "ece7d92527ca37ea502f99e8f41fe44daf00dbce"; }; }; - "autoprefixer-6.7.7" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "6.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz"; - sha1 = "1dbd1c835658e35ce3f9984099db00585c782014"; - }; - }; "aws-sdk-1.18.0" = { name = "aws-sdk"; packageName = "aws-sdk"; @@ -4567,22 +4648,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.410.0" = { + "aws-sdk-2.425.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.410.0"; + version = "2.425.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.410.0.tgz"; - sha512 = "1ekVT5gr1m2yJXHZbHb8TAJogLA3Xj//b7yffHNXScAjFx2KNE+hmJ29J716372C0HDNgIPTKqWBp+lsYhvrjA=="; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.425.0.tgz"; + sha512 = "SM2qZJPlZUKVzSSqNuCvONOhJ2kcFvU+hAwutjQeje2VKpSAbUbFCFWl6cki2FjiyGZYEPfl0Q+3ANJO8gx9BA=="; }; }; "aws-sign2-0.6.0" = { @@ -5197,15 +5269,6 @@ let sha512 = "1X8CnjFVQ+a+KW36uBNMTU5s8+v5FzeqrP7hTG5aTb4aPreSbZJlhwPon9VKMuEVgV++JM+SQrALY3kr7eswdg=="; }; }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -5431,13 +5494,13 @@ let sha1 = "e6d5ea8c5dad001304a70b22638447f69cb2f809"; }; }; - "before-after-hook-1.3.2" = { + "before-after-hook-1.4.0" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.3.2.tgz"; - sha512 = "zyPgY5dgbf99c0uGUjhY4w+mxqEGxPKg9RQDl34VvrVh2bM31lFN+mwR1ZHepq/KA3VCPk1gwJZL6IIJqjLy2w=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-1.4.0.tgz"; + sha512 = "l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg=="; }; }; "bencode-0.7.0" = { @@ -5602,13 +5665,13 @@ let sha512 = "i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew=="; }; }; - "bindings-1.4.0" = { + "bindings-1.5.0" = { name = "bindings"; packageName = "bindings"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.4.0.tgz"; - sha512 = "7znEVX22Djn+nYjxCWKDne0RRloa9XfYa84yk3s+HkE3LpDYZmhArYr9O9huBoHY3/oXispx5LorIX7Sl2CgSQ=="; + url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; + sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; "binwrap-0.2.0" = { @@ -5935,15 +5998,6 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; "boom-2.10.1" = { name = "boom"; packageName = "boom"; @@ -6052,15 +6106,6 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; - "braces-0.1.5" = { - name = "braces"; - packageName = "braces"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"; - sha1 = "c085711085291d8b75fdd74eab0f8597280711e6"; - }; - }; "braces-1.8.5" = { name = "braces"; packageName = "braces"; @@ -6133,6 +6178,15 @@ let sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA=="; }; }; + "browser-process-hrtime-0.1.3" = { + name = "browser-process-hrtime"; + packageName = "browser-process-hrtime"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw=="; + }; + }; "browser-resolve-1.11.3" = { name = "browser-resolve"; packageName = "browser-resolve"; @@ -6268,22 +6322,22 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-1.7.7" = { + "browserslist-4.5.2" = { name = "browserslist"; packageName = "browserslist"; - version = "1.7.7"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz"; - sha1 = "0bd76704258be829b2398bb50e4b62d1a166b0b9"; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.5.2.tgz"; + sha512 = "zmJVLiKLrzko0iszd/V4SsjTaomFeoVzQGYYOYgRgsbh7WNh95RgDB0CmBdFWYs/3MyFSt69NypjL/h3iaddKQ=="; }; }; - "browserslist-4.4.2" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.4.2"; + "bser-2.0.0" = { + name = "bser"; + packageName = "bser"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz"; - sha512 = "ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg=="; + url = "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz"; + sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719"; }; }; "btoa-lite-1.0.0" = { @@ -6493,15 +6547,6 @@ let sha1 = "93f222229b4f5f5e2cd559236891407f9853663b"; }; }; - "buildmail-2.0.0" = { - name = "buildmail"; - packageName = "buildmail"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-2.0.0.tgz"; - sha1 = "f0b7b0a59e9a4a1b5066bbfa051d248f3832eece"; - }; - }; "builtin-modules-2.0.0" = { name = "builtin-modules"; packageName = "builtin-modules"; @@ -6862,13 +6907,13 @@ let sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; }; }; - "camelcase-5.0.0" = { + "camelcase-5.2.0" = { name = "camelcase"; packageName = "camelcase"; - version = "5.0.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz"; - sha512 = "faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz"; + sha512 = "IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ=="; }; }; "camelcase-keys-2.1.0" = { @@ -6889,15 +6934,6 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "caniuse-api-1.6.1" = { - name = "caniuse-api"; - packageName = "caniuse-api"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz"; - sha1 = "b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"; - }; - }; "caniuse-api-3.0.0" = { name = "caniuse-api"; packageName = "caniuse-api"; @@ -6907,22 +6943,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-db-1.0.30000939" = { - name = "caniuse-db"; - packageName = "caniuse-db"; - version = "1.0.30000939"; + "caniuse-lite-1.0.30000951" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30000951"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000939.tgz"; - sha512 = "nB5tLf3hOs+biXl1lhKjHRgNC0J1I7H52h/t1FP7qxARKKwpB0z+P/JewJLYAlxCBP/q7rxJzQzHHrQMl0viKg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000951.tgz"; + sha512 = "eRhP+nQ6YUkIcNQ6hnvdhMkdc7n3zadog0KXNRxAZTT2kHjUb1yGn71OrPhSn8MOvlX97g5CR97kGVj8fMsXWg=="; }; }; - "caniuse-lite-1.0.30000939" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30000939"; + "capture-exit-2.0.0" = { + name = "capture-exit"; + packageName = "capture-exit"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz"; - sha512 = "oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg=="; + url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; "capture-stack-trace-1.0.1" = { @@ -7231,22 +7267,22 @@ let sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ=="; }; }; - "chloride-2.2.10" = { + "chloride-2.2.12" = { name = "chloride"; packageName = "chloride"; - version = "2.2.10"; + version = "2.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.2.10.tgz"; - sha512 = "CbU1ISGiB2JBV6PDXx7hkl8D94d2TPD1BANUMFbr8rZYKJi8De2d3Hu2XDIOLAhXf+8yhoFOdjtLG6fxz3QByQ=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.2.12.tgz"; + sha512 = "NNi7PsCL8gKKr3b2Lrg5WbMi76yqZBq01FyT2chj0ISE3UXjr1YezLkiJi2Lw9WFc5CeJteYsJY6hbh38KbUDQ=="; }; }; - "chloride-test-1.2.2" = { + "chloride-test-1.2.4" = { name = "chloride-test"; packageName = "chloride-test"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.2.tgz"; - sha1 = "178686a85e9278045112e96e8c791793f9a10aea"; + url = "https://registry.npmjs.org/chloride-test/-/chloride-test-1.2.4.tgz"; + sha512 = "9vhoi1qXSBPn6//ZxIgSe3M2QhKHzIPZQzmrZgmPADsqW0Jxpe3db1e7aGSRUMXbxAQ04SfypdT8dGaSvIvKDw=="; }; }; "chokidar-1.6.0" = { @@ -7303,6 +7339,15 @@ let sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; }; }; + "chrome-remote-interface-0.26.1" = { + name = "chrome-remote-interface"; + packageName = "chrome-remote-interface"; + version = "0.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.26.1.tgz"; + sha512 = "ela482aJK0riFu05sl+zdbnb3ezMiqzwsqf/f/27HngWds+Fat3vcZWpIoDoeQuWMid/+LfKAteAYWaWPqsweg=="; + }; + }; "chrome-trace-event-1.0.0" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; @@ -7402,24 +7447,6 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; - "circular-json-0.5.9" = { - name = "circular-json"; - packageName = "circular-json"; - version = "0.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz"; - sha512 = "4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ=="; - }; - }; - "clap-1.2.3" = { - name = "clap"; - packageName = "clap"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz"; - sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; - }; - }; "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; @@ -7429,15 +7456,6 @@ let sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; }; }; - "clean-css-2.2.23" = { - name = "clean-css"; - packageName = "clean-css"; - version = "2.2.23"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-2.2.23.tgz"; - sha1 = "0590b5478b516c4903edc2d89bd3fdbdd286328c"; - }; - }; "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; @@ -7465,15 +7483,6 @@ let sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; }; }; - "cli-0.6.6" = { - name = "cli"; - packageName = "cli"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; - sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; - }; - }; "cli-1.0.1" = { name = "cli"; packageName = "cli"; @@ -7546,6 +7555,15 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; + "cli-spinners-2.0.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.0.0.tgz"; + sha512 = "yiEBmhaKPPeBj7wWm4GEdtPZK940p9pl3EANIrnJ3JnvWyrPjcFcsEq6qRUuQ7fzB0+Y82ld3p6B34xo95foWw=="; + }; + }; "cli-table-0.3.1" = { name = "cli-table"; packageName = "cli-table"; @@ -7897,15 +7915,6 @@ let sha1 = "f81b3eb8a86675fec51e3d883a7f564e873c9389"; }; }; - "coa-1.0.4" = { - name = "coa"; - packageName = "coa"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; - sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; - }; - }; "coa-2.0.2" = { name = "coa"; packageName = "coa"; @@ -7987,15 +7996,6 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-0.11.4" = { - name = "color"; - packageName = "color"; - version = "0.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-0.11.4.tgz"; - sha1 = "6d7b5c74fb65e841cd48792ad1ed5e07b904d764"; - }; - }; "color-3.0.0" = { name = "color"; packageName = "color"; @@ -8050,15 +8050,6 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-0.3.0" = { - name = "color-string"; - packageName = "color-string"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz"; - sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991"; - }; - }; "color-string-1.5.3" = { name = "color-string"; packageName = "color-string"; @@ -8077,15 +8068,6 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colormin-1.1.2" = { - name = "colormin"; - packageName = "colormin"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz"; - sha1 = "ea2f7420a72b96881a38aae59ec124a6f7298133"; - }; - }; "colornames-1.1.1" = { name = "colornames"; packageName = "colornames"; @@ -8122,15 +8104,6 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; "colors-1.3.2" = { name = "colors"; packageName = "colors"; @@ -8185,15 +8158,6 @@ let sha1 = "f4df6740083e5703a3181110c2b10551f003da86"; }; }; - "combine-lists-1.0.1" = { - name = "combine-lists"; - packageName = "combine-lists"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; - sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; - }; - }; "combine-source-map-0.8.0" = { name = "combine-source-map"; packageName = "combine-source-map"; @@ -8302,15 +8266,6 @@ let sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="; }; }; - "commander-2.2.0" = { - name = "commander"; - packageName = "commander"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.2.0.tgz"; - sha1 = "175ad4b9317f3ff615f201c1e57224f55a3e91df"; - }; - }; "commander-2.3.0" = { name = "commander"; packageName = "commander"; @@ -8347,13 +8302,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "commist-1.0.0" = { + "commist-1.1.0" = { name = "commist"; packageName = "commist"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz"; - sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef"; + url = "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz"; + sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; "common-tags-1.8.0" = { @@ -8482,6 +8437,15 @@ let sha512 = "HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg=="; }; }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; "concat-map-0.0.1" = { name = "concat-map"; packageName = "concat-map"; @@ -8950,15 +8914,6 @@ let sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; }; }; - "cookie-parser-1.4.3" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz"; - sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; - }; - }; "cookie-parser-1.4.4" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -9139,6 +9094,15 @@ let sha512 = "klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A=="; }; }; + "core-js-3.0.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.0.0.tgz"; + sha512 = "WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ=="; + }; + }; "core-js-3.0.0-beta.13" = { name = "core-js"; packageName = "core-js"; @@ -9148,6 +9112,24 @@ let sha512 = "16Q43c/3LT9NyePUJKL8nRIQgYWjcBhjJSMWg96PVSxoS0PeE0NHitPI3opBrs9MGGHjte1KoEVr9W63YKlTXQ=="; }; }; + "core-js-compat-3.0.0" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.0.tgz"; + sha512 = "W/Ppz34uUme3LmXWjMgFlYyGnbo1hd9JvA0LNQ4EmieqVjg2GPYbj3H6tcdP2QGPGWdRKUqZVbVKLNIFVs/HiA=="; + }; + }; + "core-js-pure-3.0.0" = { + name = "core-js-pure"; + packageName = "core-js-pure"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.0.tgz"; + sha512 = "yPiS3fQd842RZDgo/TAKGgS0f3p2nxssF1H65DIZvZv0Od5CygP8puHXn3IQiM/39VAvgCbdaMQpresrbGgt9g=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -9157,13 +9139,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cors-2.8.4" = { - name = "cors"; - packageName = "cors"; - version = "2.8.4"; + "core_d-1.0.1" = { + name = "core_d"; + packageName = "core_d"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; - sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; + url = "https://registry.npmjs.org/core_d/-/core_d-1.0.1.tgz"; + sha512 = "Uge+GU4vDha5IEf0PxX/NdBZBMAE69t93OKasRfWlr+tylp5DDhRQSb7QDDFw/EySwgdS0HV9bsN9iFk6SBDHg=="; }; }; "cors-2.8.5" = { @@ -9229,22 +9211,22 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-6.0.0" = { + "cp-file-6.1.0" = { name = "cp-file"; packageName = "cp-file"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-6.0.0.tgz"; - sha512 = "OtHMgPugkgwHlbph25wlMKd358lZNhX1Y2viUpPoFmlBPlEiPIRhztYWha11grbGPnlM+urp5saVmwsChCIOEg=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-6.1.0.tgz"; + sha512 = "an34I0lJwKncRKjxe3uGWUuiIIVYsHHjBGKld3OQB56hfoPCYom31VysvfuysKqHLbz6drnqP5YrCfLw17I2kw=="; }; }; - "cpy-7.0.1" = { + "cpy-7.1.0" = { name = "cpy"; packageName = "cpy"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-7.0.1.tgz"; - sha512 = "Zo52tXKLJcgy/baacn6KaNoRAakkl2wb+R4u6qJ4wlD0uchncwRQcIk66PlGlkzuToCJO6A6PWX27Tdwc8LU2g=="; + url = "https://registry.npmjs.org/cpy/-/cpy-7.1.0.tgz"; + sha512 = "HT6xnKeHwACUObD3LEFAsjeQ9IUVhC1Pn6Qbk0q6CEWy0WG061khT3ZxQU6IuMXPEEyb+vvluyUOyTdl+9EPWQ=="; }; }; "crc-0.2.0" = { @@ -9346,22 +9328,22 @@ let sha512 = "KMd0KuvwVUg1grlRd5skG9ZkSbBYDDkAjDUMLnvxdRn0rL7ph3IwoOk7I8u1yLX4HYjGiLVlWYO55YWNNPjJFA=="; }; }; - "creato-1.0.3" = { + "creato-1.0.4" = { name = "creato"; packageName = "creato"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/creato/-/creato-1.0.3.tgz"; - sha512 = "i33ANluSZq742lqjQZRQJCOSuRvx8P9u5756sZheDcCqOvDsiTQd3eZx5GkPpQMhFrLIveslAKaK0M+OHgmu/g=="; + url = "https://registry.npmjs.org/creato/-/creato-1.0.4.tgz"; + sha512 = "JwtxKvu+1zbzZoV6SPCRagkU3v5wylfvfsG/KCf6TUE0gjCE8V/Ft447WyV1JPTont080EVvz07k6qov0GDY1w=="; }; }; - "cron-1.5.0" = { + "cron-1.7.0" = { name = "cron"; packageName = "cron"; - version = "1.5.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.5.0.tgz"; - sha512 = "j7zMFLrcSta53xqOvETUt8ge+PM14GtF47gEGJJeVlM6qP24/eWHSgtiWiEiKBR2sHS8xZaBQZq4D7vFXg8dcQ=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.0.tgz"; + sha512 = "I7S7ES2KZtKPfBTGJ5Brc6X23apE71fgYU/PC5ayh8R6VhECpqvTLe/LTkwAEN3ERFzNKXlWzh/PkwsGg3vkDQ=="; }; }; "cross-env-5.2.0" = { @@ -9463,15 +9445,6 @@ let sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; "cryptiles-2.0.5" = { name = "cryptiles"; packageName = "cryptiles"; @@ -9553,6 +9526,15 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; + "css-modules-loader-core-1.1.0" = { + name = "css-modules-loader-core"; + packageName = "css-modules-loader-core"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz"; + sha1 = "5908668294a1becd261ae0a4ce21b0b551f21d16"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -9580,6 +9562,15 @@ let sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; }; }; + "css-selector-tokenizer-0.7.1" = { + name = "css-selector-tokenizer"; + packageName = "css-selector-tokenizer"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz"; + sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA=="; + }; + }; "css-tree-1.0.0-alpha.28" = { name = "css-tree"; packageName = "css-tree"; @@ -9634,6 +9625,15 @@ let sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8"; }; }; + "cssesc-0.1.0" = { + name = "cssesc"; + packageName = "cssesc"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz"; + sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4"; + }; + }; "cssesc-2.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -9643,15 +9643,6 @@ let sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg=="; }; }; - "csslint-0.10.0" = { - name = "csslint"; - packageName = "csslint"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; - sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; - }; - }; "csslint-1.0.5" = { name = "csslint"; packageName = "csslint"; @@ -9661,15 +9652,6 @@ let sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; }; - "cssnano-3.10.0" = { - name = "cssnano"; - packageName = "cssnano"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz"; - sha1 = "4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"; - }; - }; "cssnano-4.1.10" = { name = "cssnano"; packageName = "cssnano"; @@ -9724,15 +9706,6 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; - "csso-2.3.2" = { - name = "csso"; - packageName = "csso"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"; - sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; - }; - }; "csso-3.5.1" = { name = "csso"; packageName = "csso"; @@ -9760,6 +9733,15 @@ let sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; }; }; + "cssstyle-1.2.1" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.2.1.tgz"; + sha512 = "7DYm8qe+gPx/h77QlCyFmX80+fGaE/6A/Ekl0zaszYOubvySO2saYFdQ78P29D0UsULxFKCetDGNaNRUdSF+2A=="; + }; + }; "csurf-1.8.3" = { name = "csurf"; packageName = "csurf"; @@ -9967,31 +9949,22 @@ let sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf"; }; }; - "dat-dns-3.1.0" = { + "dat-dns-3.2.0" = { name = "dat-dns"; packageName = "dat-dns"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.1.0.tgz"; - sha512 = "QDh1+cMFX6qw4sncReWamb7qM6jrztB9Wri5YcKNhtYXxayHfFG2MC6ny8KovKPvz+7whP1A9lYzeZY0L0fO8Q=="; + url = "https://registry.npmjs.org/dat-dns/-/dat-dns-3.2.0.tgz"; + sha512 = "3U17SGiMgSflp0CnqMxoOkyNPZF93q/ieITIjogmWc/gVwZ/z0PgAALgPxrwmebxf8rYCPukVRWfue/8F9PRMg=="; }; }; - "dat-doctor-2.1.1" = { + "dat-doctor-2.1.2" = { name = "dat-doctor"; packageName = "dat-doctor"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.1.1.tgz"; - sha512 = "f8ttD6oTzVrQgnDn4fYUvA0ocx+1Cg4aQ2fTX3jtEtClYiAh9Cv+KetPEWw+QZb1+tSStBfgMeFxl3pZhkhLew=="; - }; - }; - "dat-encoding-4.0.2" = { - name = "dat-encoding"; - packageName = "dat-encoding"; - version = "4.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/dat-encoding/-/dat-encoding-4.0.2.tgz"; - sha1 = "b01068fe0d080f3d3e4985a0c4ad21b7c14675f6"; + url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-2.1.2.tgz"; + sha512 = "h7JaXbgHDuTOA/HWxw77rEHSFE3zFp5BgORFOO0puTj9+Jr6ll8RuotLJQxx02EwUPPpSpE77juJ75Z9rvPXaA=="; }; }; "dat-encoding-5.0.1" = { @@ -10012,13 +9985,13 @@ let sha512 = "27xyi8MzFCJ6qlB8AMGAjI/ec1q9AKT18Qe+8E8AxrG3Axpf4GHa+rWXBE9vTA5T1Mi4cPnhboiGLhiR4r0JAA=="; }; }; - "dat-json-1.0.2" = { + "dat-json-1.0.3" = { name = "dat-json"; packageName = "dat-json"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.2.tgz"; - sha512 = "EZq+VeE/tM7FGygMVZx3hsMVm7zW3qxhuUYCNtLONaZptqXz4laB5cIWHydmeEn6sl3RZatZqpIuWRu4xDYxIg=="; + url = "https://registry.npmjs.org/dat-json/-/dat-json-1.0.3.tgz"; + sha512 = "fppyz6O5htUleUClWXgJVyKVzRYCLiPwYKuBbpCcjXekBzuxU32Zyk4LwWs0yz9enV2GoXdCdtEvI2ffjzRhWw=="; }; }; "dat-link-resolve-2.3.0" = { @@ -10048,13 +10021,13 @@ let sha512 = "NTkLhalHkXseLcI/l8CA2yhf1TBnbuc0d98ojFuzQfEoVr0y+VPd5KrCm5u7Uhaj3YTGkpOxbDk5N6WH10ODMQ=="; }; }; - "dat-registry-4.0.0" = { + "dat-registry-4.0.1" = { name = "dat-registry"; packageName = "dat-registry"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.0.tgz"; - sha512 = "CKV7j8kwWNBW2Oacdbf5x0ihxMfPNN8wcKHHmx5UjE4iyaOnfnTwCqTGM5rFoMleXKOGWpB7uCKQa0qpvzmCIA=="; + url = "https://registry.npmjs.org/dat-registry/-/dat-registry-4.0.1.tgz"; + sha512 = "UjUZHdgVWL2YPQQzqbYoQaBZ+gbPvaaQcOaexfjR+kbON2av/H26zC4iUOrKWmbkqJZqAVt3Cj+GpNQie/GlUQ=="; }; }; "dat-secret-storage-4.0.1" = { @@ -10102,13 +10075,22 @@ let sha512 = "YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw=="; }; }; - "date-format-1.2.0" = { + "data-urls-1.1.0" = { + name = "data-urls"; + packageName = "data-urls"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; + sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; + }; + }; + "date-format-2.0.0" = { name = "date-format"; packageName = "date-format"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz"; - sha1 = "615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"; + url = "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz"; + sha512 = "M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA=="; }; }; "date-now-0.1.4" = { @@ -10318,13 +10300,13 @@ let sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; }; }; - "decimal.js-10.0.2" = { + "decimal.js-10.1.1" = { name = "decimal.js"; packageName = "decimal.js"; - version = "10.0.2"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.2.tgz"; - sha512 = "qL5tUTXAWjB5cSBfm0V2a4jO5FaDLumCfwc/0f7WaTOT3WU8pIeq2HHrd98eXHtbey4qFWlaPzfml1JWIoO9TQ=="; + url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.1.1.tgz"; + sha512 = "vEEgyk1fWVEnv7lPjkNedAIjzxQDue5Iw4FeX4UkNUDSVyD/jZTD0Bw2kAO7k6iyyJRAhM9oxxI0D1ET6k0Mmg=="; }; }; "decode-uri-component-0.2.0" = { @@ -10660,15 +10642,6 @@ let sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095"; }; }; - "del-3.0.0" = { - name = "del"; - packageName = "del"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; - }; - }; "delayed-stream-0.0.5" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -10705,13 +10678,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "denque-1.3.0" = { + "denque-1.4.0" = { name = "denque"; packageName = "denque"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.3.0.tgz"; - sha512 = "4SRaSj+PqmrS1soW5/Avd7eJIM2JJIqLLmwhRqIGleZM/8KwZq80njbSS2Iqas+6oARkSkLDHEk4mm78q3JlIg=="; + url = "https://registry.npmjs.org/denque/-/denque-1.4.0.tgz"; + sha512 = "gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ=="; }; }; "dep-graph-1.1.0" = { @@ -10768,6 +10741,15 @@ let sha1 = "00966317b7a12fe92f3cc831f7583af329b86c37"; }; }; + "deprecation-1.0.1" = { + name = "deprecation"; + packageName = "deprecation"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deprecation/-/deprecation-1.0.1.tgz"; + sha512 = "ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg=="; + }; + }; "deps-sort-2.0.0" = { name = "deps-sort"; packageName = "deps-sort"; @@ -11011,16 +10993,6 @@ let sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; }; }; - "dir-glob-git://github.com/nexe/dir-glob.git#84f4381fe041b6afd425e8d5c14c33809430d8f1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "2.2.0"; - src = fetchgit { - url = "git://github.com/nexe/dir-glob.git"; - rev = "84f4381fe041b6afd425e8d5c14c33809430d8f1"; - sha256 = "e436ec06b2782c8c740e24211ae663270a87ff0297cceb9f489086c5bf6ae88e"; - }; - }; "director-1.2.7" = { name = "director"; packageName = "director"; @@ -11282,6 +11254,15 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; + "domexception-1.0.1" = { + name = "domexception"; + packageName = "domexception"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; + sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; + }; + }; "domhandler-2.2.1" = { name = "domhandler"; packageName = "domhandler"; @@ -11624,13 +11605,13 @@ let sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; }; }; - "editorconfig-0.15.2" = { + "editorconfig-0.15.3" = { name = "editorconfig"; packageName = "editorconfig"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz"; - sha512 = "GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ=="; + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; + sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; "ee-first-1.1.0" = { @@ -11660,13 +11641,13 @@ let sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="; }; }; - "electron-to-chromium-1.3.113" = { + "electron-to-chromium-1.3.118" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.113"; + version = "1.3.118"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz"; - sha512 = "De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.118.tgz"; + sha512 = "/1FpHvmKmKo2Z6CCza2HfkrKvKhU7Rq4nvyX1FOherdTrdTufhVrJbCrcrIqgqUCI+BG6JC2rlY4z5QA1G0NOw=="; }; }; "elegant-spinner-1.0.1" = { @@ -12147,13 +12128,13 @@ let sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; }; }; - "es5-ext-0.10.48" = { + "es5-ext-0.10.49" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.48"; + version = "0.10.49"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz"; - sha512 = "CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.49.tgz"; + sha512 = "3NMEhi57E31qdzmYp2jwRArIUsj1HI/RxbQ4bgnSB+AIKIxsAmTiK83bYMifIcpWvEc3P1X30DhUKOqEtF/kvg=="; }; }; "es5-ext-0.8.2" = { @@ -12390,13 +12371,13 @@ let sha512 = "nqD5WQMisciZC5EHZowejLKQjWGuFS5c70fxqSKlnDME+oz9zmE8KTlX+lHSg+/5wsC/kf9Q9eMkC8qS3oM2fg=="; }; }; - "eslint-5.14.1" = { + "eslint-5.15.3" = { name = "eslint"; packageName = "eslint"; - version = "5.14.1"; + version = "5.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; - sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz"; + sha512 = "vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -12417,13 +12398,13 @@ let sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; }; }; - "eslint-scope-4.0.0" = { + "eslint-scope-4.0.3" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz"; - sha512 = "1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; }; }; "eslint-utils-1.3.1" = { @@ -12444,13 +12425,13 @@ let sha512 = "qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ=="; }; }; - "esm-3.2.6" = { + "esm-3.2.19" = { name = "esm"; packageName = "esm"; - version = "3.2.6"; + version = "3.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.6.tgz"; - sha512 = "3wWjSurKSczMzYyHiBih3VVEQYCoZa6nfsqqcM2Tx6KBAQAeor0SZUfAol+zeVUtESLygayOi2ZcMfYZy7MCsg=="; + url = "https://registry.npmjs.org/esm/-/esm-3.2.19.tgz"; + sha512 = "thFxRC6o0gKfSiSwuUI2JO01f9JOm1qRWGfBLry0LF3L8mSeSTK58DqCE3+0ZKq02e/DClCJf3BW9nVwd/ejCw=="; }; }; "espree-3.5.4" = { @@ -12480,15 +12461,6 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "esprima-2.7.3" = { - name = "esprima"; - packageName = "esprima"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; - }; - }; "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; @@ -12768,6 +12740,15 @@ let sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; }; }; + "exec-sh-0.3.2" = { + name = "exec-sh"; + packageName = "exec-sh"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz"; + sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; + }; + }; "execa-0.1.1" = { name = "execa"; packageName = "execa"; @@ -12885,15 +12866,6 @@ let sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; }; }; - "expand-braces-0.1.2" = { - name = "expand-braces"; - packageName = "expand-braces"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz"; - sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; - }; - }; "expand-brackets-0.1.5" = { name = "expand-brackets"; packageName = "expand-brackets"; @@ -12912,15 +12884,6 @@ let sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; }; }; - "expand-range-0.1.1" = { - name = "expand-range"; - packageName = "expand-range"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"; - sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"; - }; - }; "expand-range-1.8.2" = { name = "expand-range"; packageName = "expand-range"; @@ -12930,13 +12893,13 @@ let sha1 = "a299effd335fe2721ebae8e257ec79644fc85337"; }; }; - "expand-template-1.1.1" = { + "expand-template-2.0.3" = { name = "expand-template"; packageName = "expand-template"; - version = "1.1.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz"; - sha512 = "cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg=="; + url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; "expand-tilde-2.0.2" = { @@ -13047,6 +13010,15 @@ let sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; }; }; + "express-ws-4.0.0" = { + name = "express-ws"; + packageName = "express-ws"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz"; + sha512 = "KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw=="; + }; + }; "ext-list-2.2.2" = { name = "ext-list"; packageName = "ext-list"; @@ -13083,15 +13055,6 @@ let sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; }; }; - "extend-2.0.2" = { - name = "extend"; - packageName = "extend"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-2.0.2.tgz"; - sha512 = "AgFD4VU+lVLP6vjnlNfF7OeInLTyeyckCNPEsuxz1vi786UuK/nk6ynPuhn/h+Ju9++TQyr5EpLRI14fc1QtTQ=="; - }; - }; "extend-3.0.0" = { name = "extend"; packageName = "extend"; @@ -13371,13 +13334,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.4.4" = { + "fast-redact-1.5.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.4.4.tgz"; - sha512 = "QOQZ8sDDQPZMJ6x6zlm6hLZ2cjPDqfN3R/AYnAbM+yy8VNPvOnVXdUF/E/xbMv7g44c1krhWuzgjH2u0V5Vhsg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.5.0.tgz"; + sha512 = "Afo61CgUjkzdvOKDHn08qnZ0kwck38AOGcMlvSGzvJbIab6soAP5rdoQayecGCDsD69AiF9vJBXyq31eoEO2tQ=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -13407,6 +13370,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fastparse-1.1.2" = { + name = "fastparse"; + packageName = "fastparse"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz"; + sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; + }; + }; "fault-1.0.2" = { name = "fault"; packageName = "fault"; @@ -13425,6 +13397,15 @@ let sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; }; }; + "fb-watchman-2.0.0" = { + name = "fb-watchman"; + packageName = "fb-watchman"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz"; + sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + }; + }; "fd-lock-1.0.2" = { name = "fd-lock"; packageName = "fd-lock"; @@ -13713,22 +13694,22 @@ let sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; }; }; - "find-cache-dir-2.0.0" = { + "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz"; - sha512 = "LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; - "find-elm-dependencies-2.0.0" = { + "find-elm-dependencies-2.0.1" = { name = "find-elm-dependencies"; packageName = "find-elm-dependencies"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.0.tgz"; - sha512 = "lnLilxwdS3U/CSPoMnfUL1u21MBNolv6NF54y4Yds7WxdRMrTBXrmugrcvIGvakWQ2anYuinmBSUR+jUQy+vpA=="; + url = "https://registry.npmjs.org/find-elm-dependencies/-/find-elm-dependencies-2.0.1.tgz"; + sha512 = "KBxPjc7J1CLw90jVateMKvMYMROZRTR7/QT2I3MxT+7I6KuUQUMNUFuS/eQXQnMnyElGKQ1iyPbe7GnEuYnFXw=="; }; }; "find-index-0.1.1" = { @@ -13803,15 +13784,6 @@ let sha1 = "6509f0126af4c178551cfa99394e032e13a4d56e"; }; }; - "findup-sync-0.2.1" = { - name = "findup-sync"; - packageName = "findup-sync"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz"; - sha1 = "e0a90a450075c49466ee513732057514b81e878c"; - }; - }; "findup-sync-2.0.0" = { name = "findup-sync"; packageName = "findup-sync"; @@ -13884,15 +13856,6 @@ let sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA=="; }; }; - "flagged-respawn-0.3.2" = { - name = "flagged-respawn"; - packageName = "flagged-respawn"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz"; - sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5"; - }; - }; "flagged-respawn-1.0.1" = { name = "flagged-respawn"; packageName = "flagged-respawn"; @@ -14163,15 +14126,6 @@ let sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; }; }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -14199,15 +14153,6 @@ let sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; }; }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; "form-data-1.0.0-rc3" = { name = "form-data"; packageName = "form-data"; @@ -14685,24 +14630,6 @@ let sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; }; }; - "gear-0.9.7" = { - name = "gear"; - packageName = "gear"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/gear/-/gear-0.9.7.tgz"; - sha1 = "1ead19eee639319d8e2e655494c61bd8956e777f"; - }; - }; - "gear-lib-0.9.2" = { - name = "gear-lib"; - packageName = "gear-lib"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gear-lib/-/gear-lib-0.9.2.tgz"; - sha1 = "bc8d461ebc81ecaffe99c1da82abe0f56eb93540"; - }; - }; "generate-function-1.1.0" = { name = "generate-function"; packageName = "generate-function"; @@ -14766,13 +14693,13 @@ let sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; }; }; - "get-caller-file-2.0.1" = { + "get-caller-file-2.0.5" = { name = "get-caller-file"; packageName = "get-caller-file"; - version = "2.0.1"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.1.tgz"; - sha512 = "SpOZHfz845AH0wJYVuZk2jWDqFmu7Xubsx+ldIpwzy5pDUpu7OJHK7QYNSA2NPlDSKQwM1GFaAkciOWjjW92Sg=="; + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; "get-func-name-2.0.0" = { @@ -15072,15 +14999,6 @@ let sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; - "glob-4.3.5" = { - name = "glob"; - packageName = "glob"; - version = "4.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz"; - sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3"; - }; - }; "glob-4.5.3" = { name = "glob"; packageName = "glob"; @@ -15298,15 +15216,6 @@ let sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8"; }; }; - "globby-6.1.0" = { - name = "globby"; - packageName = "globby"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - }; "globby-8.0.2" = { name = "globby"; packageName = "globby"; @@ -15316,23 +15225,13 @@ let sha512 = "yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w=="; }; }; - "globby-9.0.0" = { + "globby-9.1.0" = { name = "globby"; packageName = "globby"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-9.0.0.tgz"; - sha512 = "q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw=="; - }; - }; - "globby-git://github.com/nexe/globby.git#de057b69c2bca74391bfd913ed0145ce4e42563a" = { - name = "globby"; - packageName = "globby"; - version = "8.0.1"; - src = fetchgit { - url = "git://github.com/nexe/globby.git"; - rev = "de057b69c2bca74391bfd913ed0145ce4e42563a"; - sha256 = "0a57359385d74a9125d6c26c6cb023d1d34b3753f3089dbe392a53a4d81285da"; + url = "https://registry.npmjs.org/globby/-/globby-9.1.0.tgz"; + sha512 = "VtYjhHr7ncls724Of5W6Kaahz0ag7dB4G62/2HsN+xEKG6SrPzM1AJMerGxQTwJGnN9reeyxdvXbuZYpfssCvg=="; }; }; "globule-0.1.0" = { @@ -15524,13 +15423,13 @@ let sha512 = "C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q=="; }; }; - "graphql-anywhere-4.1.28" = { + "graphql-anywhere-4.2.1" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.1.28"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.1.28.tgz"; - sha512 = "NtLN0qmu2AasvZ31kwWte1UOw1mYRbfuSICbcVTshA2S5/BNZ7IVMl0X4wA2HPHc3mxN6rvrU4rS3+/Is2QsVw=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.1.tgz"; + sha512 = "4zlzTFzixGXtIYjX7BiXQOGhQ5yQVohj/EKNxUHUTAR7lHnCmrXU17gGtZ+108l9TkoHNfc33ieJ9U8trnHE1w=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -15578,13 +15477,13 @@ let sha512 = "qLThJGVMqcItE7GDf/xX/E40m/aeqFheEKiR5bfra4q5eHxQKGjnIc20P9CVqjOn9I0FkEiU9ypOobfmIf7t6g=="; }; }; - "graphql-extensions-0.5.5" = { + "graphql-extensions-0.5.7" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.5.5"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.5.tgz"; - sha512 = "jCUt/WVayiQvmXVPMetmq3wpV3RyzXOXFfssoTz9/YFuoSg1Y7BwzgNuilSybQqMPRdfGAsqf/OIa1DZwrnggw=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.5.7.tgz"; + sha512 = "HrU6APE1PiehZ46scMB3S5DezSeCATd8v+e4mmg2bqszMyCFkmAnmK6hR1b5VjHxhzt5/FX21x1WsXfqF4FwdQ=="; }; }; "graphql-import-0.4.5" = { @@ -15677,13 +15576,13 @@ let sha512 = "chF12etTIGVVGy3fCTJ1ivJX2KB7OSG4c6UOJQuqOHCmBQwTyNgCDuejZKvpYxNZiEx7bwIjrodDgDe9RIkjlw=="; }; }; - "graphql-type-json-0.2.1" = { + "graphql-type-json-0.2.2" = { name = "graphql-type-json"; packageName = "graphql-type-json"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.1.tgz"; - sha1 = "d2c177e2f1b17d87f81072cd05311c0754baa420"; + url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.2.2.tgz"; + sha512 = "srKbRJWxvZ8J6b7P3F0PrOtKgWg3pxlUPb1xbSIB+aMdK+UPKpp4aDzPV1A+IUTlea6lk9FWwI08UXQApC03lw=="; }; }; "graphql-upload-8.0.4" = { @@ -15830,22 +15729,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "handlebars-2.0.0" = { - name = "handlebars"; - packageName = "handlebars"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz"; - sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f"; - }; - }; - "handlebars-4.1.0" = { + "handlebars-4.1.1" = { name = "handlebars"; packageName = "handlebars"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.0.tgz"; - sha512 = "l2jRuU1NAWK6AW5qqcTATWQJvNPEwkM7NEKSiv/gqOsoSQbVoWyqVEY5GS+XPQ88zLNmqASRpzfdm8d79hJS+w=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz"; + sha512 = "3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA=="; }; }; "har-schema-1.0.5" = { @@ -16181,15 +16071,6 @@ let sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a"; }; }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; "hawk-3.1.3" = { name = "hawk"; packageName = "hawk"; @@ -16262,13 +16143,13 @@ let sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; }; }; - "highlight.js-9.15.5" = { + "highlight.js-9.15.6" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.15.5"; + version = "9.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.5.tgz"; - sha512 = "rxTzkHOur3JzJGHuKKfd9xoE5cBMkMPsAck1LcchT7WbMe4NjT2o1JQtpSrT2/k6iAsfRCgPOlv8FpZob67g7g=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz"; + sha512 = "zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ=="; }; }; "hiredis-0.4.1" = { @@ -16289,15 +16170,6 @@ let sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; }; }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; "hoek-2.16.3" = { name = "hoek"; packageName = "hoek"; @@ -16388,6 +16260,15 @@ let sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; }; }; + "html-encoding-sniffer-1.0.2" = { + name = "html-encoding-sniffer"; + packageName = "html-encoding-sniffer"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; + }; + }; "html-entities-1.2.1" = { name = "html-entities"; packageName = "html-entities"; @@ -16397,6 +16278,15 @@ let sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; }; }; + "html-tags-1.2.0" = { + name = "html-tags"; + packageName = "html-tags"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-tags/-/html-tags-1.2.0.tgz"; + sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98"; + }; + }; "htmlescape-1.1.1" = { name = "htmlescape"; packageName = "htmlescape"; @@ -16406,13 +16296,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "htmlnano-0.1.10" = { + "htmlnano-0.2.3" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.1.10"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.1.10.tgz"; - sha512 = "eTEUzz8VdWYp+w/KUdb99kwao4reR64epUySyZkQeepcyzPQ2n2EPWzibf6QDxmkGy10Kr+CKxYqI3izSbmhJQ=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.3.tgz"; + sha512 = "iS6T3J5gk2wInodbtMUyAU8sLYJOhuWDnIEd8lFRoHTypVGgawPHFEx2ZIK/XTErtDfwHBsrXeCwHAP8bdoSWw=="; }; }; "htmlparser2-3.10.1" = { @@ -16550,15 +16440,6 @@ let sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; }; }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -16676,13 +16557,13 @@ let sha512 = "80kUQN6aZhdip4vHRhLyYrJ8Uhj34Xw1RdAtMwQNChoOlnVAvOzVh+ffIs6NiqBF4ExU25ToOvPTaYv+pYZBbg=="; }; }; - "hyperdrive-9.14.2" = { + "hyperdrive-9.14.3" = { name = "hyperdrive"; packageName = "hyperdrive"; - version = "9.14.2"; + version = "9.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.2.tgz"; - sha512 = "er9ZPrOypGpDVMNC3l08JT1rLx/Q6RJnFu6z0iGXvdDxudAtJ90hgoIQfl6qdyjC8pD2t1KXaKRwRSdznhX66A=="; + url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-9.14.3.tgz"; + sha512 = "j722JRSwempuD8fn5VPVDHR/NFBFKxUlZ1ZLvTTipVkV70uWC9OyWYBlYqWp/b4ZgZpVhcpfzqzpsL1i/H+pTw=="; }; }; "hyperdrive-http-4.4.0" = { @@ -16721,13 +16602,13 @@ let sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; }; }; - "i18next-11.6.0" = { + "i18next-14.1.1" = { name = "i18next"; packageName = "i18next"; - version = "11.6.0"; + version = "14.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-11.6.0.tgz"; - sha512 = "+eOdu1laoPX8l3zuaEFpf0MPYqAyKeX46WEjRkpPLp0TcijP3ww6NrDCPcRwX3yKB69R+ggiLvLGzCm8ALaVXQ=="; + url = "https://registry.npmjs.org/i18next/-/i18next-14.1.1.tgz"; + sha512 = "HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg=="; }; }; "iconv-lite-0.4.11" = { @@ -16775,6 +16656,15 @@ let sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; }; + "icss-replace-symbols-1.1.0" = { + name = "icss-replace-symbols"; + packageName = "icss-replace-symbols"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; + sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; + }; + }; "ieee754-1.1.12" = { name = "ieee754"; packageName = "ieee754"; @@ -16820,13 +16710,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.0.5" = { + "ignore-5.0.6" = { name = "ignore"; packageName = "ignore"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.0.5.tgz"; - sha512 = "kOC8IUb8HSDMVcYrDVezCxpJkzSQWTAzf3olpKM6o9rM5zpojx23O0Fl8Wr4+qJ6ZbPEHqf1fdwev/DS7v7pmA=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.0.6.tgz"; + sha512 = "/+hp3kUf/Csa32ktIaj0OlRqQxrgs30n62M90UBpNd9k+ENEch5S+hmbW3DtcJGz3sYFTh4F3A6fQ0q7KWsp4w=="; }; }; "ignore-by-default-1.0.1" = { @@ -16928,13 +16818,13 @@ let sha1 = "97b38fd444114eec16824a935f8da575b57aa1ce"; }; }; - "import-jsx-1.3.0" = { + "import-jsx-1.3.2" = { name = "import-jsx"; packageName = "import-jsx"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.0.tgz"; - sha512 = "YQ1wdkSZeRhWNvlSyQGvn8d34tIChAYb/USZv08tHATBWOyfXIU7u2R/YieyCRZIVNUxB5G9Bq+aiyrep/zejQ=="; + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.2.tgz"; + sha512 = "9y2DexZ7+6XqcaJljFcLDAP7kwlfDQb+KhgfwWyWACAbNIXykB7YI21Kz/17oOqkPH9RS/YEf3f4YCFGXH8gmw=="; }; }; "import-lazy-2.1.0" = { @@ -17855,6 +17745,15 @@ let sha512 = "but/G3sapV3MNyqiDBLrOi4x8uCIw0RY3o/Vb5GT0sMFHrVV7731wFSVy41T5FO1og7G0gXLJh0MkgPRouko/A=="; }; }; + "is-html-1.1.0" = { + name = "is-html"; + packageName = "is-html"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-html/-/is-html-1.1.0.tgz"; + sha1 = "e04f1c18d39485111396f9a0273eab51af218464"; + }; + }; "is-installed-globally-0.1.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -17945,15 +17844,6 @@ let sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; }; }; - "is-number-0.1.1" = { - name = "is-number"; - packageName = "is-number"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"; - sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806"; - }; - }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -18008,24 +17898,6 @@ let sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; }; }; - "is-path-cwd-1.0.0" = { - name = "is-path-cwd"; - packageName = "is-path-cwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; - }; - }; - "is-path-in-cwd-1.0.1" = { - name = "is-path-in-cwd"; - packageName = "is-path-in-cwd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; - }; - }; "is-path-inside-1.0.1" = { name = "is-path-inside"; packageName = "is-path-inside"; @@ -18224,15 +18096,6 @@ let sha512 = "3vcJecUUrpgCqc/ca0aWeNu64UGgxcvO60K/Fkr1N6RSvfGCTU60UKN68JDmKokgba0rFFJs12EnzOQa14ubKQ=="; }; }; - "is-svg-2.1.0" = { - name = "is-svg"; - packageName = "is-svg"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz"; - sha1 = "cf61090da0d9efbcab8722deba6f032208dbb0e9"; - }; - }; "is-svg-3.0.0" = { name = "is-svg"; packageName = "is-svg"; @@ -18656,13 +18519,13 @@ let sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="; }; }; - "js-beautify-1.8.9" = { + "js-beautify-1.9.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.8.9"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz"; - sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz"; + sha512 = "P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw=="; }; }; "js-levenshtein-1.1.6" = { @@ -18737,22 +18600,22 @@ let sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A=="; }; }; - "js-yaml-3.12.1" = { + "js-yaml-3.12.2" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.1"; + version = "3.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz"; - sha512 = "um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz"; + sha512 = "QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q=="; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.13.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; }; "js2xmlparser-3.0.0" = { @@ -18782,22 +18645,22 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jsdom-7.2.2" = { + "jsdom-11.12.0" = { name = "jsdom"; packageName = "jsdom"; - version = "7.2.2"; + version = "11.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; - sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; + url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz"; + sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; }; }; - "jsdom-9.2.1" = { + "jsdom-7.2.2" = { name = "jsdom"; packageName = "jsdom"; - version = "9.2.1"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-9.2.1.tgz"; - sha1 = "061cbccc6e563d14493f653af92eadc3c0d39910"; + url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; + sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; "jsesc-0.5.0" = { @@ -18827,31 +18690,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jshint-2.10.1" = { - name = "jshint"; - packageName = "jshint"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.10.1.tgz"; - sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw=="; - }; - }; - "jshint-2.5.11" = { + "jshint-2.10.2" = { name = "jshint"; packageName = "jshint"; - version = "2.5.11"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz"; - sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0"; - }; - }; - "jslint-0.3.4" = { - name = "jslint"; - packageName = "jslint"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/jslint/-/jslint-0.3.4.tgz"; - sha1 = "fb768ac8de0641fcc570c87ca1fbd28e293c8d75"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; }; "json-buffer-2.0.11" = { @@ -18908,6 +18753,15 @@ let sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89"; }; }; + "json-refs-3.0.12" = { + name = "json-refs"; + packageName = "json-refs"; + version = "3.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.12.tgz"; + sha512 = "6RbO1Y3e0Hty/tEpXtQG6jUx7g1G8e39GIOuPugobPC8BX1gZ0OGZQpBn1FLWGkuWF35GRGADvhwdEIFpwIjyA=="; + }; + }; "json-rpc2-0.8.1" = { name = "json-rpc2"; packageName = "json-rpc2"; @@ -19052,13 +18906,13 @@ let sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; }; }; - "jsonata-1.5.4" = { + "jsonata-1.6.4" = { name = "jsonata"; packageName = "jsonata"; - version = "1.5.4"; + version = "1.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.4.tgz"; - sha512 = "F/p92UWYUn+kD3SE898jjlz1mkBzjtok9ZTtWT6+axS4Z2Wtc8p/md6xHkyCGWPdIEJBTSw0mlvKE+s+fAVSjg=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.6.4.tgz"; + sha512 = "3MWTH77OHLf3muMknZJS4GnDhGPMITyF9D84hpRQrjt1Hk3pBtTiyZcqodHUDSaDq8VDy9YyIbanRI+3RoW3FA=="; }; }; "jsonfile-1.0.1" = { @@ -19151,13 +19005,13 @@ let sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; }; }; - "jsonwebtoken-8.5.0" = { + "jsonwebtoken-8.5.1" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; - sha512 = "IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; + sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; "jsprim-0.3.0" = { @@ -19251,22 +19105,22 @@ let sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; }; }; - "jwa-1.3.0" = { + "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; - sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; + sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; - "jws-3.2.1" = { + "jws-3.2.2" = { name = "jws"; packageName = "jws"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz"; - sha512 = "bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g=="; + url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; + sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; "k-bucket-0.6.0" = { @@ -19395,6 +19249,15 @@ let sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; }; }; + "keyv-3.1.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + }; "kind-of-1.1.0" = { name = "kind-of"; packageName = "kind-of"; @@ -19467,6 +19330,15 @@ let sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; }; }; + "kleur-3.0.2" = { + name = "kleur"; + packageName = "kleur"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kleur/-/kleur-3.0.2.tgz"; + sha512 = "3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q=="; + }; + }; "knockout-3.5.0" = { name = "knockout"; packageName = "knockout"; @@ -19476,15 +19348,6 @@ let sha512 = "vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg=="; }; }; - "knox-0.8.10" = { - name = "knox"; - packageName = "knox"; - version = "0.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/knox/-/knox-0.8.10.tgz"; - sha1 = "6a2edcdac1d2ae379d1e1994d559b95c283b2588"; - }; - }; "kuler-1.0.1" = { name = "kuler"; packageName = "kuler"; @@ -19557,6 +19420,15 @@ let sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; + "latest-version-4.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-4.0.0.tgz"; + sha512 = "b4Myk7aQiQJvgssw2O8yITjELdqKRX4JQJUF1IUplgLaA8unv7s+UsAOwH6Q0/a09czSvlxEm306it2LBXrCzg=="; + }; + }; "launch-editor-2.2.1" = { name = "launch-editor"; packageName = "launch-editor"; @@ -19647,6 +19519,15 @@ let sha1 = "e400e57f0e60d8ef2bd4d068dc428a54345dbcda"; }; }; + "left-pad-1.3.0" = { + name = "left-pad"; + packageName = "left-pad"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz"; + sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA=="; + }; + }; "length-prefixed-message-3.0.3" = { name = "length-prefixed-message"; packageName = "length-prefixed-message"; @@ -19656,15 +19537,6 @@ let sha1 = "245474d69abc0614dca368dc35aa8074982a23ac"; }; }; - "less-1.7.5" = { - name = "less"; - packageName = "less"; - version = "1.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-1.7.5.tgz"; - sha1 = "4f220cf7288a27eaca739df6e4808a2d4c0d5756"; - }; - }; "less-2.7.3" = { name = "less"; packageName = "less"; @@ -19746,13 +19618,13 @@ let sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; }; }; - "leveldown-4.0.1" = { + "leveldown-4.0.2" = { name = "leveldown"; packageName = "leveldown"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/leveldown/-/leveldown-4.0.1.tgz"; - sha512 = "ZlBKVSsglPIPJnz4ggB8o2R0bxDxbsMzuQohbfgoFMVApyTE118DK5LNRG0cRju6rt3OkGxe0V6UYACGlq/byg=="; + url = "https://registry.npmjs.org/leveldown/-/leveldown-4.0.2.tgz"; + sha512 = "SUgSRTWFh3eeiTdIt2a4Fi9TZO5oWzE9uC/Iw8+fVr1sk8x1S2l151UWwSmrMFZB3GxJhZIf4bQ0n+051Cctpw=="; }; }; "levelup-0.19.1" = { @@ -19773,13 +19645,13 @@ let sha512 = "9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg=="; }; }; - "leven-1.0.2" = { + "leven-2.1.0" = { name = "leven"; packageName = "leven"; - version = "1.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"; - sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3"; + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; "levn-0.3.0" = { @@ -19791,24 +19663,6 @@ let sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; }; - "libbase64-0.1.0" = { - name = "libbase64"; - packageName = "libbase64"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz"; - sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6"; - }; - }; - "libmime-1.2.0" = { - name = "libmime"; - packageName = "libmime"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz"; - sha1 = "8d84b4f3b225b3704410236ef494906436ba742b"; - }; - }; "libnested-1.4.1" = { name = "libnested"; packageName = "libnested"; @@ -19836,15 +19690,6 @@ let sha512 = "nefbvJd/wY38zdt+b9SHL6171vqBrMtZ56Gsgfd0duEKb/pB8rDT4/ObUQLrHz1tOfht1flt2zM+UGaemzAG5g=="; }; }; - "libqp-1.1.0" = { - name = "libqp"; - packageName = "libqp"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; - sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; - }; - }; "libsodium-0.7.4" = { name = "libsodium"; packageName = "libsodium"; @@ -19872,15 +19717,6 @@ let sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; }; }; - "liftoff-2.0.3" = { - name = "liftoff"; - packageName = "liftoff"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz"; - sha1 = "fbab25362a506ac28a3db0c55cde9562fbd70456"; - }; - }; "liftoff-2.5.0" = { name = "liftoff"; packageName = "liftoff"; @@ -20052,15 +19888,6 @@ let sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; }; }; - "lodash-4.17.10" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.10"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz"; - sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="; - }; - }; "lodash-4.17.11" = { name = "lodash"; packageName = "lodash"; @@ -21042,13 +20869,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "log4js-3.0.6" = { + "log4js-4.0.2" = { name = "log4js"; packageName = "log4js"; - version = "3.0.6"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz"; - sha512 = "ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-4.0.2.tgz"; + sha512 = "KE7HjiieVDPPdveA3bJZSuu0n8chMkFl8mIoisBFxwEJ9FmXe4YzNuiqSwYUiR1K8q8/5/8Yd6AClENY1RA9ww=="; }; }; "logform-1.10.0" = { @@ -21339,13 +21166,13 @@ let sha512 = "mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA=="; }; }; - "macos-release-2.0.0" = { + "macos-release-2.1.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz"; - sha512 = "iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.1.0.tgz"; + sha512 = "8TCbwvN1mfNxbBv0yBtfyIFMo3m1QsNbKHv7PYIp/abRBKVQBXN7ecu3aeGGgT18VC/Tf397LBDGZF9KBGJFFw=="; }; }; "magic-string-0.22.5" = { @@ -21393,22 +21220,13 @@ let sha512 = "VYaJMxhr8B9BrCiNINUsuhaEe40YnG+AQBwcqUKO66lSVaI9I3A1iH/6EmEwRI8OYUg5Gt+4lLE7achg676lrg=="; }; }; - "mailcomposer-2.1.0" = { - name = "mailcomposer"; - packageName = "mailcomposer"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-2.1.0.tgz"; - sha1 = "a6531822899614fee899c92226d81e2b9cbb183d"; - }; - }; - "mailparser-0.6.2" = { - name = "mailparser"; - packageName = "mailparser"; - version = "0.6.2"; + "mailparser-mit-1.0.0" = { + name = "mailparser-mit"; + packageName = "mailparser-mit"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-0.6.2.tgz"; - sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068"; + url = "https://registry.npmjs.org/mailparser-mit/-/mailparser-mit-1.0.0.tgz"; + sha512 = "sckRITNb3VCT1sQ275g47MAN786pQ5lU20bLY5f794dF/ARGzuVATQ64gO13FOw8jayjFT10e5ttsripKGGXcw=="; }; }; "make-dir-1.3.0" = { @@ -21420,6 +21238,15 @@ let sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ=="; }; }; + "make-dir-2.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; + sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; + }; + }; "make-error-1.3.5" = { name = "make-error"; packageName = "make-error"; @@ -21456,6 +21283,15 @@ let sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw=="; }; }; + "makeerror-1.0.11" = { + name = "makeerror"; + packageName = "makeerror"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + }; "mamacro-0.0.3" = { name = "mamacro"; packageName = "mamacro"; @@ -21654,15 +21490,6 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; - "math-expression-evaluator-1.2.17" = { - name = "math-expression-evaluator"; - packageName = "math-expression-evaluator"; - version = "1.2.17"; - src = fetchurl { - url = "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz"; - sha1 = "de819fdbcd84dccd8fae59c6aeb79615b9d266ac"; - }; - }; "math-random-1.0.4" = { name = "math-random"; packageName = "math-random"; @@ -21762,6 +21589,15 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; + "media-typer-1.0.1" = { + name = "media-typer"; + packageName = "media-typer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-1.0.1.tgz"; + sha512 = "v42gdPIuqYCoDVH5OiaKsVrv6aJqdMWJzl8KCyDs/KeDyBveYp3Wxq4UWJfsWjkSZUNC0xlLfDlLCPa1h/oo+g=="; + }; + }; "mediasource-2.3.0" = { name = "mediasource"; packageName = "mediasource"; @@ -21780,13 +21616,13 @@ let sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; }; }; - "mem-4.1.0" = { + "mem-4.2.0" = { name = "mem"; packageName = "mem"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz"; - sha512 = "I5u6Q1x7wxO0kdOpYBB28xueHADYps5uty/zg936CiG8NTe5sJL8EjrCuLneuDW3PlMdZBGDIn8BirEVdovZvg=="; + url = "https://registry.npmjs.org/mem/-/mem-4.2.0.tgz"; + sha512 = "5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA=="; }; }; "mem-fs-1.1.3" = { @@ -21852,13 +21688,13 @@ let sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; }; }; - "memorystore-1.6.0" = { + "memorystore-1.6.1" = { name = "memorystore"; packageName = "memorystore"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.0.tgz"; - sha1 = "1fb5fb5f0b2edf1add184917e918f094a9ff3465"; + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.1.tgz"; + sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA=="; }; }; "menu-string-1.3.0" = { @@ -22167,15 +22003,6 @@ let sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="; }; }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -22203,15 +22030,6 @@ let sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog=="; }; }; - "mimelib-0.3.1" = { - name = "mimelib"; - packageName = "mimelib"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz"; - sha1 = "787add2415d827acb3af6ec4bca1ea9596418853"; - }; - }; "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -22221,6 +22039,15 @@ let sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; + "mimic-fn-2.0.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.0.0.tgz"; + sha512 = "jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA=="; + }; + }; "mimic-response-1.0.1" = { name = "mimic-response"; packageName = "mimic-response"; @@ -22284,15 +22111,6 @@ let sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; - "minimatch-1.0.0" = { - name = "minimatch"; - packageName = "minimatch"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"; - sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d"; - }; - }; "minimatch-2.0.10" = { name = "minimatch"; packageName = "minimatch"; @@ -22329,24 +22147,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-0.1.0" = { - name = "minimist"; - packageName = "minimist"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }; - }; - "minimist-1.1.3" = { - name = "minimist"; - packageName = "minimist"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz"; - sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; - }; - }; "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; @@ -22833,13 +22633,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.2.0" = { + "multiserver-3.3.1" = { name = "multiserver"; packageName = "multiserver"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.2.0.tgz"; - sha512 = "cJ9nnh/+aMwOpegTPSLC1zFRFJKn6f3va6WI0WPV84R55Llh8TinhpH8ZrpYfRofETykRWIvWhX6sQRZg04F1Q=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.3.1.tgz"; + sha512 = "c27pE5N8m6WlU9OkOWjmZ/jY/d+s9Wnpv45qtm65GkHtJKgNR5MBSxPA+r07RadNV9ZQJkCgEtpQg7M2eITGpw=="; }; }; "multiserver-address-1.0.1" = { @@ -22887,6 +22687,15 @@ let sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; }; }; + "mustache-3.0.1" = { + name = "mustache"; + packageName = "mustache"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mustache/-/mustache-3.0.1.tgz"; + sha512 = "jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA=="; + }; + }; "mutate.js-0.2.0" = { name = "mutate.js"; packageName = "mutate.js"; @@ -23040,6 +22849,15 @@ let sha512 = "JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="; }; }; + "nan-2.13.1" = { + name = "nan"; + packageName = "nan"; + version = "2.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz"; + sha512 = "I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA=="; + }; + }; "nanoassert-1.1.0" = { name = "nanoassert"; packageName = "nanoassert"; @@ -23103,6 +22921,15 @@ let sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw=="; }; }; + "napi-build-utils-1.0.1" = { + name = "napi-build-utils"; + packageName = "napi-build-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz"; + sha512 = "boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="; + }; + }; "napi-macros-1.8.2" = { name = "napi-macros"; packageName = "napi-macros"; @@ -23323,24 +23150,6 @@ let sha512 = "U8HkIv90/lrdNlHVp63PoF3FeuQUvJ6toMX6InqRqpBmQq9iukZRAnq/yCE4Ii6WHZRYa6DEiTH/EGFTZ0rIGg=="; }; }; - "needle-0.10.0" = { - name = "needle"; - packageName = "needle"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.10.0.tgz"; - sha1 = "16a24d63f2a61152eb74cce1d12af85c507577d4"; - }; - }; - "needle-0.11.0" = { - name = "needle"; - packageName = "needle"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-0.11.0.tgz"; - sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29"; - }; - }; "needle-2.2.4" = { name = "needle"; packageName = "needle"; @@ -23386,6 +23195,15 @@ let sha512 = "MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA=="; }; }; + "nested-error-stacks-2.0.1" = { + name = "nested-error-stacks"; + packageName = "nested-error-stacks"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz"; + sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="; + }; + }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -23539,13 +23357,13 @@ let sha1 = "e57063e6101c8387160ac2aa359d6427e1e26886"; }; }; - "node-elm-compiler-5.0.1" = { + "node-elm-compiler-5.0.3" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; - version = "5.0.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.1.tgz"; - sha512 = "Li9NfZTL83/URoUEWly+iHJeOcZRBYUaeIL4MImnB4r21oe/xpkR6JRHjdNjLf1rMtO0tgPyOvuGW4Beytaaow=="; + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.3.tgz"; + sha512 = "I3CWm/ExYYQ/a9bjB0OL9VsGa3Lmgbb8QOs4y2kEiB/DTkTqkcTaCr/lVyOYjRpgR25TsmOBATscsg6H6aC9Hg=="; }; }; "node-environment-flags-1.0.4" = { @@ -23701,13 +23519,13 @@ let sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="; }; }; - "node-red-node-email-0.1.29" = { + "node-red-node-email-1.3.0" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.29"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz"; - sha512 = "+tqda0bNT8A0PM9G47XqFiUP9gEe1zvB/9f+JJhbLWTEk9TeRB4UeyycubmCbR1/TzJnk2v9yCDogFhDJQWbOw=="; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-1.3.0.tgz"; + sha512 = "Pe4IdxYWTast5zZ0ByTeBJPj/AJNjxmTldz/2IeWrvbuCw9XscaD6Muwhep5/PGtLSC2n0mAH1uBq1fctVllTQ=="; }; }; "node-red-node-feedparser-0.1.14" = { @@ -23728,6 +23546,24 @@ let sha512 = "ft/8/dTRGzGQ9vCnAzuBxzR+aDv4Yun/vuSKi/eI5Qj2/ZBal28L9HpWziSTWlLrMhZns8CRz7s2p84P2ee/vA=="; }; }; + "node-red-node-sentiment-0.1.3" = { + name = "node-red-node-sentiment"; + packageName = "node-red-node-sentiment"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-sentiment/-/node-red-node-sentiment-0.1.3.tgz"; + sha512 = "X3F7VdfFJ4iioWCiMgIv1Pyp6YxUuA8Mod/zcHN3FHBM8aue2vL4bvAT/1zQgxqxehUVkKCbXr+cdRnJx5e7nw=="; + }; + }; + "node-red-node-tail-0.0.2" = { + name = "node-red-node-tail"; + packageName = "node-red-node-tail"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.0.2.tgz"; + sha512 = "+92kgY+SOW6Oq7GfH3x9HC/9YBAg5UmdZBl426nFg0K4x9oegLqCqW2S0/fBAgyDBQQF8eHmn/GjHeO32R0aRg=="; + }; + }; "node-red-node-twitter-1.1.4" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; @@ -23737,13 +23573,13 @@ let sha512 = "mkw8HOosXHMBRdyJkio77vPx4Ls5IY26P5ZyoMWmKMkimXKTnX00DdpmNlkW+dHwMDYq1H66WzFtQhNOdEAbgA=="; }; }; - "node-releases-1.1.8" = { + "node-releases-1.1.11" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.8.tgz"; - sha512 = "gQm+K9mGCiT/NXHy+V/ZZS1N/LOaGGqRAAJJs3X9Ah1g+CIbRcBgNyoNYQ+SEtcyAtB9KqDruu+fF7nWjsqRaA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.11.tgz"; + sha512 = "8v1j5KfP+s5WOTa1spNUAOfreajQPN12JXbRR0oDE+YrJBQCXBnNqUDj27EKpPLOoSiU3tKi3xGPB+JaOdUEQQ=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -23827,40 +23663,13 @@ let sha1 = "fae179165265509302cefbebeabd29bd4035184d"; }; }; - "nodemailer-1.11.0" = { + "nodemailer-4.7.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz"; - sha1 = "4e69cb39b03015b1d1ef0c78a815412b9e976f79"; - }; - }; - "nodemailer-direct-transport-1.1.0" = { - name = "nodemailer-direct-transport"; - packageName = "nodemailer-direct-transport"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz"; - sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624"; - }; - }; - "nodemailer-smtp-transport-1.1.0" = { - name = "nodemailer-smtp-transport"; - packageName = "nodemailer-smtp-transport"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz"; - sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398"; - }; - }; - "nodemailer-wellknown-0.1.10" = { - name = "nodemailer-wellknown"; - packageName = "nodemailer-wellknown"; - version = "0.1.10"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz"; - sha1 = "586db8101db30cb4438eb546737a41aad0cf13d5"; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz"; + sha512 = "IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw=="; }; }; "nodemon-1.18.10" = { @@ -23944,6 +23753,15 @@ let sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; + "normalize-html-whitespace-0.2.0" = { + name = "normalize-html-whitespace"; + packageName = "normalize-html-whitespace"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-html-whitespace/-/normalize-html-whitespace-0.2.0.tgz"; + sha1 = "101722f6423551c75cdb8f9d104ff850daf1e10e"; + }; + }; "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -23971,15 +23789,6 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-range-0.1.2" = { - name = "normalize-range"; - packageName = "normalize-range"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; - }; - }; "normalize-uri-1.1.1" = { name = "normalize-uri"; packageName = "normalize-uri"; @@ -23989,15 +23798,6 @@ let sha512 = "bui9/kzRGymbkxJsZEBZgDHK2WJWGOHzR0pCr404EpkpVFTkCOYaRwQTlehUE+7oI70mWNENncCWqUxT/icfHw=="; }; }; - "normalize-url-1.9.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"; - sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; - }; - }; "normalize-url-2.0.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -24034,15 +23834,6 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-3.10.10" = { - name = "npm"; - packageName = "npm"; - version = "3.10.10"; - src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.10.tgz"; - sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e"; - }; - }; "npm-6.4.1" = { name = "npm"; packageName = "npm"; @@ -24232,15 +24023,6 @@ let sha512 = "iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA=="; }; }; - "npmi-2.0.1" = { - name = "npmi"; - packageName = "npmi"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmi/-/npmi-2.0.1.tgz"; - sha1 = "32607657e1bd47ca857ab4e9d98f0a0cff96bcea"; - }; - }; "npmlog-2.0.4" = { name = "npmlog"; packageName = "npmlog"; @@ -24295,15 +24077,6 @@ let sha1 = "cabec1fd5f4da4aca995af90b7a0f379944e1dbd"; }; }; - "num2fraction-1.2.2" = { - name = "num2fraction"; - packageName = "num2fraction"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"; - sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; - }; - }; "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; @@ -24340,6 +24113,15 @@ let sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; }; }; + "nwsapi-2.1.1" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.1.tgz"; + sha512 = "T5GaA1J/d34AC8mkrFD2O0DR17kwJ702ZOtJOsS8RpbsQZVOC2/xYFb1i/cw+xdM54JIlMuojjDOYct8GIWtwg=="; + }; + }; "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; @@ -24359,15 +24141,6 @@ let sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; - "oauth-sign-0.3.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }; - }; "oauth-sign-0.8.2" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -24656,15 +24429,6 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; - "on-headers-1.0.1" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; - }; - }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -24863,6 +24627,15 @@ let sha512 = "YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw=="; }; }; + "opn-5.5.0" = { + name = "opn"; + packageName = "opn"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz"; + sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA=="; + }; + }; "optimism-0.6.9" = { name = "optimism"; packageName = "optimism"; @@ -24881,15 +24654,6 @@ let sha1 = "e981ab7e268b457948593b55674c099a815cac31"; }; }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - }; "optimist-0.6.0" = { name = "optimist"; packageName = "optimist"; @@ -24971,13 +24735,13 @@ let sha512 = "LBS97LFe2RV6GJmXBi6OKcETKyklHNMV0xw7BtsVn2MlsgsydyZetSCbCANr+PFLmDyv4KV88nn0eCKza665Mg=="; }; }; - "ora-3.1.0" = { + "ora-3.2.0" = { name = "ora"; packageName = "ora"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz"; - sha512 = "vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw=="; + url = "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz"; + sha512 = "XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA=="; }; }; "orchestrator-0.3.8" = { @@ -25160,13 +24924,13 @@ let sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; }; }; - "p-cancelable-1.0.0" = { + "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.0.0.tgz"; - sha512 = "USgPoaC6tkTGlS831CxsVdmZmyb8tR1D+hStI84MyckLOzfJlYQUweomrwE3D8T7u5u5GVuW064LT501wHTYYA=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; "p-defer-1.0.0" = { @@ -25223,13 +24987,13 @@ let sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; }; }; - "p-limit-2.1.0" = { + "p-limit-2.2.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz"; - sha512 = "NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz"; + sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ=="; }; }; "p-locate-2.0.0" = { @@ -25322,13 +25086,13 @@ let sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; }; }; - "p-try-2.0.0" = { + "p-try-2.1.0" = { name = "p-try"; packageName = "p-try"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz"; - sha512 = "hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ=="; + url = "https://registry.npmjs.org/p-try/-/p-try-2.1.0.tgz"; + sha512 = "H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA=="; }; }; "p-waterfall-1.0.0" = { @@ -25385,6 +25149,15 @@ let sha512 = "EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="; }; }; + "package-json-6.1.0" = { + name = "package-json"; + packageName = "package-json"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-6.1.0.tgz"; + sha512 = "TCE9JWb3IU1XMy/d9j3lwLJFF8UUfO7tiXminR3OhtsEm6147k+IFwQ3gAu2VqLZmFvcnOoIKUwOVteUmKwW4Q=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -25457,13 +25230,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "pako-1.0.8" = { + "pako-1.0.10" = { name = "pako"; packageName = "pako"; - version = "1.0.8"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.8.tgz"; - sha512 = "6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA=="; + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; "parallel-transform-1.1.0" = { @@ -25709,6 +25482,15 @@ let sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; }; }; + "parse5-4.0.0" = { + name = "parse5"; + packageName = "parse5"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz"; + sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA=="; + }; + }; "parsejson-0.0.1" = { name = "parsejson"; packageName = "parsejson"; @@ -25745,15 +25527,6 @@ let sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; }; }; - "parserlib-0.2.5" = { - name = "parserlib"; - packageName = "parserlib"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; - sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; - }; - }; "parserlib-1.1.1" = { name = "parserlib"; packageName = "parserlib"; @@ -26474,6 +26247,15 @@ let sha512 = "ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="; }; }; + "pn-1.1.0" = { + name = "pn"; + packageName = "pn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; + sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; + }; + }; "po2json-0.4.5" = { name = "po2json"; packageName = "po2json"; @@ -26520,13 +26302,22 @@ let sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa"; }; }; - "postcss-5.2.18" = { + "postcss-6.0.1" = { name = "postcss"; packageName = "postcss"; - version = "5.2.18"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz"; - sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz"; + sha1 = "000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"; + }; + }; + "postcss-6.0.23" = { + name = "postcss"; + packageName = "postcss"; + version = "6.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; + sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; "postcss-7.0.14" = { @@ -26538,15 +26329,6 @@ let sha512 = "NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg=="; }; }; - "postcss-calc-5.3.1" = { - name = "postcss-calc"; - packageName = "postcss-calc"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz"; - sha1 = "77bae7ca928ad85716e2fda42f261bf7c1d65b5e"; - }; - }; "postcss-calc-7.0.1" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -26556,15 +26338,6 @@ let sha512 = "oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ=="; }; }; - "postcss-colormin-2.2.2" = { - name = "postcss-colormin"; - packageName = "postcss-colormin"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz"; - sha1 = "6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"; - }; - }; "postcss-colormin-4.0.3" = { name = "postcss-colormin"; packageName = "postcss-colormin"; @@ -26574,15 +26347,6 @@ let sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; }; }; - "postcss-convert-values-2.6.1" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz"; - sha1 = "bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"; - }; - }; "postcss-convert-values-4.0.1" = { name = "postcss-convert-values"; packageName = "postcss-convert-values"; @@ -26592,15 +26356,6 @@ let sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; }; }; - "postcss-discard-comments-2.0.4" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz"; - sha1 = "befe89fafd5b3dace5ccce51b76b81514be00e3d"; - }; - }; "postcss-discard-comments-4.0.2" = { name = "postcss-discard-comments"; packageName = "postcss-discard-comments"; @@ -26610,15 +26365,6 @@ let sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; }; }; - "postcss-discard-duplicates-2.1.0" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz"; - sha1 = "b9abf27b88ac188158a5eb12abcae20263b91932"; - }; - }; "postcss-discard-duplicates-4.0.2" = { name = "postcss-discard-duplicates"; packageName = "postcss-discard-duplicates"; @@ -26628,15 +26374,6 @@ let sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; }; }; - "postcss-discard-empty-2.1.0" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz"; - sha1 = "d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"; - }; - }; "postcss-discard-empty-4.0.1" = { name = "postcss-discard-empty"; packageName = "postcss-discard-empty"; @@ -26646,15 +26383,6 @@ let sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; }; }; - "postcss-discard-overridden-0.1.1" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz"; - sha1 = "8b1eaf554f686fb288cd874c55667b0aa3668d58"; - }; - }; "postcss-discard-overridden-4.0.1" = { name = "postcss-discard-overridden"; packageName = "postcss-discard-overridden"; @@ -26664,42 +26392,6 @@ let sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; }; }; - "postcss-discard-unused-2.2.3" = { - name = "postcss-discard-unused"; - packageName = "postcss-discard-unused"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz"; - sha1 = "bce30b2cc591ffc634322b5fb3464b6d934f4433"; - }; - }; - "postcss-filter-plugins-2.0.3" = { - name = "postcss-filter-plugins"; - packageName = "postcss-filter-plugins"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz"; - sha512 = "T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ=="; - }; - }; - "postcss-merge-idents-2.1.7" = { - name = "postcss-merge-idents"; - packageName = "postcss-merge-idents"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz"; - sha1 = "4c5530313c08e1d5b3bbf3d2bbc747e278eea270"; - }; - }; - "postcss-merge-longhand-2.0.2" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz"; - sha1 = "23d90cd127b0a77994915332739034a1a4f3d658"; - }; - }; "postcss-merge-longhand-4.0.11" = { name = "postcss-merge-longhand"; packageName = "postcss-merge-longhand"; @@ -26709,15 +26401,6 @@ let sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; }; }; - "postcss-merge-rules-2.1.2" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz"; - sha1 = "d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"; - }; - }; "postcss-merge-rules-4.0.3" = { name = "postcss-merge-rules"; packageName = "postcss-merge-rules"; @@ -26727,24 +26410,6 @@ let sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; }; }; - "postcss-message-helpers-2.0.0" = { - name = "postcss-message-helpers"; - packageName = "postcss-message-helpers"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz"; - sha1 = "a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"; - }; - }; - "postcss-minify-font-values-1.0.5" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz"; - sha1 = "4b58edb56641eba7c8474ab3526cafd7bbdecb69"; - }; - }; "postcss-minify-font-values-4.0.2" = { name = "postcss-minify-font-values"; packageName = "postcss-minify-font-values"; @@ -26754,15 +26419,6 @@ let sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; }; }; - "postcss-minify-gradients-1.0.5" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz"; - sha1 = "5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"; - }; - }; "postcss-minify-gradients-4.0.2" = { name = "postcss-minify-gradients"; packageName = "postcss-minify-gradients"; @@ -26772,15 +26428,6 @@ let sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; }; }; - "postcss-minify-params-1.2.2" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz"; - sha1 = "ad2ce071373b943b3d930a3fa59a358c28d6f1f3"; - }; - }; "postcss-minify-params-4.0.2" = { name = "postcss-minify-params"; packageName = "postcss-minify-params"; @@ -26790,15 +26437,6 @@ let sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; }; }; - "postcss-minify-selectors-2.1.1" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz"; - sha1 = "b2c6a98c0072cf91b932d1a496508114311735bf"; - }; - }; "postcss-minify-selectors-4.0.2" = { name = "postcss-minify-selectors"; packageName = "postcss-minify-selectors"; @@ -26808,13 +26446,40 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; - "postcss-normalize-charset-1.1.1" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "1.1.1"; + "postcss-modules-extract-imports-1.1.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz"; + sha1 = "b614c9720be6816eaee35fb3a5faa1dba6a05ddb"; + }; + }; + "postcss-modules-local-by-default-1.2.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz"; - sha1 = "ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"; + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz"; + sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; + }; + }; + "postcss-modules-scope-1.1.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz"; + sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; + }; + }; + "postcss-modules-values-1.3.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz"; + sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; }; }; "postcss-normalize-charset-4.0.1" = { @@ -26880,15 +26545,6 @@ let sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; }; }; - "postcss-normalize-url-3.0.8" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz"; - sha1 = "108f74b3f2fcdaf891a2ffa3ea4592279fc78222"; - }; - }; "postcss-normalize-url-4.0.1" = { name = "postcss-normalize-url"; packageName = "postcss-normalize-url"; @@ -26907,15 +26563,6 @@ let sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; }; }; - "postcss-ordered-values-2.2.3" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz"; - sha1 = "eec6c2a67b6c412a8db2042e77fe8da43f95c11d"; - }; - }; "postcss-ordered-values-4.1.2" = { name = "postcss-ordered-values"; packageName = "postcss-ordered-values"; @@ -26925,24 +26572,6 @@ let sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; }; }; - "postcss-reduce-idents-2.4.0" = { - name = "postcss-reduce-idents"; - packageName = "postcss-reduce-idents"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz"; - sha1 = "c2c6d20cc958284f6abfbe63f7609bf409059ad3"; - }; - }; - "postcss-reduce-initial-1.0.1" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz"; - sha1 = "68f80695f045d08263a879ad240df8dd64f644ea"; - }; - }; "postcss-reduce-initial-4.0.3" = { name = "postcss-reduce-initial"; packageName = "postcss-reduce-initial"; @@ -26952,15 +26581,6 @@ let sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; }; }; - "postcss-reduce-transforms-1.0.4" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz"; - sha1 = "ff76f4d8212437b31c298a42d2e1444025771ae1"; - }; - }; "postcss-reduce-transforms-4.0.2" = { name = "postcss-reduce-transforms"; packageName = "postcss-reduce-transforms"; @@ -26970,15 +26590,6 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; - "postcss-selector-parser-2.2.3" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz"; - sha1 = "f9437788606c3c9acee16ffe8d8b16297f27bb90"; - }; - }; "postcss-selector-parser-3.1.1" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; @@ -26997,15 +26608,6 @@ let sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ=="; }; }; - "postcss-svgo-2.1.6" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz"; - sha1 = "b6df18aa613b666e133f08adb5219c2684ac108d"; - }; - }; "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; @@ -27015,15 +26617,6 @@ let sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; }; }; - "postcss-unique-selectors-2.0.2" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz"; - sha1 = "981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"; - }; - }; "postcss-unique-selectors-4.0.1" = { name = "postcss-unique-selectors"; packageName = "postcss-unique-selectors"; @@ -27042,15 +26635,6 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-zindex-2.2.0" = { - name = "postcss-zindex"; - packageName = "postcss-zindex"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz"; - sha1 = "d2109ddc055b91af67fc4cb3b025946639d2af22"; - }; - }; "posthtml-0.11.3" = { name = "posthtml"; packageName = "posthtml"; @@ -27087,13 +26671,13 @@ let sha512 = "jL6eFIzoN3xUEvbo33OAkSDE2VIKU4JQ1wENOows1DpfnrdapR/K3Q1/fB43Mq7wQlcSgRm23nFrvoioufM7eA=="; }; }; - "prebuild-install-4.0.0" = { + "prebuild-install-5.2.5" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "4.0.0"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz"; - sha512 = "7tayxeYboJX0RbVzdnKyGl2vhQRWr6qfClEXDhOkXjuaOKCw2q8aiuFhONRYVsG/czia7KhpykIlI2S2VaPunA=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.5.tgz"; + sha512 = "6uZgMVg7yDfqlP5CPurVhtq3hUKBFNufiar4J5hZrlHTo59DDBEtyxw01xCdFss9j0Zb9+qzFVf/s4niayba3w=="; }; }; "precond-0.2.3" = { @@ -27393,6 +26977,15 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; + "prompts-2.0.4" = { + name = "prompts"; + packageName = "prompts"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/prompts/-/prompts-2.0.4.tgz"; + sha512 = "HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA=="; + }; + }; "promzard-0.3.0" = { name = "promzard"; packageName = "promzard"; @@ -27519,13 +27112,13 @@ let sha512 = "CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg=="; }; }; - "proxy-agent-3.0.3" = { + "proxy-agent-3.1.0" = { name = "proxy-agent"; packageName = "proxy-agent"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.3.tgz"; - sha512 = "PXVVVuH9tiQuxQltFJVSnXWuDtNr+8aNBP6XVDDCDiUuDN8eRCm+ii4/mFWmXWEA0w8jjJSlePa4LXlM4jIzNA=="; + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.1.0.tgz"; + sha512 = "IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA=="; }; }; "proxy-from-env-1.0.0" = { @@ -28284,15 +27877,6 @@ let sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; }; }; - "qs-1.0.2" = { - name = "qs"; - packageName = "qs"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; - sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768"; - }; - }; "qs-1.2.0" = { name = "qs"; packageName = "qs"; @@ -28374,15 +27958,6 @@ let sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf"; }; }; - "query-string-4.3.4" = { - name = "query-string"; - packageName = "query-string"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"; - sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; - }; - }; "query-string-5.1.1" = { name = "query-string"; packageName = "query-string"; @@ -28410,13 +27985,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "querystringify-2.1.0" = { + "querystringify-2.1.1" = { name = "querystringify"; packageName = "querystringify"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz"; - sha512 = "sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg=="; + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; }; }; "quick-format-unescaped-3.0.2" = { @@ -28671,13 +28246,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "react-is-16.8.3" = { + "react-is-16.8.4" = { name = "react-is"; packageName = "react-is"; - version = "16.8.3"; + version = "16.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.8.3.tgz"; - sha512 = "Y4rC1ZJmsxxkkPuMLwvKvlL1Zfpbcu+Bf4ZigkHup3v9EfdYhAlWAaVyA19olXq2o2mGn0w+dFKvk3pVVlYcIA=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.8.4.tgz"; + sha512 = "PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA=="; }; }; "read-1.0.7" = { @@ -28869,13 +28444,13 @@ let sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; }; }; - "readable-stream-3.1.1" = { + "readable-stream-3.2.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz"; - sha512 = "DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz"; + sha512 = "RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw=="; }; }; "readdir-scoped-modules-1.0.2" = { @@ -28923,13 +28498,13 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "recast-0.17.3" = { + "recast-0.17.4" = { name = "recast"; packageName = "recast"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.17.3.tgz"; - sha512 = "NwQguXPwHqaVb6M7tsY11+8RDoAKHGRdymPGDxHJrsxOlNADQh0b08uz/MgYp1R1wmHuSBK4A4I5Oq+cE1J40g=="; + url = "https://registry.npmjs.org/recast/-/recast-0.17.4.tgz"; + sha512 = "94mbtFr2e4XoleJVCQQ138gK7xT2IScq25+thwEzNWd/hjOXQd6ejFiztgZZGVSByoV7/k3pLBXO3RK1BvJsIw=="; }; }; "rechoir-0.6.2" = { @@ -29004,24 +28579,6 @@ let sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; }; }; - "reduce-css-calc-1.3.0" = { - name = "reduce-css-calc"; - packageName = "reduce-css-calc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"; - sha1 = "747c914e049614a4c9cfbba629871ad1d2927716"; - }; - }; - "reduce-function-call-1.0.2" = { - name = "reduce-function-call"; - packageName = "reduce-function-call"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"; - sha1 = "5a200bf92e0e37751752fe45b0ab330fd4b6be99"; - }; - }; "regenerate-1.4.0" = { name = "regenerate"; packageName = "regenerate"; @@ -29031,13 +28588,13 @@ let sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; }; }; - "regenerate-unicode-properties-7.0.0" = { + "regenerate-unicode-properties-8.0.2" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "7.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz"; - sha512 = "s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz"; + sha512 = "SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ=="; }; }; "regenerator-runtime-0.11.1" = { @@ -29067,6 +28624,15 @@ let sha512 = "5KzMIyPLvfdPmvsdlYsHqITrDfK9k7bmvf97HvHSN4810i254ponbxCQ1NukpRWlu6en2MBWzAlhDExEKISwAA=="; }; }; + "regenerator-runtime-0.13.2" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz"; + sha512 = "S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -29121,13 +28687,22 @@ let sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="; }; }; - "regexpu-core-4.4.0" = { + "regexpu-core-1.0.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.4.0"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz"; + sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b"; + }; + }; + "regexpu-core-4.5.4" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz"; - sha512 = "eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz"; + sha512 = "BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ=="; }; }; "registry-auth-token-3.3.2" = { @@ -29139,6 +28714,15 @@ let sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; }; }; + "registry-auth-token-3.4.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A=="; + }; + }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -29148,6 +28732,24 @@ let sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; }; }; + "registry-url-5.0.0" = { + name = "registry-url"; + packageName = "registry-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-5.0.0.tgz"; + sha512 = "qH1SjdlyxreHU8atIDzP1MOb1GG2g5746L3nnwISWTUh8GBLotl82sOayZJtm/KwmrMeMaEzAV26o6Pk1hJuoA=="; + }; + }; + "regjsgen-0.2.0" = { + name = "regjsgen"; + packageName = "regjsgen"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"; + sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7"; + }; + }; "regjsgen-0.5.0" = { name = "regjsgen"; packageName = "regjsgen"; @@ -29157,6 +28759,15 @@ let sha512 = "RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="; }; }; + "regjsparser-0.1.5" = { + name = "regjsparser"; + packageName = "regjsparser"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"; + sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; + }; + }; "regjsparser-0.6.0" = { name = "regjsparser"; packageName = "regjsparser"; @@ -29301,15 +28912,6 @@ let sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; }; }; - "repeat-string-0.2.2" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"; - sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; - }; - }; "repeat-string-1.6.1" = { name = "repeat-string"; packageName = "repeat-string"; @@ -29364,15 +28966,6 @@ let sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e"; }; }; - "request-2.40.0" = { - name = "request"; - packageName = "request"; - version = "2.40.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.40.0.tgz"; - sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67"; - }; - }; "request-2.81.0" = { name = "request"; packageName = "request"; @@ -29508,6 +29101,15 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; + "requireg-0.2.1" = { + name = "requireg"; + packageName = "requireg"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/requireg/-/requireg-0.2.1.tgz"; + sha512 = "bbNOK9MAyAGe4Q9/0skx6bzkFVRvVuHerXZthc3jmf2/cO7gthKM7GpnhW522Vx3/uCLA9RXXpQaqdXHRrZVxQ=="; + }; + }; "requirejs-2.3.6" = { name = "requirejs"; packageName = "requirejs"; @@ -29553,6 +29155,15 @@ let sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg=="; }; }; + "resolve-1.7.1" = { + name = "resolve"; + packageName = "resolve"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; + sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + }; + }; "resolve-cwd-2.0.0" = { name = "resolve-cwd"; packageName = "resolve-cwd"; @@ -29562,13 +29173,13 @@ let sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; }; - "resolve-dependencies-2.2.1" = { + "resolve-dependencies-2.2.2" = { name = "resolve-dependencies"; packageName = "resolve-dependencies"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.1.tgz"; - sha512 = "nZkQEcXmJG5C3oDkbILK3fdFyhtwdV+67OD+0sUKLZU+ZJ/ozWsCe7Hyq0bqmhvmtnBgtmOO91OfiqCv6bu+GA=="; + url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.2.tgz"; + sha512 = "lZARvM5mDaVOBUNam2fbaHYydBBPMlMt6jjlQYvD8D2N//SOlq6iqqFrCWsYkBGYtXgix4EAiTFuZLpt5lXQtA=="; }; }; "resolve-dir-1.0.1" = { @@ -29940,13 +29551,13 @@ let sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ=="; }; }; - "rollup-pluginutils-2.4.1" = { + "rollup-pluginutils-2.5.0" = { name = "rollup-pluginutils"; packageName = "rollup-pluginutils"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.4.1.tgz"; - sha512 = "wesMQ9/172IJDIW/lYWm0vW0LiKe5Ekjws481R7z9WTRtmO59cqyM/2uUlxvf6yzm/fElFmHUobeQOYz46dZJw=="; + url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.5.0.tgz"; + sha512 = "9Muh1H+XB5f5ONmKMayUoTYR1EZwHbwJJ9oZLrKT5yuTf/RLIQ5mYIGsrERquVucJmjmaAW0Y7+6Qo1Ep+5w3Q=="; }; }; "root-check-1.0.0" = { @@ -29967,13 +29578,13 @@ let sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; }; }; - "rss-parser-3.6.2" = { + "rss-parser-3.7.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.6.2"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.6.2.tgz"; - sha512 = "xXaMG7Zsj2+t16X+mysd419TpD2UQZifXwTo6Ks9GnUgF8GezPb3LVnh8BuCRm9V9Ty2gC0FRSvBJi8Ks2lfpg=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.0.tgz"; + sha512 = "xN1fwjVxBO0unbrUAOIUK5MAyEaaZTpKWnPY+d3QYigIG4awtbdqxHPOLuOwsTIJFsaKC78nPxIGRJG92p86Hw=="; }; }; "rsvp-3.6.2" = { @@ -29985,6 +29596,15 @@ let sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="; }; }; + "rsvp-4.8.4" = { + name = "rsvp"; + packageName = "rsvp"; + version = "4.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.4.tgz"; + sha512 = "6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA=="; + }; + }; "run-async-0.1.0" = { name = "run-async"; packageName = "run-async"; @@ -30183,13 +29803,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "safer-eval-1.3.0" = { + "safer-eval-1.3.2" = { name = "safer-eval"; packageName = "safer-eval"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.0.tgz"; - sha512 = "4qkBS8VzJatFR7F0eZfKoJyjqo43jY1jBvRhB5WXM0eJNjx9fiSmph5NApJefqKqpASKWPfaIJCJMMeWePSzfw=="; + url = "https://registry.npmjs.org/safer-eval/-/safer-eval-1.3.2.tgz"; + sha512 = "mAkc9NX+ULPw4qX+lkFVuIhXQbjFaX97fWFj6atFXMG11lUX4rXfQY6Q0VFf1wfJfqCHYO7cxtC7cA8fIkWsLQ=="; }; }; "sander-0.5.1" = { @@ -30201,6 +29821,15 @@ let sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; }; }; + "sane-4.1.0" = { + name = "sane"; + packageName = "sane"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz"; + sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="; + }; + }; "sanitize-filename-1.6.1" = { name = "sanitize-filename"; packageName = "sanitize-filename"; @@ -30219,15 +29848,6 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "sax-0.5.8" = { - name = "sax"; - packageName = "sax"; - version = "0.5.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; - }; - }; "sax-1.1.4" = { name = "sax"; packageName = "sax"; @@ -30300,13 +29920,13 @@ let sha512 = "iJgGEykTXa8772vmYMGM20jYifTV7lg96bFeitGjly99aIEkIKHkiJWb+3KZ98dg4gwtF/6L+XhL/76iBgKhpA=="; }; }; - "secret-stack-5.1.0" = { + "secret-stack-5.1.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-5.1.0.tgz"; - sha512 = "lCY0Oad4BYSKDlMbVXNEZEF8qVTbz2tNB7oNdlZAFg7k558Njq/bCx5MEj9GWmc+n+GhnxAXQYB5+CX1+0v4iQ=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-5.1.1.tgz"; + sha512 = "EHOmkh/CWTOXOtOgqfG1k3ziYJ7bg4zMy52UG7sIwNcoF0scHTt8cZg1tbJfMCDlx+VdYbRfsBZ/aq4v8F+IFw=="; }; }; "secure-keys-1.0.0" = { @@ -31011,13 +30631,13 @@ let sha1 = "71766db352326928cf3a807242ba762322636723"; }; }; - "simple-sha1-2.1.1" = { + "simple-sha1-2.1.2" = { name = "simple-sha1"; packageName = "simple-sha1"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz"; - sha512 = "pFMPd+I/lQkpf4wFUeS/sED5IqdIG1lUlrQviBMV4u4mz8BRAcB5fvUx5Ckfg3kBigEglAjHg7E9k/yy2KlCqA=="; + url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.2.tgz"; + sha512 = "TQl9rm4rdKAVmhO++sXAb8TNN0D6JAD5iyI1mqEPNpxUzTRrtm4aOG1pDf/5W/qCFihiaoK6uuL9rvQz1x1VKw=="; }; }; "simple-swizzle-0.2.2" = { @@ -31074,6 +30694,15 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; + "sisteransi-1.0.0" = { + name = "sisteransi"; + packageName = "sisteransi"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.0.tgz"; + sha512 = "N+z4pHB4AmUv0SjveWRd6q1Nj5w62m5jodv+GD8lvmbY/83T/rpbJGZOnK5T149OldDj4Db07BSv9xY4K6NTPQ=="; + }; + }; "skin-tone-1.0.0" = { name = "skin-tone"; packageName = "skin-tone"; @@ -31200,15 +30829,6 @@ let sha1 = "42d45710e791deb92df91326c8eed1bd5a842cb6"; }; }; - "smtp-connection-1.3.8" = { - name = "smtp-connection"; - packageName = "smtp-connection"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz"; - sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536"; - }; - }; "snabbdom-0.7.0" = { name = "snabbdom"; packageName = "snabbdom"; @@ -31272,15 +30892,6 @@ let sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - }; "sntp-1.0.9" = { name = "sntp"; packageName = "sntp"; @@ -31317,13 +30928,13 @@ let sha512 = "hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA=="; }; }; - "snyk-gradle-plugin-2.1.3" = { + "snyk-gradle-plugin-2.3.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "2.1.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.3.tgz"; - sha512 = "xti5Uox0NLPO89O/MQd9qgnlynNtO2eXSukzyjONeGgueyNv6I7FQnUvHtVj6IUCBPlMP8c5D7bQmlFfemz8ZA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.3.0.tgz"; + sha512 = "XnADEkQ4YXxFrKnd+F2+ixmvhgDG4yyBpYE1RMx3i/2y9auXkt/E+pWTmU4xnofFEtuAnZiYcfvOE6dIGk06KA=="; }; }; "snyk-module-1.9.1" = { @@ -31407,13 +31018,13 @@ let sha512 = "7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw=="; }; }; - "snyk-resolve-deps-4.0.2" = { + "snyk-resolve-deps-4.0.3" = { name = "snyk-resolve-deps"; packageName = "snyk-resolve-deps"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.2.tgz"; - sha512 = "nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA=="; + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.3.tgz"; + sha512 = "GP3VBrkz1iDDw2q8ftTqppHqzIAxmsUIoXR+FRWDKcipkKHXHJyUmtEo11QVT5fNRV0D0RCsssk2S5CTxTCu6A=="; }; }; "snyk-sbt-plugin-2.0.1" = { @@ -31596,15 +31207,6 @@ let sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; }; }; - "socks-2.2.3" = { - name = "socks"; - packageName = "socks"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.2.3.tgz"; - sha512 = "+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA=="; - }; - }; "socks-2.3.2" = { name = "socks"; packageName = "socks"; @@ -31623,13 +31225,13 @@ let sha512 = "ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA=="; }; }; - "socks-proxy-agent-4.0.1" = { + "socks-proxy-agent-4.0.2" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.1.tgz"; - sha512 = "Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz"; + sha512 = "NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg=="; }; }; "socks5-client-1.2.6" = { @@ -31659,22 +31261,22 @@ let sha512 = "FbZ/X/2Xq3DAMhuRA4bnN0jy1QxaPTVPLFvyv6CEj0QDKSTdWp9yRxo1JhqXmWKhPQeJyUMajHJB2UjT43pFcw=="; }; }; - "sodium-browserify-1.2.4" = { + "sodium-browserify-1.2.5" = { name = "sodium-browserify"; packageName = "sodium-browserify"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.4.tgz"; - sha512 = "IYcxKje/uf/c3a7VhZYJLlUxWMcktfbD4AjqHjUD1/VWKjj0Oq5wNbX8wjJOWVO9UhUMqJQiOn2xFbzKWBmy5w=="; + url = "https://registry.npmjs.org/sodium-browserify/-/sodium-browserify-1.2.5.tgz"; + sha512 = "X3+Z4uYPGceVjRz6qLY/4clVU/gYo1KC9q4L4FSjqFfomzsndMutNAgbVoJa0nsilQw6I/Y7jDQ7SCbUdaOiKw=="; }; }; - "sodium-browserify-tweetnacl-0.2.3" = { + "sodium-browserify-tweetnacl-0.2.5" = { name = "sodium-browserify-tweetnacl"; packageName = "sodium-browserify-tweetnacl"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.3.tgz"; - sha1 = "b5537ffcbb9f74ebc443b8b6a211b291e8fcbc8e"; + url = "https://registry.npmjs.org/sodium-browserify-tweetnacl/-/sodium-browserify-tweetnacl-0.2.5.tgz"; + sha512 = "Q6YgyMyEB7dFLTt3vB8/YSjmSQrpQ/J4VEZfivOxRXFRs8BLjn39jA2X7sJO1Co4+Ma5kD+DSZm8x7Tum7ajQw=="; }; }; "sodium-chloride-1.1.2" = { @@ -31821,15 +31423,6 @@ let sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61"; }; }; - "source-map-0.1.34" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.34"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; - sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; - }; - }; "source-map-0.4.4" = { name = "source-map"; packageName = "source-map"; @@ -31902,6 +31495,15 @@ let sha512 = "YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ=="; }; }; + "source-map-support-0.5.11" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz"; + sha512 = "//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ=="; + }; + }; "source-map-support-0.5.3" = { name = "source-map-support"; packageName = "source-map-support"; @@ -32082,13 +31684,13 @@ let sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; }; }; - "split2-3.1.0" = { + "split2-3.1.1" = { name = "split2"; packageName = "split2"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.1.0.tgz"; - sha512 = "ePE1otNQVMnBRyqf3INbZvZwBPGsdBDThgrOWZ6z8zXGNVQNVCSEoOO9aBMTzDN1mXoNSZJ2kHSFH7AA5SPWww=="; + url = "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz"; + sha512 = "emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q=="; }; }; "sprintf-js-1.0.3" = { @@ -32127,22 +31729,22 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-blobs-1.1.12" = { + "ssb-blobs-1.1.13" = { name = "ssb-blobs"; packageName = "ssb-blobs"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.12.tgz"; - sha512 = "huR2ABWAbPZEyol5m9qkO29S+vnGx0epKXpxQkqbj7ATIC8abia7hLIISpQkNrCv2NtdPGJOERZPNbkaiCzGgg=="; + url = "https://registry.npmjs.org/ssb-blobs/-/ssb-blobs-1.1.13.tgz"; + sha512 = "vW/PuIBQMU06GFjbmUrszT14nZGXtuTT+wRuFnBde2Jg7KEhyWSAGx57YjqmZdJbHCd8N2/CQKAWre97PabvoQ=="; }; }; - "ssb-client-4.7.0" = { + "ssb-client-4.7.1" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.0.tgz"; - sha512 = "jMuPSdAwcOoWbgwR/CnyU2MyP6FxGwyPHxa+trWIg+oobs3lryGwgm8BfM0Rdgw9ywdvJJO0xHJ8Hc5ROCe8Aw=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.1.tgz"; + sha512 = "b6pCnYLPq1elhO+ZJLnnPXJECO8dYYpK2OGxCO8ZPGFIn1O1eiKvXoWy4lGBR06jmDY6JVu9ZgTWQ4vSOjPt9w=="; }; }; "ssb-config-2.3.9" = { @@ -32163,13 +31765,13 @@ let sha512 = "/4nFP7yj1JD5jrwX9bHG2nipBefl++xXXbNWD14eL+Ohs3X8kdmJeBKnHgiIF7Je4HQOI31OmEIdyyLKum5niQ=="; }; }; - "ssb-ebt-5.4.1" = { + "ssb-ebt-5.5.3" = { name = "ssb-ebt"; packageName = "ssb-ebt"; - version = "5.4.1"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.4.1.tgz"; - sha512 = "ddXLpLmVHSChKb66vkGBxV/GI0hlqaYho0rfw83ZmdQAqMjavlvtj/JPL8EMToN+eIq6iAagmSXX2p+a6GvM5g=="; + url = "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.5.3.tgz"; + sha512 = "eB41pjKGJspgHo9XioR6LVoxy60p4acyv1J/bRflncOd121Md29aPbTY3X4rAMKGlaXkrUPSD9C1jB+kXSjWVg=="; }; }; "ssb-friends-3.1.13" = { @@ -32433,13 +32035,13 @@ let sha512 = "Qe8QntFrrpWTnHwvwj2FZTgv+PKIsp0B9VxLzLLbSpPXWOgRgc5LVj/aTiSfK1RqIeF9jeC1UeOH8Q8y60A7og=="; }; }; - "static-eval-2.0.1" = { + "static-eval-2.0.2" = { name = "static-eval"; packageName = "static-eval"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.1.tgz"; - sha512 = "1JJ8ADJ7UB//CRqocI6j4WxGvSqQHX14Fz0gXDNvRA6Y1JIAI/lMNdqn1lpnaA6ugQ0fMH0uBB955DkwhKActw=="; + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; + sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; }; }; "static-extend-0.1.2" = { @@ -32595,15 +32197,6 @@ let sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg=="; }; }; - "stream-counter-0.1.0" = { - name = "stream-counter"; - packageName = "stream-counter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.1.0.tgz"; - sha1 = "a035e429361fb57f361606e17fcd8a8b9677327b"; - }; - }; "stream-counter-0.2.0" = { name = "stream-counter"; packageName = "stream-counter"; @@ -32703,13 +32296,13 @@ let sha1 = "b1edb2e1c8cb11289d1b503c08d3f2aef51e650f"; }; }; - "stream-to-pull-stream-1.7.2" = { + "stream-to-pull-stream-1.7.3" = { name = "stream-to-pull-stream"; packageName = "stream-to-pull-stream"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.2.tgz"; - sha1 = "757609ae1cebd33c7432d4afbe31ff78650b9dde"; + url = "https://registry.npmjs.org/stream-to-pull-stream/-/stream-to-pull-stream-1.7.3.tgz"; + sha512 = "6sNyqJpr5dIOQdgNy/xcDWwDuzAsAwVzhzrWlAPAQ7Lkjx/rv0wgvxEyKwTq6FmNd5rjTrELt/CLmaSw7crMGg=="; }; }; "stream-transcoder-0.0.5" = { @@ -32739,13 +32332,13 @@ let sha512 = "UxSISjxmguvfYzZdq6d4XAjc3gAocqTIOS1CjgwkDkkGT/LMTsIYiV8agIw42IHFFHf8k4lPOoroCCf4W9oqzg=="; }; }; - "streamroller-0.7.0" = { + "streamroller-1.0.3" = { name = "streamroller"; packageName = "streamroller"; - version = "0.7.0"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz"; - sha512 = "WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-1.0.3.tgz"; + sha512 = "P7z9NwP51EltdZ81otaGAN3ob+/F88USJE546joNq7bqRNTe6jc74fTBDyynxP4qpIfKlt/CesEYicuMzI0yJg=="; }; }; "streamsearch-0.1.2" = { @@ -32856,13 +32449,13 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-3.0.0" = { + "string-width-3.1.0" = { name = "string-width"; packageName = "string-width"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.0.0.tgz"; - sha512 = "rr8CUxBbvOZDUvc5lNIJ+OC1nPVpz+Siw9VBtUjB9b6jZehZLFt0JMCZzShFHIsI8cbhm0EsNIfWJMFV3cu3Ew=="; + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; "string.prototype.codepointat-0.2.1" = { @@ -33000,13 +32593,13 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "strip-ansi-5.0.0" = { + "strip-ansi-5.2.0" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "5.0.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz"; - sha512 = "Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; "strip-bom-1.0.0" = { @@ -33198,22 +32791,22 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "subcommand-2.1.0" = { + "subcommand-2.1.1" = { name = "subcommand"; packageName = "subcommand"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.0.tgz"; - sha1 = "5e4ceca5a3779e3365b1511e05f866877302f760"; + url = "https://registry.npmjs.org/subcommand/-/subcommand-2.1.1.tgz"; + sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; - "subscriptions-transport-ws-0.9.15" = { + "subscriptions-transport-ws-0.9.16" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.15"; + version = "0.9.16"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.15.tgz"; - sha512 = "f9eBfWdHsePQV67QIX+VRhf++dn1adyC/PZHP6XI5AfKnZ4n0FW+v5omxwdHVpd4xq2ZijaHEcmlQrhBY79ZWQ=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.16.tgz"; + sha512 = "pQdoU7nC+EpStXnCfh/+ho0zE0Z+ma+i7xvj7bkXKb1dvYHSZxgRPaU6spRP+Bjzow67c/rRDoix5RT0uU9omw=="; }; }; "sudo-block-1.2.0" = { @@ -33378,15 +32971,6 @@ let sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"; }; }; - "svgo-0.7.2" = { - name = "svgo"; - packageName = "svgo"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz"; - sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; - }; - }; "svgo-1.2.0" = { name = "svgo"; packageName = "svgo"; @@ -33550,6 +33134,15 @@ let sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; }; }; + "tail-2.0.2" = { + name = "tail"; + packageName = "tail"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tail/-/tail-2.0.2.tgz"; + sha512 = "raFipiKWdGKEzxbvZwnhUGqjvsv0gpa/1A479rL//NOxnNwYZDN4MPk6xJJdUFs8P2Xrff3nbH5fcyYRLU4UHQ=="; + }; + }; "taketalk-1.0.0" = { name = "taketalk"; packageName = "taketalk"; @@ -33730,13 +33323,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "terser-3.16.1" = { + "terser-3.17.0" = { name = "terser"; packageName = "terser"; - version = "3.16.1"; + version = "3.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz"; - sha512 = "JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow=="; + url = "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz"; + sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; "terser-webpack-plugin-1.2.3" = { @@ -33901,13 +33494,13 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.0" = { + "through2-3.0.1" = { name = "through2"; packageName = "through2"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.0.tgz"; - sha512 = "8B+sevlqP4OiCjonI1Zw03Sf8PuV1eRsYQgLad5eonILOdyeRsY27A/2Ze8IlvlMvq31OH+3fz/styI7Ya62yQ=="; + url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; + sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; }; }; "through2-filter-3.0.0" = { @@ -33991,6 +33584,15 @@ let sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; }; }; + "timeout-refresh-1.0.0" = { + name = "timeout-refresh"; + packageName = "timeout-refresh"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz"; + sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg=="; + }; + }; "timers-browserify-1.4.2" = { name = "timers-browserify"; packageName = "timers-browserify"; @@ -34054,15 +33656,6 @@ let sha1 = "93d9decffc8805bd57eae4310f0b745e9b6fb3a7"; }; }; - "tiny-worker-2.1.2" = { - name = "tiny-worker"; - packageName = "tiny-worker"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.1.2.tgz"; - sha512 = "t8xrlrw0ScBnJ1K5ziHcD6u2SgWpE9Tozv4EIqpXMnCfEVc3pWzMx+ZFwqpXk20C4WTRoLZVBi9v1tLkaciCTg=="; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -34135,6 +33728,15 @@ let sha512 = "hOabTz9Tp49wCozFwuJe5ISrOqkECm6kzw66XTP23DuzNU7QS/KiZq5LC9Y7QSy8f1rPSLy4bKaViP0OwGI1cA=="; }; }; + "tmpl-1.0.4" = { + name = "tmpl"; + packageName = "tmpl"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + }; "to-absolute-glob-2.0.2" = { name = "to-absolute-glob"; packageName = "to-absolute-glob"; @@ -34414,15 +34016,6 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; - "tough-cookie-3.0.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; - }; - }; "township-client-1.3.2" = { name = "township-client"; packageName = "township-client"; @@ -34612,13 +34205,31 @@ let sha1 = "cfde6fabd72d63e5797cfaab873abbe8e700e912"; }; }; - "ts-node-7.0.1" = { + "ts-invariant-0.2.1" = { + name = "ts-invariant"; + packageName = "ts-invariant"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.2.1.tgz"; + sha512 = "Z/JSxzVmhTo50I+LKagEISFJW3pvPCqsMWLamCTX8Kr3N5aMrnGOqcflbe5hLUzwjvgPfnLzQtHZv0yWQ+FIHg=="; + }; + }; + "ts-invariant-0.3.2" = { + name = "ts-invariant"; + packageName = "ts-invariant"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.2.tgz"; + sha512 = "QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg=="; + }; + }; + "ts-node-8.0.3" = { name = "ts-node"; packageName = "ts-node"; - version = "7.0.1"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz"; - sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.0.3.tgz"; + sha512 = "2qayBA4vdtVRuDo11DEFSsD/SFsBXQBRZZhbRGSIkmYmVkWjULn/GGMdG10KVqkaGndljfaTD8dKjWgcejO8YA=="; }; }; "tslib-1.9.3" = { @@ -34702,6 +34313,15 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "tweetnacl-1.0.1" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz"; + sha512 = "kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A=="; + }; + }; "tweetnacl-auth-0.3.1" = { name = "tweetnacl-auth"; packageName = "tweetnacl-auth"; @@ -34801,22 +34421,22 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.1.6" = { + "typescript-3.2.4" = { name = "typescript"; packageName = "typescript"; - version = "3.1.6"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.1.6.tgz"; - sha512 = "tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; + sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; }; - "typescript-3.2.4" = { + "typescript-3.3.4000" = { name = "typescript"; packageName = "typescript"; - version = "3.2.4"; + version = "3.3.4000"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; - sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz"; + sha512 = "jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA=="; }; }; "typewise-1.0.3" = { @@ -34855,40 +34475,40 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; - "uglify-js-2.3.6" = { + "uglify-js-2.8.29" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.3.6"; + version = "2.8.29"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; - sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-2.4.24" = { + "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.4.24"; + version = "3.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"; + sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-2.8.29" = { + "uglify-js-3.4.9" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.29"; + version = "3.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; - sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; + sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; }; }; - "uglify-js-3.4.9" = { + "uglify-js-3.5.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.9"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; - sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; + sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -35035,6 +34655,15 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; + "uncss-0.16.2" = { + name = "uncss"; + packageName = "uncss"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uncss/-/uncss-0.16.2.tgz"; + sha1 = "3b2269c59012da7c66cbe98fbedddeef94f0649c"; + }; + }; "undeclared-identifiers-1.1.3" = { name = "undeclared-identifiers"; packageName = "undeclared-identifiers"; @@ -35170,22 +34799,22 @@ let sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; }; }; - "unicode-match-property-value-ecmascript-1.0.2" = { + "unicode-match-property-value-ecmascript-1.1.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz"; - sha512 = "Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; + sha512 = "hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="; }; }; - "unicode-property-aliases-ecmascript-1.0.4" = { + "unicode-property-aliases-ecmascript-1.0.5" = { name = "unicode-property-aliases-ecmascript"; packageName = "unicode-property-aliases-ecmascript"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz"; - sha512 = "2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg=="; + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; + sha512 = "L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="; }; }; "unicode-trie-0.3.1" = { @@ -35512,6 +35141,15 @@ let sha512 = "bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw=="; }; }; + "upath-1.1.2" = { + name = "upath"; + packageName = "upath"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz"; + sha512 = "kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q=="; + }; + }; "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; @@ -35917,6 +35555,15 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; + "utp-native-2.1.3" = { + name = "utp-native"; + packageName = "utp-native"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.3.tgz"; + sha512 = "lXjmAJxlaz58GDFlEqKYkNzO5rqttA+/TVHl7UUAs8Saj1QJq/3D4IckuVpsmCsjjZod5N7sE8QMUCYScVHDpg=="; + }; + }; "uue-3.1.2" = { name = "uue"; packageName = "uue"; @@ -36502,13 +36149,22 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-cli-plugin-apollo-0.19.1" = { + "vue-cli-plugin-apollo-0.19.2" = { name = "vue-cli-plugin-apollo"; packageName = "vue-cli-plugin-apollo"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.19.1.tgz"; - sha512 = "GVXCamuTmT7EpTFJHUNR48Lbg1Y+ZnED1fQ6nveTqAf7VCSADswJyX75gYrJSjWUP4N3BJqzT/O/JVWJfB1G2Q=="; + url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.19.2.tgz"; + sha512 = "gWZsSbfHR2CmMLgpHxj6viwLczUdZ3zdwkXPoEUa7yn34Z8mZJW/fokwhPONgQNTrs3KNcq+zNQA7ED09+fP4A=="; + }; + }; + "w3c-hr-time-1.0.1" = { + name = "w3c-hr-time"; + packageName = "w3c-hr-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; }; }; "walk-2.3.14" = { @@ -36520,6 +36176,15 @@ let sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg=="; }; }; + "walker-1.0.7" = { + name = "walker"; + packageName = "walker"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + }; "ware-1.3.0" = { name = "ware"; packageName = "ware"; @@ -36583,15 +36248,6 @@ let sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; - }; - }; "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -36601,22 +36257,22 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.29.5" = { + "webpack-4.29.6" = { name = "webpack"; packageName = "webpack"; - version = "4.29.5"; + version = "4.29.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.29.5.tgz"; - sha512 = "DuWlYUT982c7XVHodrLO9quFbNpVq5FNxLrMUfYUTlgKW0+yPimynYf1kttSQpEneAL1FH3P3OLNgkyImx8qIQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz"; + sha512 = "MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw=="; }; }; - "webpack-cli-3.2.3" = { + "webpack-cli-3.3.0" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz"; - sha512 = "Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.0.tgz"; + sha512 = "t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw=="; }; }; "webpack-core-0.6.9" = { @@ -36664,13 +36320,22 @@ let sha512 = "lchLOk435iDWs0jNuL+hiU14i3ERSrMA0IKSiJh7z6X/i4XNsutBZrtqu2CPOZuA4G/zabiqVAos0vW+S7GEVw=="; }; }; - "webtorrent-0.103.0" = { + "webtorrent-0.103.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.103.0"; + version = "0.103.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.103.1.tgz"; + sha512 = "rqMD8sAaPzrUzEpA6gDEOgcN9Xyz4WGrQiHoVY6HlymLoNSkScMnmnEX1bsdMcIU9iOrnUlghDEW9sJ9jYCmwQ=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.103.0.tgz"; - sha512 = "4N8+KQMtQw7KPz8Zjz8Y9S+olkpRA1kdUpbJynQHnSzIkTNJGPL9c6akBTOvtSfTtXs4kETts6eUIZkml6xRoA=="; + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; "whatwg-fetch-2.0.4" = { @@ -36682,13 +36347,22 @@ let sha512 = "dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="; }; }; - "whatwg-url-3.1.0" = { + "whatwg-mimetype-2.3.0" = { + name = "whatwg-mimetype"; + packageName = "whatwg-mimetype"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; + }; + }; + "whatwg-url-6.5.0" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "3.1.0"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-3.1.0.tgz"; - sha1 = "7bdcae490f921aef6451fb6739ec6bbd8e907bf6"; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; }; }; "whatwg-url-7.0.0" = { @@ -36727,15 +36401,6 @@ let sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; }; }; - "whet.extend-0.9.9" = { - name = "whet.extend"; - packageName = "whet.extend"; - version = "0.9.9"; - src = fetchurl { - url = "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz"; - sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; - }; - }; "which-1.2.4" = { name = "which"; packageName = "which"; @@ -37159,6 +36824,15 @@ let sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; }; }; + "ws-6.2.0" = { + name = "ws"; + packageName = "ws"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.0.tgz"; + sha512 = "deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w=="; + }; + }; "wtf-8-1.0.0" = { name = "wtf-8"; packageName = "wtf-8"; @@ -37258,6 +36932,15 @@ let sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; }; }; + "xml-name-validator-3.0.0" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; + }; + }; "xml2js-0.2.4" = { name = "xml2js"; packageName = "xml2js"; @@ -37267,15 +36950,6 @@ let sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d"; }; }; - "xml2js-0.2.8" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz"; - sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2"; - }; - }; "xml2js-0.4.19" = { name = "xml2js"; packageName = "xml2js"; @@ -37583,15 +37257,6 @@ let sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; }; }; - "yargs-3.5.4" = { - name = "yargs"; - packageName = "yargs"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; - }; - }; "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; @@ -37745,13 +37410,13 @@ let sha512 = "KLxE5ft/74Qj7h3AsQZv8G6MEEHYJwmD5F99nfOVaep3rBzCtbrJKkdqWc7bDV141Nr8UZZsIXmzc3IcCm6E2w=="; }; }; - "yn-2.0.0" = { + "yn-3.0.0" = { name = "yn"; packageName = "yn"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; - sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; + url = "https://registry.npmjs.org/yn/-/yn-3.0.0.tgz"; + sha512 = "+Wo/p5VRfxUgBUGy2j/6KX2mj9AYJWOHuhMjMcbBFc3y54o9/4buK1ksBvuiK01C3kby8DH9lSmJdSxw+4G/2Q=="; }; }; "yosay-2.0.2" = { @@ -37790,13 +37455,13 @@ let sha512 = "fa+6aDUVvavYsefZw0zaZ/v3ckEtMgCFi30sn91SEZea4y/6jQp05E3omjkX91zV6RVdn15fqnFZ6RKjRGbp2g=="; }; }; - "zen-observable-ts-0.8.15" = { + "zen-observable-ts-0.8.18" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "0.8.15"; + version = "0.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.15.tgz"; - sha512 = "sXKPWiw6JszNEkRv5dQ+lQCttyjHM2Iks74QU5NP8mMPS/NrzTlHDr780gf/wOBqmHkPO6NCLMlsa+fAQ8VE8w=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz"; + sha512 = "q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A=="; }; }; "zerr-1.0.4" = { @@ -37841,17 +37506,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "7.3.3"; + version = "7.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.3.tgz"; - sha512 = "dw1iBOYbQRN2l/BH21zDItDFC9KXgqeK0A/koDLDukjrUAnW/XVATjxGi+7EPlTpABTFhqu/rHZDy8aBglLDXQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.6.tgz"; + sha512 = "u5lBcYVQRk9cez/DozJvFOYomeko9b5kE+NElyFhPtM3GF1SBcXKb5QyNxH/zSOc850VL7KPe7ZfC6kW3Phhyw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.13.3" - sources."@angular-devkit/core-7.3.3" - sources."@angular-devkit/schematics-7.3.3" - sources."@schematics/angular-7.3.3" - sources."@schematics/update-0.13.3" + sources."@angular-devkit/architect-0.13.6" + sources."@angular-devkit/core-7.3.6" + sources."@angular-devkit/schematics-7.3.6" + sources."@schematics/angular-7.3.6" + sources."@schematics/update-0.13.6" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.2.1" @@ -37867,7 +37532,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -38065,7 +37730,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."node-fetch-npm-2.0.2" sources."normalize-package-data-2.5.0" @@ -38178,8 +37843,8 @@ in sources."kind-of-3.2.2" ]; }) - sources."socks-2.2.3" - sources."socks-proxy-agent-4.0.1" + sources."socks-2.3.2" + sources."socks-proxy-agent-4.0.2" sources."source-map-0.7.3" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -38214,9 +37879,9 @@ in ]; }) sources."string_decoder-1.1.1" - (sources."strip-ansi-5.0.0" // { + (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" ]; }) sources."supports-color-5.5.0" @@ -38254,7 +37919,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -38319,10 +37984,10 @@ in azure-functions-core-tools = nodeEnv.buildNodePackage { name = "azure-functions-core-tools"; packageName = "azure-functions-core-tools"; - version = "2.4.401"; + version = "2.4.419"; src = fetchurl { - url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.401.tgz"; - sha512 = "Tj2xiWe38/KGUuYwojVujA1UiLvMfqUtTpp31/XzWnK3GwjNb8srL0mDIGxj3ssU2RSmgFtetQVCuXnUhZ4o9g=="; + url = "https://registry.npmjs.org/azure-functions-core-tools/-/azure-functions-core-tools-2.4.419.tgz"; + sha512 = "GMVzgR1VwKGOZ819qkgYV0PxqK/xJRZU4ZwLGRHfJZmngHC/FN1fw/yaQxNahCokBuCoSHECzbVG6jobUxbriw=="; }; dependencies = [ sources."agent-base-4.2.1" @@ -38547,7 +38212,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.6.2" sources."acorn-walk-6.1.1" @@ -38643,7 +38308,7 @@ in sources."module-deps-6.2.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."pako-1.0.8" + sources."pako-1.0.10" sources."parents-1.0.1" sources."parse-asn1-5.1.4" sources."path-browserify-0.0.1" @@ -38724,7 +38389,7 @@ in dependencies = [ sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -38784,7 +38449,7 @@ in sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { dependencies = [ - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" sources."string_decoder-1.2.0" ]; }) @@ -39022,7 +38687,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."simple-sha1-2.1.1" + sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { dependencies = [ sources."isarray-1.0.0" @@ -39274,11 +38939,11 @@ in sources."acorn-dynamic-import-4.0.0" (sources."acorn-node-1.6.2" // { dependencies = [ - sources."acorn-6.1.0" + sources."acorn-6.1.1" ]; }) sources."acorn-walk-6.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."aliasify-2.1.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -39361,7 +39026,7 @@ in sources."combine-source-map-0.8.0" sources."combined-stream-1.0.7" sources."compressible-2.0.16" - sources."compression-1.7.3" + sources."compression-1.7.4" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -39598,7 +39263,7 @@ in sources."once-1.4.0" sources."onetime-1.1.0" sources."opener-1.5.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."os-browserify-0.1.2" sources."os-homedir-1.0.2" sources."os-name-1.0.3" @@ -39662,7 +39327,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."request-2.88.0" sources."resolve-1.10.0" @@ -39806,6 +39471,10 @@ in dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-11.11.4" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -39853,8 +39522,8 @@ in sources."component-emitter-1.2.1" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" - sources."cp-file-6.0.0" - sources."cpy-7.0.1" + sources."cp-file-6.1.0" + sources."cpy-7.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -39865,7 +39534,7 @@ in }) sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" - sources."dir-glob-2.0.0" + sources."dir-glob-2.2.2" sources."error-ex-1.3.2" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -39914,7 +39583,7 @@ in ]; }) sources."glob-to-regexp-0.3.0" - sources."globby-8.0.2" + sources."globby-9.1.0" sources."graceful-fs-4.1.15" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -39923,7 +39592,7 @@ in ]; }) sources."hosted-git-info-2.7.1" - sources."ignore-3.3.10" + sources."ignore-4.0.6" sources."indent-string-3.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -39947,10 +39616,14 @@ in sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" sources."kind-of-6.0.2" - sources."load-json-file-4.0.0" + (sources."load-json-file-4.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-1.3.0" + sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -39993,8 +39666,12 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."path-type-3.0.0" - sources."pify-3.0.0" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-4.0.1" sources."posix-character-classes-0.1.1" sources."quick-lru-1.1.0" sources."read-pkg-3.0.0" @@ -40015,7 +39692,7 @@ in ]; }) sources."signal-exit-3.0.2" - sources."slash-1.0.0" + sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -40129,7 +39806,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-11.9.5" + sources."@types/node-11.11.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -40158,7 +39835,7 @@ in sources."d-1.0.0" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-set-0.1.5" @@ -40260,10 +39937,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "2.1.5"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.1.5.tgz"; - sha512 = "sTbhSYYT3lX6bAhI3NRt2qLYMy0z3BV+8GW9xfFqpNWKuji4DkJmlg+IfxQTvnA0l9BZTFK3r5GObA2NNAIy/w=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-2.1.8.tgz"; + sha512 = "osHOZ3fw4BT4+L3CnhGsr/92CXEczQ/0fl/vd1Tbud4gT1ykt3a+zQlNJpOchDCnZjSqpHOxoWaH0XljFOhJLg=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -40421,7 +40098,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -40534,19 +40211,11 @@ in sources."crypto-random-string-1.0.0" sources."cycle-1.0.3" sources."dashdash-1.14.1" - sources."dat-dns-3.1.0" - (sources."dat-doctor-2.1.1" // { - dependencies = [ - sources."debug-3.2.6" - ]; - }) + sources."dat-dns-3.2.0" + sources."dat-doctor-2.1.2" sources."dat-encoding-5.0.1" sources."dat-ignore-2.1.2" - (sources."dat-json-1.0.2" // { - dependencies = [ - sources."dat-encoding-4.0.2" - ]; - }) + sources."dat-json-1.0.3" sources."dat-link-resolve-2.3.0" (sources."dat-log-1.2.0" // { dependencies = [ @@ -40554,7 +40223,7 @@ in ]; }) sources."dat-node-3.5.14" - sources."dat-registry-4.0.0" + sources."dat-registry-4.0.1" sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" @@ -40575,7 +40244,11 @@ in sources."thunky-0.1.0" ]; }) - sources."discovery-swarm-5.1.4" + (sources."discovery-swarm-5.1.4" // { + dependencies = [ + sources."utp-native-1.7.3" + ]; + }) (sources."dns-discovery-6.2.3" // { dependencies = [ sources."debug-2.6.9" @@ -40682,7 +40355,7 @@ in sources."varint-5.0.0" ]; }) - sources."hyperdrive-9.14.2" + sources."hyperdrive-9.14.3" sources."hyperdrive-http-4.4.0" (sources."hyperdrive-network-speed-2.1.0" // { dependencies = [ @@ -40787,7 +40460,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanomatch-1.2.13" @@ -40861,7 +40534,7 @@ in sources."readable-stream-2.3.6" sources."recursive-watch-1.1.4" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-array-items-1.1.1" sources."remove-trailing-separator-1.1.0" @@ -40893,7 +40566,7 @@ in }) sources."simple-concat-1.0.0" sources."simple-get-3.0.3" - sources."simple-sha1-2.1.1" + sources."simple-sha1-2.1.2" sources."siphash24-1.1.1" sources."slice-ansi-1.0.0" (sources."snapdragon-0.8.2" // { @@ -40971,17 +40644,13 @@ in sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."subcommand-2.1.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) + sources."subcommand-2.1.1" sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."throttle-1.0.3" sources."thunky-1.0.3" sources."timed-out-4.0.1" + sources."timeout-refresh-1.0.0" sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -41041,7 +40710,12 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - sources."utp-native-1.7.3" + (sources."utp-native-2.1.3" // { + dependencies = [ + sources."readable-stream-3.2.0" + sources."unordered-set-2.0.1" + ]; + }) sources."uuid-3.3.2" sources."varint-3.0.1" sources."verror-1.10.0" @@ -41105,7 +40779,7 @@ in sources."async-0.9.2" sources."better-curry-1.6.0" sources."binaryheap-0.0.3" - sources."bindings-1.4.0" + sources."bindings-1.5.0" sources."bluebird-2.9.9" sources."bottleneck-1.5.3" sources."buffercursor-0.0.12" @@ -41166,7 +40840,7 @@ in sources."mime-types-2.1.22" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -41244,12 +40918,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.410.0" + sources."aws-sdk-2.425.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -41261,7 +40935,7 @@ in sources."combined-stream-1.0.7" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."decimal.js-10.0.2" + sources."decimal.js-10.1.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events-1.1.1" @@ -41355,6 +41029,386 @@ in production = true; bypassCache = true; }; + elm-doc-preview = nodeEnv.buildNodePackage { + name = "elm-doc-preview"; + packageName = "elm-doc-preview"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-doc-preview/-/elm-doc-preview-2.0.3.tgz"; + sha512 = "YQZTlFX/DdR2hjJC00nof1hMG4DNeSFbxf45GTVpedPRKZXIZDJI5zeXukGCwD7lPJZIm9gegjqJPXLCCghv8g=="; + }; + dependencies = [ + sources."@cnakazawa/watch-1.0.3" + sources."@sindresorhus/is-0.7.0" + sources."accepts-1.3.5" + sources."ansi-styles-3.2.1" + sources."anymatch-2.0.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."async-limiter-1.0.0" + sources."atob-2.1.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."body-parser-1.18.3" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."bser-2.0.0" + sources."bytes-3.0.0" + sources."cache-base-1.0.1" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) + sources."capture-exit-2.0.0" + sources."chalk-2.4.2" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."clone-response-1.0.2" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.19.0" + sources."component-emitter-1.2.1" + sources."content-disposition-0.5.2" + sources."content-type-1.0.4" + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."cross-spawn-6.0.5" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."define-property-2.0.2" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."exec-sh-0.3.2" + (sources."execa-1.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."express-4.16.4" + (sources."express-ws-4.0.0" // { + dependencies = [ + sources."ws-5.2.2" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fb-watchman-2.0.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."finalhandler-1.1.1" + sources."for-in-1.0.2" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."got-8.3.2" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."http-cache-semantics-3.8.1" + sources."http-errors-1.6.3" + sources."iconv-lite-0.4.23" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."into-stream-3.1.0" + sources."ipaddr.js-1.8.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-object-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isurl-1.0.0" + sources."json-buffer-3.0.0" + sources."keyv-3.0.0" + sources."kind-of-6.0.2" + sources."latest-version-4.0.0" + sources."lowercase-keys-1.0.1" + sources."makeerror-1.0.11" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."micromatch-3.1.10" + sources."mime-1.4.1" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" + sources."mimic-response-1.0.1" + sources."minimist-1.2.0" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + sources."negotiator-0.6.1" + sources."nice-try-1.0.5" + sources."node-int64-0.4.0" + sources."normalize-path-2.1.1" + sources."normalize-url-2.0.1" + sources."npm-run-path-2.0.2" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."on-finished-2.3.0" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."p-cancelable-0.4.1" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-timeout-2.0.1" + sources."package-json-5.0.0" + sources."parseurl-1.3.2" + sources."pascalcase-0.1.1" + sources."path-key-2.0.1" + sources."path-to-regexp-0.1.7" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.0" + sources."proxy-addr-2.0.4" + sources."pump-3.0.0" + sources."qs-6.5.2" + sources."query-string-5.1.1" + sources."range-parser-1.2.0" + sources."raw-body-2.3.3" + sources."rc-1.2.8" + sources."readable-stream-2.3.6" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."ret-0.1.15" + sources."rsvp-4.8.4" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sane-4.1.0" + sources."semver-5.6.0" + sources."send-0.16.2" + sources."serve-static-1.13.2" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."sort-keys-2.0.0" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.4.0" + sources."strict-uri-encode-1.1.0" + sources."string_decoder-1.1.1" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."tmpl-1.0.4" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."type-is-1.6.16" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."vary-1.1.2" + sources."walker-1.0.7" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."ws-6.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Elm offline documentation previewer with hot reloading."; + homepage = "https://github.com/dmy/elm-doc-preview#readme"; + license = "SEE LICENSE IN LICENSE.md"; + }; + production = true; + bypassCache = true; + }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; @@ -41372,7 +41426,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-limiter-1.0.0" sources."atob-2.1.2" (sources."base-0.11.2" // { @@ -41436,7 +41490,7 @@ in ]; }) sources."encodeurl-1.0.2" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-promisify-6.0.1" sources."es6-symbol-3.1.1" @@ -41555,7 +41609,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -41604,7 +41658,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" - sources."querystringify-2.1.0" + sources."querystringify-2.1.1" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -41801,23 +41855,27 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.0-rev5"; + version = "0.19.0-rev6"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev5.tgz"; - sha512 = "D/LS6Db9VIuaM3UffbBkrHmR6oLpm68EYVSru9CeHkVqUQwedVuLmZX6d0jvnU0C8I/dLSEdXlGueaPgTGhNnA=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.0-rev6.tgz"; + sha512 = "Qdy9QusZF+eT0203XBiT1Y/UhFeUjcSuyyzf3iyp32dsYpAfcoDTWHjlBVjia1CyvFauESQ4pc81nKaq6snClg=="; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-styles-3.2.1" - sources."anymatch-1.3.2" - sources."arr-diff-2.0.0" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-unique-0.2.1" + sources."array-unique-0.3.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -41826,7 +41884,6 @@ in (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) sources."bcrypt-pbkdf-1.0.2" @@ -41836,17 +41893,22 @@ in sources."block-stream-0.0.9" sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - sources."buffers-0.1.1" - (sources."cache-base-1.0.1" // { + (sources."braces-2.3.2" // { dependencies = [ - sources."isobject-3.0.1" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) + sources."buffers-0.1.1" + sources."cache-base-1.0.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" sources."chalk-2.1.0" - sources."chokidar-1.7.0" + (sources."chokidar-2.1.2" // { + dependencies = [ + sources."fsevents-1.2.7" + ]; + }) (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -41861,7 +41923,6 @@ in ]; }) sources."is-descriptor-0.1.6" - sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) @@ -41877,39 +41938,56 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."elmi-to-json-0.19.1" sources."escape-string-regexp-1.0.5" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" + sources."kind-of-5.1.0" + ]; + }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { + sources."extend-shallow-3.0.2" + (sources."extglob-2.0.4" // { dependencies = [ - sources."is-extendable-1.0.1" + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) - sources."extglob-0.3.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.0.0" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - (sources."find-elm-dependencies-2.0.0" // { + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" + ]; + }) + (sources."find-elm-dependencies-2.0.1" // { dependencies = [ sources."firstline-1.2.0" - sources."lodash-4.17.10" ]; }) sources."find-parent-dir-0.3.0" sources."firstline-1.2.1" sources."for-in-1.0.2" - sources."for-own-0.1.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" @@ -41920,65 +41998,43 @@ in sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.1" - sources."glob-base-0.3.0" - sources."glob-parent-2.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-2.0.0" - (sources."has-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.3" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) + sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.2" - ]; - }) - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - sources."is-number-2.1.0" - (sources."is-plain-object-2.0.4" // { + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-1.0.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + (sources."is-number-3.0.0" // { dependencies = [ - sources."isobject-3.0.1" + sources."kind-of-3.2.2" ]; }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" + sources."is-plain-object-2.0.4" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-2.1.0" + sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" @@ -41986,23 +42042,18 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.1" - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" sources."klaw-1.3.1" sources."lodash-4.17.11" sources."lru-cache-4.1.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-random-1.0.4" - sources."micromatch-2.3.11" + sources."micromatch-3.1.10" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."minimatch-3.0.4" sources."minimist-1.2.0" - (sources."mixin-deep-1.3.1" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) + sources."mixin-deep-1.3.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -42011,20 +42062,10 @@ in sources."ms-2.0.0" sources."murmur-hash-js-1.0.0" sources."mustache-2.3.2" - sources."nan-2.12.1" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.2" - ]; - }) - (sources."node-elm-compiler-5.0.1" // { - dependencies = [ - sources."lodash-4.17.10" - ]; - }) - sources."normalize-path-2.1.1" + sources."nan-2.13.1" + sources."nanomatch-1.2.13" + sources."node-elm-compiler-5.0.3" + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { dependencies = [ @@ -42036,91 +42077,25 @@ in sources."kind-of-5.1.0" ]; }) + sources."kind-of-3.2.2" ]; }) - (sources."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-tmpdir-1.0.2" - sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."posix-character-classes-0.1.1" - sources."preserve-0.2.0" sources."process-nextick-args-2.0.0" sources."pseudomap-1.0.2" sources."psl-1.1.31" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.2" - ]; - }) sources."readable-stream-2.3.6" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.2" - sources."micromatch-3.1.10" - ]; - }) - sources."regex-cache-0.4.4" + sources."readdirp-2.2.1" sources."regex-not-1.0.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -42141,6 +42116,7 @@ in (sources."set-value-2.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" ]; }) (sources."snapdragon-0.8.2" // { @@ -42158,16 +42134,20 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."is-extendable-0.1.1" sources."kind-of-5.1.0" ]; }) (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" - sources."isobject-3.0.1" ]; }) - sources."snapdragon-util-3.0.1" + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" @@ -42201,13 +42181,13 @@ in ]; }) sources."through-2.3.8" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { + (sources."to-object-path-0.3.0" // { dependencies = [ - sources."is-number-3.0.0" + sources."kind-of-3.2.2" ]; }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" (sources."tough-cookie-2.4.3" // { dependencies = [ sources."punycode-1.4.1" @@ -42219,6 +42199,7 @@ in (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) @@ -42230,10 +42211,10 @@ in ]; }) sources."has-values-0.1.4" - sources."isobject-3.0.1" ]; }) sources."unzip-stream-0.3.0" + sources."upath-1.1.2" sources."uri-js-4.2.2" sources."urix-0.1.0" sources."use-3.1.1" @@ -42333,7 +42314,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."home-or-tmp-2.0.0" sources."hosted-git-info-2.7.1" - sources."import-jsx-1.3.0" + sources."import-jsx-1.3.2" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" (sources."ink-0.3.1" // { @@ -42419,7 +42400,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.8.3" + sources."react-is-16.8.4" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -42494,19 +42475,19 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.14.1"; + version = "5.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; - sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.15.3.tgz"; + sha512 = "vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -42526,7 +42507,7 @@ in sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.0" + sources."eslint-scope-4.0.3" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-5.0.1" @@ -42556,14 +42537,14 @@ in sources."inherits-2.0.3" (sources."inquirer-6.2.2" // { dependencies = [ - sources."strip-ansi-5.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -42610,8 +42591,8 @@ in sources."supports-color-5.5.0" (sources."table-5.2.3" // { dependencies = [ - sources."string-width-3.0.0" - sources."strip-ansi-5.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" @@ -42637,19 +42618,19 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.2.0.tgz"; - sha512 = "EKKAUB0GB8Wu7dy82Ah8Vypxao95VK3CWjBK8ucWjeLc8KCcr7Zf7W1SaEJNx/E2PzYZ4GJjAy4Ru8lMZ4T+TA=="; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-7.3.0.tgz"; + sha512 = "vCP2gYfOiWkXYBtsTFFBCa0nou0leSOhvuUhoDWKedKg3cy4w+ZQoE+4/aGbfLYYnkzxmdiao/vYGMW/BDdi/A=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" sources."@babel/highlight-7.0.0" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-jsx-5.0.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -42663,14 +42644,15 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" + sources."core_d-1.0.1" sources."cross-spawn-6.0.5" sources."debug-4.1.1" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-5.14.1" - sources."eslint-scope-4.0.0" + sources."eslint-5.15.3" + sources."eslint-scope-4.0.3" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" sources."espree-5.0.1" @@ -42700,14 +42682,14 @@ in sources."inherits-2.0.3" (sources."inquirer-6.2.2" // { dependencies = [ - sources."strip-ansi-5.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.3.0" @@ -42757,8 +42739,8 @@ in sources."supports-color-5.5.0" (sources."table-5.2.3" // { dependencies = [ - sources."string-width-3.0.0" - sources."strip-ansi-5.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."text-table-0.2.0" @@ -42806,7 +42788,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -43046,8 +43028,8 @@ in sources."inherits-2.0.3" (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."inquirer-autocomplete-prompt-1.0.1" @@ -43189,7 +43171,7 @@ in sources."array-unique-0.2.1" sources."assign-symbols-1.0.0" sources."async-0.2.10" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -43362,7 +43344,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -43627,251 +43609,46 @@ in sha512 = "xH6KEeJaUJDB8FAov4OdYxb4GuMOTcKdJ+xW5SUGLEuXfBLgyS0zUeeYVIUS8qvM3gf7w+W35WRwwK4d0InqxQ=="; }; dependencies = [ - sources."@types/node-10.12.27" - sources."@types/semver-5.5.0" - sources."abab-1.0.4" - sources."abbrev-1.1.1" - sources."acorn-2.7.0" - sources."acorn-globals-1.0.9" - sources."ajv-6.9.2" - sources."amdefine-1.0.1" - sources."array-equal-1.0.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."asn1-0.1.11" - sources."assert-plus-0.1.5" - sources."async-0.8.0" - sources."asynckit-0.4.0" sources."asyncmemo-1.0.0" - sources."aws-sign2-0.5.0" - sources."aws4-1.8.0" - sources."balanced-match-1.0.0" - sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.5.3" - sources."boom-0.4.2" - sources."brace-expansion-1.1.11" - sources."camelcase-1.2.1" - sources."caseless-0.12.0" - sources."chloride-2.2.10" - sources."chloride-test-1.2.2" - (sources."clean-css-2.2.23" // { - dependencies = [ - sources."commander-2.2.0" - ]; - }) - (sources."cli-0.6.6" // { - dependencies = [ - sources."glob-3.2.11" - sources."minimatch-0.3.0" - ]; - }) - sources."combined-stream-0.0.7" + sources."chloride-2.2.12" + sources."chloride-test-1.2.4" sources."commander-2.19.0" - sources."concat-map-0.0.1" - sources."config-chain-1.1.12" - sources."console-browserify-1.1.0" - sources."core-util-is-1.0.2" - sources."cryptiles-0.2.2" - sources."csslint-0.10.0" - sources."cssom-0.3.6" - sources."cssstyle-0.2.37" - sources."ctype-0.5.3" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."date-now-0.1.4" - sources."debug-0.7.4" - sources."decamelize-1.2.0" + sources."debug-4.1.1" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" - sources."del-3.0.0" - sources."delayed-stream-0.0.5" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" - (sources."dom-serializer-0.1.1" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."ecc-jsbn-0.1.2" sources."ed2curve-0.1.4" - (sources."editorconfig-0.15.2" // { - dependencies = [ - sources."lru-cache-4.1.5" - ]; - }) sources."emoji-named-characters-1.0.2" - sources."entities-1.0.0" - (sources."escodegen-1.11.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."exit-0.1.2" sources."explain-error-1.0.4" - sources."extend-2.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."fast-levenshtein-2.0.6" - (sources."findup-sync-0.2.1" // { - dependencies = [ - sources."glob-4.3.5" - ]; - }) - sources."flagged-respawn-0.3.2" - sources."forever-agent-0.5.2" - (sources."form-data-0.1.4" // { - dependencies = [ - sources."async-0.9.2" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gear-0.9.7" - (sources."gear-lib-0.9.2" // { - dependencies = [ - sources."glob-3.2.11" - sources."minimatch-0.3.0" - ]; - }) sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) sources."git-packidx-parser-1.0.0" sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" - (sources."glob-7.1.3" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."graceful-fs-3.0.11" - (sources."handlebars-2.0.0" // { - dependencies = [ - sources."async-0.2.10" - sources."uglify-js-2.3.6" - ]; - }) - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" sources."hashlru-2.3.0" - sources."hawk-1.1.1" - sources."highlight.js-9.15.5" - sources."hoek-0.9.1" - sources."htmlparser2-3.8.3" - sources."http-signature-0.10.1" - sources."iconv-lite-0.4.24" + sources."highlight.js-9.15.6" sources."increment-buffer-1.0.1" - sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" sources."ip-1.1.5" - sources."ip-regex-2.1.0" sources."is-canonical-base64-1.1.1" sources."is-electron-2.2.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.19.0" - sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.1" - sources."is-path-inside-1.0.1" sources."is-property-1.0.2" - sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.7" - sources."isarray-0.0.1" - sources."isstream-0.1.2" - (sources."js-beautify-1.8.9" // { - dependencies = [ - sources."nopt-4.0.1" - ]; - }) - sources."jsbn-0.1.1" - (sources."jsdom-9.2.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."aws-sign2-0.7.0" - sources."combined-stream-1.0.7" - sources."delayed-stream-1.0.0" - sources."extend-3.0.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."http-signature-1.2.0" - sources."oauth-sign-0.9.0" - sources."punycode-1.4.1" - sources."qs-6.5.2" - (sources."request-2.88.0" // { - dependencies = [ - sources."tough-cookie-2.4.3" - ]; - }) - sources."sax-1.2.4" - (sources."tough-cookie-2.5.0" // { - dependencies = [ - sources."punycode-2.1.1" - ]; - }) - sources."tunnel-agent-0.6.0" - ]; - }) - (sources."jshint-2.5.11" // { - dependencies = [ - sources."minimatch-1.0.0" - ]; - }) - (sources."jslint-0.3.4" // { - dependencies = [ - sources."glob-3.2.11" - sources."minimatch-0.3.0" - ]; - }) sources."json-buffer-2.0.11" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" sources."jsonpointer-4.0.1" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."knox-0.8.10" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."less-1.7.5" - sources."levn-0.3.0" sources."libsodium-0.7.4" sources."libsodium-wrappers-0.7.4" - (sources."liftoff-2.0.3" // { - dependencies = [ - sources."minimist-1.1.3" - ]; - }) - sources."lodash-4.17.11" sources."looper-4.0.0" - sources."lru-cache-2.7.3" sources."lrucache-1.0.3" - sources."mime-1.2.11" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."minimatch-2.0.10" - sources."minimist-0.1.0" + sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -43881,54 +43658,22 @@ in sources."moo-0.4.3" sources."ms-2.1.1" sources."multicb-1.2.2" - (sources."multiserver-3.2.0" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) + sources."multiserver-3.3.1" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" - sources."nan-2.12.1" - sources."natives-1.1.6" + sources."nan-2.13.1" sources."nearley-2.16.0" sources."node-gyp-build-3.8.0" sources."node-polyglot-1.0.0" - sources."node-uuid-1.4.8" sources."non-private-ip-1.4.4" - sources."nopt-1.0.10" - sources."nwmatcher-1.4.4" - sources."oauth-sign-0.3.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."optimist-0.3.7" - (sources."optionator-0.8.2" // { - dependencies = [ - sources."wordwrap-1.0.0" - ]; - }) sources."options-0.0.6" sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."p-map-1.2.0" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" - sources."pako-1.0.8" - sources."parse5-1.5.1" - sources."parserlib-0.2.5" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."prelude-ls-1.1.2" + sources."pako-1.0.10" sources."private-box-0.3.0" sources."progress-1.1.8" - sources."proto-list-1.2.4" - sources."pseudomap-1.0.2" - sources."psl-1.1.31" sources."pull-block-filter-1.0.0" sources."pull-box-stream-1.0.13" sources."pull-buffered-0.3.4" @@ -43973,51 +43718,31 @@ in ]; }) sources."pull-ws-3.3.2" - sources."punycode-2.1.1" - sources."qs-1.0.2" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" - (sources."rc-1.2.8" // { - dependencies = [ - sources."minimist-1.2.0" - sources."strip-json-comments-2.0.1" - ]; - }) - sources."readable-stream-1.1.14" + sources."rc-1.2.8" sources."relative-url-1.0.2" sources."remove-markdown-0.1.0" - (sources."request-2.40.0" // { - dependencies = [ - sources."mime-types-1.0.2" - ]; - }) - sources."resolve-1.1.7" sources."ret-0.1.15" - sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sax-0.5.8" sources."secret-handshake-1.1.16" sources."semver-5.6.0" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" - sources."shelljs-0.3.0" - sources."sigmund-1.0.1" sources."smart-buffer-4.0.2" - sources."sntp-0.2.4" sources."socks-2.3.2" - sources."sodium-browserify-1.2.4" - (sources."sodium-browserify-tweetnacl-0.2.3" // { + sources."sodium-browserify-1.2.5" + (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" + sources."tweetnacl-1.0.1" ]; }) sources."sodium-chloride-1.1.2" sources."sodium-native-2.3.0" - sources."source-map-0.1.34" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" - sources."ssb-client-4.7.0" + sources."ssb-client-4.7.1" sources."ssb-config-2.3.9" sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" @@ -44037,60 +43762,18 @@ in sources."ssb-msgs-5.2.0" sources."ssb-pull-requests-1.0.0" sources."ssb-ref-2.13.9" - (sources."sshpk-1.16.1" // { - dependencies = [ - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - ]; - }) - (sources."stream-counter-0.1.0" // { - dependencies = [ - sources."readable-stream-1.0.34" - ]; - }) - (sources."stream-to-pull-stream-1.7.2" // { + (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" ]; }) - sources."string_decoder-0.10.31" - sources."stringstream-0.0.6" - sources."strip-json-comments-1.0.4" - sources."symbol-tree-3.2.2" + sources."strip-json-comments-2.0.1" sources."through-2.2.7" - sources."tiny-worker-2.1.2" - sources."tough-cookie-3.0.1" - sources."tr46-0.0.3" - sources."tunnel-agent-0.4.3" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" - sources."type-check-0.3.2" - (sources."uglify-js-2.4.24" // { - dependencies = [ - sources."async-0.2.10" - ]; - }) - sources."uglify-to-browserify-1.0.2" sources."ultron-1.0.2" - sources."underscore-1.6.0" - sources."uri-js-4.2.2" - sources."uuid-3.3.2" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."webidl-conversions-3.0.1" - sources."whatwg-url-3.1.0" - sources."window-size-0.1.0" - sources."wordwrap-0.0.2" - sources."wrappy-1.0.2" sources."ws-1.1.5" - sources."xml-name-validator-2.0.1" - sources."xml2js-0.2.8" sources."xtend-4.0.1" - sources."yallist-2.1.2" - sources."yargs-3.5.4" ]; buildInputs = globalBuildInputs; meta = { @@ -44141,7 +43824,7 @@ in }) sources."accepts-1.3.5" sources."agent-base-4.2.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -44194,7 +43877,7 @@ in sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" + sources."cli-spinners-2.0.0" sources."cli-width-2.2.0" sources."cliui-4.1.0" sources."clone-1.0.4" @@ -44223,7 +43906,7 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-4.0.0" sources."create-error-class-3.0.2" - sources."creato-1.0.3" + sources."creato-1.0.4" (sources."cross-fetch-2.2.2" // { dependencies = [ sources."node-fetch-2.1.2" @@ -44400,7 +44083,7 @@ in sources."isstream-0.1.2" sources."iterall-1.2.2" sources."js-base64-2.5.1" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" @@ -44416,14 +44099,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - (sources."jsonwebtoken-8.5.0" // { + (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."ms-2.1.1" ]; }) sources."jsprim-1.4.1" - sources."jwa-1.3.0" - sources."jws-3.2.1" + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."latest-version-3.1.0" sources."lcid-1.0.0" (sources."load-json-file-2.0.0" // { @@ -44495,11 +44178,11 @@ in sources."onetime-2.0.1" sources."ono-4.0.11" sources."open-0.0.5" - sources."opn-5.4.0" - (sources."ora-3.1.0" // { + sources."opn-5.5.0" + (sources."ora-3.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."os-locale-2.1.0" @@ -44568,7 +44251,7 @@ in ]; }) sources."regenerator-runtime-0.11.1" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."replaceall-0.1.6" sources."request-2.88.0" @@ -44601,7 +44284,7 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.10" // { + (sources."source-map-support-0.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -44690,18 +44373,19 @@ in sources."yaml-ast-parser-0.0.40" (sources."yargs-12.0.5" // { dependencies = [ - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" sources."execa-1.0.0" sources."find-up-3.0.0" sources."get-stream-4.1.0" sources."invert-kv-2.0.0" sources."lcid-2.0.0" sources."locate-path-3.0.0" - sources."mem-4.1.0" + sources."mem-4.2.0" + sources."mimic-fn-2.0.0" sources."os-locale-3.1.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."yargs-parser-11.1.1" ]; }) @@ -45028,7 +44712,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-done-1.3.1" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -45108,7 +44792,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.1" sources."error-ex-1.3.2" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -45243,7 +44927,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -45422,7 +45106,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -45513,7 +45197,7 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" (sources."expand-brackets-2.1.4" // { @@ -45797,7 +45481,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -45855,7 +45539,7 @@ in sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - (sources."jshint-2.10.1" // { + (sources."jshint-2.10.2" // { dependencies = [ sources."strip-json-comments-1.0.4" ]; @@ -45926,7 +45610,11 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.4.9" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + ]; + }) sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -46027,7 +45715,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" sources."safe-buffer-5.1.2" sources."sprintf-js-1.0.3" sources."string_decoder-1.2.0" @@ -46049,17 +45737,23 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "4.10.3"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-4.10.3.tgz"; - sha512 = "tjx8EoNsTcOhDpRTGYL5+noAotjbLMbV2gDORhHdHbIxSHcrmbhPhwG+nrdamaveqrLEqBaLHlgRPI6EAJLSQQ=="; + url = "https://registry.npmjs.org/ionic/-/ionic-4.12.0.tgz"; + sha512 = "3NXldV3Uw5FzwKd+267AbOIQi7u/5BiXSJ6nuaBWPHPk2oigEPa0RZvM5mgcz2uOGnwcb7O/HQlR6nR5RMoJXg=="; }; dependencies = [ - sources."@ionic/cli-framework-1.6.1" - sources."@ionic/discover-1.0.12" - sources."@ionic/utils-fs-1.1.0" - sources."@ionic/utils-network-0.0.7" - sources."@types/node-8.10.40" + sources."@ionic/cli-framework-1.7.0" + sources."@ionic/discover-1.0.13" + sources."@ionic/utils-array-0.0.1" + sources."@ionic/utils-fs-1.2.0" + sources."@ionic/utils-network-0.0.8" + sources."@ionic/utils-object-0.0.1" + sources."@ionic/utils-process-0.1.0" + sources."@ionic/utils-stream-0.0.1" + sources."@ionic/utils-subprocess-0.1.0" + sources."@ionic/utils-terminal-0.0.1" + sources."@types/node-8.10.44" sources."agent-base-4.2.1" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -46145,7 +45839,7 @@ in sources."get-stream-3.0.0" (sources."get-uri-2.0.3" // { dependencies = [ - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" ]; }) sources."glob-7.1.3" @@ -46224,7 +45918,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.0.0" + sources."macos-release-2.1.0" sources."make-dir-1.3.0" sources."methods-1.1.2" sources."mime-2.4.0" @@ -46251,7 +45945,7 @@ in sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."optionator-0.8.2" sources."os-name-3.0.0" sources."os-tmpdir-1.0.2" @@ -46270,7 +45964,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.0" - (sources."proxy-agent-3.0.3" // { + (sources."proxy-agent-3.1.0" // { dependencies = [ sources."debug-3.2.6" ]; @@ -46285,7 +45979,7 @@ in }) sources."rc-1.2.8" sources."readable-stream-2.3.6" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.6.3" @@ -46303,29 +45997,29 @@ in sources."signal-exit-3.0.2" sources."slice-ansi-2.1.0" sources."smart-buffer-4.0.2" - sources."socks-2.2.3" - sources."socks-proxy-agent-4.0.1" + sources."socks-2.3.2" + sources."socks-proxy-agent-4.0.2" sources."source-map-0.6.1" - (sources."split2-3.1.0" // { + (sources."split2-3.1.1" // { dependencies = [ - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" ]; }) sources."ssh-config-1.1.5" sources."statuses-1.5.0" sources."stream-combiner2-1.1.1" - sources."string-width-3.0.0" + sources."string-width-3.1.0" sources."string_decoder-1.1.1" - (sources."strip-ansi-5.0.0" // { + (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" ]; }) sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" (sources."superagent-4.1.0" // { dependencies = [ - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" ]; }) (sources."superagent-proxy-2.0.0" // { @@ -46346,7 +46040,7 @@ in ]; }) sources."through-2.3.8" - sources."through2-3.0.0" + sources."through2-3.0.1" sources."thunkify-2.1.2" sources."timed-out-4.0.1" sources."tmp-0.0.33" @@ -46379,10 +46073,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" - sources."ws-6.1.4" + sources."ws-6.2.0" sources."xdg-basedir-3.0.0" sources."xregexp-2.0.0" - sources."xtend-4.0.1" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -46445,7 +46138,7 @@ in }) sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -46473,13 +46166,41 @@ in production = true; bypassCache = true; }; + indium = nodeEnv.buildNodePackage { + name = "indium"; + packageName = "indium"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indium/-/indium-3.4.1.tgz"; + sha512 = "RJ8nHsE4diosqkSpKot3unMn05ExCisUDy/URw/3M9t8MetvthBBQpcfaRPGftXRGebaMF1HnH6dLG994TpNVQ=="; + }; + dependencies = [ + sources."async-limiter-1.0.0" + sources."chrome-remote-interface-0.26.1" + sources."commander-2.11.0" + sources."node-fetch-2.3.0" + sources."safe-buffer-5.1.2" + sources."semver-5.6.0" + sources."source-map-0.7.3" + sources."ultron-1.1.1" + sources."ws-3.3.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Indium server"; + homepage = "https://github.com/NicolasPetton/Indium#readme"; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + }; jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "8.0.19"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-8.0.19.tgz"; - sha512 = "iilJduYCUwxRqH3fJ3b4cP5rqeh43pGM8OS62LDwoKCRoeYAj4t/KJAtBJ4jcsVKEOPJ1jNg4o1sKibk3ZnVUw=="; + url = "https://registry.npmjs.org/jake/-/jake-8.1.1.tgz"; + sha512 = "RJUWDas5xu4rP6CbCPqkVP9+vglMPThhZIj08EtjSiUBpwRtVjhShPKIpETyEhy/Z1hEk97qITxbZK+WXtSyzw=="; }; dependencies = [ sources."ansi-styles-1.0.0" @@ -46510,10 +46231,10 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.11.2"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.2.tgz"; - sha512 = "ntxgW8oAKKGU+Gk21u7HK+/LG8+D4jekxPxOrJYov82CJRb/k/9MKX+gdk7Eh1VSaujwDKJIWzCOWpna4Vtw3A=="; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.3.tgz"; + sha512 = "j2dKPq5tgSUyM2AOXWh2O7pNWzXzKI/3W02X1OrEZnV3B9yt9IM+snuGt/mk1Nryxyy7OZnhdL0XqHe4xx7Qzw=="; }; dependencies = [ sources."ansi-color-0.2.1" @@ -46635,10 +46356,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.10.1.tgz"; - sha512 = "9GpPfKeffYBl7oBDX2lHPG16j0AM7D2bn3aLy9DaWTr6CWa0i/7UGhX8WLZ7V14QQnnr4hXbjauTLYg06F+HYw=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; + sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -46702,21 +46423,19 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.8.9"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.8.9.tgz"; - sha512 = "MwPmLywK9RSX0SPsUJjN7i+RQY9w/yC17Lbrq9ViEefpLRgqAR2BgrMN2AbifkUuhDV8tRauLhLda/9+bE0YQA=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz"; + sha512 = "P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw=="; }; dependencies = [ - sources."@types/node-10.12.27" - sources."@types/semver-5.5.0" sources."abbrev-1.1.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."commander-2.19.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."editorconfig-0.15.2" + sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" sources."glob-7.1.3" sources."inflight-1.0.6" @@ -46822,7 +46541,7 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" @@ -46862,7 +46581,7 @@ in }; dependencies = [ sources."accepts-1.3.5" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -46889,7 +46608,7 @@ in sources."color-name-1.1.3" sources."combined-stream-1.0.7" sources."compressible-2.0.16" - sources."compression-1.7.3" + sources."compression-1.7.4" sources."configstore-3.1.2" sources."connect-pause-0.1.1" sources."content-disposition-0.5.2" @@ -46993,7 +46712,7 @@ in sources."make-dir-1.3.0" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.1.0" + sources."mem-4.2.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { dependencies = [ @@ -47004,7 +46723,7 @@ in sources."mime-1.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.0.0" sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" @@ -47028,9 +46747,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."package-json-4.0.1" sources."parseurl-1.3.2" sources."path-exists-3.0.0" @@ -47051,7 +46770,7 @@ in sources."range-parser-1.2.0" sources."raw-body-2.3.3" sources."rc-1.2.8" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."request-2.88.0" sources."require-directory-2.1.1" @@ -47120,7 +46839,7 @@ in sources."yargs-12.0.5" (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" ]; }) ]; @@ -47136,10 +46855,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.12.1"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz"; - sha512 = "um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz"; + sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ=="; }; dependencies = [ sources."argparse-1.0.10" @@ -47158,10 +46877,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-4.0.0.tgz"; - sha512 = "EFoFs3F6G0BcUGPNOn/YloGOb3h09hzTguyXlg6loHlKY76qbJikkcyPk43m2kfRF65TUGda/mig29QQtyhm1g=="; + url = "https://registry.npmjs.org/karma/-/karma-4.0.1.tgz"; + sha512 = "ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A=="; }; dependencies = [ sources."accepts-1.3.5" @@ -47174,11 +46893,11 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-slice-0.2.3" sources."array-unique-0.3.2" sources."arraybuffer.slice-0.0.7" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-2.6.2" + sources."async-each-1.0.2" sources."async-limiter-1.0.0" sources."atob-2.1.2" sources."backo2-1.0.2" @@ -47196,12 +46915,7 @@ in sources."bluebird-3.5.3" sources."body-parser-1.18.3" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."braces-2.3.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -47209,27 +46923,9 @@ in sources."cache-base-1.0.1" sources."callsite-1.0.0" sources."chokidar-2.1.2" - sources."circular-json-0.5.9" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."class-utils-0.3.6" sources."collection-visit-1.0.0" sources."colors-1.3.3" - sources."combine-lists-1.0.1" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -47241,10 +46937,25 @@ in sources."core-js-2.6.5" sources."core-util-is-1.0.2" sources."custom-event-1.0.1" - sources."date-format-1.2.0" + sources."date-format-2.0.0" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" + (sources."define-property-0.2.5" // { + dependencies = [ + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) sources."depd-1.1.2" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -47264,52 +46975,15 @@ in sources."ent-2.2.0" sources."escape-html-1.0.3" sources."eventemitter3-3.1.0" - (sources."expand-braces-0.1.2" // { - dependencies = [ - sources."array-unique-0.2.1" - sources."braces-0.1.5" - ]; - }) - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - (sources."expand-range-0.1.1" // { - dependencies = [ - sources."is-number-0.1.1" - sources."repeat-string-0.2.2" - ]; - }) + sources."expand-brackets-2.1.4" sources."extend-3.0.2" - sources."extend-shallow-3.0.2" + sources."extend-shallow-2.0.1" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" ]; }) + sources."fill-range-4.0.0" (sources."finalhandler-1.1.0" // { dependencies = [ sources."statuses-1.3.1" @@ -47324,6 +46998,7 @@ in }) sources."for-in-1.0.2" sources."fragment-cache-0.2.1" + sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-1.2.7" sources."get-value-2.0.6" @@ -47352,27 +47027,36 @@ in sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" - sources."is-accessor-descriptor-1.0.0" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.0" - (sources."is-number-3.0.0" // { + (sources."is-data-descriptor-1.0.0" // { dependencies = [ - sources."kind-of-3.2.2" + sources."kind-of-6.0.2" ]; }) + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.0" + sources."is-number-3.0.0" sources."is-plain-object-2.0.4" sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isbinaryfile-3.0.3" sources."isobject-3.0.1" - sources."kind-of-6.0.2" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" sources."lodash-4.17.11" - (sources."log4js-3.0.6" // { + (sources."log4js-4.0.2" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -47382,33 +47066,38 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" - sources."micromatch-3.1.10" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."define-property-2.0.2" + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.2" + ]; + }) sources."mime-2.4.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."mixin-deep-1.3.1" - sources."mkdirp-0.5.1" + sources."minimist-0.0.10" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."ms-2.0.0" - sources."nan-2.12.1" - sources."nanomatch-1.2.13" - sources."negotiator-0.6.1" - sources."normalize-path-3.0.0" - sources."object-component-0.0.3" - (sources."object-copy-0.1.0" // { + sources."nan-2.13.1" + (sources."nanomatch-1.2.13" // { dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" + sources."define-property-2.0.2" + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.2" ]; }) + sources."negotiator-0.6.1" + sources."normalize-path-3.0.0" + sources."object-component-0.0.3" + sources."object-copy-0.1.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -47430,7 +47119,12 @@ in sources."raw-body-2.3.3" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" - sources."regex-not-1.0.2" + (sources."regex-not-1.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -47442,30 +47136,10 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) + sources."set-value-2.0.0" sources."setprototypeof-1.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" sources."source-map-0.5.7" ]; }) @@ -47474,11 +47148,7 @@ in sources."define-property-1.0.0" ]; }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."snapdragon-util-3.0.1" (sources."socket.io-2.1.1" // { dependencies = [ sources."debug-3.1.0" @@ -47499,26 +47169,15 @@ in sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" sources."source-map-url-0.4.0" - sources."split-string-3.1.0" - (sources."static-extend-0.1.2" // { + (sources."split-string-3.1.0" // { dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" ]; }) + sources."static-extend-0.1.2" sources."statuses-1.5.0" - (sources."streamroller-0.7.0" // { + (sources."streamroller-1.0.3" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.1" @@ -47527,22 +47186,23 @@ in sources."string_decoder-1.1.1" sources."tmp-0.0.33" sources."to-array-0.1.4" - (sources."to-object-path-0.3.0" // { + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.2" // { dependencies = [ - sources."kind-of-3.2.2" + sources."define-property-2.0.2" + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" ]; }) - sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."type-is-1.6.16" sources."ultron-1.1.1" (sources."union-value-1.0.0" // { dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" sources."set-value-0.4.3" ]; }) + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -47554,7 +47214,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."urix-0.1.0" sources."use-3.1.1" sources."useragent-2.3.0" @@ -47682,7 +47342,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -47782,7 +47442,11 @@ in sources."lodash-4.17.11" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" - sources."mem-4.1.0" + (sources."mem-4.2.0" // { + dependencies = [ + sources."mimic-fn-2.0.0" + ]; + }) sources."mime-db-1.38.0" sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" @@ -47816,9 +47480,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."parse5-1.5.1" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -47908,7 +47572,7 @@ in }) (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" ]; }) ]; @@ -47924,39 +47588,39 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.13.0.tgz"; - sha512 = "MHaqqwfAdYIo0rAE0oOZRQ8eKbKyW035akLf0pz3YlWbdXKH91lxXRLj0BpbEytUz7hDbsv0FNNtXz9u5eTNFg=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.13.1.tgz"; + sha512 = "7kSz8LLozVsoUNTJzJzy+b8TnV9YdviR2Ee2PwGZSlVw3T1Rn7kOAPZjEi+3IWnOPC96zMPHVmjCmzQ4uubalw=="; }; dependencies = [ - sources."@lerna/add-3.13.0" + sources."@lerna/add-3.13.1" sources."@lerna/batch-packages-3.13.0" - sources."@lerna/bootstrap-3.13.0" - sources."@lerna/changed-3.13.0" + sources."@lerna/bootstrap-3.13.1" + sources."@lerna/changed-3.13.1" sources."@lerna/check-working-tree-3.13.0" sources."@lerna/child-process-3.13.0" - sources."@lerna/clean-3.13.0" + sources."@lerna/clean-3.13.1" sources."@lerna/cli-3.13.0" sources."@lerna/collect-updates-3.13.0" - sources."@lerna/command-3.13.0" + sources."@lerna/command-3.13.1" sources."@lerna/conventional-commits-3.13.0" - sources."@lerna/create-3.13.0" + sources."@lerna/create-3.13.1" sources."@lerna/create-symlink-3.13.0" sources."@lerna/describe-ref-3.13.0" - sources."@lerna/diff-3.13.0" - sources."@lerna/exec-3.13.0" + sources."@lerna/diff-3.13.1" + sources."@lerna/exec-3.13.1" sources."@lerna/filter-options-3.13.0" sources."@lerna/filter-packages-3.13.0" sources."@lerna/get-npm-exec-opts-3.13.0" sources."@lerna/get-packed-3.13.0" - sources."@lerna/github-client-3.13.0" + sources."@lerna/github-client-3.13.1" sources."@lerna/global-options-3.13.0" sources."@lerna/has-npm-version-3.13.0" - sources."@lerna/import-3.13.0" - sources."@lerna/init-3.13.0" - sources."@lerna/link-3.13.0" - sources."@lerna/list-3.13.0" + sources."@lerna/import-3.13.1" + sources."@lerna/init-3.13.1" + sources."@lerna/link-3.13.1" + sources."@lerna/list-3.13.1" sources."@lerna/listable-3.13.0" sources."@lerna/log-packed-3.13.0" sources."@lerna/npm-conf-3.13.0" @@ -47965,35 +47629,35 @@ in sources."@lerna/npm-publish-3.13.0" sources."@lerna/npm-run-script-3.13.0" sources."@lerna/output-3.13.0" - sources."@lerna/pack-directory-3.13.0" + sources."@lerna/pack-directory-3.13.1" sources."@lerna/package-3.13.0" sources."@lerna/package-graph-3.13.0" - sources."@lerna/project-3.13.0" + sources."@lerna/project-3.13.1" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.13.0" + sources."@lerna/publish-3.13.1" sources."@lerna/pulse-till-done-3.13.0" sources."@lerna/resolve-symlink-3.13.0" sources."@lerna/rimraf-dir-3.13.0" - sources."@lerna/run-3.13.0" + sources."@lerna/run-3.13.1" sources."@lerna/run-lifecycle-3.13.0" sources."@lerna/run-parallel-batches-3.13.0" sources."@lerna/symlink-binary-3.13.0" sources."@lerna/symlink-dependencies-3.13.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.13.0" + sources."@lerna/version-3.13.1" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/endpoint-3.1.3" - sources."@octokit/plugin-enterprise-rest-2.1.1" - sources."@octokit/request-2.3.0" - sources."@octokit/rest-16.16.0" + sources."@octokit/endpoint-3.2.3" + sources."@octokit/plugin-enterprise-rest-2.2.2" + sources."@octokit/request-2.4.2" + sources."@octokit/rest-16.20.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" sources."agentkeepalive-3.5.2" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -48014,7 +47678,6 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-2.6.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -48026,7 +47689,7 @@ in ]; }) sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-1.3.2" + sources."before-after-hook-1.4.0" sources."block-stream-0.0.9" sources."bluebird-3.5.3" sources."brace-expansion-1.1.11" @@ -48046,7 +47709,7 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" (sources."camelcase-keys-4.2.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -48090,7 +47753,7 @@ in sources."color-name-1.1.3" sources."columnify-1.5.4" sources."combined-stream-1.0.7" - sources."commander-2.17.1" + sources."commander-2.19.0" (sources."compare-func-1.3.2" // { dependencies = [ sources."dot-prop-3.0.0" @@ -48133,6 +47796,7 @@ in sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."deprecation-1.0.1" sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" sources."dir-glob-2.0.0" @@ -48256,7 +47920,7 @@ in sources."glob-to-regexp-0.3.0" sources."globby-8.0.2" sources."graceful-fs-4.1.15" - (sources."handlebars-4.1.0" // { + (sources."handlebars-4.1.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -48304,8 +47968,8 @@ in sources."init-package-json-1.10.3" (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."invert-kv-2.0.0" @@ -48342,7 +48006,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-0.2.3" @@ -48376,7 +48040,7 @@ in sources."lodash.uniq-4.5.0" sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" - sources."macos-release-2.0.0" + sources."macos-release-2.1.0" sources."make-dir-1.3.0" (sources."make-fetch-happen-4.0.1" // { dependencies = [ @@ -48388,7 +48052,11 @@ in sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" - sources."mem-4.1.0" + (sources."mem-4.2.0" // { + dependencies = [ + sources."mimic-fn-2.0.0" + ]; + }) sources."meow-4.0.1" sources."merge2-1.2.3" sources."micromatch-3.1.10" @@ -48417,6 +48085,7 @@ in sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."nanomatch-1.2.13" + sources."neo-async-2.6.0" sources."nice-try-1.0.5" sources."node-fetch-2.3.0" sources."node-fetch-npm-2.0.2" @@ -48476,13 +48145,13 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" sources."p-map-1.2.0" sources."p-map-series-1.0.0" sources."p-pipe-1.2.0" sources."p-reduce-1.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."p-waterfall-1.0.0" sources."pacote-9.5.0" sources."parallel-transform-1.1.0" @@ -48613,8 +48282,8 @@ in sources."kind-of-3.2.2" ]; }) - sources."socks-2.2.3" - sources."socks-proxy-agent-4.0.1" + sources."socks-2.3.2" + sources."socks-proxy-agent-4.0.2" sources."sort-keys-2.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" @@ -48687,7 +48356,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."typedarray-0.0.6" - (sources."uglify-js-3.4.9" // { + (sources."uglify-js-3.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -48770,7 +48439,7 @@ in sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w=="; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -48887,7 +48556,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -49031,7 +48700,7 @@ in sources."mixin-deep-1.3.1" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.1" sources."normalize-path-3.0.0" @@ -49053,7 +48722,7 @@ in sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -49167,7 +48836,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -49197,7 +48866,7 @@ in dependencies = [ sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -49209,7 +48878,7 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-limiter-1.0.0" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -49431,7 +49100,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -49467,7 +49136,7 @@ in ]; }) sources."on-finished-2.3.0" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."parse-glob-3.0.4" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -49697,17 +49366,17 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/core-7.3.4" - sources."@babel/generator-7.3.4" + sources."@babel/core-7.4.0" + sources."@babel/generator-7.4.0" sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-call-delegate-7.1.0" - sources."@babel/helper-create-class-features-plugin-7.3.4" - sources."@babel/helper-define-map-7.1.0" + sources."@babel/helper-call-delegate-7.4.0" + sources."@babel/helper-create-class-features-plugin-7.4.0" + sources."@babel/helper-define-map-7.4.0" sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.0.0" + sources."@babel/helper-hoist-variables-7.4.0" sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" sources."@babel/helper-module-transforms-7.2.2" @@ -49715,59 +49384,59 @@ in sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.0.0" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.3.4" + sources."@babel/helper-replace-supers-7.4.0" sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.0.0" + sources."@babel/helper-split-export-declaration-7.4.0" sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.3.1" + sources."@babel/helpers-7.4.2" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.3.4" + sources."@babel/parser-7.4.2" sources."@babel/plugin-external-helpers-7.0.0" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.3.4" + sources."@babel/plugin-proposal-class-properties-7.4.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.3.4" + sources."@babel/plugin-proposal-object-rest-spread-7.4.0" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-json-strings-7.2.0" sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.3.4" + sources."@babel/plugin-transform-async-to-generator-7.4.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.3.4" - sources."@babel/plugin-transform-classes-7.3.4" + sources."@babel/plugin-transform-block-scoping-7.4.0" + sources."@babel/plugin-transform-classes-7.4.0" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.3.2" + sources."@babel/plugin-transform-destructuring-7.4.0" sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-for-of-7.2.0" + sources."@babel/plugin-transform-for-of-7.4.0" sources."@babel/plugin-transform-function-name-7.2.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" - sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.3.4" + sources."@babel/plugin-transform-modules-commonjs-7.4.0" + sources."@babel/plugin-transform-modules-systemjs-7.4.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" - sources."@babel/plugin-transform-new-target-7.0.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" + sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.3.3" - sources."@babel/plugin-transform-regenerator-7.3.4" - sources."@babel/plugin-transform-runtime-7.3.4" + sources."@babel/plugin-transform-parameters-7.4.0" + sources."@babel/plugin-transform-regenerator-7.4.0" + sources."@babel/plugin-transform-runtime-7.4.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.2.0" sources."@babel/plugin-transform-typeof-symbol-7.2.0" sources."@babel/plugin-transform-unicode-regex-7.2.0" - sources."@babel/preset-env-7.3.4" + sources."@babel/preset-env-7.4.2" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.3.4" - sources."@babel/template-7.2.2" - sources."@babel/traverse-7.3.4" - sources."@babel/types-7.3.4" + sources."@babel/runtime-7.4.2" + sources."@babel/template-7.4.0" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -49775,31 +49444,34 @@ in sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/estree-0.0.39" - sources."@types/node-11.9.5" - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-buffer-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/helper-wasm-section-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/wasm-edit-1.8.3" - sources."@webassemblyjs/wasm-gen-1.8.3" - sources."@webassemblyjs/wasm-opt-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-11.11.4" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-buffer-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/helper-wasm-section-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/wasm-edit-1.8.5" + sources."@webassemblyjs/wasm-gen-1.8.5" + sources."@webassemblyjs/wasm-opt-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ace.improved-0.2.1" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" sources."amdefine-1.0.1" @@ -49868,7 +49540,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-retry-1.2.3" sources."atob-2.1.2" (sources."babel-code-frame-6.26.0" // { @@ -49925,6 +49597,7 @@ in sources."babel-preset-minify-0.5.0" (sources."babel-runtime-6.26.0" // { dependencies = [ + sources."core-js-2.6.5" sources."regenerator-runtime-0.11.1" ]; }) @@ -49964,7 +49637,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.4.2" + sources."browserslist-4.5.2" sources."buffer-5.2.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -49986,8 +49659,8 @@ in ]; }) sources."call-me-maybe-1.0.1" - sources."camelcase-5.0.0" - sources."caniuse-lite-1.0.30000939" + sources."camelcase-5.2.0" + sources."caniuse-lite-1.0.30000951" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -50036,7 +49709,7 @@ in ]; }) sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" + sources."cli-spinners-2.0.0" (sources."cliui-4.1.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -50064,7 +49737,9 @@ in sources."convert-source-map-1.6.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.5" + sources."core-js-3.0.0" + sources."core-js-compat-3.0.0" + sources."core-js-pure-3.0.0" sources."core-util-is-1.0.2" sources."create-ecdh-4.0.3" sources."create-hash-1.2.0" @@ -50078,7 +49753,15 @@ in sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-4.2.0" + (sources."decompress-4.2.0" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + ]; + }) sources."decompress-response-3.3.0" (sources."decompress-tar-4.1.1" // { dependencies = [ @@ -50127,12 +49810,13 @@ in (sources."download-7.1.0" // { dependencies = [ sources."got-8.3.2" + sources."make-dir-1.3.0" sources."pify-3.0.0" ]; }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.113" + sources."electron-to-chromium-1.3.118" sources."elliptic-6.4.1" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.1" @@ -50235,7 +49919,7 @@ in sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."fill-range-2.2.4" - sources."find-cache-dir-2.0.0" + sources."find-cache-dir-2.1.0" sources."find-up-2.1.0" (sources."findup-sync-2.0.0" // { dependencies = [ @@ -50315,7 +49999,7 @@ in sources."get-stream-4.1.0" sources."http-cache-semantics-4.0.3" sources."normalize-url-3.3.0" - sources."p-cancelable-1.0.0" + sources."p-cancelable-1.1.0" ]; }) sources."graceful-fs-4.1.15" @@ -50439,9 +50123,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."magic-string-0.25.2" - (sources."make-dir-1.3.0" // { + (sources."make-dir-2.1.0" // { dependencies = [ - sources."pify-3.0.0" + sources."pify-4.0.1" ]; }) sources."mamacro-0.0.3" @@ -50450,8 +50134,9 @@ in sources."map-visit-1.0.0" sources."math-random-1.0.4" sources."md5.js-1.3.5" - (sources."mem-4.1.0" // { + (sources."mem-4.2.0" // { dependencies = [ + sources."mimic-fn-2.0.0" sources."p-is-promise-2.0.0" ]; }) @@ -50480,7 +50165,7 @@ in sources."move-concurrently-1.0.1" sources."ms-2.1.1" sources."multistream-2.1.1" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -50502,7 +50187,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.8" + sources."node-releases-1.1.11" sources."normalize-package-data-2.5.0" sources."normalize-path-2.1.1" (sources."normalize-url-2.0.1" // { @@ -50545,10 +50230,10 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - (sources."ora-3.1.0" // { + (sources."ora-3.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."os-browserify-0.3.0" @@ -50562,7 +50247,7 @@ in sources."p-locate-2.0.0" sources."p-timeout-2.0.1" sources."p-try-1.0.0" - sources."pako-1.0.8" + sources."pako-1.0.10" sources."parallel-transform-1.1.0" sources."paredit.js-0.3.4" sources."parse-asn1-5.1.4" @@ -50586,9 +50271,9 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" ]; }) sources."posix-character-classes-0.1.1" @@ -50678,13 +50363,13 @@ in ]; }) sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-7.0.0" - sources."regenerator-runtime-0.12.1" + sources."regenerate-unicode-properties-8.0.2" + sources."regenerator-runtime-0.13.2" sources."regenerator-transform-0.13.4" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" sources."regexp-tree-0.1.5" - sources."regexpu-core-4.4.0" + sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { dependencies = [ @@ -50700,10 +50385,10 @@ in sources."require-main-filename-1.0.1" sources."resolve-1.10.0" sources."resolve-cwd-2.0.0" - (sources."resolve-dependencies-2.2.1" // { + (sources."resolve-dependencies-2.2.2" // { dependencies = [ - sources."dir-glob-git://github.com/nexe/dir-glob.git#84f4381fe041b6afd425e8d5c14c33809430d8f1" - sources."globby-git://github.com/nexe/globby.git#de057b69c2bca74391bfd913ed0145ce4e42563a" + sources."dir-glob-2.2.2" + sources."globby-9.1.0" sources."ignore-4.0.6" (sources."path-type-3.0.0" // { dependencies = [ @@ -50733,7 +50418,7 @@ in }) sources."rollup-plugin-node-resolve-3.4.0" sources."rollup-plugin-replace-2.1.0" - (sources."rollup-pluginutils-2.4.1" // { + (sources."rollup-pluginutils-2.5.0" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -50825,7 +50510,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" - (sources."source-map-support-0.5.10" // { + (sources."source-map-support-0.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -50876,9 +50561,9 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.1" sources."tar-stream-1.6.2" - (sources."terser-3.16.1" // { + (sources."terser-3.17.0" // { dependencies = [ - sources."commander-2.17.1" + sources."commander-2.19.0" sources."source-map-0.6.1" ]; }) @@ -50912,8 +50597,8 @@ in sources."unbzip2-stream-1.3.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.0.2" - sources."unicode-property-aliases-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.1.0" + sources."unicode-property-aliases-ecmascript-1.0.5" (sources."union-value-1.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -50933,7 +50618,7 @@ in sources."isobject-3.0.1" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -50953,14 +50638,14 @@ in sources."vm-browserify-0.0.4" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.29.5" // { + (sources."webpack-4.29.6" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" sources."braces-2.3.2" sources."debug-2.6.9" sources."define-property-1.0.0" - sources."eslint-scope-4.0.0" + sources."eslint-scope-4.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -50995,7 +50680,7 @@ in sources."ms-2.0.0" ]; }) - (sources."webpack-cli-3.2.3" // { + (sources."webpack-cli-3.3.0" // { dependencies = [ sources."supports-color-5.5.0" ]; @@ -51033,9 +50718,9 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" ]; }) sources."yargs-parser-11.1.1" @@ -51078,7 +50763,7 @@ in sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -51213,10 +50898,10 @@ in meguca = nodeEnv.buildNodePackage { name = "meguca"; packageName = "meguca"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.1.3.tgz"; - sha512 = "p9O6RWIqdP74tgmHNwfw6T2RJd8P+M7snBU2yfBrZAQT3SSL0IsbCPpQt42v0rxJOdQuPVVCsYesVAIzwa+VYQ=="; + url = "https://registry.npmjs.org/meguca/-/meguca-1.1.4.tgz"; + sha512 = "ccvNbLwUeWRLWO9l0dZj1G0T+n10MRtORrvuq8/UYBgCKzdmvHW5FTU/3T2yO2P3AK+6Ghsey/+6KBiJpokeSg=="; }; dependencies = [ (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -51386,7 +51071,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-0.1.5" sources."errno-0.1.7" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.1" sources."es6-weak-map-2.0.2" @@ -51865,7 +51550,7 @@ in sources."tough-cookie-2.3.4" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-3.1.6" + sources."typescript-3.3.4000" (sources."uglify-js-3.4.9" // { dependencies = [ sources."source-map-0.6.1" @@ -51967,7 +51652,7 @@ in }) sources."browser-stdout-1.3.1" sources."cache-base-1.0.1" - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" (sources."chalk-2.4.2" // { dependencies = [ sources."supports-color-5.5.0" @@ -52114,9 +51799,9 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.1.0" + sources."mem-4.2.0" sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" (sources."mixin-deep-1.3.1" // { @@ -52154,9 +51839,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" @@ -52294,10 +51979,10 @@ in multi-file-swagger = nodeEnv.buildNodePackage { name = "multi-file-swagger"; packageName = "multi-file-swagger"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.2.0.tgz"; - sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; + url = "https://registry.npmjs.org/multi-file-swagger/-/multi-file-swagger-2.3.0.tgz"; + sha512 = "kiGLOSzovuYddOePdYicu/jkIjvlNgvq/bP/0C0+oiPBIuiJWLS1vXPvnU2OowRQPi/Hxnp0HuRI5/7s7qu8Qg=="; }; dependencies = [ sources."argparse-1.0.10" @@ -52316,8 +52001,12 @@ in sources."graphlib-2.1.7" sources."inherits-2.0.3" sources."isarray-1.0.0" - sources."js-yaml-3.12.1" - sources."json-refs-2.1.7" + sources."js-yaml-3.13.0" + (sources."json-refs-3.0.12" // { + dependencies = [ + sources."commander-2.11.0" + ]; + }) sources."lodash-4.17.11" sources."methods-1.1.2" sources."mime-1.6.0" @@ -52349,10 +52038,10 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "4.2.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-4.2.1.tgz"; - sha512 = "2Kto3HlBsFFtgyAmV8ecNtBBUrydoXp2EfIHwIvuhOIiVinCuKJaUmp1+1u5eGGu1TDZHUiHwvFv0T05eG8T+w=="; + url = "https://registry.npmjs.org/neovim/-/neovim-4.4.0.tgz"; + sha512 = "zFsmjUeiK7vJNXsSljaAXt8eUmwKIJ4d7iTn7Mq2PmTEPmtBCuaVEGRpkl5z3AWJKPmOYNzlIu9Lgyq4s4FTew=="; }; dependencies = [ sources."async-1.0.0" @@ -52366,6 +52055,7 @@ in sources."isstream-0.1.2" sources."lodash-4.17.11" sources."msgpack-lite-0.1.26" + sources."semver-5.6.0" sources."stack-trace-0.0.10" sources."traverse-0.6.6" sources."winston-2.4.4" @@ -52410,7 +52100,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -52568,7 +52258,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -52840,7 +52530,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."negotiator-0.6.1" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -53096,7 +52786,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -53258,7 +52948,7 @@ in sources."minimist-1.2.0" sources."mixin-deep-1.3.1" sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."nopt-1.0.10" sources."normalize-path-3.0.0" @@ -53295,7 +52985,7 @@ in sources."readable-stream-2.3.6" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -53406,7 +53096,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.0" + sources."upath-1.1.2" sources."update-notifier-2.5.0" sources."urix-0.1.0" sources."url-parse-lax-1.0.0" @@ -53430,17 +53120,28 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.19.6"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.19.6.tgz"; - sha512 = "JSXgkh/PlLSDAvplfFqRmTyDKgKRK9rjuTGjiAX5hM9BbMLiJnNGMWjt6qkJmRGzzND7x+stgwvdDODJExW5zQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-0.20.3.tgz"; + sha512 = "Ws9yCaG7LXWV5AlfM6z7wQYM7/LBkuulm78I+aXag0ED4HTcNoFNxtaez2eNvBYLiwHlvhhFvw/mthGDJ6HTow=="; }; dependencies = [ + sources."@node-red/editor-api-0.20.3" + sources."@node-red/editor-client-0.20.3" + (sources."@node-red/nodes-0.20.3" // { + dependencies = [ + sources."iconv-lite-0.4.24" + sources."media-typer-1.0.1" + ]; + }) + sources."@node-red/registry-0.20.3" + sources."@node-red/runtime-0.20.3" + sources."@node-red/util-0.20.3" sources."abbrev-1.1.1" sources."accepts-1.3.5" - sources."addressparser-0.3.2" + sources."addressparser-1.0.1" sources."agent-base-4.2.1" - sources."ajv-6.5.4" + sources."ajv-6.10.0" sources."append-field-1.0.0" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -53467,11 +53168,6 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" - (sources."buildmail-2.0.0" // { - dependencies = [ - sources."needle-0.10.0" - ]; - }) (sources."busboy-0.2.14" // { dependencies = [ sources."isarray-0.0.1" @@ -53491,7 +53187,7 @@ in sources."clone-2.1.2" sources."combined-stream-1.0.7" sources."commander-2.17.1" - sources."commist-1.0.0" + sources."commist-1.1.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -53502,19 +53198,19 @@ in sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."cookie-0.3.1" - sources."cookie-parser-1.4.3" + sources."cookie-parser-1.4.4" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" - sources."cors-2.8.4" + sources."cors-2.8.5" sources."crc-3.4.4" - sources."cron-1.5.0" + sources."cron-1.7.0" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.0" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."delayed-stream-1.0.0" - sources."denque-1.3.0" + sources."denque-1.4.0" sources."depd-1.1.2" sources."destroy-1.0.4" (sources."dicer-0.2.5" // { @@ -53537,10 +53233,9 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - sources."encoding-0.1.12" sources."end-of-stream-1.4.1" sources."entities-1.1.2" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.6" @@ -53564,7 +53259,6 @@ in sources."fast-json-stable-stringify-2.0.0" (sources."feedparser-2.2.9" // { dependencies = [ - sources."addressparser-1.0.1" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -53578,7 +53272,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-5.0.0" + sources."fs-extra-7.0.1" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" @@ -53592,11 +53286,7 @@ in }) sources."graceful-fs-4.1.15" sources."har-schema-2.0.0" - (sources."har-validator-5.1.3" // { - dependencies = [ - sources."ajv-6.9.2" - ]; - }) + sources."har-validator-5.1.3" sources."hash-sum-1.0.2" sources."help-me-1.1.0" sources."htmlparser2-3.10.1" @@ -53608,7 +53298,7 @@ in sources."ms-2.1.1" ]; }) - sources."i18next-11.6.0" + sources."i18next-14.1.1" sources."iconv-lite-0.4.23" (sources."imap-0.8.19" // { dependencies = [ @@ -53631,19 +53321,16 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."js-yaml-3.12.0" + sources."js-yaml-3.12.2" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.5.4" + sources."jsonata-1.6.4" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - sources."leven-1.0.2" - sources."libbase64-0.1.0" - sources."libmime-1.2.0" - sources."libqp-1.1.0" + sources."leven-2.1.0" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.bind-4.2.1" @@ -53661,24 +53348,23 @@ in sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" sources."lru-cache-4.1.5" - sources."mailcomposer-2.1.0" - sources."mailparser-0.6.2" + (sources."mailparser-mit-1.0.0" // { + dependencies = [ + sources."iconv-lite-0.4.24" + sources."mime-1.6.0" + ]; + }) sources."media-typer-0.3.0" - (sources."memorystore-1.6.0" // { + (sources."memorystore-1.6.1" // { dependencies = [ sources."debug-3.1.0" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-1.4.1" + sources."mime-2.4.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - (sources."mimelib-0.3.1" // { - dependencies = [ - sources."addressparser-1.0.1" - ]; - }) sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -53698,23 +53384,17 @@ in sources."mri-1.1.4" sources."ms-2.0.0" sources."multer-1.4.1" - sources."mustache-2.3.2" + sources."mustache-3.0.1" sources."nan-2.10.0" - sources."needle-0.11.0" sources."negotiator-0.6.1" sources."next-tick-1.0.0" - sources."node-red-node-email-0.1.29" + sources."node-red-node-email-1.3.0" sources."node-red-node-feedparser-0.1.14" sources."node-red-node-rbe-0.2.4" + sources."node-red-node-sentiment-0.1.3" + sources."node-red-node-tail-0.0.2" sources."node-red-node-twitter-1.1.4" - sources."nodemailer-1.11.0" - sources."nodemailer-direct-transport-1.1.0" - (sources."nodemailer-smtp-transport-1.1.0" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."nodemailer-wellknown-0.1.10" + sources."nodemailer-4.7.0" sources."nopt-4.0.1" sources."nth-check-1.0.2" sources."oauth-0.9.15" @@ -53722,14 +53402,13 @@ in sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" - sources."on-headers-1.0.1" + sources."on-headers-1.0.2" sources."once-1.4.0" (sources."optimist-0.6.1" // { dependencies = [ sources."minimist-0.0.10" ]; }) - sources."options-0.0.6" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.6" @@ -53765,7 +53444,7 @@ in sources."random-bytes-1.0.0" sources."range-parser-1.2.0" sources."raw-body-2.3.3" - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."request-2.88.0" @@ -53776,13 +53455,13 @@ in sources."semver-5.6.0" (sources."send-0.16.2" // { dependencies = [ + sources."mime-1.4.1" sources."statuses-1.4.0" ]; }) sources."sentiment-2.1.0" sources."serve-static-1.13.2" sources."setprototypeof-1.1.0" - sources."smtp-connection-1.3.8" sources."source-map-0.6.1" sources."split2-2.2.0" sources."sprintf-js-1.0.3" @@ -53791,6 +53470,7 @@ in sources."stream-shift-1.0.0" sources."streamsearch-0.1.2" sources."string_decoder-1.2.0" + sources."tail-2.0.2" (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" @@ -53839,11 +53519,7 @@ in sources."when-3.7.8" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - (sources."ws-1.1.5" // { - dependencies = [ - sources."ultron-1.0.2" - ]; - }) + sources."ws-6.2.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.1" @@ -53861,10 +53537,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.8.0"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.8.0.tgz"; - sha512 = "xMH6V0OCSJ5ZET6yWPI3BmJSqMMCuVJSIcLx3LSH/SrratFSt6EDuCuGRFMQYty98Q1l6x/7vKmfURosoyWgrA=="; + url = "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz"; + sha512 = "91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w=="; }; buildInputs = globalBuildInputs; meta = { @@ -53886,7 +53562,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -54046,31 +53722,29 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.15.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.15.0.tgz"; - sha512 = "0ZUokfgS+4uPVSVWP3CMie7kQwngiQag2e70CdcnUfBM7/tOUmxb0DDMfxqshw4MvgqlPsxSYprzKaBGlvXqnA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.1.1.tgz"; + sha512 = "xUf4iL28QAMjOkd9eH2CIxt98KMub3Z5BN1rkLMphb3WoGeiRZ4YDs82KmR3Jl5cheeWjJjI+HBXiiGFAxAYuQ=="; }; dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" sources."ansi-align-2.0.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."bluebird-3.5.3" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" - ]; - }) + sources."boxen-1.3.0" + sources."cacheable-request-6.0.0" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" - sources."chalk-1.1.3" + sources."chalk-2.4.2" sources."ci-info-1.6.0" sources."cint-8.2.1" sources."cli-boxes-1.0.0" sources."cli-table-0.3.1" + sources."clone-response-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" @@ -54080,21 +53754,29 @@ in sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" sources."debug-3.2.6" + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."defer-to-connect-1.0.2" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" + sources."end-of-stream-1.4.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."execa-0.7.0" + (sources."execa-0.7.0" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."fast-diff-1.2.0" - sources."find-up-1.1.2" - sources."get-stdin-5.0.1" - sources."get-stream-3.0.0" + sources."find-up-3.0.0" + sources."get-stdin-6.0.0" + sources."get-stream-4.1.0" sources."global-dirs-0.1.1" - sources."got-6.7.1" + sources."got-9.6.0" sources."graceful-fs-4.1.15" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."http-cache-semantics-4.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."ini-1.3.5" @@ -54109,45 +53791,67 @@ in sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."jju-1.4.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" + sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json5-1.0.1" - sources."latest-version-3.1.0" + sources."keyv-3.1.0" + sources."kleur-3.0.2" + (sources."latest-version-3.1.0" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."got-6.7.1" + sources."package-json-4.0.1" + sources."prepend-http-1.0.4" + sources."registry-url-3.1.0" + sources."url-parse-lax-1.0.0" + ]; + }) + sources."locate-path-3.0.0" sources."lodash-4.17.11" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" + sources."mimic-response-1.0.1" sources."minimist-1.2.0" sources."ms-2.1.1" - sources."node-alias-1.0.4" - sources."npm-3.10.10" - sources."npm-run-path-2.0.2" - (sources."npmi-2.0.1" // { + sources."nested-error-stacks-2.0.1" + (sources."node-alias-1.0.4" // { dependencies = [ - sources."semver-4.3.6" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" ]; }) + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."object-keys-1.1.0" + sources."once-1.4.0" + sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."package-json-4.0.1" - sources."path-exists-2.1.0" + sources."p-limit-2.2.0" + sources."p-locate-3.0.0" + sources."p-try-2.1.0" + sources."package-json-6.1.0" + sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" + sources."path-parse-1.0.6" sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" + sources."progress-2.0.3" + sources."prompts-2.0.4" sources."pseudomap-1.0.2" + sources."pump-3.0.0" sources."rc-1.2.8" - (sources."rc-config-loader-2.0.2" // { - dependencies = [ - sources."path-exists-3.0.0" - ]; - }) - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" + sources."rc-config-loader-2.0.2" + sources."registry-auth-token-3.4.0" + sources."registry-url-5.0.0" sources."require-from-string-2.0.2" + sources."requireg-0.2.1" + sources."resolve-1.7.1" + sources."responselike-1.0.2" sources."safe-buffer-5.1.2" sources."semver-5.6.0" sources."semver-diff-2.1.0" @@ -54155,6 +53859,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" + sources."sisteransi-1.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" (sources."string-width-2.1.1" // { @@ -54166,21 +53871,17 @@ in sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" + sources."to-readable-stream-1.0.0" sources."unique-string-1.0.0" sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."supports-color-5.5.0" - ]; - }) - sources."url-parse-lax-1.0.0" + sources."update-notifier-2.5.0" + sources."url-parse-lax-3.0.0" sources."which-1.3.1" sources."widest-line-2.0.1" + sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" @@ -54469,7 +54170,7 @@ in sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" - sources."simple-sha1-2.1.1" + sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { dependencies = [ sources."safe-buffer-5.0.1" @@ -54547,7 +54248,7 @@ in sources."accepts-1.2.13" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."archiver-3.0.0" sources."archiver-utils-2.0.0" sources."arraybuffer.slice-0.0.6" @@ -54889,7 +54590,7 @@ in sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" - sources."simple-sha1-2.1.1" + sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { dependencies = [ sources."safe-buffer-5.0.1" @@ -54990,10 +54691,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.6"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; - sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; + sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; }; buildInputs = globalBuildInputs; meta = { @@ -55007,10 +54708,10 @@ in parcel-bundler = nodeEnv.buildNodePackage { name = "parcel-bundler"; packageName = "parcel-bundler"; - version = "1.11.0"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.11.0.tgz"; - sha512 = "H0w/Obx76vWiG+UtofznfcHZJBmd6JA5iCn7zrGBINyVAh+Nt/JLD6QDROghHLXfJkO4XyczsB+fO+nPbXlFfA=="; + url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.3.tgz"; + sha512 = "8bq6lj0hhQeGxD9f9xEkFMXQ3d8TIlf2+isKxoi9bciB0KVEILRGllaPkUgp++5t0anToBh9+tG6ZyInXOC1/A=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -55028,12 +54729,28 @@ in sources."@babel/helper-annotate-as-pure-7.0.0" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" sources."@babel/helper-builder-react-jsx-7.3.0" - sources."@babel/helper-call-delegate-7.1.0" - sources."@babel/helper-define-map-7.1.0" + (sources."@babel/helper-call-delegate-7.4.0" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/helper-define-map-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-explode-assignable-expression-7.1.0" sources."@babel/helper-function-name-7.1.0" sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.0.0" + (sources."@babel/helper-hoist-variables-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-member-expression-to-functions-7.0.0" sources."@babel/helper-module-imports-7.0.0" sources."@babel/helper-module-transforms-7.2.2" @@ -55041,18 +54758,39 @@ in sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.0.0" sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.3.4" + (sources."@babel/helper-replace-supers-7.4.0" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.0.0" + (sources."@babel/helper-split-export-declaration-7.4.0" // { + dependencies = [ + sources."@babel/types-7.4.0" + ]; + }) sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.3.1" + (sources."@babel/helpers-7.4.2" // { + dependencies = [ + sources."@babel/generator-7.4.0" + sources."@babel/parser-7.4.2" + sources."@babel/template-7.4.0" + sources."@babel/traverse-7.4.0" + sources."@babel/types-7.4.0" + sources."source-map-0.5.7" + ]; + }) sources."@babel/highlight-7.0.0" sources."@babel/parser-7.3.4" sources."@babel/plugin-proposal-async-generator-functions-7.2.0" sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.3.4" + sources."@babel/plugin-proposal-object-rest-spread-7.4.0" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.2.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.4.0" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-flow-7.2.0" sources."@babel/plugin-syntax-json-strings-7.2.0" @@ -55060,29 +54798,29 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.3.4" + sources."@babel/plugin-transform-async-to-generator-7.4.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.3.4" - sources."@babel/plugin-transform-classes-7.3.4" + sources."@babel/plugin-transform-block-scoping-7.4.0" + sources."@babel/plugin-transform-classes-7.4.0" sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.3.2" + sources."@babel/plugin-transform-destructuring-7.4.0" sources."@babel/plugin-transform-dotall-regex-7.2.0" sources."@babel/plugin-transform-duplicate-keys-7.2.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.3.4" - sources."@babel/plugin-transform-for-of-7.2.0" + sources."@babel/plugin-transform-for-of-7.4.0" sources."@babel/plugin-transform-function-name-7.2.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.2.0" sources."@babel/plugin-transform-modules-commonjs-7.2.0" - sources."@babel/plugin-transform-modules-systemjs-7.3.4" + sources."@babel/plugin-transform-modules-systemjs-7.4.0" sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.3.0" - sources."@babel/plugin-transform-new-target-7.0.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.4.2" + sources."@babel/plugin-transform-new-target-7.4.0" sources."@babel/plugin-transform-object-super-7.2.0" - sources."@babel/plugin-transform-parameters-7.3.3" + sources."@babel/plugin-transform-parameters-7.4.0" sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.3.4" + sources."@babel/plugin-transform-regenerator-7.4.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.2.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" @@ -55100,13 +54838,19 @@ in sources."@parcel/fs-1.11.0" sources."@parcel/logger-1.11.0" sources."@parcel/utils-1.11.0" - sources."@parcel/watcher-1.11.0" + sources."@parcel/watcher-1.12.0" sources."@parcel/workers-1.11.0" - sources."@types/node-10.12.27" - sources."@types/q-1.5.1" - sources."@types/semver-5.5.0" + sources."@types/q-1.5.2" + sources."abab-2.0.0" sources."abbrev-1.1.1" sources."acorn-5.7.3" + (sources."acorn-globals-4.3.0" // { + dependencies = [ + sources."acorn-6.1.1" + ]; + }) + sources."acorn-walk-6.1.1" + sources."ajv-6.10.0" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -55120,7 +54864,9 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" + sources."array-equal-1.0.0" sources."array-unique-0.3.2" + sources."asn1-0.2.4" sources."asn1.js-4.10.1" (sources."assert-1.4.1" // { dependencies = [ @@ -55128,27 +54874,14 @@ in sources."util-0.10.3" ]; }) + sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-limiter-1.0.0" + sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."autoprefixer-6.7.7" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."browserslist-1.7.7" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" - ]; - }) + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -55167,6 +54900,7 @@ in ]; }) sources."base64-js-1.3.0" + sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.0" sources."bindings-1.2.1" sources."bn.js-4.11.8" @@ -55175,6 +54909,7 @@ in sources."braces-2.3.2" sources."brfs-1.6.1" sources."brorand-1.1.0" + sources."browser-process-hrtime-0.1.3" sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" @@ -55182,10 +54917,10 @@ in sources."browserify-sign-4.0.4" (sources."browserify-zlib-0.2.0" // { dependencies = [ - sources."pako-1.0.8" + sources."pako-1.0.10" ]; }) - sources."browserslist-4.4.2" + sources."browserslist-4.5.2" (sources."buffer-4.9.1" // { dependencies = [ sources."isarray-1.0.0" @@ -55201,20 +54936,11 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-db-1.0.30000939" - sources."caniuse-lite-1.0.30000939" + sources."caniuse-lite-1.0.30000951" + sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.2" sources."cipher-base-1.0.4" - (sources."clap-1.2.3" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" @@ -55226,14 +54952,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.3" - (sources."colormin-1.1.2" // { - dependencies = [ - sources."clone-1.0.4" - sources."color-0.11.4" - sources."color-string-0.3.0" - ]; - }) - sources."colors-1.1.2" + sources."combined-stream-1.0.7" sources."command-exists-1.2.8" sources."commander-2.19.0" sources."component-emitter-1.2.1" @@ -55254,8 +54973,32 @@ in sources."crypto-browserify-3.12.0" sources."css-color-names-0.0.4" sources."css-declaration-sorter-4.0.1" + (sources."css-modules-loader-core-1.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."supports-color-2.0.0" + ]; + }) + sources."has-flag-1.0.0" + sources."postcss-6.0.1" + sources."source-map-0.5.7" + sources."strip-ansi-3.0.1" + sources."supports-color-3.2.3" + ]; + }) sources."css-select-2.0.2" sources."css-select-base-adapter-0.1.1" + (sources."css-selector-tokenizer-0.7.1" // { + dependencies = [ + sources."jsesc-0.5.0" + sources."regexpu-core-1.0.0" + sources."regjsgen-0.2.0" + sources."regjsparser-0.1.5" + ]; + }) (sources."css-tree-1.0.0-alpha.28" // { dependencies = [ sources."source-map-0.5.7" @@ -55264,7 +55007,7 @@ in sources."css-unit-converter-1.1.1" sources."css-url-regex-1.1.0" sources."css-what-2.1.3" - sources."cssesc-2.0.0" + sources."cssesc-0.1.0" sources."cssnano-4.1.10" sources."cssnano-preset-default-4.0.7" sources."cssnano-util-get-arguments-4.0.0" @@ -55277,10 +55020,17 @@ in sources."source-map-0.5.7" ]; }) + sources."cssom-0.3.6" + sources."cssstyle-1.2.1" + sources."dashdash-1.14.1" + (sources."data-urls-1.1.0" // { + dependencies = [ + sources."whatwg-url-7.0.0" + ]; + }) sources."date-now-0.1.4" sources."deasync-0.1.14" sources."debug-4.1.1" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -55305,7 +55055,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."defined-1.0.0" + sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."des.js-1.0.0" sources."destroy-1.0.4" @@ -55313,15 +55063,17 @@ in sources."dom-serializer-0.1.1" sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" + sources."domexception-1.0.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-4.2.0" sources."dotenv-5.0.1" sources."dotenv-expand-4.2.0" sources."duplexer2-0.1.4" - sources."editorconfig-0.15.2" + sources."ecc-jsbn-0.1.2" + sources."editorconfig-0.15.3" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.113" + sources."electron-to-chromium-1.3.118" sources."elliptic-6.4.1" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -55343,20 +55095,26 @@ in sources."ms-2.0.0" ]; }) + sources."extend-3.0.2" sources."extend-shallow-2.0.1" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" ]; }) + sources."extsprintf-1.3.0" sources."falafel-2.1.0" + sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.6" + sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" + sources."fastparse-1.1.2" sources."filesize-3.6.1" sources."fill-range-4.0.0" - sources."flatten-1.0.2" sources."for-in-1.0.2" sources."foreach-2.0.5" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" @@ -55364,6 +55122,7 @@ in sources."function-bind-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" + sources."getpass-0.1.7" sources."glob-7.1.3" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -55374,6 +55133,8 @@ in sources."globals-11.11.0" sources."graceful-fs-4.1.15" sources."grapheme-breaker-0.3.2" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ @@ -55395,63 +55156,19 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" - (sources."htmlnano-0.1.10" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."browserslist-1.7.7" - sources."caniuse-api-1.6.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."coa-1.0.4" - sources."cssnano-3.10.0" - sources."csso-2.3.2" - sources."esprima-2.7.3" - sources."has-flag-1.0.0" - sources."is-svg-2.1.0" - sources."js-yaml-3.7.0" - sources."normalize-url-1.9.1" - sources."postcss-5.2.18" - sources."postcss-calc-5.3.1" - sources."postcss-colormin-2.2.2" - sources."postcss-convert-values-2.6.1" - sources."postcss-discard-comments-2.0.4" - sources."postcss-discard-duplicates-2.1.0" - sources."postcss-discard-empty-2.1.0" - sources."postcss-discard-overridden-0.1.1" - sources."postcss-merge-longhand-2.0.2" - sources."postcss-merge-rules-2.1.2" - sources."postcss-minify-font-values-1.0.5" - sources."postcss-minify-gradients-1.0.5" - sources."postcss-minify-params-1.2.2" - sources."postcss-minify-selectors-2.1.1" - sources."postcss-normalize-charset-1.1.1" - sources."postcss-normalize-url-3.0.8" - sources."postcss-ordered-values-2.2.3" - sources."postcss-reduce-initial-1.0.1" - sources."postcss-reduce-transforms-1.0.4" - sources."postcss-selector-parser-2.2.3" - (sources."postcss-svgo-2.1.6" // { - dependencies = [ - sources."svgo-0.7.2" - ]; - }) - sources."postcss-unique-selectors-2.0.2" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" - ]; - }) + sources."html-encoding-sniffer-1.0.2" + sources."html-tags-1.2.0" + sources."htmlnano-0.2.3" (sources."htmlparser2-3.10.1" // { dependencies = [ - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" ]; }) sources."http-errors-1.6.3" + sources."http-signature-1.2.0" sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."icss-replace-symbols-1.1.0" sources."ieee754-1.1.12" sources."import-fresh-2.0.0" sources."indexes-of-1.0.1" @@ -55486,38 +55203,47 @@ in sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.0" + sources."is-html-1.1.0" sources."is-number-3.0.0" sources."is-obj-1.0.1" - sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.0.4" sources."is-resolvable-1.1.0" sources."is-svg-3.0.0" sources."is-symbol-1.0.2" + sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."js-base64-2.5.1" - sources."js-beautify-1.8.9" + sources."isstream-0.1.2" + sources."js-beautify-1.9.0" sources."js-levenshtein-1.1.6" sources."js-tokens-4.0.0" - (sources."js-yaml-3.12.1" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; }) + sources."jsbn-0.1.1" + sources."jsdom-11.12.0" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" + sources."jsprim-1.4.1" sources."kind-of-3.2.2" + sources."left-pad-1.3.0" sources."levn-0.3.0" sources."lodash-4.17.11" sources."lodash.clone-4.5.0" sources."lodash.get-4.4.2" sources."lodash.memoize-4.1.2" + sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" sources."log-symbols-2.2.0" sources."loose-envify-1.4.0" @@ -55525,7 +55251,6 @@ in sources."magic-string-0.22.5" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."math-expression-evaluator-1.2.17" sources."md5.js-1.3.5" sources."mdn-data-1.1.4" (sources."merge-source-map-1.0.4" // { @@ -55544,6 +55269,8 @@ in }) sources."miller-rabin-4.0.1" sources."mime-1.4.1" + sources."mime-db-1.38.0" + sources."mime-types-2.1.22" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -55560,7 +55287,7 @@ in ]; }) sources."ms-2.1.1" - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -55572,14 +55299,19 @@ in sources."nice-try-1.0.5" sources."node-addon-api-1.6.2" sources."node-forge-0.7.6" - sources."node-libs-browser-2.2.0" - sources."node-releases-1.1.8" + (sources."node-libs-browser-2.2.0" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-1.1.11" sources."nopt-4.0.1" + sources."normalize-html-whitespace-0.2.0" sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" - sources."num2fraction-1.2.2" + sources."nwsapi-2.1.1" + sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" sources."object-inspect-1.4.1" @@ -55591,7 +55323,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."optionator-0.8.2" sources."ora-2.1.0" sources."os-browserify-0.3.0" @@ -55601,6 +55333,7 @@ in sources."pako-0.2.9" sources."parse-asn1-5.1.4" sources."parse-json-4.0.0" + sources."parse5-4.0.0" sources."parseurl-1.3.2" sources."pascalcase-0.1.1" sources."path-browserify-0.0.0" @@ -55609,7 +55342,9 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pbkdf2-3.0.17" + sources."performance-now-2.1.0" sources."physical-cpu-count-2.0.0" + sources."pn-1.1.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.14" // { dependencies = [ @@ -55623,67 +55358,38 @@ in sources."postcss-discard-duplicates-4.0.2" sources."postcss-discard-empty-4.0.1" sources."postcss-discard-overridden-4.0.1" - (sources."postcss-discard-unused-2.2.3" // { + sources."postcss-merge-longhand-4.0.11" + (sources."postcss-merge-rules-4.0.3" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" + sources."postcss-selector-parser-3.1.1" ]; }) - (sources."postcss-filter-plugins-2.0.3" // { + sources."postcss-minify-font-values-4.0.2" + sources."postcss-minify-gradients-4.0.2" + sources."postcss-minify-params-4.0.2" + (sources."postcss-minify-selectors-4.0.2" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" + sources."postcss-selector-parser-3.1.1" ]; }) - (sources."postcss-merge-idents-2.1.7" // { + (sources."postcss-modules-extract-imports-1.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" + sources."postcss-6.0.23" ]; }) - sources."postcss-merge-longhand-4.0.11" - (sources."postcss-merge-rules-4.0.3" // { + (sources."postcss-modules-local-by-default-1.2.0" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-6.0.23" ]; }) - sources."postcss-message-helpers-2.0.0" - sources."postcss-minify-font-values-4.0.2" - sources."postcss-minify-gradients-4.0.2" - sources."postcss-minify-params-4.0.2" - (sources."postcss-minify-selectors-4.0.2" // { + (sources."postcss-modules-scope-1.1.0" // { dependencies = [ - sources."postcss-selector-parser-3.1.1" + sources."postcss-6.0.23" + ]; + }) + (sources."postcss-modules-values-1.3.0" // { + dependencies = [ + sources."postcss-6.0.23" ]; }) sources."postcss-normalize-charset-4.0.1" @@ -55696,44 +55402,16 @@ in sources."postcss-normalize-url-4.0.1" sources."postcss-normalize-whitespace-4.0.2" sources."postcss-ordered-values-4.1.2" - (sources."postcss-reduce-idents-2.4.0" // { + sources."postcss-reduce-initial-4.0.3" + sources."postcss-reduce-transforms-4.0.2" + (sources."postcss-selector-parser-5.0.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" + sources."cssesc-2.0.0" ]; }) - sources."postcss-reduce-initial-4.0.3" - sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-5.0.0" sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" - (sources."postcss-zindex-2.2.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" - ]; - }) (sources."posthtml-0.11.3" // { dependencies = [ sources."isarray-1.0.0" @@ -55744,16 +55422,16 @@ in sources."posthtml-parser-0.4.1" sources."posthtml-render-1.1.4" sources."prelude-ls-1.1.2" - sources."prepend-http-1.0.4" sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" + sources."psl-1.1.31" sources."public-encrypt-4.0.3" - sources."punycode-1.4.1" + sources."punycode-2.1.1" sources."q-1.5.1" - sources."query-string-4.3.4" + sources."qs-6.5.2" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."quote-stream-1.0.2" @@ -55766,18 +55444,8 @@ in ]; }) sources."readdirp-2.2.1" - (sources."reduce-css-calc-1.3.0" // { - dependencies = [ - sources."balanced-match-0.4.2" - ]; - }) - (sources."reduce-function-call-1.0.2" // { - dependencies = [ - sources."balanced-match-0.4.2" - ]; - }) sources."regenerate-1.4.0" - sources."regenerate-unicode-properties-7.0.0" + sources."regenerate-unicode-properties-8.0.2" sources."regenerator-runtime-0.12.1" sources."regenerator-transform-0.13.4" (sources."regex-not-1.0.2" // { @@ -55787,7 +55455,7 @@ in ]; }) sources."regexp-tree-0.1.5" - sources."regexpu-core-4.4.0" + sources."regexpu-core-4.5.4" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { dependencies = [ @@ -55797,6 +55465,14 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + (sources."request-2.88.0" // { + dependencies = [ + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" sources."resolve-1.10.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -55808,7 +55484,8 @@ in sources."ripemd160-2.0.2" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - sources."safer-eval-1.3.0" + sources."safer-buffer-2.1.2" + sources."safer-eval-1.3.2" sources."sax-1.2.4" sources."semver-5.6.0" (sources."send-0.16.2" // { @@ -55846,10 +55523,9 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."sort-keys-1.1.2" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" - sources."source-map-support-0.5.10" + sources."source-map-support-0.5.11" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -55858,14 +55534,15 @@ in ]; }) sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."stable-0.1.8" - sources."static-eval-2.0.1" + sources."static-eval-2.0.2" sources."static-extend-0.1.2" sources."static-module-2.2.5" sources."statuses-1.4.0" + sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."strict-uri-encode-1.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -55875,11 +55552,8 @@ in }) sources."supports-color-5.5.0" sources."svgo-1.2.0" - (sources."terser-3.16.1" // { - dependencies = [ - sources."commander-2.17.1" - ]; - }) + sources."symbol-tree-3.2.2" + sources."terser-3.17.0" sources."through2-2.0.5" sources."timers-browserify-2.0.10" sources."timsort-0.3.0" @@ -55895,14 +55569,24 @@ in ]; }) sources."to-regex-range-2.1.1" + sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" sources."trim-right-1.0.1" sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."typedarray-0.0.6" + (sources."uncss-0.16.2" // { + dependencies = [ + sources."postcss-6.0.23" + sources."postcss-selector-parser-3.1.1" + ]; + }) sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.0.2" - sources."unicode-property-aliases-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.1.0" + sources."unicode-property-aliases-ecmascript-1.0.5" sources."unicode-trie-0.3.1" (sources."union-value-1.0.0" // { dependencies = [ @@ -55923,7 +55607,8 @@ in sources."isarray-1.0.0" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" + sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -55934,16 +55619,23 @@ in sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."util.promisify-1.0.0" + sources."uuid-3.3.2" sources."v8-compile-cache-2.0.2" sources."vendors-1.0.2" + sources."verror-1.10.0" sources."vlq-0.2.3" sources."vm-browserify-0.0.4" + sources."w3c-hr-time-1.0.1" sources."wcwidth-1.0.1" - sources."whet.extend-0.9.9" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-6.5.0" sources."which-1.3.1" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."ws-5.2.2" + sources."xml-name-validator-3.0.0" sources."xtend-4.0.1" sources."yallist-2.1.2" ]; @@ -55983,7 +55675,7 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" sources."acorn-node-1.6.2" sources."acorn-walk-6.1.1" @@ -56008,7 +55700,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -56241,7 +55933,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" sources."node-static-0.7.11" @@ -56418,7 +56110,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ @@ -56588,7 +56280,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -56740,7 +56432,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -56783,8 +56475,8 @@ in sources."character-entities-legacy-1.1.2" sources."character-reference-invalid-1.1.2" sources."charwise-3.0.1" - sources."chloride-2.2.10" - sources."chloride-test-1.2.2" + sources."chloride-2.2.12" + sources."chloride-test-1.2.4" sources."chokidar-1.7.0" sources."chownr-1.1.1" (sources."class-utils-0.3.6" // { @@ -56865,7 +56557,7 @@ in sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - sources."expand-template-1.1.1" + sources."expand-template-2.0.3" sources."explain-error-1.0.4" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { @@ -57021,9 +56713,9 @@ in sources."string_decoder-0.10.31" ]; }) - (sources."leveldown-4.0.1" // { + (sources."leveldown-4.0.2" // { dependencies = [ - sources."nan-2.10.0" + sources."nan-2.12.1" ]; }) sources."levelup-3.1.1" @@ -57063,7 +56755,7 @@ in sources."multiblob-1.13.3" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - (sources."multiserver-3.2.0" // { + (sources."multiserver-3.3.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -57087,7 +56779,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.12.1" + sources."nan-2.13.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -57095,6 +56787,7 @@ in sources."kind-of-6.0.2" ]; }) + sources."napi-build-utils-1.0.1" sources."ncp-2.0.0" sources."nearley-2.16.0" sources."nice-try-1.0.5" @@ -57158,7 +56851,7 @@ in sources."pinkie-promise-2.0.1" sources."plur-2.1.2" sources."posix-character-classes-0.1.1" - sources."prebuild-install-4.0.0" + sources."prebuild-install-5.2.5" sources."preserve-0.2.0" sources."private-box-0.3.0" sources."process-nextick-args-2.0.0" @@ -57316,7 +57009,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.16" - (sources."secret-stack-5.1.0" // { + (sources."secret-stack-5.1.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -57364,10 +57057,11 @@ in }) sources."snapdragon-util-3.0.1" sources."socks-2.3.2" - sources."sodium-browserify-1.2.4" - (sources."sodium-browserify-tweetnacl-0.2.3" // { + sources."sodium-browserify-1.2.5" + (sources."sodium-browserify-tweetnacl-0.2.5" // { dependencies = [ sources."sha.js-2.4.11" + sources."tweetnacl-1.0.1" ]; }) sources."sodium-chloride-1.1.2" @@ -57377,16 +57071,16 @@ in sources."source-map-url-0.4.0" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-blobs-1.1.12" // { + (sources."ssb-blobs-1.1.13" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" ]; }) - sources."ssb-client-4.7.0" + sources."ssb-client-4.7.1" sources."ssb-config-2.3.9" sources."ssb-db-18.6.5" - sources."ssb-ebt-5.4.1" + sources."ssb-ebt-5.5.3" sources."ssb-friends-3.1.13" sources."ssb-keys-7.1.5" sources."ssb-links-3.0.4" @@ -57419,7 +57113,7 @@ in ]; }) sources."statistics-3.3.0" - sources."stream-to-pull-stream-1.7.2" + sources."stream-to-pull-stream-1.7.3" sources."string-width-1.0.2" sources."string.prototype.trim-1.1.2" sources."string_decoder-1.1.1" @@ -57651,7 +57345,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.5" sources."after-0.8.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -58107,10 +57801,10 @@ in smartdc = nodeEnv.buildNodePackage { name = "smartdc"; packageName = "smartdc"; - version = "8.1.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/smartdc/-/smartdc-8.1.0.tgz"; - sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585"; + url = "https://registry.npmjs.org/smartdc/-/smartdc-9.0.0.tgz"; + sha512 = "EGXTn+4v1f9SBVPP3NiWTNMiTtnYZS+eWV88aU8tqwlg+jQTQHrCvgrXwDz5YXZkqpeoeT9/tYDs4nwxaUgxFQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -58156,7 +57850,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."mv-2.1.1" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -58240,7 +57934,7 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Client SDK and CLI for the Joyent SmartDataCenter API"; + description = "Old Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; }; production = true; @@ -58249,10 +57943,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.134.2"; + version = "1.143.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; - sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.143.0.tgz"; + sha512 = "3hndcJH+fxQoC2Bg8YN/RqFBuQo+goZJnFlBm3PoQAaCg2zIWIfCuuzmn+6E/Ssy7LhJb0KbYmhxawS1Ib4rJg=="; }; dependencies = [ sources."@snyk/dep-graph-1.4.0" @@ -58385,7 +58079,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-yaml-3.12.1" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -58407,7 +58101,7 @@ in sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-2.0.0" + sources."macos-release-2.1.0" sources."make-dir-1.3.0" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -58431,7 +58125,7 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."optionator-0.8.2" sources."os-locale-1.4.0" sources."os-name-3.0.0" @@ -58440,7 +58134,7 @@ in sources."pac-proxy-agent-2.0.2" sources."pac-resolver-3.0.0" sources."package-json-4.0.1" - sources."pako-1.0.8" + sources."pako-1.0.10" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."pify-3.0.0" @@ -58464,7 +58158,7 @@ in ]; }) sources."recursive-readdir-2.2.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" @@ -58490,7 +58184,7 @@ in sources."snyk-config-2.2.1" sources."snyk-docker-plugin-1.22.0" sources."snyk-go-plugin-1.6.1" - sources."snyk-gradle-plugin-2.1.3" + sources."snyk-gradle-plugin-2.3.0" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" sources."snyk-nodejs-lockfile-parser-1.11.0" @@ -58500,14 +58194,14 @@ in sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" sources."snyk-resolve-1.0.1" - sources."snyk-resolve-deps-4.0.2" + sources."snyk-resolve-deps-4.0.3" sources."snyk-sbt-plugin-2.0.1" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.3.1" sources."socks-1.1.10" sources."socks-proxy-agent-3.0.1" sources."source-map-0.6.1" - sources."source-map-support-0.5.10" + sources."source-map-support-0.5.11" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."string-width-2.1.1" @@ -58679,7 +58373,7 @@ in sha512 = "xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw=="; }; dependencies = [ - sources."@types/q-1.5.1" + sources."@types/q-1.5.2" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."boolbase-1.0.0" @@ -58714,7 +58408,7 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."mdn-data-1.1.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -58768,7 +58462,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.0" @@ -58950,10 +58644,8 @@ in ]; }) sources."growl-1.9.2" - (sources."handlebars-4.1.0" // { + (sources."handlebars-4.1.1" // { dependencies = [ - sources."async-2.6.2" - sources."lodash-4.17.11" sources."source-map-0.6.1" ]; }) @@ -59019,7 +58711,7 @@ in ]; }) sources."js-string-escape-1.0.1" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.3.4" // { dependencies = [ @@ -59092,9 +58784,10 @@ in sources."ms-2.0.0" sources."multer-1.4.1" sources."mute-stream-0.0.5" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" + sources."neo-async-2.6.0" (sources."nodemon-1.18.10" // { dependencies = [ sources."debug-3.2.6" @@ -59171,7 +58864,7 @@ in sources."readline2-1.0.1" sources."reduce-component-1.0.1" sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -59309,9 +59002,8 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.16" sources."typedarray-0.0.6" - (sources."uglify-js-3.4.9" // { + (sources."uglify-js-3.5.1" // { dependencies = [ - sources."commander-2.17.1" sources."source-map-0.6.1" ]; }) @@ -59336,7 +59028,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.0" + sources."upath-1.1.2" (sources."update-notifier-2.5.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -59381,7 +59073,7 @@ in sha512 = "lST8jq/DougDUADb+vBaufwjqNChwABSJTkWf+5GG4xNVJoR/atEaMe/G7buaVZrpGCy+zoaq1TuycQy8xX+Bg=="; }; dependencies = [ - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-loose-6.0.0" sources."acorn-walk-6.1.1" sources."balanced-match-1.0.0" @@ -59442,7 +59134,7 @@ in sources."@textlint/textlint-plugin-markdown-5.1.4" sources."@textlint/textlint-plugin-text-4.1.4" sources."@textlint/types-1.1.3" - sources."@types/bluebird-3.5.25" + sources."@types/bluebird-3.5.26" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -59513,7 +59205,7 @@ in sources."is-whitespace-character-1.0.2" sources."is-word-character-1.0.2" sources."isarray-1.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."json-parse-better-errors-1.0.2" sources."json-stable-stringify-1.0.1" (sources."json5-1.0.1" // { @@ -59644,10 +59336,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.101.1"; + version = "0.102.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.101.1.tgz"; - sha512 = "8ufimUVmRLtH+BTpEIbDjdGEKQOVWLMLgGynaKin1KbYTE136ZNOepJ8EgByi0tN43dQ7B1YrKLCJgXGy4bLmw=="; + url = "https://registry.npmjs.org/three/-/three-0.102.1.tgz"; + sha512 = "btHBdww/Es4vdBkB2GjTE9mpj0vy8tgtxkX7ne7uxySXV8zoGxWJv1N88BydxnCqvAfmD4ZUTqPeESO7oDgeOQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -59678,10 +59370,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "6.3.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-6.3.0.tgz"; - sha512 = "Ten1ofJ4SS+VA/POnb+erqv6NsvTygSmJgTqo2ABoKm2rlHgB2Y5ADSEsoif5vekEboSnOg5CabSxYzUjj1NMw=="; + url = "https://registry.npmjs.org/triton/-/triton-7.0.1.tgz"; + sha512 = "crjtf6abEddwhMV8/JWAYWHMbWEoDwIh4ZP9dE/72DBETyawx1zsxel+ZvAZp+K3e3AY1XFPlKbiH6S3yWzKJA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -59754,7 +59446,7 @@ in sources."mooremachine-2.2.1" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -59867,7 +59559,7 @@ in sha512 = "DM9diPumksx/2837NoyRXq97PxSpqt9zhCnHaoeqmX2ItgksNE+QCXO6bczNAEtVVbQYML9LAxl/iawYKyMZng=="; }; dependencies = [ - sources."@types/node-6.14.3" + sources."@types/node-6.14.4" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -59921,10 +59613,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.3.3333"; + version = "3.3.4000"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz"; - sha512 = "JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.3.4000.tgz"; + sha512 = "jjOcCZvpkl2+z7JFn0yBOoLQyLoIkNZAs/fYJkUG6VKy6zLPHJGfQJYFHzibB6GJaF/8QrcECtlQ5cpvRHSMEA=="; }; buildInputs = globalBuildInputs; meta = { @@ -59938,13 +59630,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.9"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; - sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.1.tgz"; + sha512 = "kI+3c+KphOAKIikQsZoT2oDsVYH5qvhpTtFObfMCdhPAYnjSvmW4oTWMhvDD4jtAGHJwztlBXQgozGcq3Xw9oQ=="; }; dependencies = [ - sources."commander-2.17.1" + sources."commander-2.19.0" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -59968,7 +59660,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."after-0.8.2" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -59996,7 +59688,7 @@ in sources."builtins-1.0.3" sources."bytes-3.0.0" sources."callsite-1.0.0" - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" sources."caseless-0.12.0" (sources."cliui-4.1.0" // { dependencies = [ @@ -60127,7 +59819,7 @@ in sources."http-errors-1.6.3" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" - sources."ignore-5.0.5" + sources."ignore-5.0.6" sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -60158,8 +59850,8 @@ in sources."lru-cache-4.1.5" sources."map-age-cleaner-0.1.3" sources."media-typer-0.3.0" - sources."mem-4.1.0" - (sources."memorystore-1.6.0" // { + sources."mem-4.2.0" + (sources."memorystore-1.6.1" // { dependencies = [ sources."debug-3.1.0" ]; @@ -60169,7 +59861,7 @@ in sources."mime-1.4.1" sources."mime-db-1.38.0" sources."mime-types-2.1.22" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.0.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" @@ -60202,9 +59894,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.2" @@ -60294,7 +59986,7 @@ in sources."debug-4.1.1" sources."mime-2.4.0" sources."ms-2.1.1" - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" ]; }) (sources."temp-0.8.3" // { @@ -60365,7 +60057,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -60466,7 +60158,7 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.1.0" + sources."handlebars-4.1.1" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -60499,7 +60191,7 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -60532,6 +60224,7 @@ in sources."mkdirp-0.5.1" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" + sources."neo-async-2.6.0" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -60584,9 +60277,9 @@ in ]; }) sources."string_decoder-1.1.1" - (sources."strip-ansi-5.0.0" // { + (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" ]; }) sources."strip-dirs-2.1.0" @@ -60610,11 +60303,7 @@ in sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - (sources."uglify-js-3.4.9" // { - dependencies = [ - sources."commander-2.17.1" - ]; - }) + sources."uglify-js-3.5.1" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -60648,14 +60337,14 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-3.4.1.tgz"; - sha512 = "aV5jWDgeVFrtafJN4Txkx3X36TcEL1uhBiwejKJDG3mXiqWWZAXis7nXaAqt4aI0N7YmL9IvZNDuTjLVuj4B1g=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-3.5.1.tgz"; + sha512 = "BRRwPBetZ5Nj7P9fjq0YpextHuv/Fa7rq6RnNxfY5sgnvM+9lzLKJkaqt6x5FXW2vuPWKVOfQrp3EL6QvIBGeg=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollographql/apollo-tools-0.3.3" + sources."@apollographql/apollo-tools-0.3.5" sources."@apollographql/graphql-playground-html-1.6.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -60675,68 +60364,79 @@ in sources."@types/cors-2.8.4" sources."@types/events-3.0.0" sources."@types/express-4.16.1" - sources."@types/express-serve-static-core-4.16.1" + sources."@types/express-serve-static-core-4.16.2" + sources."@types/glob-7.1.1" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" - sources."@types/node-11.9.5" + sources."@types/minimatch-3.0.3" + sources."@types/node-11.11.4" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.2" sources."@types/ws-6.0.1" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-3.4.1" - (sources."@vue/cli-ui-3.4.1" // { + sources."@vue/cli-shared-utils-3.5.1" + (sources."@vue/cli-ui-3.5.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-3.4.1" - sources."@vue/cli-ui-addon-widgets-3.4.1" + sources."@vue/cli-ui-addon-webpack-3.5.1" + sources."@vue/cli-ui-addon-widgets-3.5.1" sources."abbrev-1.1.1" sources."accepts-1.3.5" sources."aggregate-error-1.0.0" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" ]; }) - sources."apollo-cache-1.1.26" + sources."apollo-cache-1.2.1" (sources."apollo-cache-control-0.5.2" // { dependencies = [ sources."graphql-extensions-0.5.4" ]; }) - sources."apollo-cache-inmemory-1.4.3" - sources."apollo-client-2.4.13" + sources."apollo-cache-inmemory-1.5.1" + sources."apollo-client-2.5.1" sources."apollo-datasource-0.3.1" - sources."apollo-engine-reporting-1.0.5" + sources."apollo-engine-reporting-1.0.7" sources."apollo-engine-reporting-protobuf-0.2.1" - sources."apollo-env-0.3.3" - sources."apollo-graphql-0.1.1" - sources."apollo-link-1.2.8" - sources."apollo-link-context-1.0.14" - sources."apollo-link-dedup-1.0.15" - sources."apollo-link-http-common-0.2.10" + sources."apollo-env-0.4.0" + sources."apollo-graphql-0.1.3" + (sources."apollo-link-1.2.11" // { + dependencies = [ + sources."ts-invariant-0.3.2" + ]; + }) + sources."apollo-link-context-1.0.17" + sources."apollo-link-dedup-1.0.18" + (sources."apollo-link-http-common-0.2.13" // { + dependencies = [ + sources."ts-invariant-0.3.2" + ]; + }) sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" - sources."apollo-link-ws-1.0.14" + sources."apollo-link-ws-1.0.17" sources."apollo-server-caching-0.3.1" - sources."apollo-server-core-2.4.6" + sources."apollo-server-core-2.4.8" sources."apollo-server-env-2.2.0" sources."apollo-server-errors-2.2.1" - sources."apollo-server-express-2.4.6" - sources."apollo-server-plugin-base-0.3.5" + sources."apollo-server-express-2.4.8" + sources."apollo-server-plugin-base-0.3.7" (sources."apollo-tracing-0.5.2" // { dependencies = [ sources."graphql-extensions-0.5.4" ]; }) sources."apollo-upload-client-10.0.0" - sources."apollo-utilities-1.1.3" + sources."apollo-utilities-1.2.1" + sources."arg-4.1.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -60754,7 +60454,7 @@ in sources."assign-symbols-1.0.0" sources."ast-types-0.12.2" sources."async-1.5.2" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."async-limiter-1.0.0" sources."async-retry-1.2.3" sources."asynckit-0.4.0" @@ -60821,7 +60521,7 @@ in sources."clean-stack-1.3.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" + sources."cli-spinners-2.0.0" sources."cli-width-2.2.0" sources."clipboard-2.0.4" sources."clone-1.0.4" @@ -60912,7 +60612,7 @@ in sources."es-to-primitive-1.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.6" + sources."esm-3.2.19" sources."esprima-4.0.1" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -61015,7 +60715,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globby-9.0.0" // { + (sources."globby-9.1.0" // { dependencies = [ sources."pify-4.0.1" ]; @@ -61025,12 +60725,12 @@ in sources."graceful-fs-4.1.15" sources."graceful-readlink-1.0.1" sources."graphql-14.1.1" - sources."graphql-anywhere-4.1.28" - sources."graphql-extensions-0.5.5" + sources."graphql-anywhere-4.2.1" + sources."graphql-extensions-0.5.7" sources."graphql-subscriptions-1.0.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.4" - sources."graphql-type-json-0.2.1" + sources."graphql-type-json-0.2.2" sources."graphql-upload-8.0.4" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -61112,7 +60812,7 @@ in sources."joi-14.3.1" sources."js-message-1.0.5" sources."js-queue-2.0.0" - sources."js-yaml-3.12.1" + sources."js-yaml-3.13.0" sources."jsbn-0.1.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -61166,7 +60866,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.7" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanoid-2.0.1" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -61218,9 +60918,9 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."optimism-0.6.9" - sources."ora-3.1.0" + sources."ora-3.2.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" @@ -61262,7 +60962,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.12.27" + sources."@types/node-10.14.1" ]; }) sources."proxy-addr-2.0.4" @@ -61283,7 +60983,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.6" sources."readdirp-2.2.1" - (sources."recast-0.17.3" // { + (sources."recast-0.17.4" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61294,7 +60994,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" @@ -61308,7 +61008,7 @@ in sources."ret-0.1.15" sources."retry-0.12.0" sources."rimraf-2.6.3" - sources."rss-parser-3.6.2" + sources."rss-parser-3.7.0" sources."run-async-2.3.0" sources."rxjs-6.4.0" sources."safe-buffer-5.1.2" @@ -61373,7 +61073,7 @@ in }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" - (sources."source-map-support-0.5.10" // { + (sources."source-map-support-0.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61417,12 +61117,12 @@ in }) sources."string.prototype.padstart-3.0.0" sources."string_decoder-1.1.1" - sources."strip-ansi-5.0.0" + sources."strip-ansi-5.2.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.15" // { + (sources."subscriptions-transport-ws-0.9.16" // { dependencies = [ sources."ws-5.2.2" ]; @@ -61475,7 +61175,8 @@ in ]; }) sources."trim-repeated-1.0.0" - sources."ts-node-7.0.1" + sources."ts-invariant-0.2.1" + sources."ts-node-8.0.3" sources."tslib-1.9.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -61505,7 +61206,7 @@ in ]; }) sources."unzip-response-2.0.1" - sources."upath-1.1.0" + sources."upath-1.1.2" sources."update-notifier-2.5.0" sources."uri-js-4.2.2" sources."urix-0.1.0" @@ -61519,14 +61220,14 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vue-cli-plugin-apollo-0.19.1" + sources."vue-cli-plugin-apollo-0.19.2" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."widest-line-2.0.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.2" - sources."ws-6.1.4" + sources."ws-6.2.0" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -61538,9 +61239,9 @@ in ]; }) sources."yauzl-2.10.0" - sources."yn-2.0.0" + sources."yn-3.0.0" sources."zen-observable-0.8.13" - sources."zen-observable-ts-0.8.15" + sources."zen-observable-ts-0.8.18" ]; buildInputs = globalBuildInputs; meta = { @@ -61673,11 +61374,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.0.0" - sources."@babel/generator-7.3.4" + sources."@babel/generator-7.4.0" sources."@babel/highlight-7.0.0" - sources."@babel/parser-7.3.4" - sources."@babel/template-7.2.2" - sources."@babel/types-7.3.4" + sources."@babel/parser-7.4.2" + sources."@babel/template-7.4.0" + sources."@babel/types-7.4.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -61750,35 +61451,35 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.29.5"; + version = "4.29.6"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.29.5.tgz"; - sha512 = "DuWlYUT982c7XVHodrLO9quFbNpVq5FNxLrMUfYUTlgKW0+yPimynYf1kttSQpEneAL1FH3P3OLNgkyImx8qIQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz"; + sha512 = "MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw=="; }; dependencies = [ - sources."@webassemblyjs/ast-1.8.3" - sources."@webassemblyjs/floating-point-hex-parser-1.8.3" - sources."@webassemblyjs/helper-api-error-1.8.3" - sources."@webassemblyjs/helper-buffer-1.8.3" - sources."@webassemblyjs/helper-code-frame-1.8.3" - sources."@webassemblyjs/helper-fsm-1.8.3" - sources."@webassemblyjs/helper-module-context-1.8.3" - sources."@webassemblyjs/helper-wasm-bytecode-1.8.3" - sources."@webassemblyjs/helper-wasm-section-1.8.3" - sources."@webassemblyjs/ieee754-1.8.3" - sources."@webassemblyjs/leb128-1.8.3" - sources."@webassemblyjs/utf8-1.8.3" - sources."@webassemblyjs/wasm-edit-1.8.3" - sources."@webassemblyjs/wasm-gen-1.8.3" - sources."@webassemblyjs/wasm-opt-1.8.3" - sources."@webassemblyjs/wasm-parser-1.8.3" - sources."@webassemblyjs/wast-parser-1.8.3" - sources."@webassemblyjs/wast-printer-1.8.3" + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-buffer-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/helper-wasm-section-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/wasm-edit-1.8.5" + sources."@webassemblyjs/wasm-gen-1.8.5" + sources."@webassemblyjs/wasm-opt-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-dynamic-import-4.0.0" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.0" (sources."anymatch-2.0.0" // { @@ -61799,7 +61500,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."atob-2.1.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -61853,7 +61554,7 @@ in ]; }) sources."collection-visit-1.0.0" - sources."commander-2.17.1" + sources."commander-2.19.0" sources."commondir-1.0.1" sources."component-emitter-1.2.1" sources."concat-map-0.0.1" @@ -61881,7 +61582,7 @@ in sources."end-of-stream-1.4.1" sources."enhanced-resolve-4.1.0" sources."errno-0.1.7" - sources."eslint-scope-4.0.0" + sources."eslint-scope-4.0.3" sources."esrecurse-4.2.1" sources."estraverse-4.2.0" sources."events-3.0.0" @@ -61923,7 +61624,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-cache-dir-2.0.0" + sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" @@ -61981,7 +61682,7 @@ in sources."loader-utils-1.2.3" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" - sources."make-dir-1.3.0" + sources."make-dir-2.1.0" sources."mamacro-0.0.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -62006,7 +61707,7 @@ in }) sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.0" (sources."node-libs-browser-2.2.0" // { @@ -62032,10 +61733,10 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" - sources."pako-1.0.8" + sources."p-try-2.1.0" + sources."pako-1.0.10" sources."parallel-transform-1.1.0" sources."parse-asn1-5.1.4" sources."pascalcase-0.1.1" @@ -62044,7 +61745,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."pbkdf2-3.0.17" - sources."pify-3.0.0" + sources."pify-4.0.1" sources."pkg-dir-3.0.0" sources."posix-character-classes-0.1.1" sources."process-0.11.10" @@ -62077,6 +61778,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" + sources."semver-5.6.0" sources."serialize-javascript-1.6.1" (sources."set-value-2.0.0" // { dependencies = [ @@ -62116,7 +61818,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.2" - (sources."source-map-support-0.5.10" // { + (sources."source-map-support-0.5.11" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62147,7 +61849,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.1" - (sources."terser-3.16.1" // { + (sources."terser-3.17.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62188,7 +61890,7 @@ in sources."has-values-0.1.4" ]; }) - sources."upath-1.1.0" + sources."upath-1.1.2" sources."uri-js-4.2.2" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -62224,10 +61926,10 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz"; - sha512 = "Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.0.tgz"; + sha512 = "t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw=="; }; dependencies = [ sources."ansi-regex-3.0.0" @@ -62250,7 +61952,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ @@ -62374,10 +62076,10 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."mem-4.1.0" + sources."mem-4.2.0" sources."memory-fs-0.4.1" sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" + sources."mimic-fn-2.0.0" sources."minimist-1.2.0" (sources."mixin-deep-1.3.1" // { dependencies = [ @@ -62409,9 +62111,9 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-exists-3.0.0" @@ -62760,7 +62462,7 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.0" sources."range-slice-stream-2.0.0" - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" sources."record-cache-1.1.0" (sources."render-media-3.1.3" // { dependencies = [ @@ -62785,7 +62487,7 @@ in sources."readable-stream-2.3.6" ]; }) - sources."simple-sha1-2.1.1" + sources."simple-sha1-2.1.2" (sources."simple-websocket-7.2.0" // { dependencies = [ sources."debug-3.2.6" @@ -62830,7 +62532,7 @@ in sources."util-deprecate-1.0.2" sources."videostream-2.6.0" sources."vlc-command-1.1.2" - (sources."webtorrent-0.103.0" // { + (sources."webtorrent-0.103.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.1" @@ -62839,7 +62541,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-6.1.4" + sources."ws-6.2.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.27" @@ -62869,7 +62571,7 @@ in sources."@babel/runtime-7.3.1" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" - sources."@types/node-11.9.5" + sources."@types/node-11.11.4" sources."JSONSelect-0.2.1" sources."acorn-5.7.3" (sources."acorn-jsx-3.0.1" // { @@ -62882,17 +62584,17 @@ in sources."adbkit-monkey-1.0.1" (sources."addons-linter-1.6.1" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."camelcase-5.0.0" + sources."ansi-regex-4.1.0" + sources."camelcase-5.2.0" sources."decamelize-1.2.0" sources."es6-promisify-6.0.1" - sources."get-caller-file-2.0.1" + sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-2.0.0" sources."regenerator-runtime-0.13.1" sources."require-main-filename-2.0.0" sources."source-map-support-0.5.10" - sources."string-width-3.0.0" - sources."strip-ansi-5.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" sources."yargs-13.1.0" sources."yargs-parser-13.0.0" ]; @@ -62938,7 +62640,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-0.2.10" - sources."async-each-1.0.1" + sources."async-each-1.0.2" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -63100,7 +62802,7 @@ in dependencies = [ sources."async-2.6.2" sources."decamelize-1.2.0" - sources."source-map-support-0.5.10" + sources."source-map-support-0.5.11" sources."yargs-12.0.5" ]; }) @@ -63119,7 +62821,7 @@ in sources."end-of-stream-1.4.1" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es5-ext-0.10.48" + sources."es5-ext-0.10.49" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -63172,12 +62874,12 @@ in }) ]; }) - sources."eslint-scope-4.0.0" + sources."eslint-scope-4.0.3" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" (sources."espree-5.0.0" // { dependencies = [ - sources."acorn-6.1.0" + sources."acorn-6.1.1" sources."acorn-jsx-5.0.1" ]; }) @@ -63224,7 +62926,7 @@ in sources."fast-json-patch-2.0.7" sources."fast-json-stable-stringify-2.0.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.4.4" + sources."fast-redact-1.5.0" sources."fast-safe-stringify-2.0.6" sources."fd-slicer-1.1.0" sources."figures-2.0.0" @@ -63320,8 +63022,8 @@ in sources."ini-1.3.5" (sources."inquirer-6.2.2" // { dependencies = [ - sources."ansi-regex-4.0.0" - sources."strip-ansi-5.0.0" + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."interpret-1.2.0" @@ -63369,7 +63071,7 @@ in sources."jetpack-id-1.0.0" sources."js-select-0.6.0" sources."js-tokens-4.0.0" - (sources."js-yaml-3.12.1" // { + (sources."js-yaml-3.13.0" // { dependencies = [ sources."esprima-4.0.1" ]; @@ -63392,8 +63094,8 @@ in }) sources."jsprim-1.4.1" sources."jszip-2.6.1" - sources."jwa-1.3.0" - sources."jws-3.2.1" + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."kind-of-6.0.2" sources."latest-version-3.1.0" (sources."lazystream-1.0.0" // { @@ -63428,7 +63130,11 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."mdn-browser-compat-data-0.0.66" - sources."mem-4.1.0" + (sources."mem-4.2.0" // { + dependencies = [ + sources."mimic-fn-2.0.0" + ]; + }) sources."micromatch-3.1.10" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -63452,7 +63158,7 @@ in ]; }) sources."mz-2.7.0" - sources."nan-2.12.1" + sources."nan-2.13.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -63502,11 +63208,11 @@ in sources."p-defer-1.0.0" sources."p-finally-1.0.0" sources."p-is-promise-2.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."package-json-4.0.1" - sources."pako-1.0.8" + sources."pako-1.0.10" sources."parent-module-1.0.0" sources."parse-json-4.0.0" sources."parse5-3.0.3" @@ -63560,7 +63266,7 @@ in sources."path-exists-2.1.0" ]; }) - sources."readable-stream-3.1.1" + sources."readable-stream-3.2.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."readable-stream-2.3.6" @@ -63576,7 +63282,7 @@ in sources."regenerator-runtime-0.12.1" sources."regex-not-1.0.2" sources."regexpp-2.0.1" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" (sources."relaxed-json-1.0.1" // { dependencies = [ @@ -63733,10 +63439,10 @@ in sources."supports-color-5.5.0" (sources."table-5.2.3" // { dependencies = [ - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.0.0" - sources."strip-ansi-5.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) (sources."tar-stream-1.6.2" // { @@ -63853,7 +63559,7 @@ in }) (sources."yargs-parser-11.1.1" // { dependencies = [ - sources."camelcase-5.0.0" + sources."camelcase-5.2.0" sources."decamelize-1.2.0" ]; }) @@ -63926,7 +63632,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."aggregate-error-1.0.0" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -64325,7 +64031,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.4.0" + sources."opn-5.5.0" sources."os-homedir-1.0.2" sources."os-name-2.0.1" sources."os-shim-0.1.3" @@ -64384,9 +64090,9 @@ in sources."find-up-3.0.0" sources."load-json-file-4.0.0" sources."locate-path-3.0.0" - sources."p-limit-2.1.0" + sources."p-limit-2.2.0" sources."p-locate-3.0.0" - sources."p-try-2.0.0" + sources."p-try-2.1.0" sources."parse-json-4.0.0" sources."path-type-3.0.0" sources."read-pkg-3.0.0" @@ -64400,7 +64106,7 @@ in ]; }) sources."regex-not-1.0.2" - sources."registry-auth-token-3.3.2" + sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -64508,9 +64214,9 @@ in ]; }) sources."string_decoder-1.1.1" - (sources."strip-ansi-5.0.0" // { + (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.0.0" + sources."ansi-regex-4.1.0" ]; }) sources."strip-bom-2.0.0" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v6.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v6.nix index 0f72522ce48f..4f90525ea56c 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v6.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v6.nix @@ -13,13 +13,13 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "ajv-6.9.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "6.9.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; - sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "ansi-regex-2.1.1" = { @@ -2391,7 +2391,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -2606,10 +2606,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.6"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; - sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; + sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; }; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix b/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix index add1dbd00f7d..eca37615dbd3 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages-v8.nix @@ -4,13 +4,13 @@ let sources = { - "@types/node-8.10.40" = { + "@types/node-8.10.44" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.40"; + version = "8.10.44"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.40.tgz"; - sha512 = "RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.44.tgz"; + sha512 = "HY3SK7egERHGUfY8p6ztXIEQWcIPHouYhCGcLAPQin7gE2G/fALFz+epnMwcxKUS6aKqTVoAFdi+t1llQd3xcw=="; }; }; "JSV-4.0.2" = { @@ -49,13 +49,13 @@ let sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; }; }; - "ajv-6.9.2" = { + "ajv-6.10.0" = { name = "ajv"; packageName = "ajv"; - version = "6.9.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz"; - sha512 = "4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz"; + sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg=="; }; }; "amdefine-1.0.1" = { @@ -355,13 +355,13 @@ let sha512 = "DDfgAiRruGAiL8Yot5nufG3O8GLA0r5lf1CGYhuF8pEzQ+vYfhLpgJzme7LPh3ASPb8UBSVYHm1IK4W4StvVnw=="; }; }; - "azure-arm-cdn-4.1.0" = { + "azure-arm-cdn-4.2.0" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.1.0.tgz"; - sha512 = "5xD2CkCx5ONn1vaGa4USAzv3LtCs0kmZCkdSNj98eQlQJLJQ7RPpIsNAXHGuHX4yN+EKHdaA2/hC/ynuQujNEQ=="; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-4.2.0.tgz"; + sha512 = "DkpLntvqHtCLbf7p/qqLS0eJluZtsb8gU65deJYiMz4OFQco+InP9giCVnY8gElW3QbMaqKyHOJCDK7NllKMoA=="; }; }; "azure-arm-commerce-2.1.0" = { @@ -1066,15 +1066,6 @@ let sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; }; }; - "commander-2.17.1" = { - name = "commander"; - packageName = "commander"; - version = "2.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; - sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; - }; - }; "commander-2.19.0" = { name = "commander"; packageName = "commander"; @@ -2515,22 +2506,22 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; - "jwa-1.3.0" = { + "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.3.0.tgz"; - sha512 = "SxObIyzv9a6MYuZYaSN6DhSm9j3+qkokwvCB0/OTSV5ylPq1wUQiygZQcHT5Qlux0I5kmISx3J86TxKhuefItg=="; + url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; + sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; - "jws-3.2.1" = { + "jws-3.2.2" = { name = "jws"; packageName = "jws"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.2.1.tgz"; - sha512 = "bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g=="; + url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; + sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; "jwt-decode-2.2.0" = { @@ -3748,13 +3739,13 @@ let sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "source-map-support-0.5.10" = { + "source-map-support-0.5.11" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.10"; + version = "0.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz"; - sha512 = "YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz"; + sha512 = "//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ=="; }; }; "source-map-url-0.4.0" = { @@ -4126,13 +4117,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "uglify-js-3.4.9" = { + "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.4.9"; + version = "3.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz"; - sha512 = "8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"; + sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; "unc-path-regex-0.1.2" = { @@ -4492,10 +4483,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.13.8.tgz"; - sha512 = "NhxxnijbAEtZg1x18aehW8VBqNMDurgFtJptKjC5k3lT3TDvu+/s6znxJ3x+8ZNpb0aTfkd6N6MvHx/a+6Uhvg=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.13.9.tgz"; + sha512 = "deAPCgLHkWHwRgPG9XXqJrfhLuaxOcWrqiSSiGQ7gZDxItDFndeH2NJF5Tf/0SQQgBDbi3lPREWcONHf38zZ1w=="; }; dependencies = [ sources."JSV-4.0.2" @@ -4632,10 +4623,10 @@ in sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ=="; }; dependencies = [ - sources."@types/node-8.10.40" + sources."@types/node-8.10.44" sources."JSV-4.0.2" sources."adal-node-0.1.28" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -4649,7 +4640,7 @@ in sources."aws4-1.8.0" sources."azure-arm-authorization-2.0.0" sources."azure-arm-batch-3.2.0" - sources."azure-arm-cdn-4.1.0" + sources."azure-arm-cdn-4.2.0" sources."azure-arm-commerce-2.1.0" sources."azure-arm-compute-3.0.0-preview" (sources."azure-arm-datalake-analytics-1.0.2-preview" // { @@ -4857,8 +4848,8 @@ in ]; }) sources."jsrsasign-4.8.2" - sources."jwa-1.3.0" - sources."jws-3.2.1" + sources."jwa-1.4.1" + sources."jws-3.2.2" sources."jwt-decode-2.2.0" sources."keypress-0.1.0" (sources."kuduscript-1.0.16" // { @@ -5340,7 +5331,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -5555,10 +5546,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "2.25.6"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-2.25.6.tgz"; - sha512 = "5N7JPGL0rwwWQU/ofxhnp3lgmRoF7LlxMvJUCLjWORavfpB8uBIOKoae4JGWt4cPhXY/u6y5k1yZRmHMZiyRKQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz"; + sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A=="; }; buildInputs = globalBuildInputs; meta = { @@ -5579,7 +5570,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.9.2" + sources."ajv-6.10.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -5593,7 +5584,7 @@ in sources."caseless-0.12.0" sources."colors-1.3.3" sources."combined-stream-1.0.7" - sources."commander-2.17.1" + sources."commander-2.19.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" @@ -5662,7 +5653,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.6.0" sources."source-map-0.6.1" - sources."source-map-support-0.5.10" + sources."source-map-support-0.5.11" sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -5678,7 +5669,7 @@ in }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.4.9" + sources."uglify-js-3.4.10" sources."universalify-0.1.2" sources."uri-js-4.2.2" sources."uuid-3.3.2" diff --git a/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix index b37dd413f693..1213120ce1cb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,43 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, - enableGtkSupport ? true # Whether to compile with support for Gtk - # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk2. +{ stdenv, lib, fetchurl, buildDunePackage +, pkgconfig, cairo }: -let - inherit (stdenv.lib) optionals; - version = "0.5"; -in - -stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-cairo2-${version}"; +buildDunePackage rec { + pname = "cairo2"; + version = "0.6"; src = fetchurl { - url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; - sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; + sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild cairo ] - ++ optionals enableGtkSupport [ gtk2 ]; - - # lablgtk2 is marked as a propagated build input since loading the - # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as - # well. - propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out" - + (if enableGtkSupport then " --enable-lablgtk2" - else " --disable-lablgtk2"); - - buildPhase = "ocaml setup.ml -build"; + buildInputs = [ cairo ]; - installPhase = "ocaml setup.ml -install"; + doCheck = !stdenv.isDarwin; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' @@ -46,8 +25,7 @@ stdenv.mkDerivation { the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. ''; - license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ jirkamarsik vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index de759e922781..dba3e2569574 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.5"; + name = "ocaml${ocaml.version}-extlib-1.7.6"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.5.tar.gz; - sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz; + sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 504e83734d88..988b7147fcb4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -324,10 +324,11 @@ rec { pname = "re2"; hash = "0bl65d0nmvr7k1mkkcc4aai86l5qzgn1xxwmszshpwhaz87cqghd"; propagatedBuildInputs = [ core_kernel ]; - meta = { - description = "OCaml bindings for RE2"; - broken = stdenv.isDarwin; - }; + prePatch = '' + substituteInPlace src/re2_c/jbuild --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/jbuild --replace '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2)))' '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2) (-x c++)))' + ''; + meta.description = "OCaml bindings for RE2"; }; core_extended = janePackage { diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix index 26131d0a98c8..7c6198add622 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,18 +1,10 @@ -{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: +{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }: -if !lib.versionAtLeast ocaml.version "4.05" -then throw "lablgtk3 is not available for OCaml ${ocaml.version}" -else - -# This package uses the dune.configurator library -# It thus needs said library to be compiled with this OCaml compiler -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in - -stdenv.mkDerivation rec { +buildDunePackage rec { version = "3.0.beta5"; pname = "lablgtk3"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + + minimumOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "garrigue"; @@ -22,17 +14,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib dune gtk3 ]; + buildInputs = [ gtk3 ]; propagatedBuildInputs = [ cairo2 ]; - buildPhase = "dune build -p ${pname}"; - inherit (dune) installPhase; - meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 7e8807576eeb..a266e57dd859 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,9 +1,8 @@ -{ stdenv, ocaml, gtksourceview, lablgtk3 }: +{ buildDunePackage, gtksourceview, lablgtk3 }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; - buildPhase = "dune build -p lablgtk3-sourceview3"; +buildDunePackage rec { + pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs installPhase; + inherit (lablgtk3) src version meta nativeBuildInputs; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix new file mode 100644 index 000000000000..b316540e3d05 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lacaml"; + version = "11.0.3"; + + src = fetchFromGitHub { + owner = "mmottl"; + repo = "lacaml"; + rev = "${version}"; + sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb"; + }; + + buildInputs = + [ ocaml findlib dune base stdio liblapack blas ] ++ + stdenv.lib.optionals stdenv.isDarwin + [ darwin.apple_sdk.frameworks.Accelerate ]; + + inherit (dune) installPhase; + + meta = with stdenv.lib; { + homepage = http://mmottl.github.io/lacaml; + description = "OCaml bindings for BLAS and LAPACK"; + license = licenses.lgpl21Plus; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.rixed ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix b/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix index 129f9dd7289f..0b8f83a1ea3e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchFromGitHub, ocaml, findlib, dune }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-stdint-${version}"; - version = "0.5.0"; + pname = "stdint"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "0.5.1"; src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "1xjzqq13m7cqrfwa6vcwxirm17w8bx025dgnjqjgd3k2lxfgd1j7"; + sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + buildInputs = [ ocaml findlib dune ]; - createFindlibDestdir = true; + buildPhase = "dune build -p ${pname}"; + inherit (dune) installPhase; meta = { description = "Various signed and unsigned integers for OCaml"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix index e8eabcf43b30..117277fe1b6e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; + buildFlags = [ "all" "opt" ]; + createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix index bb16ac46f991..d454d244959f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,15 +1,8 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "zmq is not available for OCaml ${ocaml.version}" -else - -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; -in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zmq-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + pname = "zmq"; version = "20180726"; src = fetchFromGitHub { owner = "issuu"; @@ -18,23 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1f5l4bw78y4drabhyvmpj3z8k30bill33ca7bzhr02m55yf6gqpf"; }; - patches = [ - ./ocaml-zmq-issue43.patch - ]; - - buildInputs = [ ocaml findlib dune czmq ]; + buildInputs = [ czmq ]; propagatedBuildInputs = [ stdint ]; - buildPhase = "dune build -p zmq"; - - inherit (dune) installPhase; - - meta = with stdenv.lib; { + meta = { description = "ZeroMQ bindings for OCaml"; - license = licenses.mit; - maintainers = with maintainers; [ akavel ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ akavel ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch b/nixpkgs/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch deleted file mode 100644 index 0d01e8b45f39..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/zmq/ocaml-zmq-issue43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 -+++ source/zmq/src/caml_zmq_stubs.c 1970-01-01 01:00:01.000000000 +0100 -@@ -35,7 +35,7 @@ - #include "socket.h" - #include "msg.h" - --#include <uint64.h> -+#include <ocaml_stdint/uint64.h> - - /** - * Version diff --git a/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix new file mode 100644 index 000000000000..9db926bf94da --- /dev/null +++ b/nixpkgs/pkgs/development/perl-modules/DBD-Oracle/default.nix @@ -0,0 +1,15 @@ +{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }: + +buildPerlPackage rec { + name = "DBD-Oracle-1.76"; + + src = fetchurl { + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz"; + sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3"; + }; + + ORACLE_HOME = "${oracle-instantclient}/lib"; + + buildInputs = [ TestNoWarnings oracle-instantclient ] ; + propagatedBuildInputs = [ DBI ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/Markups/default.nix b/nixpkgs/pkgs/development/python-modules/Markups/default.nix new file mode 100644 index 000000000000..6fe41e404192 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/Markups/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-markdown-math +, markdown +, docutils +, pygments +}: + +buildPythonPackage rec { + pname = "Markups"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39"; + }; + + checkInputs = [ markdown docutils pygments ]; + propagatedBuildInputs = [ python-markdown-math ]; + + meta = { + description = "A wrapper around various text markup languages."; + homepage = https://github.com/retext-project/pymarkups; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ klntsky ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix new file mode 100644 index 000000000000..80c85a2614ca --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, attrs, protobuf, zeroconf }: + +buildPythonPackage rec { + pname = "aioesphomeapi"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "16ywa7yggmsx8m2r9azdq7w9fxjh736g1vd1aibgh24g7srhwwhj"; + }; + + propagatedBuildInputs = [ attrs protobuf zeroconf ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Python Client for ESPHome native API"; + homepage = https://github.com/esphome/aioesphomeapi; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/altair/default.nix b/nixpkgs/pkgs/development/python-modules/altair/default.nix index 544be4f67dd6..b870e9197f87 100644 --- a/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "altair"; - version = "2.3.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6"; + sha256 = "1lqln4510qqqla6s8z4ca0271qrhq6yyznsijsdn3nssvxsynqpc"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/nixpkgs/pkgs/development/python-modules/amqp/default.nix index 54b6e87a1cea..29fd1f592f30 100644 --- a/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.4.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb"; + sha256 = "043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7"; }; checkInputs = [ pytest case pytest-sugar ]; diff --git a/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 1ec50ef7780b..dff12fcaf92c 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.7.8"; + version = "2.7.9"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx"; + sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/nixpkgs/pkgs/development/python-modules/astropy/default.nix index 0ba779ec93e5..90fe66bf4e92 100644 --- a/nixpkgs/pkgs/development/python-modules/astropy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.1.1"; + version = "3.1.2"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0fzm2q922qi68ns5biy807dzmgz1i9gqdh73lcafs0gfk8zyc9v5"; + sha256 = "1plyx3gcsff02g4yclvhlcdj8bh1lnm98d7h6wdabl36jvnahy2a"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/nixpkgs/pkgs/development/python-modules/asynctest/default.nix b/nixpkgs/pkgs/development/python-modules/asynctest/default.nix index 187e0924ccac..020ba9df8b00 100644 --- a/nixpkgs/pkgs/development/python-modules/asynctest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asynctest/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "asynctest"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "77520850ae21620ec31738f4a7b467acaa44de6d3752d8ac7a9f4dcf55d77853"; + sha256 = "bbeb45bb41344d2cbb814b4c89c04f2c568742352736cabf7af6fcbed06f66cc"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index cf619e6021ef..8906b72dcca0 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.4"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2"; + sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/baselines/default.nix b/nixpkgs/pkgs/development/python-modules/baselines/default.nix new file mode 100644 index 000000000000..2fd58010f5a7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/baselines/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, gym +, scipy +, tqdm +, joblib +, dill +, progressbar2 +, cloudpickle +, click +, pyzmq +, tensorflow +, mpi4py +}: + +buildPythonPackage rec { + pname = "baselines"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n1mxkcg82gzhkb4j5zzwm335r3rc1sblknqs4x6nkrrh42d65cm"; + }; + + patches = [ + # already fixed upstream + ./fix-dep-names.patch + ]; + + propagatedBuildInputs = [ + gym + scipy + tqdm + joblib + pyzmq + dill + progressbar2 + mpi4py + cloudpickle + tensorflow + click + ]; + + # fails to create a daemon, probably because of sandboxing + doCheck = false; + + checkInputs = [ + pytest + ]; + + meta = with lib; { + description = "High-quality implementations of reinforcement learning algorithms"; + homepage = https://github.com/openai/baselines; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/baselines/fix-dep-names.patch b/nixpkgs/pkgs/development/python-modules/baselines/fix-dep-names.patch new file mode 100644 index 000000000000..5b0de29247af --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/baselines/fix-dep-names.patch @@ -0,0 +1,18 @@ +diff --git a/setup.py b/setup.py +index bf8badc..570be20 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,11 +10,11 @@ setup(name='baselines', + packages=[package for package in find_packages() + if package.startswith('baselines')], + install_requires=[ +- 'gym[mujoco,atari,classic_control,robotics]', ++ 'gym', + 'scipy', + 'tqdm', + 'joblib', +- 'zmq', ++ 'pyzmq', + 'dill', + 'progressbar2', + 'mpi4py', diff --git a/nixpkgs/pkgs/development/python-modules/beaker/default.nix b/nixpkgs/pkgs/development/python-modules/beaker/default.nix index 7a17fd0f1d0a..3882af3a67df 100644 --- a/nixpkgs/pkgs/development/python-modules/beaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beaker/default.nix @@ -2,42 +2,75 @@ , buildPythonPackage , fetchFromGitHub , nose +, pylibmc +, memcached +, redis +, pymongo , mock , webtest , sqlalchemy , pycrypto +, cryptography , isPy27 +, isPy3k , funcsigs , pycryptopp }: buildPythonPackage rec { pname = "Beaker"; - version = "1.8.0"; + version = "1.10.1"; # The pypy release do not contains the tests src = fetchFromGitHub { owner = "bbangert"; repo = "beaker"; rev = "${version}"; - sha256 = "17yfr7a307n8rdl09was4j60xqk2s0hk0hywdkigrpj4qnw0is7g"; + sha256 = "0xrvg503xmi28w0hllr4s7fkap0p09fgw2wax3p1s2r6b3xjvbz7"; }; - buildInputs = - [ nose - mock - webtest - ]; propagatedBuildInputs = [ sqlalchemy pycrypto + cryptography ] ++ lib.optionals (isPy27) [ funcsigs pycryptopp ]; + checkInputs = [ + nose + mock + webtest + pylibmc + memcached + redis + pymongo + ]; + + + # Can not run memcached tests because it immediately tries to connect + postPatch = lib.optionalString isPy3k '' + substituteInPlace setup.py \ + --replace "python-memcached" "python3-memcached" + '' + '' + + rm tests/test_memcached.py + ''; + + # Disable external tests because they need to connect to a live database. + # Also disable a test in test_cache.py called "test_upgrade" because + # it currently fails on darwin. + # Please see issue https://github.com/bbangert/beaker/issues/166 + checkPhase = '' + nosetests \ + -e ".*test_ext_.*" \ + -e "test_upgrade" \ + -vv tests + ''; + meta = { description = "A Session and Caching library with WSGI Middleware"; maintainers = with lib.maintainers; [ garbas domenkozar ]; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix index 6ad124e8fd4b..fc729dd399d2 100644 --- a/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -1,16 +1,16 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder -, attrs, click, toml, appdirs, aiohttp +, attrs, click, toml, appdirs, aiohttp, aiohttp-cors , glibcLocales, pytest }: buildPythonPackage rec { pname = "black"; - version = "18.9b0"; + version = "19.3b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1992ramdwv8sg4mbl5ajirwj5i4a48zjgsycib0fnbaliyiajc70"; + sha256 = "073kd5rs02lisp6n3h7yai9lix520xnaa6c7rdmp2sci9pyhz5b8"; }; checkInputs = [ pytest glibcLocales ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { --deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached ''; - propagatedBuildInputs = [ attrs appdirs click toml aiohttp ]; + propagatedBuildInputs = [ attrs appdirs click toml aiohttp aiohttp-cors ]; meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index cd98a8da710a..268c08ced848 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, - isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }: + isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, + glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -24,12 +25,21 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "1.8.1"; + version = "2.1.0"; - src = fetchPypi { + /*src = fetchPypi { inherit pname version; - sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7"; - }; + sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w"; + };*/ + # Temporarily use GitHub source because PyPi archive is missing some files + # needed for the tests to pass. This has been fixed upstream. + # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d + src = fetchFromGitHub { + owner = "buildbot"; + repo = "buildbot"; + rev = "v${version}"; + sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65"; + } + "/master"; propagatedBuildInputs = [ # core @@ -63,6 +73,7 @@ let flake8 buildbot-worker buildbot-pkg + parameterized glibcLocales ]; @@ -84,6 +95,8 @@ let export PATH="$out/bin:$PATH" ''; + disabled = !isPy3k; + passthru = { inherit withPlugins; }; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index 480bed2805ee..35524040da99 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "1.8.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3"; + sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index 4bcaa965d2f3..2f73fbc81a4f 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -10,7 +10,8 @@ src = fetchPypi { inherit pname version format; - sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl"; + python = "py3"; + sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v"; }; meta = with lib; { @@ -27,7 +28,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824"; + sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -47,7 +48,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz"; + sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -67,7 +68,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5"; + sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -87,7 +88,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d"; + sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 8e49d085fbd1..f888448db218 100644 --- a/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -2,11 +2,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "1.8.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39"; + sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index 64f649ad28ab..3fc4c3e84ed4 100644 --- a/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -25,12 +25,19 @@ buildPythonPackage rec { -k "not test_nightshade_image" ''; - buildInputs = [ cython glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + ]; + + buildInputs = [ + geos proj + ]; propagatedBuildInputs = [ # required - six pyshp shapely geos proj numpy + six pyshp shapely numpy # optional gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib diff --git a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix index 05fe33f7e2eb..a40238412c6d 100644 --- a/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cassandra-driver/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.16.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "1gjs2lqy0ba6zhh13a1dhirk59i7lc4zcbl7h50619hdm5kv3g22"; + sha256 = "1z49z6f9rj9kp1v03s1hs1rg8cj49rh0yk0fc2qi57w7slgy2hkd"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index c22bb427a349..404ead243a98 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -4,13 +4,18 @@ buildPythonPackage rec { pname = "celery"; - version = "4.3.0rc1"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1jmg47l0b3bnwmg44x48bwziwyk6xqs1y5plvr99a3ikz1l807yf"; + sha256 = "4c4532aa683f170f40bd76f928b70bc06ff171a959e06e71bf35f2f9d6031ef9"; }; + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytest>=4.3.1,<4.4.0" pytest + ''; + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ diff --git a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix index 104bdb86bf00..41e653354e7b 100644 --- a/nixpkgs/pkgs/development/python-modules/chameleon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.5"; + version = "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1a83jf211mqjhgbd3abqyrn4mp4vb077ql8fydmv80xg3whrf3yb"; + sha256 = "0141kfwx553q73wzfl624pppmbhh7fpzvaj5pbj21pqlk2rhfx75"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix new file mode 100644 index 000000000000..daeb6ca45267 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/17.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi +, setuptools_scm +, cheroot, contextlib2, portend, routes, six, zc_lockfile +, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +}: + +buildPythonPackage rec { + pname = "cherrypy"; + version = "17.4.1"; + + src = fetchPypi { + pname = "CherryPy"; + inherit version; + sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; + }; + + propagatedBuildInputs = [ + cheroot contextlib2 portend routes six zc_lockfile + ]; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = https://www.cherrypy.org; + description = "A pythonic, object-oriented HTTP framework"; + license = licenses.bsd3; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 4a860c5510ca..b39353f649d1 100644 --- a/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -1,54 +1,40 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cheroot, contextlib2, portend, routes, six -, setuptools_scm, zc_lockfile, more-itertools -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov -, backports_functools_lru_cache, requests_toolbelt, pytest-services +, setuptools_scm +, cheroot, portend, more-itertools, zc_lockfile, routes +, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services }: -let - srcInfo = if isPy3k then { - version = "18.1.0"; - sha256 = "4dd2f59b5af93bd9ca85f1ed0bb8295cd0f5a8ee2b84d476374d4e070aa5c615"; - } else { - version = "17.4.1"; - sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv"; - }; -in buildPythonPackage rec { - pname = "CherryPy"; - inherit (srcInfo) version; +buildPythonPackage rec { + pname = "cherrypy"; + version = "18.1.1"; + + disabled = !isPy3k; src = fetchPypi { - inherit pname; - inherit (srcInfo) version sha256; + pname = "CherryPy"; + inherit version; + sha256 = "6585c19b5e4faffa3613b5bf02c6a27dcc4c69a30d302aba819639a2af6fa48b"; }; - propagatedBuildInputs = if isPy3k then [ + propagatedBuildInputs = [ # required cheroot portend more-itertools zc_lockfile # optional routes - ] else [ - cheroot contextlib2 portend routes six zc_lockfile ]; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = if isPy3k then [ + checkInputs = [ objgraph pytest pytestcov pathpy requests_toolbelt pytest-services - ] else [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' - # 3 out of 5 SignalHandlingTests need network access - # test_2_File_Concurrency also fails upstream: https://github.com/cherrypy/cherrypy/issues/1306 - # ...and skipping it makes 2 other tests fail - LANG=en_US.UTF-8 pytest -k "not SignalHandlingTests and not test_4_Autoreload \ - and not test_2_File_Concurrency and not test_3_Redirect and not test_4_File_deletion" + pytest ''; meta = with lib; { - homepage = "http://www.cherrypy.org"; + homepage = https://www.cherrypy.org; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/click/default.nix b/nixpkgs/pkgs/development/python-modules/click/default.nix index 561c47069cb8..1ae0cba4844a 100644 --- a/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, substituteAll, locale, pytest }: buildPythonPackage rec { pname = "click"; @@ -10,10 +10,10 @@ buildPythonPackage rec { sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; }; - patches = stdenv.lib.optional (stdenv.lib.versionAtLeast version "6.7") (substituteAll { - src = ./fix-paths.patch; - locale = "${locale}/bin/locale"; - }); + postPatch = '' + substituteInPlace click/_unicodefun.py \ + --replace "'locale'" "'${locale}/bin/locale'" + ''; buildInputs = [ pytest ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { # https://github.com/pallets/click/issues/823 doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = http://click.pocoo.org/; description = "Create beautiful command line interfaces in Python"; longDescription = '' diff --git a/nixpkgs/pkgs/development/python-modules/click/fix-paths.patch b/nixpkgs/pkgs/development/python-modules/click/fix-paths.patch deleted file mode 100644 index b44a08e591e8..000000000000 --- a/nixpkgs/pkgs/development/python-modules/click/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/click/_unicodefun.py b/click/_unicodefun.py -index 620edff..85a3c98 100644 ---- a/click/_unicodefun.py -+++ b/click/_unicodefun.py -@@ -63,7 +63,7 @@ def _verify_python3_env(): - if os.name == 'posix': - import subprocess - try: -- rv = subprocess.Popen(['locale', '-a'], stdout=subprocess.PIPE, -+ rv = subprocess.Popen(['@locale@', '-a'], stdout=subprocess.PIPE, - stderr=subprocess.PIPE).communicate()[0] - except OSError: - rv = b'' diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index ff9e70b41463..5751d62b9fce 100644 --- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.10"; + version = "0.9.11"; src = fetchPypi { inherit pname version; - sha256 = "00d68374abe02363a417160e5836022be5c8f8bdac1da5dd101fadb6f8e96619"; + sha256 = "0hjj587dwnl5767wbl875vglvdr1f5z5jzb5wliip78lbyq3b8rl"; }; LC_ALL="en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/contextvars/default.nix b/nixpkgs/pkgs/development/python-modules/contextvars/default.nix index 27ee2fc82f9e..b378c901fad8 100644 --- a/nixpkgs/pkgs/development/python-modules/contextvars/default.nix +++ b/nixpkgs/pkgs/development/python-modules/contextvars/default.nix @@ -2,16 +2,14 @@ buildPythonPackage rec { pname = "contextvars"; - version = "2.3"; + version = "2.4"; disabled = !isPy36; src = fetchPypi { inherit pname version; - sha256 = "09fnni8cyxm070bfv9ay030qbyk0dfds5nq77s0p38h33hp08h93"; + sha256 = "f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e"; }; - # pull request for this patch is https://github.com/MagicStack/contextvars/pull/9 - patches = [ ./immutables_version.patch ]; propagatedBuildInputs = [ immutables ]; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/contextvars/immutables_version.patch b/nixpkgs/pkgs/development/python-modules/contextvars/immutables_version.patch deleted file mode 100644 index 733c0502a665..000000000000 --- a/nixpkgs/pkgs/development/python-modules/contextvars/immutables_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./setup.py 2018-07-30 15:40:14.000000000 +0000 -+++ ./setup.py 2019-02-12 18:33:24.984430303 +0000 -@@ -17,7 +17,7 @@ - packages=['contextvars'], - provides=['contextvars'], - install_requires=[ -- 'immutables==0.6', -+ 'immutables>=0.6', - ], - license='Apache License, Version 2.0', - classifiers=[ diff --git a/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index 381c114b44e4..45a9920dbe2e 100644 --- a/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: buildPythonPackage rec { pname = "cssselect2"; @@ -9,11 +9,21 @@ buildPythonPackage rec { sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; }; - propagatedBuildInputs = [ tinycss2 ]; + # We're not interested in code quality tests + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-cov" "" \ + --replace "pytest-flake8" "" \ + --replace "pytest-isort" "" + substituteInPlace setup.cfg \ + --replace "--cov=cssselect2" "" \ + --replace "--flake8" "" \ + --replace "--isort" "" + ''; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; + propagatedBuildInputs = [ tinycss2 ]; - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 95825b07b233..1344ef4d6ae2 100644 --- a/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -1,19 +1,27 @@ -{ buildPythonPackage, stdenv, fetchPypi, pandas, plotly, colorlover +{ buildPythonPackage, stdenv, fetchPypi +, numpy, pandas, plotly, six, colorlover +, ipython, ipywidgets, nose }: buildPythonPackage rec { pname = "cufflinks"; - version = "0.14.6"; + version = "0.15"; src = fetchPypi { inherit pname version; - sha256 = "4188324361cc584214150aadaeb28ed07e9d150adb714b53c5f09d5b3fcdd28a"; + sha256 = "014098a4568199957198c0a7fe3dbeb3b4010b6de8d692a41fe3b3ac107b660e"; }; - propagatedBuildInputs = [ pandas plotly colorlover ]; + propagatedBuildInputs = [ + numpy pandas plotly six colorlover + ipython ipywidgets + ]; - # tests not included in archive - doCheck = false; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -xv tests.py + ''; meta = { homepage = https://github.com/santosjorge/cufflinks; diff --git a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 185ab310510a..4a070a578731 100644 --- a/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, py, pytest }: +{ lib, buildPythonPackage, fetchPypi, requests, py, pytest, pytest-flakes }: buildPythonPackage rec { pname = "devpi-common"; @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests py ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-flakes ]; checkPhase = '' py.test diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index f227ed99bc9a..0f4c559bd16b 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.2"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66"; + sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp"; }; # Test settings are missing diff --git a/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/nixpkgs/pkgs/development/python-modules/dlib/default.nix index 90e2c526789f..c200b6959b64 100644 --- a/nixpkgs/pkgs/development/python-modules/dlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dlib/default.nix @@ -1,12 +1,17 @@ -{ buildPythonPackage, dlib, python, pytest }: +{ buildPythonPackage, dlib, python, pytest, avxSupport ? true }: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; + # although AVX can be enabled, we never test with it. Some Hydra machines + # fail because of this, however their build results are probably used on hardware + # with AVX support. checkPhase = '' ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS ''; + setupPyBuildFlags = [ "--${if avxSupport then "yes" else "no"} USE_AVX_INSTRUCTIONS" ]; + patches = [ ./build-cores.patch ]; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix new file mode 100644 index 000000000000..15c771ebaf52 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -0,0 +1,20 @@ +{ lib, python, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dnslib"; + version = "0.9.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c"; + }; + + checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; + + meta = with lib; { + description = "Simple library to encode/decode DNS wire-format packets"; + license = licenses.bsd2; + homepage = https://bitbucket.org/paulc/dnslib/; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix index 66c124d65a78..b65e524346f0 100644 --- a/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -62,5 +62,8 @@ buildPythonPackage rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; + + # https://github.com/elastic/curator/pull/1280 + broken = versionAtLeast click.version "7.0"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/envs/default.nix b/nixpkgs/pkgs/development/python-modules/envs/default.nix index e39292049da0..600cb3b0320e 100644 --- a/nixpkgs/pkgs/development/python-modules/envs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/envs/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi -, click, jinja2, terminaltables }: +, mock, jinja2, click, terminaltables +}: buildPythonPackage rec { pname = "envs"; @@ -10,7 +11,7 @@ buildPythonPackage rec { sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42"; }; - checkInputs = [ click jinja2 terminaltables ]; + checkInputs = [ mock jinja2 click terminaltables ]; meta = with lib; { description = "Easy access to environment variables from Python"; diff --git a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix index b532c7d19f73..2856eeeab1b9 100644 --- a/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix +++ b/nixpkgs/pkgs/development/python-modules/face_recognition/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "face_recognition"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { repo = pname; owner = "ageitgey"; - rev = "v${version}"; - sha256 = "17jnyr80j1p74gyvh1jabvwd3zsxvip2y7cjhh2g6gsjv2dpvrjv"; + rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e"; + sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx"; }; postPatch = '' @@ -19,6 +19,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models ]; + # Our dlib is compiled with AVX instructions by default which breaks + # with "Illegal instruction" on some builders due to missing hardware features. + # + # As this makes the build fairly unreliable, it's better to skip the test and to ensure that + # the build is working and after each change to the package, manual testing should be done. + doCheck = false; + + # Although tests are disabled by default, checkPhase still exists, so + # maintainers can check the package's functionality locally before modifying it. checkInputs = [ flake8 pytest glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" py.test diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix new file mode 100644 index 000000000000..a31b5670732a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi, fetchpatch, numba, numpy, pandas, +pytestrunner, thrift, pytest, python-snappy, lz4 }: + +buildPythonPackage rec { + pname = "fastparquet"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "183wdmhnhnlsd7908n3d2g4qnb49fcipqfshghwpbdwdzjpa0day"; + }; + + # Fixes for recent pandas version + # See https://github.com/dask/fastparquet/pull/396 + patches = fetchpatch { + url = https://github.com/dask/fastparquet/commit/31fb3115598d1ab62a5c8bf7923a27c16f861529.patch; + sha256 = "0r1ig4rydmy4j85dgb52qbsx6knxdwn4dn9h032fg3p6xqq0zlpm"; + }; + + postPatch = '' + # FIXME: package zstandard + # removing the test dependency for now + substituteInPlace setup.py --replace "'zstandard'," "" + ''; + + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ numba numpy pandas thrift ]; + checkInputs = [ pytest python-snappy lz4 ]; + + # test_data/ missing in PyPI tarball + doCheck = false; + + meta = with lib; { + description = "A python implementation of the parquet format"; + homepage = https://github.com/dask/fastparquet; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/first/default.nix b/nixpkgs/pkgs/development/python-modules/first/default.nix index 16c1d79d767a..3b91fb717bc4 100644 --- a/nixpkgs/pkgs/development/python-modules/first/default.nix +++ b/nixpkgs/pkgs/development/python-modules/first/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "first"; - version = "2.0.1"; + version = "2.0.2"; name = pname + "-" + version; src = fetchPypi { inherit pname version; - sha256 = "0pn9hl2y0pz61la1xhkdz6vl9i2dg3nh0ksizcf0f9ybh8sxxcrv"; + sha256 = "1gykyrm6zlrbf9iz318p57qwk594mx1jf0d79v79g32zql45na7z"; }; doCheck = false; # no tests diff --git a/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix b/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix index 5709b17c524a..8099f3318e86 100644 --- a/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.18"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf"; + sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; diff --git a/nixpkgs/pkgs/development/python-modules/folium/default.nix b/nixpkgs/pkgs/development/python-modules/folium/default.nix index 78db8e0e10cd..1557cfdd52d5 100644 --- a/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "folium"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "04mhdl3k644j45rlfkamxz1paf58fxrmnwgvkrvza2fcwcs4nr9n"; + sha256 = "0f25fhwxnix8hddzf67barzjwwsvpww112zisrvz2lpl08j388rn"; }; checkInputs = [ pytest nbconvert pandas mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 21780ccb9fcd..2db42395186b 100644 --- a/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.37.3"; + version = "3.39.0"; src = fetchPypi { inherit pname version; - sha256 = "c898a455a39afbe6707bc17a0e4f720ebe2087fec67683e7c86a13183078204d"; + sha256 = "0hgv83b4nhk2bl33xa41x0xvsl2b138p974ywkglzckp1123a7z2"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/gym/default.nix b/nixpkgs/pkgs/development/python-modules/gym/default.nix index fe4cf01a8dfe..b207e7ca239e 100644 --- a/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155"; + sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/nixpkgs/pkgs/development/python-modules/hglib/default.nix index aa8c051aed3c..eab8ffe2bfd8 100644 --- a/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hglib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose, mercurial, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, python, nose, mercurial }: buildPythonPackage rec { pname = "python-hglib"; @@ -9,11 +9,18 @@ buildPythonPackage rec { sha256 = "7c1fa0cb4d332dd6ec8409b04787ceba4623e97fb378656f7cab0b996c6ca3b2"; }; + patches = [ + (substituteAll { + src = ./hgpath.patch; + hg = "${mercurial}/bin/hg"; + }) + ]; + checkInputs = [ nose ]; - buildInputs = [ mercurial ]; - checkPhase = ''python test.py''; - doCheck = if isPy3k then false else true; + checkPhase = '' + ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" + ''; meta = with stdenv.lib; { description = "Mercurial Python library"; diff --git a/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch b/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch new file mode 100644 index 000000000000..2141aa32a139 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/hglib/hgpath.patch @@ -0,0 +1,24 @@ +diff -r 2d0ec6097d78 hglib/__init__.py +--- a/hglib/__init__.py Mon Apr 30 15:43:29 2018 +0900 ++++ b/hglib/__init__.py Tue Mar 19 23:30:01 2019 +0100 +@@ -1,7 +1,7 @@ + import subprocess + from hglib import client, util, error + +-HGPATH = 'hg' ++HGPATH = '@hg@' + + def open(path=None, encoding=None, configs=None): + '''starts a cmdserver for the given path (or for a repository found +diff -r 2d0ec6097d78 tests/common.py +--- a/tests/common.py Mon Apr 30 15:43:29 2018 +0900 ++++ b/tests/common.py Tue Mar 19 23:30:01 2019 +0100 +@@ -26,7 +26,7 @@ + os.mkdir(self._testtmp) + os.chdir(self._testtmp) + # until we can run norepo commands in the cmdserver +- os.system('hg init') ++ os.system('@hg@ init') + self.client = hglib.open() + + def tearDown(self): diff --git a/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/nixpkgs/pkgs/development/python-modules/hpack/default.nix index d3db75f1458f..a10882417fc0 100644 --- a/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, glibcLocales }: buildPythonPackage rec { @@ -13,10 +12,6 @@ buildPythonPackage rec { sha256 = "8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2"; }; - buildInputs = [ glibcLocales ]; - - LC_ALL = "en_US.UTF-8"; - meta = with stdenv.lib; { description = "Pure-Python HPACK header compression"; homepage = "http://hyper.rtfd.org"; diff --git a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index 55c835e75cce..046cfbad26b6 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools_scm +, zipp , pathlib2 , contextlib2 +, configparser , isPy3k , importlib-resources +, packaging }: buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.6"; + version = "0.8"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "36b02c84f9001adf65209fefdf951be8e9014a95eab9938c0779ad5670359b1c"; + sha256 = "b50191ead8c70adfa12495fba19ce6d75f2e0275c14c5a7beb653d6799b512bd"; }; - propagatedBuildInputs = [] ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 ]; + nativeBuildInputs = [ setuptools_scm ]; - checkInputs = [ importlib-resources ]; + propagatedBuildInputs = [ zipp ] + ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + + checkInputs = [ importlib-resources packaging ]; meta = with lib; { description = "Read metadata from Python packages"; homepage = https://importlib-metadata.readthedocs.io/; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/development/python-modules/irc/default.nix b/nixpkgs/pkgs/development/python-modules/irc/default.nix index 672704249dc9..b422b368ffb6 100644 --- a/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm }: +, setuptools_scm, jaraco_collections +}: buildPythonPackage rec { pname = "irc"; @@ -23,5 +24,6 @@ buildPythonPackage rec { jaraco_stream pytz jaraco_itertools + jaraco_collections ]; } diff --git a/nixpkgs/pkgs/development/python-modules/isort/default.nix b/nixpkgs/pkgs/development/python-modules/isort/default.nix index 5a7e50d43322..bb9958a6fef1 100644 --- a/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }: -buildPythonPackage rec { +let + skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; + testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; +in buildPythonPackage rec { pname = "isort"; - version = "4.3.4"; + version = "4.3.16"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r"; + sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08"; }; - propagatedBuildInputs = lib.optional isPy27 futures; + propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; checkInputs = [ mock pytest ]; + # isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/ checkPhase = '' - py.test test_isort.py -k "not test_long_line_comments \ - and not test_import_case_produces_inconsistent_results_issue_472 \ - and not test_no_extra_lines_issue_557" + PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix index c0b30edb9ad4..8fde41e9b499 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, six, jaraco_classes }: +, six, jaraco_classes, jaraco_text +}: buildPythonPackage rec { pname = "jaraco.collections"; @@ -11,7 +12,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six jaraco_classes ]; + propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; # break dependency cycle patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..43530fcc3285 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 10 Mar 2019 13:10:18 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index d165e5e..d8e4694 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 9f3517f..c9033ec 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix index 4057d7ad2758..cbf966785e17 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, inflect, more-itertools, six, pytest, pytest-flake8 }: +, inflect, more-itertools, six, pytest +}: buildPythonPackage rec { pname = "jaraco.itertools"; @@ -10,9 +11,11 @@ buildPythonPackage rec { sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' pytest diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..aab9604b9ce8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 10 Mar 2019 16:42:21 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index 9b3c1ec..a5189c1 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 3e7bbed..5cac7a2 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix index 68fba6bfb5fb..ae05a76da1d5 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six, pytest, pytest-flake8 }: +, tempora, six, pytest +}: buildPythonPackage rec { pname = "jaraco.logging"; @@ -10,9 +11,11 @@ buildPythonPackage rec { sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' PYTHONPATH=".:$PYTHONPATH" pytest diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix index 222a92e60fb6..6087258a289b 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,14 +1,15 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, jaraco_functools, jaraco_collections }: +, jaraco_functools +}: buildPythonPackage rec { pname = "jaraco.text"; - version = "2.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa"; + sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx"; }; doCheck = false; buildInputs =[ setuptools_scm ]; - propagatedBuildInputs = [ jaraco_functools jaraco_collections ]; + propagatedBuildInputs = [ jaraco_functools ]; } diff --git a/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/nixpkgs/pkgs/development/python-modules/joblib/default.nix index d96752ba05f3..f9f5ba23eac9 100644 --- a/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, fetchpatch , sphinx , numpydoc , pytest @@ -10,16 +11,30 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.12.4"; + version = "0.13.2"; - # get full repository inorder to run tests - src = fetchFromGitHub { - owner = "joblib"; - repo = pname; - rev = version; - sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb"; + src = fetchPypi { + inherit pname version; + sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524"; }; + # python-lz4 compatibility + # https://github.com/joblib/joblib/pull/847 + patches = [ + (fetchpatch { + url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch; + sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch; + sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch; + sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d"; + }) + ]; + checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 0478d59c7085..978ed150ef45 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -13,6 +13,7 @@ , tornado , traitlets , requests +, notebook , pythonOlder , nodePackages }: @@ -106,7 +107,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado - traitlets prometheus_client async_generator + traitlets prometheus_client async_generator notebook ]; # Disable tests because they take an excessive amount of time to complete. diff --git a/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/nixpkgs/pkgs/development/python-modules/kombu/default.nix index b70228b6835a..72de84f9c59e 100644 --- a/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.3.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "529df9e0ecc0bad9fc2b376c3ce4796c41b482cf697b78b71aea6ebe7ca353c8"; + sha256 = "389ba09e03b15b55b1a7371a441c894fd8121d174f5583bbbca032b9ea8c9edd"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix index 6858a6bcf949..3dedc3b06d88 100644 --- a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0mf10xm9blqik8mwrpw0r07vqlk2y4r98yqvk1sq849zqlxmqpsr"; + sha256 = "0kaiw8zzzcp92p6mzm9zkyhv578p0x4lzjsyl8b4rnsafplmbscs"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/ldap/default.nix b/nixpkgs/pkgs/development/python-modules/ldap/default.nix index 09d399d25b37..8f5cd7e7e881 100644 --- a/nixpkgs/pkgs/development/python-modules/ldap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldap/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "python-ldap"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "41975e79406502c092732c57ef0c2c2eb318d91e8e765f81f5d4ab6c1db727c5"; + sha256 = "13nvrhp85yr0jyxixcjj012iw8l9wynxxlykm9j3alss6waln73x"; }; propagatedBuildInputs = [ pyasn1 pyasn1-modules ]; @@ -28,4 +28,10 @@ buildPythonPackage rec { ''; doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + description = "Python modules for implementing LDAP clients"; + homepage = https://www.python-ldap.org/; + license = licenses.psfl; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix index 460d743b1eda..3ad0ae3b7232 100644 --- a/nixpkgs/pkgs/development/python-modules/ldappool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldappool/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pbr, ldap, fixtures, testresources, testtools }: +, pbr, ldap, prettytable, fixtures, testresources, testtools }: buildPythonPackage rec { name = "ldappool-${version}"; @@ -11,9 +11,14 @@ buildPythonPackage rec { sha256 = "d9c9ec29be3f3e64164be84fe080a3087108836f307a12ec62f7d18988293df3"; }; + postPatch = '' + # Tests run without most of the dependencies + echo "" > test-requirements.txt + ''; + nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ ldap ]; + propagatedBuildInputs = [ ldap prettytable ]; checkInputs = [ fixtures testresources testtools ]; diff --git a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index 004fedf79b4d..671949669492 100644 --- a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "3.6.0"; + version = "4.0.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1zbp6axai47k3p2q497wiajls1h17wss143zynbwbwrqinsfiw43"; + sha256 = "14c62bsc2cynhaajpdidcqpq2vqwshrdkqyzwvpsjjbfmlx3b1ay"; }; disabled = pythonOlder "3.4.0"; diff --git a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index ef01fde2daa7..6babc6ae0145 100644 --- a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -66,8 +66,9 @@ buildPythonPackage rec { enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; + buildInputs = [ - cmake cython nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix index 52760420b83c..dc783ba8f33a 100644 --- a/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "3.6.0"; + version = "4.0.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1bz8ga0n9aw65hqzajbr93dcv5g555iaihbhs1jq2k47cx66klzv"; + sha256 = "1q70l37qafzfkpw8vlagmpd2w576b6jc1xmxp3wf3qfq45j8kya0"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix index fb433be8d990..810f37b4b136 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/2.nix @@ -5,7 +5,8 @@ , enableGhostscript ? false, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobject-introspection , enableGtk3 ? false, cairo -, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null +# darwin has its own "MacOSX" backend +, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt4 , libcxx , Cocoa diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index e795181e2ff0..d3ea365082cd 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -4,7 +4,8 @@ , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk2 ? false, pygtk ? null, gobject-introspection , enableGtk3 ? false, cairo -, enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null +# darwin has its own "MacOSX" backend +, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt4 , libcxx , Cocoa diff --git a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index 1a2cce8f110f..c68fb90952e5 100644 --- a/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage -, mecab , fetchPypi +, mecab +, swig }: buildPythonPackage rec { @@ -13,12 +14,17 @@ buildPythonPackage rec { sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d"; }; - propagatedBuildInputs = [ mecab ]; + nativeBuildInputs = [ + mecab # for mecab-config + swig + ]; + + buildInputs = [ mecab ]; meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; - homepage = https://github.com/LuminosoInsight/wordfreq/; - license = licenses.bsd0; + homepage = https://github.com/SamuraiT/mecab-python3; + license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three maintainers = with maintainers; [ ixxie ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/minio/default.nix b/nixpkgs/pkgs/development/python-modules/minio/default.nix new file mode 100644 index 000000000000..c8595f0383e7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi +, urllib3, python-dateutil , pytz, faker, mock, nose }: + +buildPythonPackage rec { + pname = "minio"; + version = "4.0.13"; + + src = fetchPypi { + inherit pname version; + sha256 = "1sbmv1lskm5cs3jmn8f2688pimgibly16g8ycc6fgnsjanyby35l"; + }; + + disabled = !isPy3k; + + checkInputs = [ faker mock nose ]; + propagatedBuildInputs = [ urllib3 python-dateutil pytz ]; + + meta = with lib; { + description = "Simple APIs to access any Amazon S3 compatible object storage server"; + homepage = https://github.com/minio/minio-py; + maintainers = with maintainers; [ peterromfeldhk ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/nixpkgs/pkgs/development/python-modules/msrest/default.nix index bb7f8a9c62dd..e44d65e5cbe3 100644 --- a/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast +, isPy3k , requests , requests_oauthlib , isodate , certifi +, enum34 +, typing , aiohttp , aiodns , pytest , httpretty +, mock +, futures , trio }: @@ -28,12 +32,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_oauthlib isodate certifi - # optional - aiohttp aiodns - ]; + ] ++ lib.optionals (!isPy3k) [ enum34 typing ] + ++ lib.optionals isPy3k [ aiohttp aiodns ]; checkInputs = [ pytest httpretty ] - ++ lib.optional (pythonAtLeast "3.5") trio; + ++ lib.optionals (!isPy3k) [ mock futures ] + ++ lib.optional isPy3k trio; # Deselected tests require network access checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index 2693e350112c..820b4c1696b3 100644 --- a/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -3,15 +3,16 @@ }: buildPythonPackage rec { - version = "4.13.0"; + version = "4.13.2"; pname = "mt-940"; # No tests in PyPI tarball + # See https://github.com/WoLpH/mt940/pull/72 src = fetchFromGitHub { owner = "WoLpH"; repo = "mt940"; rev = "v${version}"; - sha256 = "0p6z4ipj0drph3ryn8mnb3xn0vjfv54y1c5w5i9ixrxwz48h6bga"; + sha256 = "1lvw3qyv7qhjabcvg55br8x4pnc7hv8xzzaf6wnr8cfjg0q7dzzg"; }; postPatch = '' @@ -21,9 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) enum34; - LC_ALL="en_US.UTF-8"; - - checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest glibcLocales ]; + checkInputs = [ pyyaml pytestpep8 pytest-flakes pytest ]; checkPhase = '' py.test diff --git a/nixpkgs/pkgs/development/python-modules/munkres/default.nix b/nixpkgs/pkgs/development/python-modules/munkres/default.nix index a3d9e992cb30..5e83818a0143 100644 --- a/nixpkgs/pkgs/development/python-modules/munkres/default.nix +++ b/nixpkgs/pkgs/development/python-modules/munkres/default.nix @@ -1,19 +1,19 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, isPy3k , nose }: buildPythonPackage rec { pname = "munkres"; - version = "1.0.12"; + version = "1.1.2"; - # No sdist for 1.0.12, see https://github.com/bmc/munkres/issues/25 - src = fetchFromGitHub { - owner = "bmc"; - repo = pname; - rev = "release-${version}"; - sha256 = "0m3rkn0z3ialndxmyg26xn081znna34i5maa1i4nkhy6nf0ixdjm"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "81e9ced40c3d0ffc48be4b6da5cfdfaa49041faaaba8075b159974ec47926aea"; }; checkInputs = [ nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 5da8257ac81e..0b0220d32460 100644 --- a/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -2,7 +2,7 @@ let pname = "nbxmpp"; - version = "0.6.9"; + version = "0.6.10"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -11,7 +11,7 @@ in buildPythonPackage rec { name = "${name}.tar.bz2"; url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?" + "ref=${name}"; - sha256 = "14xrq0r5k1dk7rwj4cxyxfapi6gbnqg70mz94g6hn9ij06284mi7"; + sha256 = "1w31a747mj9rvlp3n20z0fnvyvihphkgkyr22sk2kap3migw8vai"; }; propagatedBuildInputs = [ pyopenssl ]; diff --git a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index d3fac8df084a..1c9af258995d 100644 --- a/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "netdisco"; - version = "2.5.0"; + version = "2.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2ecb9830ceed5cf8f2ccc5a9bbe02ca5f6851435f5315a5402f0123311f13b37"; + sha256 = "2b3aca14a1807712a053f11fd80dc251dd821ee4899aefece515287981817762"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/nixpkgs/pkgs/development/python-modules/nevow/default.nix b/nixpkgs/pkgs/development/python-modules/nevow/default.nix index 1adfe13dd13b..fa11ab3fb907 100644 --- a/nixpkgs/pkgs/development/python-modules/nevow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nevow/default.nix @@ -12,6 +12,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; + checkInputs = [ twisted ]; + checkPhase = '' trial formless nevow ''; diff --git a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index 0776e4fd792f..804c90d7d9dc 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0mh7p19rhx800dd54ij1pgln5ny03fdyvadyhrsb380fgjby2nh3"; + sha256 = "1r864sc7anw43s8bg5yd17bxcw1a4lj5h7mz7cbwnzpb9xmqpccj"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index c636346a5e36..7ceffb7a8dd2 100644 --- a/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "1.3"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0lgcc05c515d7692zvcmf36n2qpyn0bi018i1z3jy73abm04230j"; + sha256 = "0v340wkq4sn9pvcpjh076l8mcqkn3nrn7if8p6iysk02bjxvknbv"; }; propagatedBuildInputs = [ setuptools structlog tornado pycurl ]; diff --git a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index c34b75bd0415..ae4e8a039711 100755 --- a/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "osmnx"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "gboeing"; repo = pname; rev = "v${version}"; - sha256 = "1pn2v3dhbmb0yhqif9padg7x3sdx27pgfr95i3kxj4v0yrviaf9k"; + sha256 = "1k3y5kl4k93vxaxyanc040x44s2fyyc3m1ndy2j3kg0037z8ad4z"; }; propagatedBuildInputs = [ geopandas descartes matplotlib networkx numpy pandas requests Rtree shapely folium scikitlearn scipy ]; diff --git a/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 4619400b6e35..37c999e86b4c 100644 --- a/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -16,8 +16,13 @@ buildPythonPackage rec { sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; + nativeBuildInputs = with pkgs; [ + swig1 coin3d soqt + ]; + buildInputs = with pkgs; with xorg; [ - swig1 coin3d soqt libGLU_combined + coin3d soqt + libGLU_combined libXi libXext libSM libICE libX11 ]; diff --git a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix index 98d189d62b1c..c0d44e2851e2 100644 --- a/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }: +{ stdenv, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { version = "1.0.0"; pname = "pluginbase"; - buildInputs = [ pytest tox ]; - src = fetchPypi { inherit pname version; sha256 = "497894df38d0db71e1a4fbbfaceb10c3ef49a3f95a0582e11b75f8adaa030005"; }; + checkInputs = [ pytest ]; + + checkPhase = '' + cd tests + PYTHONPATH=.. pytest + ''; + meta = with stdenv.lib; { homepage = https://github.com/mitsuhiko/pluginbase; description = "A support library for building plugins sytems in Python"; diff --git a/nixpkgs/pkgs/development/python-modules/priority/deadline.patch b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch index a9d8af453f3a..f028953c28ab 100644 --- a/nixpkgs/pkgs/development/python-modules/priority/deadline.patch +++ b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch @@ -18,9 +18,9 @@ index c98a28d..013ce30 100644 --- a/test/test_priority.py +++ b/test/test_priority.py @@ -12,7 +12,7 @@ import itertools - + import pytest - + -from hypothesis import given +from hypothesis import given, settings from hypothesis.strategies import ( @@ -30,10 +30,10 @@ index c98a28d..013ce30 100644 fairness and equidistribution. """ @given(STREAMS_AND_WEIGHTS) -+ @settings(deadline=500) ++ @settings(deadline=None) def test_period_of_repetition(self, streams_and_weights): """ The period of repetition of a priority sequence is given by the sum of --- +-- 2.19.2 diff --git a/nixpkgs/pkgs/development/python-modules/progress/default.nix b/nixpkgs/pkgs/development/python-modules/progress/default.nix index 4b8269136ad2..d6c8d9125d16 100644 --- a/nixpkgs/pkgs/development/python-modules/progress/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progress/default.nix @@ -5,17 +5,14 @@ }: buildPythonPackage rec { - version = "1.4"; + version = "1.5"; pname = "progress"; src = fetchPypi { inherit pname version; - sha256 = "5e2f9da88ed8236a76fffbee3ceefd259589cf42dfbc2cec2877102189fae58a"; + sha256 = "0wj3wvdgfmqj44n32wag3mzpp5fjqkkd321x67v1prxvs78yvv39"; }; - # tests not packaged with pypi release - doCheck = false; - checkPhase = '' ${python.interpreter} test_progress.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix index a8e8bf07ad56..a68ecf59ad0e 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar/default.nix @@ -4,9 +4,6 @@ buildPythonPackage rec { pname = "progressbar"; version = "2.5"; - # https://github.com/niltonvolpato/python-progressbar/issues/54 - disabled = isPy3k; - src = fetchPypi { inherit pname version; sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63"; diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 5f43ae32ea23..d8f3c01bbd48 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -5,6 +5,10 @@ , requests , pytz , tzlocal +, i3ipc +, pydbus +, pygobject3 +, pyserial , file , acpi @@ -20,14 +24,14 @@ buildPythonPackage rec { pname = "py3status"; version = "3.16"; - + src = fetchPypi { inherit pname version; sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; }; doCheck = false; - propagatedBuildInputs = [ pytz requests tzlocal ]; + propagatedBuildInputs = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial ]; buildInputs = [ file ]; prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py diff --git a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 899b18eecbed..32c5f38b66d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -24,6 +25,10 @@ buildPythonPackage rec { "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; + preCheck = '' rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py @@ -43,13 +48,15 @@ buildPythonPackage rec { # when it is not intended to be imported at all rm pyarrow/tests/deserialize_buffer.py substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + + # Fails to bind a socket + # "PermissionError: [Errno 1] Operation not permitted" + substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" ''; ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; - setupPyBuildFlags = ["--with-parquet" ]; - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix new file mode 100644 index 000000000000..944278ce3c2c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, libGLU_combined +, xorg +}: + +buildPythonPackage rec { + pname = "pybullet"; + version = "2.4.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b6dkrac5zydxqfrf827xhamsimychrn77dsfnz1kf7c1crlwcw9"; + }; + + buildInputs = [ + libGLU_combined + xorg.libX11 + ]; + + patches = [ + # make sure X11 and OpenGL can be found at runtime + ./static-libs.patch + ]; + + meta = with lib; { + description = "Open-source software for robot simulation, integrated with OpenAI Gym"; + homepage = https://pybullet.org/; + license = licenses.zlib; + maintainers = with maintainers; [ timokau ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch new file mode 100644 index 000000000000..08a68b814866 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pybullet/static-libs.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 98efabdbf..e69e79084 100644 +--- a/setup.py ++++ b/setup.py +@@ -563,6 +563,8 @@ print("-----") + + extensions = [] + ++libraries += [ "X11", "GL" ] # statically link x11 and opengl ++ + pybullet_ext = Extension("pybullet", + sources = sources, + libraries = libraries, diff --git a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix index e466f800107c..acb5c9648783 100644 --- a/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchFromBitbucket , isPy3k , fetchurl , pkgs @@ -17,6 +18,18 @@ buildPythonPackage rec { sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834"; }; + srcMissing = fetchFromBitbucket { + owner = "andybuckley"; + repo = "pyhepmc"; + rev = "pyhepmc-1.0.0"; + sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w"; + }; + + prePatch = '' + cp -r $srcMissing/hepmc . + chmod +w hepmc + ''; + patches = [ # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff ./pyhepmc_export_edges.patch @@ -26,11 +39,11 @@ buildPythonPackage rec { # regenerate python wrapper preConfigure = '' - rm hepmc/hepmcwrap.py swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i ''; - buildInputs = [ pkgs.swig pkgs.hepmc ]; + nativeBuildInputs = [ pkgs.swig ]; + buildInputs = [ pkgs.hepmc ]; HEPMCPATH = pkgs.hepmc; diff --git a/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix b/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix new file mode 100644 index 000000000000..ac4af42851cd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +# Runtime inputs: +, pyparsing +# Check inputs: +, pytest +, mock +}: + +buildPythonPackage rec { + pname = "pyhocon"; + version = "0.3.51"; + + src = fetchPypi { + inherit pname version; + sha256 = "10l014br012fa583rnj3wqf6g9gmljamcwpw4snqwwg15i0dmkll"; + }; + + propagatedBuildInputs = [ pyparsing ]; + + checkInputs = [ pytest mock ]; + + # Tests fail because necessary data files aren't packaged for PyPi yet. + # See https://github.com/chimpler/pyhocon/pull/203 + doCheck = false; + + meta = with lib; { + homepage = https://github.com/chimpler/pyhocon/; + description = "HOCON parser for Python"; + # Long description copied from + # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py + # (the tip of master as of 2019-03-24). + longDescription = '' + A HOCON parser for Python. It additionally provides a tool + (pyhocon) to convert any HOCON content into json, yaml and properties + format + ''; + license = licenses.asl20; + maintainers = [ maintainers.chreekat ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 0510948e6bae..6d58fbfb21a9 100644 --- a/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -1,12 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, certifi, six }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, certifi, six }: buildPythonPackage rec { pname = "pylast"; - version = "3.0.0"; + version = "3.1.0"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "24051c52011ff18bdeaee9df084ecc90da6c627da86f3cdcfec4af2928e9bc56"; + sha256 = "0sk08l8dq0r4xgmqkxq6jzlbam34k95adaw468n0bh6cps18ddby"; }; propagatedBuildInputs = [ certifi six ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix index 10c34dd8353c..bd27de6eba77 100644 --- a/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pyls-black"; - version = "0.3.0"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rupert"; repo = "pyls-black"; rev = "v${version}"; - sha256 = "1pagbafb9r9glzy7nbvrq19msjy4wqahrvmc0wll0a0r4msqpi1d"; + sha256 = "1ynynay9g6yma39szbzf15ypq3c72fg1i0kjmq1dwxarj68i2gf9"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index 428ec1d46b89..d78a5f55aadc 100644 --- a/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.25"; + version = "4.0.26"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f"; + sha256 = "1qrxnf7ji5hml7z4y669k4wmk3iz2pcsr05bnn1n912asash09z5"; }; buildInputs = [ unixODBC ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyogg/default.nix b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix index 901cc137f192..88fdc960a2bb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyogg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyogg/default.nix @@ -1,34 +1,31 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile }: +{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }: buildPythonPackage rec { pname = "PyOgg"; - version = "0.6.6a1"; + version = "0.6.9a1"; src = fetchPypi { inherit pname version; - sha256 = "1ihzgl8p0rc3yjsp27zdrrs2r4qar5yf5l4v8wg0lilvan78h0rs"; + sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim"; }; buildInputs = [ libvorbis flac libogg libopus ]; propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ]; # There are no tests in this package. doCheck = false; - postPatch = '' - substituteInPlace pyogg/vorbis.py --replace \ - 'libvorbisfile = ExternalLibrary.load("vorbisfile")' "libvorbisfile = ctypes.CDLL('${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/vorbis.py --replace \ - 'libvorbisenc = ExternalLibrary.load("vorbisenc")' "libvorbisenc = ctypes.CDLL('${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/vorbis.py --replace \ - 'libvorbis = ExternalLibrary.load("vorbis")' "libvorbis = ctypes.CDLL('${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/flac.py --replace \ - 'libflac = ExternalLibrary.load("flac")' "libflac = ctypes.CDLL('${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/ogg.py --replace \ - 'libogg = ExternalLibrary.load("ogg")' "libogg = ctypes.CDLL('${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/opus.py --replace \ - 'libopus = ExternalLibrary.load("opus")' "libopus = ctypes.CDLL('${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace pyogg/opus.py --replace \ - 'libopusfile = ExternalLibrary.load("opusfile")' "libopusfile = ctypes.CDLL('${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}')" - ''; + patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol + patches = [ + (substituteAll { + src = ./pyogg-paths.patch; + flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; + oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; meta = { description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; diff --git a/nixpkgs/pkgs/development/python-modules/pyogg/pyogg-paths.patch b/nixpkgs/pkgs/development/python-modules/pyogg/pyogg-paths.patch new file mode 100644 index 000000000000..c7f1933878b4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyogg/pyogg-paths.patch @@ -0,0 +1,79 @@ +diff --git a/pyogg/flac.py b/pyogg/flac.py +index 37cc788..9fb7e95 100644 +--- a/pyogg/flac.py ++++ b/pyogg/flac.py +@@ -49,7 +49,7 @@ __here = os.getcwd() + libflac = None + + try: +- libflac = ExternalLibrary.load("FLAC", tests = [lambda lib: hasattr(lib, "FLAC__EntropyCodingMethodTypeString")]) ++ libflac = ctypes.CDLL('@flacLibPath@') + except ExternalLibraryError: + pass + except: +diff --git a/pyogg/ogg.py b/pyogg/ogg.py +index 7264774..2702e24 100644 +--- a/pyogg/ogg.py ++++ b/pyogg/ogg.py +@@ -54,7 +54,7 @@ __here = os.getcwd() + libogg = None + + try: +- libogg = ExternalLibrary.load("ogg", tests = [lambda lib: hasattr(lib, "oggpack_writeinit")]) ++ libogg = ctypes.CDLL('@oggLibPath@') + except ExternalLibraryError: + pass + except: +diff --git a/pyogg/opus.py b/pyogg/opus.py +index 81e73da..640e59c 100644 +--- a/pyogg/opus.py ++++ b/pyogg/opus.py +@@ -130,7 +130,7 @@ __here = os.getcwd() + libopus = None + + try: +- libopus = ExternalLibrary.load("opus", tests = [lambda lib: hasattr(lib, "opus_encoder_get_size")]) ++ libopus = ctypes.CDLL('@opusLibPath@') + except ExternalLibraryError: + pass + except: +@@ -139,7 +139,7 @@ except: + libopusfile = None + + try: +- libopusfile = ExternalLibrary.load("opusfile", tests = [lambda lib: hasattr(lib, "opus_head_parse")]) ++ libopusfile = ctypes.CDLL('@opusFileLibPath@') + except ExternalLibraryError: + pass + except: +diff --git a/pyogg/vorbis.py b/pyogg/vorbis.py +index a8e4792..6f44d2d 100644 +--- a/pyogg/vorbis.py ++++ b/pyogg/vorbis.py +@@ -52,7 +52,7 @@ __here = os.getcwd() + libvorbis = None + + try: +- libvorbis = ExternalLibrary.load("vorbis", tests = [lambda lib: hasattr(lib, "vorbis_info_init")]) ++ libvorbis = ctypes.CDLL('@vorbisLibPath@') + except ExternalLibraryError: + pass + except: +@@ -61,7 +61,7 @@ except: + libvorbisfile = None + + try: +- libvorbisfile = ExternalLibrary.load("vorbisfile", tests = [lambda lib: hasattr(lib, "ov_clear")]) ++ libvorbisfile = ctypes.CDLL('@vorbisFileLibPath@') + except ExternalLibraryError: + pass + except: +@@ -70,7 +70,7 @@ except: + libvorbisenc = None + + try: +- libvorbisenc = ExternalLibrary.load("vorbisenc", tests = [lambda lib: hasattr(lib, "vorbis_encode_init")]) ++ libvorbisenc = ctypes.CDLL('@vorbisEncLibPath@') + except ExternalLibraryError: + pass + except: diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix index 299fba098d9d..19b26a30ad71 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test -k 'not test_includeme' pyramid_beaker/tests.py ''; - buildInputs = [ pytest ]; + checkInputs = [ pytest ]; propagatedBuildInputs = [ beaker pyramid ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 9f8103b06065..194e76c4a912 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "79f7b4286be773c46914df0201dabaf92717a9c06e341e0c420603b2dd31c6bf"; + sha256 = "0w6z4j8l9898bj214v2mh7vx2g43j1b70ijjvc7q3316fscal469"; }; # requires root priviledges diff --git a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix index b58e1f48bb80..17d60f7507d3 100644 --- a/nixpkgs/pkgs/development/python-modules/pyshp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as"; + sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76"; }; buildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix index abb0bdebd5da..e23e63525183 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix @@ -13,7 +13,11 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pyside qt4 pysideShiboken ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 ]; + + propagatedBuildInputs = [ pyside pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix index 852de1fd49cd..f9e6846367c3 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d"; }; - buildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest-mock ]; propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index 6a70b6e8ce97..4fd0570a50dc 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4"; + sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index b6aa2460b595..79ce9fa63a9b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "6.0"; + version = "7.0"; src = fetchPypi { inherit pname version; - sha256 = "978349ae00687504fd0f9d0970c37199ccd89cbdb0cb8c4ed7ee417ede582b40"; + sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk"; }; - checkInputs = [ mock ]; + checkInputs = [ mock pytest ]; propagatedBuildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix index df34c3361d07..98cae527672f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools-git, pytest-shutil, pytest-fixture-config, psutil -, requests, future }: +, pytest_3, pytest-shutil, pytest-fixture-config, psutil +, requests, future, retry }: buildPythonPackage rec { pname = "pytest-server-fixtures"; @@ -11,8 +11,8 @@ buildPythonPackage rec { sha256 = "c89f9532f62cf851489082ece1ec692b6ed5b0f88f20823bea25e2a963ebee8f"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ setuptools-git pytest-shutil pytest-fixture-config psutil requests future ]; + buildInputs = [ pytest_3 ]; + propagatedBuildInputs = [ pytest-shutil pytest-fixture-config psutil requests future retry ]; # RuntimeError: Unable to find a free server number to start Xvfb doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 0c4d77612b0b..027054920954 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -5,15 +5,19 @@ buildPythonPackage rec { pname = "python-jsonrpc-server"; - version = "0.0.2"; + version = "0.1.2"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; rev = version; - sha256 = "1xp6xipslw8d1yv05mjmhql07kz04ibci5psjrv6rapqi6jp4bgk"; + sha256 = "0k55rpywghapk5db8dgp2jj5v5654q6m571s1gcz1mpn2qxkz69l"; }; + postPatch = '' + sed -i 's/version=versioneer.get_version(),/version="${version}",/g' setup.py + ''; + checkInputs = [ pytest mock pytestcov coverage ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix index 56c00fa11a9f..121a98335b64 100644 --- a/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix @@ -10,6 +10,7 @@ , pycodestyle ? null , pydocstyle ? null , pyflakes ? null +, pylint ? null , rope ? null , yapf ? null }: @@ -20,13 +21,13 @@ in buildPythonPackage rec { pname = "python-language-server"; - version = "0.21.2"; + version = "0.25.0"; src = fetchFromGitHub { owner = "palantir"; repo = "python-language-server"; rev = version; - sha256 = "11fvrpv1kymj2fzh8fhys4qk1xc64j1rbdrz252awyab7b3509i7"; + sha256 = "10la48m10j4alfnpw0xw359fb833scf5kv7kjvh7djf6ij7cfsvq"; }; # The tests require all the providers, disable otherwise. @@ -49,6 +50,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle ++ stdenv.lib.optional (withProvider "pydocstyle") pydocstyle ++ stdenv.lib.optional (withProvider "pyflakes") pyflakes + ++ stdenv.lib.optional (withProvider "pylint") pylint ++ stdenv.lib.optional (withProvider "rope") rope ++ stdenv.lib.optional (withProvider "yapf") yapf ++ stdenv.lib.optional isPy27 configparser diff --git a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index 692bbe4bcd89..02097d75ac87 100644 --- a/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -8,7 +8,16 @@ , pycairo }: -buildPythonPackage rec { +let + boost = pkgs.boost.override { + enablePython = true; + inherit python; + }; + mapnik = pkgs.mapnik.override { + inherit python boost; + }; + +in buildPythonPackage rec { pname = "python-mapnik"; version = "3.0.16"; @@ -28,25 +37,25 @@ buildPythonPackage rec { export BOOST_THREAD_LIB="boost_thread" export BOOST_SYSTEM_LIB="boost_system" ''; - buildInputs = with pkgs; [ - (boost.override { - enablePython = true; - inherit python; - }) - (mapnik.override { - inherit python; - boost = (boost.override { enablePython = true; inherit python; }); - }) - cairo - harfbuzz - icu - libjpeg - libpng - libtiff - libwebp - proj - zlib - ]; + + nativeBuildInputs = [ + mapnik # for mapnik_config + ]; + + buildInputs = [ + mapnik + boost + ] ++ (with pkgs; [ + cairo + harfbuzz + icu + libjpeg + libpng + libtiff + libwebp + proj + zlib + ]); propagatedBuildInputs = [ pillow pycairo ]; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix b/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix new file mode 100644 index 000000000000..053b4897e833 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markdown +}: + +buildPythonPackage rec { + pname = "python-markdown-math"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022"; + }; + + checkInputs = [ markdown ]; + + meta = { + description = "Math extension for Python-Markdown"; + homepage = https://github.com/mitya57/python-markdown-math; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ klntsky ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/nixpkgs/pkgs/development/python-modules/quandl/default.nix index 598767e6ca9b..fc4c192968f2 100644 --- a/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys"; + sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g"; }; doCheck = true; diff --git a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix index eeed42892308..4522c7623283 100644 --- a/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -9,14 +9,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.2.2"; - - # https://github.com/twolfson/restructuredtext-lint/pull/47 - disabled = isPy37; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; + sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908"; }; checkInputs = [ nose testtools ]; diff --git a/nixpkgs/pkgs/development/python-modules/retry/default.nix b/nixpkgs/pkgs/development/python-modules/retry/default.nix new file mode 100644 index 000000000000..a4743dcbfe46 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/retry/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, decorator +, py +, mock +, pytest +}: + +buildPythonPackage rec { + pname = "retry"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + decorator + py + ]; + + checkInputs = [ + mock + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Easy to use retry decorator"; + homepage = https://github.com/invl/retry; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/roboschool/default.nix b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix new file mode 100644 index 000000000000..8aa45966bd20 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/roboschool/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, python +, fetchFromGitHub +, fetchpatch +, qt5 +, boost +, assimp +, gym +, bullet-roboschool +, pkgconfig +, which +}: + +buildPythonPackage rec { + pname = "roboschool"; + version = "1.0.39"; + + src = fetchFromGitHub { + owner = "openai"; + repo = "roboschool"; + rev = version; + sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; + }; + + propagatedBuildInputs = [ + gym + ]; + + nativeBuildInputs = [ + pkgconfig + qt5.qtbase # needs the `moc` tool + which + ]; + + buildInputs = [ + bullet-roboschool + assimp + qt5.qtbase + boost + ]; + + NIX_CFLAGS_COMPILE="-I ${python}/include/${python.libPrefix}"; + + patches = [ + # Remove kwarg that was removed in upstream gym + # https://github.com/openai/roboschool/pull/180 + (fetchpatch { + name = "remove-close-kwarg.patch"; + url = "https://github.com/openai/roboschool/pull/180/commits/334f489c8ce7af4887e376139ec676f89da5b16f.patch"; + sha256 = "0bbz8b63m40a9lrwmh7c8d8gj9kpa8a7svdh08qhrddjkykvip6r"; + }) + ]; + + preBuild = '' + # First build the cpp dependencies + cd roboschool/cpp-household + make \ + MOC=moc \ + -j$NIX_BUILD_CORES + cd ../.. + ''; + + # Does a QT sanity check, but QT is not expected to work in isolation + doCheck = false; + + meta = with lib; { + description = "Open-source software for robot simulation, integrated with OpenAI Gym"; + homepage = https://github.com/openai/roboschool; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix b/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix index 88cdbf8a8fd8..116ada8e9544 100644 --- a/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "sasmodels"; - version = "0.98"; + version = "0.99"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "02y4lpjwaa73pr46ylk0pw0kbill4nfzqgnfv16v5m0z9smd76ir"; + sha256 = "1lcvn42h29i0mg4i75xn0dbk711q9ycyhm3h95skqy8i61qmjrx6"; }; buildInputs = [ opencl-headers ]; diff --git a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index b2c63ea97e3b..c1791db9fbc9 100644 --- a/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.2.8"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn"; + sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/shodan/default.nix b/nixpkgs/pkgs/development/python-modules/shodan/default.nix index 0fde898ca04f..bf57b9846ee5 100644 --- a/nixpkgs/pkgs/development/python-modules/shodan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.10.4"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4"; + sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix index df868bb4d5e5..ccff9ff4b9f8 100644 --- a/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix @@ -6,19 +6,17 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.1.2"; pname = "shouldbe"; src = fetchPypi { inherit pname version; - sha256 = "07pchxpv1xvjbck0xy44k3a1jrvklg0wbyccn14w0i7d135d4174"; + sha256 = "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj"; }; - buildInputs = [ nose ]; + checkInputs = [ nose ]; propagatedBuildInputs = [ forbiddenfruit ]; - doCheck = false; # Segmentation fault on py 3.5 - meta = with stdenv.lib; { description = "Python Assertion Helpers inspired by Shouldly"; homepage = https://pypi.python.org/pypi/shouldbe/; diff --git a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix index 2b0ff6e443a7..b41633da4d39 100644 --- a/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snakeviz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snakeviz"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5fe23667708a4ed04047abfbf209675a8488ea6ea8c038d7de06d8a083fb3531"; + sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa"; }; # Upstream doesn't run tests from setup.py diff --git a/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix index f2c38a3414ba..36816f6133d6 100644 --- a/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/speedtest-cli/default.nix @@ -7,11 +7,11 @@ # required for home-assistant buildPythonPackage rec { pname = "speedtest-cli"; - version = "2.0.2"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2f3d5aa1086d9b367c03b99db6e3207525af174772d877c6b982289b8d2bdefe"; + sha256 = "1s3ylvkclzdsyqmpjnsd6ixrbmj7vd4bfsdplkjaz1c2czyy3j9p"; }; # tests require working internet connection diff --git a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix index 5459a39fc1f1..efb8383c8fdc 100644 --- a/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/suds-jurko/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytest_3 , isPyPy }: @@ -16,9 +16,13 @@ buildPythonPackage rec { sha256 = "1s4radwf38kdh3jrn5acbidqlr66sx786fkwi0rgq61hn4n2bdqw"; }; - buildInputs = [ pytest ]; + checkInputs = [ pytest_3 ]; - doCheck = false; # v0.6 is broken with recent pytest 4.x + postPatch = '' + # fails + substituteInPlace tests/test_transport_http.py \ + --replace "test_sending_unicode_data" "noop" + ''; meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; diff --git a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index 41e413948c28..c792136cb4fb 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "telethon-session-sqlalchemy"; - version = "0.2.9.post1"; + version = "0.2.14"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bbe6a8ca32dd42aa1830b91f08f0458d728dc9eedca0ca27814a34c0b566100e"; + sha256 = "94aaf98afc051b4e167783f3d972bd9b51ab736a1e45df100bf52984e53eebac"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/nixpkgs/pkgs/development/python-modules/telethon/default.nix index 23a06c0cd253..09d944c80883 100644 --- a/nixpkgs/pkgs/development/python-modules/telethon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.5.5"; + version = "1.6.2"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1qpc4vc3lidhlp1c7521nxizjr6y5c3l9x41knqv02x8n3l9knxa"; + sha256 = "074h5gj0c330rb1nxzpqm31fp1vw7calh1cdkapbjx90j769iz18"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix index acbc2a608173..79ae18d33eaa 100644 --- a/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -63,7 +63,10 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \ --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \ - --replace "msgpack-numpy<0.4.4" "msgpack-numpy" + --replace "msgpack-numpy<0.4.4" "msgpack-numpy" \ + --replace "wheel>=0.32.0,<0.33.0" "wheel" \ + --replace "wrapt>=1.10.0,<1.11.0" "wrapt" \ + --replace "msgpack>=0.5.6,<0.6.0" "msgpack" ''; # Cannot find cython modules. diff --git a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix index 097a7368c835..2b0fc68ca4c4 100644 --- a/nixpkgs/pkgs/development/python-modules/tilestache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tilestache/default.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { disabled = !isPy27; src = fetchPypi { - inherit pname version; + pname = "TileStache"; + inherit version; sha256 = "11e15dd85501345bcfeb18dce5b1c8fb74ac8d867df2520afe0eefe1edd85f27"; }; diff --git a/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/nixpkgs/pkgs/development/python-modules/twilio/default.nix index c9b80f3699bd..2b04fdc20c95 100644 --- a/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.24.0"; + version = "6.26.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "16lxns59fms75swfjz46484464q4b1fw3ybf8f2k56aas9gyzb2j"; + sha256 = "0l50n5hljkp7w2l4c36arxf4dxhkfhs7ywwck9y1gvcgsnvccmss"; }; buildInputs = [ nose mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/uranium/default.nix b/nixpkgs/pkgs/development/python-modules/uranium/default.nix index 351279476c8c..b4081870fbe6 100644 --- a/nixpkgs/pkgs/development/python-modules/uranium/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "3.6.0"; + version = "4.0.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "02hid13h8anb9bgv2hhrcdg10bxdxa9hj9pbdv3gw3lpn9r2va98"; + sha256 = "1dzn064np76q0xpypcwsa7k7arzihg79xw1pgcvdizk9kzc6rw3y"; }; disabled = pythonOlder "3.5.0"; diff --git a/nixpkgs/pkgs/development/python-modules/vine/default.nix b/nixpkgs/pkgs/development/python-modules/vine/default.nix index 08240d5c594a..c3ee5237935e 100644 --- a/nixpkgs/pkgs/development/python-modules/vine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vine/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vine"; - version = "1.2.0"; + version = "1.3.0"; disable = pythonOlder "2.7"; src = fetchPypi { inherit pname version; - sha256 = "0xjz2sjbr5jrpjk411b7alkghdskhphgsqqrbi7abqfh2pli6j7f"; + sha256 = "133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87"; }; buildInputs = [ case pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 9496d51bfc1e..19945785eed9 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -4,18 +4,18 @@ buildPythonPackage rec { pname = "Werkzeug"; - version = "0.14.1"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; + sha256 = "ca5c2dcd367d6c0df87185b9082929d255358f5391923269335782b213d52655"; }; propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytest requests glibcLocales hypothesis ]; + checkInputs = [ pytest requests hypothesis ]; checkPhase = '' - LC_ALL="en_US.UTF-8" py.test ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} + pytest ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/nixpkgs/pkgs/development/python-modules/xdot/default.nix index 68d097d71d6a..79f0fb13d70d 100644 --- a/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }: +, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }: buildPythonPackage rec { pname = "xdot"; @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ]; + propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ]; meta = with lib; { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; diff --git a/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/nixpkgs/pkgs/development/python-modules/zipp/default.nix new file mode 100644 index 000000000000..2c060c9881c0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytest +, pytest-flake8 +}: + +buildPythonPackage rec { + pname = "zipp"; + version = "0.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "55ca87266c38af6658b84db8cfb7343cdb0bf275f93c7afaea0d8e7a209c7478"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ pytest pytest-flake8 ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Pathlib-compatible object wrapper for zip files"; + homepage = https://github.com/jaraco/zipp; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index d72ad7094d16..5d8d7d562259 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -424,7 +424,6 @@ let showtext = [ pkgs.pkgconfig ]; spate = [ pkgs.pkgconfig ]; stringi = [ pkgs.pkgconfig ]; - sys = [ pkgs.libapparmor ]; sysfonts = [ pkgs.pkgconfig ]; tesseract = [ pkgs.pkgconfig ]; Cairo = [ pkgs.pkgconfig ]; @@ -443,6 +442,11 @@ let Matrix = [ pkgs.libiconv ]; mgcv = [ pkgs.libiconv ]; igraph = [ pkgs.libiconv ]; + ape = [ pkgs.libiconv ]; + expm = [ pkgs.libiconv ]; + mnormt = [ pkgs.libiconv ]; + phangorn = [ pkgs.libiconv ]; + quadprog = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix index b0abb2c54fc5..c881d4eb4744 100644 --- a/nixpkgs/pkgs/development/ruby-modules/gem/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/gem/default.nix @@ -63,7 +63,6 @@ let else if type == "git" then fetchgit { inherit (attrs.source) url rev sha256 fetchSubmodules; - leaveDotGit = true; } else if type == "url" then fetchurl attrs.source @@ -95,6 +94,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit src; + unpackPhase = attrs.unpackPhase or '' runHook preUnpack @@ -142,6 +142,12 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { gempkg=$(echo "$output" | grep -oP 'File: \K(.*)') echo "gem package built: $gempkg" + elif [[ "$type" == "git" ]]; then + git init + # remove variations to improve the likelihood of a bit-reproducible output + rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD .git/refs/remotes/origin/HEAD .git/config + # support `git ls-files` + git add . fi runHook postBuild diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index e2b1b6d2fe69..9759bb532c8d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.94.0"; - name = "flow-${version}"; + pname = "flow"; + version = "0.96.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1bdxbyy2gchqffsk2qi0sbdlyaxp7fgmikrk7nsn5vdfzqswa6gq"; + sha256 = "04al9jnaxgh8la6s2pzzpzm6pyfc5c6g7pc8cwz4xcngbsw60cpn"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index 97140d10ca22..c08106eea2ff 100644 --- a/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.11.0"; + version = "6.12.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "0mg32bnl6j4p15akdhfc0wgilqvyphcgjimlaqq3jz51dmlr9scb"; + sha256 = "1fayb62i6p21q1d6y7ixljf37r7n7vwjwa69q5z6wr4zspaj79f9"; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix index 25c6d6d58792..c92cdb19ae28 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/cutter.nix @@ -8,7 +8,7 @@ , python3 }: let - version = "1.7.2"; + version = "1.8.0"; in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "09cqfz66r3830jkz1rwyfqw1xl1jfj6xg4pcccd2ml456kddh9dn"; + sha256 = "1z3lpzl7k3qn5xabi0qxl83rdbwi00h45blnljx8yfw0am5vfphc"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index f88dc3f6d333..9219698b2df0 100644 --- a/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -110,7 +110,7 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20942"; + version_commit = "21238"; gittap = "3.3.0"; gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; rev = "3.3.0"; @@ -120,14 +120,14 @@ in { cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "20942"; - gittap = "2.9.0-310-gcb62c376b"; - gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; - rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; - version = "2018-10-07"; - sha256 = "0z4nr1d2ca8ibq34441j15pj22wh46brcbr00j5hcqvn8y2lh96l"; - cs_ver = "e2c1cd46c06744beaceff42dd882de3a90f0a37c"; - cs_sha256 = "1czzqj8zdjgh7h2ixi26ij3mm4bgm4xw2slin6fv73nic8yaw722"; + version_commit = "21238"; + gittap = "3.3.0"; + gittip = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + rev = "5a9127d2599c8ff61d8544be7d4c9384402e94a3"; + version = "3.3.0"; + sha256 = "11ap3icr8w0y49lq5dxch2h589qdmwf3qv9lsdyfsz4l0mjm49ri"; + cs_ver = "4.0.1"; + cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; #</generated> } diff --git a/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/nixpkgs/pkgs/development/tools/bazelisk/default.nix new file mode 100644 index 000000000000..86748b716e6e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "bazelisk"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "philwo"; + repo = pname; + rev = "v${version}"; + sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72"; + }; + + modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; + + meta = with stdenv.lib; { + description = "A user-friendly launcher for Bazel"; + homepage = https://github.com/philwo/bazelisk; + license = licenses.asl20; + maintainers = with maintainers; [ elasticdog ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix index eb9f0d106d10..1e29e4b34f08 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/default.nix @@ -13,12 +13,17 @@ }: let - srcDeps = lib.singleton ( - fetchurl { + srcDeps = [ + (fetchurl { url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip"; sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7"; - } - ); + }) + + (fetchurl { + url = "https://mirror.bazel.build/bazel_java_tools/java_tools_pkg-0.5.1.tar.gz"; + sha256 = "1ld8m5cj9j0r474f56pixcfi0xvx3w7pzwahxngs8f6ns0yimz5w"; + }) + ]; distDir = runCommand "bazel-deps" {} '' mkdir -p $out @@ -61,7 +66,7 @@ let in stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.24.0"; meta = with lib; { homepage = "https://github.com/bazelbuild/bazel/"; @@ -85,9 +90,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; - sha256 = "0hannnvia8rvmi2v5d97j1f6wv0m1kxkd5hq4aqp0dqjr0ka4q38"; + sha256 = "11gsc00ghxqkbci8nrflkwq1lcvqawlgkaryj458b24si6bjl7b2"; }; + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + sourceRoot = "."; patches = [ @@ -168,6 +177,10 @@ stdenv.mkDerivation rec { --replace "/usr/bin/env python" "${python}/bin/python" \ --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \ + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + # substituteInPlace is rather slow, so prefilter the files with grep grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do # If you add more replacements here, you must change the grep above! @@ -211,8 +224,17 @@ stdenv.mkDerivation rec { src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \ --replace /bin:/usr/bin ${defaultShellPath} + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash - echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash @@ -236,18 +258,27 @@ stdenv.mkDerivation rec { customBash ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; - # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink - # detector (see com.google.devtools.build.lib.skyframe.FileFunction). - # Change this to $(mktemp -d) as soon as we figure out why. + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; buildPhase = '' - export TMPDIR=/tmp/.bazel-$UID - ./compile.sh - scripts/generate_bash_completion.sh \ - --bazel=./output/bazel \ - --output=output/bazel-complete.bash \ - --prepend=scripts/bazel-complete-header.bash \ - --prepend=scripts/bazel-complete-template.bash + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash ''; installPhase = '' @@ -255,15 +286,15 @@ stdenv.mkDerivation rec { # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel # if it can’t find something in tools, it calls $out/bin/bazel-real - cp scripts/packages/bazel.sh $out/bin/bazel - mv output/bazel $out/bin/bazel-real + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-real wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}" # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions - mv output/bazel-complete.bash $out/share/bash-completion/completions/bazel - cp scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel + cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ ''; doInstallCheck = true; @@ -278,6 +309,8 @@ stdenv.mkDerivation rec { examples/java-native/src/test/java/com/example/myproject:hello } + cd ./bazel_src + # test whether $WORKSPACE_ROOT/tools/bazel works mkdir -p tools diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 72d9f631afbc..8ae56834702b 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -30,6 +30,13 @@ let newPython = python3.override { sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav"; }; }); + pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec { + version = "0.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; + }; + }); }; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index afe93ddf383e..25ff6d09d420 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,32 +52,32 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-5.0"; - nativeVersion = "0.14"; + name = "gradle-5.3.1"; + nativeVersion = "0.17"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "19krxq9pid9dg6bhdbhhg7ykm5kcx7lv7cr58rj67g0h6jgsqmv1"; + sha256 = "0dkl6f17zl9pc6y2xm8xqz23x53fck4p2648vpq8572f0mxa2n8w"; }; }; gradle_4_10 = gradleGen rec { - name = "gradle-4.10.2"; + name = "gradle-4.10.3"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0a9s2iisivgaapsz4vq1l8fa2w0wnlq0cj67yv5a0rybnahnv75l"; + sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; }; }; gradle_3_5 = gradleGen rec { - name = "gradle-3.5"; + name = "gradle-3.5.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b"; + sha256 = "1y7fbhrdriclbs5ksxahi0aafsz760lalwyz8r4llysc5pskbkld"; }; }; @@ -91,6 +91,10 @@ rec { }; }; + # Nix pkgs that depend on this old version: + # pkgs/tools/security/jd-gui/default.nix + # pkgs/servers/mxisd/default.nix + # If these packages are updated, this old version can probably be removed gradle_2_5 = gradleGen rec { name = "gradle-2.5"; nativeVersion = "0.10"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix index 2d0bf244370f..ce15de8678d6 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.4"; - sha256 = "06lv3pmdz5l23rx3kqsi1k712bdl36i942hgbjh209s94mpb7f72"; + version = "3.0.5"; + sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; }; } diff --git a/nixpkgs/pkgs/development/tools/cachix/default.nix b/nixpkgs/pkgs/development/tools/cachix/default.nix index 895d6e4bec62..a127fb137f67 100644 --- a/nixpkgs/pkgs/development/tools/cachix/default.nix +++ b/nixpkgs/pkgs/development/tools/cachix/default.nix @@ -1,3 +1,3 @@ { haskellPackages, haskell }: -haskell.lib.justStaticExecutables haskellPackages.cachix +(haskell.lib.doDistribute haskellPackages.cachix).bin diff --git a/nixpkgs/pkgs/development/tools/cadre/Gemfile b/nixpkgs/pkgs/development/tools/cadre/Gemfile new file mode 100644 index 000000000000..aa42f75c95cf --- /dev/null +++ b/nixpkgs/pkgs/development/tools/cadre/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'cadre', '=1.0.4' diff --git a/nixpkgs/pkgs/development/tools/cadre/Gemfile.lock b/nixpkgs/pkgs/development/tools/cadre/Gemfile.lock new file mode 100644 index 000000000000..c14df9cffa61 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/cadre/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cadre (1.0.4) + thor (>= 0.14, < 1.0) + tilt (> 1.0) + valise (~> 1.2) + thor (0.20.3) + tilt (2.0.9) + valise (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + cadre (= 1.0.4) + +BUNDLED WITH + 1.16.3 diff --git a/nixpkgs/pkgs/development/tools/cadre/default.nix b/nixpkgs/pkgs/development/tools/cadre/default.nix new file mode 100644 index 000000000000..93eb32cfb514 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/cadre/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "cadre"; + gemdir = ./.; + exes = [ "cadre" ]; + + meta = with lib; { + description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs"; + homepage = https://github.com/nyarly/cadre; + license = licenses.mit; + maintainers = [ maintainers.nyarly ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/tools/cadre/gemset.nix b/nixpkgs/pkgs/development/tools/cadre/gemset.nix new file mode 100644 index 000000000000..33fd428debf2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/cadre/gemset.nix @@ -0,0 +1,35 @@ +{ + cadre = { + dependencies = ["thor" "tilt" "valise"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07q60s1bm2xar46g00ls5fjkn6dm2kfxhsz9ayblc31x5kr8d83a"; + type = "gem"; + }; + version = "1.0.4"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; + }; + valise = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5"; + type = "gem"; + }; + version = "1.2.1"; + }; +} \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f44e76c0b8e5..aa262fd54952 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.8.0"; + version = "11.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; + sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; + sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; + sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/easyjson/default.nix b/nixpkgs/pkgs/development/tools/easyjson/default.nix index ed650f37698a..14d07a0108fa 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/default.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-08-23"; + version = "2019-02-21"; goPackagePath = "github.com/mailru/easyjson"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003"; + sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/easyjson/deps.nix b/nixpkgs/pkgs/development/tools/easyjson/deps.nix index 3ba1d12a8048..0429d8876b29 100644 --- a/nixpkgs/pkgs/development/tools/easyjson/deps.nix +++ b/nixpkgs/pkgs/development/tools/easyjson/deps.nix @@ -1,3 +1,3 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ ] diff --git a/nixpkgs/pkgs/development/tools/electron/3.x.nix b/nixpkgs/pkgs/development/tools/electron/3.x.nix index 23620a12530b..597e66f9b293 100644 --- a/nixpkgs/pkgs/development/tools/electron/3.x.nix +++ b/nixpkgs/pkgs/development/tools/electron/3.x.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }: let - version = "3.1.4"; + version = "3.1.8"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -19,19 +19,19 @@ let src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1llwpd10cz5nfwqimib7xkc3xxj3z4y19l97wxma3bciizmmgq3k"; + sha256 = "1vq4vanlwixgk1q4v5d24f1ywgy2af1r14f9byzfy89vwds77yk9"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "0mb7q82r9ndvz181lnkplmvwkijzc2msrpfwpghrhsc4j3zbh0bf"; + sha256 = "13zds8bzn4z11544llkh99fw75gddxs5b9h1m5xgjzw37vf6rpws"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "0cf4jqq3n66dm11cy96q3nj1jxajv49yamhvn5g8a85nq4s5cx6f"; + sha256 = "0rfw1ydlmixyhifpmm2qyxapx3iqav4nlnzp2km9z7a0hpc4lii6"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0lxp7fpccwk6qdw79dgjlm9hywfwl3aj932qg2aff18vs077skrg"; + sha256 = "0qrnvzjz78fblfg4r6xpzc40p10y6865gqpwx2h5vsdfp6sgq898"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -59,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "1indim895a58ds09z91c8jfqmdp7ba85rx6bhq6dabgnvkykwmz0"; + sha256 = "0ms75306dq2ym838zk9d9nypnd8yjipl0zqyq9bvd4r32p241hw9"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 8c6dce0114e8..31867a87b77f 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -1,7 +1,7 @@ { stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }: let - version = "4.0.6"; + version = "4.1.3"; name = "electron-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -16,23 +16,22 @@ let linux = { inherit name version meta; - src = { i686-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; - sha256 = "1ffv4wlj827wyq7y2hfaz2d0fapqr2r9likb90ayzh91vmkc8c2y"; + sha256 = "0fjrzyd872frvlihjr5xssjqirrp0c0aa1s1z8kr5y6hw6d13m2y"; }; x86_64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; - sha256 = "01b063jabx7fglh63dk7nh21xxadwxrrvavcwznpw6jhid48g2yz"; + sha256 = "1qzfz8nm3p6qsx843jl4nlbnx6l0pa6fzz61bb8w2c1p88dwqddy"; }; armv7l-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; - sha256 = "18dsb3pyj9gfn8xyzhblx7nidgp39pfqs1ml07nxfkf1bjdh4c4w"; + sha256 = "0x5zw0937gm89rfh094kpabzcddw61ckijm8k0k5spir1nb2za9v"; }; aarch64-linux = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip"; - sha256 = "0dx6bzj0laygqkyl8ngbh0yfzyc5mxr3fxlqb867cza9sz5hh95l"; + sha256 = "1fz9przvm4jf97xbg3m7ipcnf2gv1zxhmby3bqps582nhc17fckd"; }; }.${stdenv.hostPlatform.system} or throwSystem; @@ -60,7 +59,7 @@ let src = fetchurl { url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; - sha256 = "0r1yn5lz808xdwp29g4kmlm5v0i1fsdxd4ph537gyz3sfn30dgq9"; + sha256 = "0s2fiys8mglmz5qf9l1k19p7ipl0r6vd2222n0j8m83bcr1779rz"; }; buildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix index b0069d3488e0..85e7c07b8cce 100644 --- a/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix +++ b/nixpkgs/pkgs/development/tools/gocode-gomod/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gocode-gomod-unstable-${version}"; - version = "2018-10-16"; - rev = "12640289f65065d652cc942ffa01a52bece1dd53"; + version = "2019-02-12"; + rev = "8cc90faaf4765d16de060350da41eadccc1a15d1"; goPackagePath = "github.com/stamblerre/gocode"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "stamblerre"; repo = "gocode"; - sha256 = "1avv0b5p2l8pv38m5gg97k57ndr5k9yy0rfkmmwjq96pa221hs1q"; + sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94"; }; goDeps = ./deps.nix; @@ -45,6 +45,6 @@ buildGoPackage rec { homepage = https://github.com/stamblerre/gocode; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit rvolosatovs ]; }; } diff --git a/nixpkgs/pkgs/development/tools/godot/default.nix b/nixpkgs/pkgs/development/tools/godot/default.nix index dd6a413cebf2..fe684bbf7b6f 100644 --- a/nixpkgs/pkgs/development/tools/godot/default.nix +++ b/nixpkgs/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { name = "godot-${version}"; - version = "3.0.6"; + version = "3.1"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "0g64h0x8dlv6aa9ggfcidk2mknkfl5li7z1phcav8aqp9srj8avf"; + sha256 = "1z37znqzbn0x8s04pb9dxzni9jzl8m59nfrr14vypww42f9l5i7i"; }; nativeBuildInputs = [ pkgconfig ]; @@ -51,10 +51,10 @@ in stdenv.mkDerivation rec { cp misc/dist/linux/godot.6 "$man/share/man/man6/" mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps} - cp misc/dist/linux/godot.desktop "$out/share/applications/" + cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/" cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" cp icon.png "$out/share/icons/godot.png" - substituteInPlace "$out/share/applications/godot.desktop" \ + substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \ --replace "Exec=godot" "Exec=$out/bin/godot" ''; diff --git a/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch index c57c85588a01..96a8464b5668 100644 --- a/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -1,7 +1,7 @@ +++ build/SConstruct -@@ -69,10 +69,10 @@ - custom_tools = ['mingw'] - +@@ -63,10 +63,10 @@ elif platform_arg == 'javascript': + custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip'] + env_base = Environment(tools=custom_tools) -if 'TERM' in os.environ: - env_base['ENV']['TERM'] = os.environ['TERM'] @@ -11,6 +11,7 @@ + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] + - env_base.global_defaults = global_defaults env_base.android_maven_repos = [] env_base.android_flat_dirs = [] + env_base.android_dependencies = [] + diff --git a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch index 286372f060ae..409baaa6f266 100644 --- a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,13 +1,22 @@ +++ b/platform/x11/detect.py -@@ -142,6 +142,11 @@ - env.ParseConfig('pkg-config xcursor --cflags --libs') - env.ParseConfig('pkg-config xinerama --cflags --libs') - env.ParseConfig('pkg-config xrandr --cflags --libs') -+ env.ParseConfig('pkg-config xrender --cflags --libs') +@@ -175,6 +175,11 @@ def configure(env): + env.ParseConfig('pkg-config xrender --cflags --libs') + env.ParseConfig('pkg-config xi --cflags --libs') + + env.ParseConfig('pkg-config xext --cflags --libs') + env.ParseConfig('pkg-config xfixes --cflags --libs') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') - ++ if (env['touch']): - x11_error = os.system("pkg-config xi --modversion > /dev/null ") + env.Append(CPPFLAGS=['-DTOUCH_ENABLED']) + +@@ -264,7 +269,7 @@ def configure(env): + print("Enabling ALSA") + env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_ENABLED"]) + # Don't parse --cflags, we don't need to add /usr/include/alsa to include path +- env.ParseConfig('pkg-config alsa --libs') ++ env.ParseConfig('pkg-config alsa --cflags --libs') + else: + print("ALSA libraries not found, disabling driver") + diff --git a/nixpkgs/pkgs/development/tools/gotools/default.nix b/nixpkgs/pkgs/development/tools/gotools/default.nix index 44d45e480b3a..3ba6deef26f7 100644 --- a/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "04rpdi52j26szx5kiyfmwad1sg7lfplxrkbwkr3b1kfafh1whgw5"; }; - modSha256 = "12klgqm2px878lzh05yzj6lr83v7vg0vv2k69pmg6nv1wlsxdlzf"; + modSha256 = "00yjcs26cm5civ96sikbd3wjmhx153xbyd805s3shca1mg99y7mm"; - preConfigure = '' + postConfigure = '' # Make the builtin tools available here mkdir -p $out/bin eval $(go env | grep GOTOOLDIR) diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix index cf3b0414c7a3..b8071bf1ac26 100644 --- a/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/nixpkgs/pkgs/development/tools/k6/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - name = "k6-${version}"; - version = "0.23.1"; +buildGoPackage rec { + pname = "k6"; + version = "0.24.0"; goPackagePath = "github.com/loadimpact/k6"; src = fetchFromGitHub { owner = "loadimpact"; - repo = "k6"; + repo = pname; rev = "v${version}"; - sha256 = "03krrpbb67h9hmrg5m94936kha667yh2lqzp9s7fv0b6khskr9r7"; + sha256 = "1riyyi4lxdaqilzzkxzzw3hzcrjjcylq2jh3p3656f99wiisvj28"; }; subPackages = [ "./" ]; diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 4ce2972e56da..bfad2a3d46a8 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ktlint-${version}"; - version = "0.30.0"; + version = "0.31.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0l3h3q4qc7ij3sr9ij1mrhir18xic7qbzgb621fv16zgdk6rjghn"; + sha256 = "0bqpflvnh423w54162r0d6l503lql1bwqykxw18s2fx1n1gb3n9a"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/lazygit/default.nix b/nixpkgs/pkgs/development/tools/lazygit/default.nix index 231a2009491f..d142078c50fa 100644 --- a/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lazygit-${version}"; - version = "0.5"; + version = "0.7.2"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = "lazygit"; rev = "v${version}"; - sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1"; + sha256 = "1b5mzmxw715cx7b0n22hvrpk0dbavzypljc7skwmh8k1nlx935jj"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/mdk/default.nix b/nixpkgs/pkgs/development/tools/mdk/default.nix index 8b5bea7ac6ce..27f0063e24be 100644 --- a/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, intltool, pkgconfig, glib }: stdenv.mkDerivation { - name = "gnu-mdk-1.2.9"; + name = "gnu-mdk-1.2.10"; src = fetchurl { - url = https://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; - sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; + url = https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz; + sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib ]; diff --git a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix index b2dbf65bcb08..ed4886305e3c 100644 --- a/nixpkgs/pkgs/development/tools/misc/cflow/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cflow/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, emacs }: stdenv.mkDerivation rec { - name = "cflow-1.5"; + name = "cflow-1.6"; src = fetchurl { url = "mirror://gnu/cflow/${name}.tar.bz2"; - sha256 = "0yq33k5ap1zpnja64n89iai4zh018ffr72wki5a6mzczd880mr3g"; + sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 67e353868fd6..1cfd9caa626b 100644 --- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -75,15 +75,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2019-02-01"; + version = "2019-03-18"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "8b5948f4cf12424c04df67a6eb136c9846fb2cfd"; - sha256 = "0ldk3li394vykl9c4v9bs8pir05pmad24s0rx9bzqgz569zfj2iv"; + rev = "0721f6623ffb5a4b6a77b499af4eee7d6e4dd6a7"; + sha256 = "0b2g2bnbaqpwxx8p81i4gpl4y16i57z5pnjm90fpd0jxnkij3pcg"; }; buildInputs = @@ -110,6 +110,11 @@ in releaseTools.nixBuild rec { url = "https://github.com/NixOS/hydra/commit/08de434bdd0b0a22abc2081be6064a6c846d3920.patch"; sha256 = "0kz77njp5ynn9l81g3q8zrryvnsr06nk3iw0a60187wxqzf5fmf8"; }) + ] ++ [ + (fetchpatch { + url = "https://github.com/NixOS/hydra/pull/648/commits/4171ab4c4fd576c516dc03ba64d1c7945f769af0.patch"; + sha256 = "1fxa2459kdws6qc419dv4084c1ssmys7kqg4ic7n643kybamsgrx"; + }) ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix new file mode 100644 index 000000000000..58aca8a8b5a4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "libwhich"; + version = "2019-03-20"; + + src = fetchFromGitHub { + owner = "vtjnash"; + repo = pname; + rev = "b348872107c77cba50b60475aa8ce2ddba86aac0"; + sha256 = "0fd8hsdc9b9v83j89mxvisgrz77q9rlxnbzd6j63wq66h95r02r9"; + }; + + installPhase = '' + install -Dm755 -t $out/bin libwhich + ''; + + meta = with stdenv.lib; { + description = "Like `which`, for dynamic libraries"; + homepage = https://github.com/vtjnash/libwhich; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/lit/default.nix b/nixpkgs/pkgs/development/tools/misc/lit/default.nix index 9784308b010e..c4164b414331 100644 --- a/nixpkgs/pkgs/development/tools/misc/lit/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.7.1"; + version = "0.8.0"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f"; + sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c"; }; # Non-standard test suite. Needs custom checkPhase. diff --git a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index 5a9642057d8a..43d86966694f 100644 --- a/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pkgconf-1.6.0"; + pname = "pkgconf"; + version = "1.6.1"; src = fetchurl { - url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz"; - sha256 = "1rgcw7lbmxv45y4ybnlh1wzhd1d15d2616499ajjnrvnnnms6db1"; + url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1310va0nm8iyb4ghgz9qlx7qb00iha1523hq1zbgj0c98cwfxf92"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix new file mode 100644 index 000000000000..879346a2b796 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "semver-tool"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "fsaintjacques"; + repo = pname; + rev = version; + sha256 = "0lpwsa86qb5w6vbnsn892nb3qpxxx9ifxch8pw3ahzx2dqhdgnrr"; + }; + + dontBuild = true; # otherwise we try to 'make' which fails. + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install src/semver $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = https://github.com/fsaintjacques/semver-tool; + description = "semver bash implementation"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.qyliss ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 3e764470f65c..c3553d049818 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.26"; + version = "5.0"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "070yz8xii8gnb4psiz628zwm5srh266sfb06f7f1qzagxzz2ykbw"; + sha256 = "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix index 66d9d521b058..65a210ed4b91 100644 --- a/nixpkgs/pkgs/development/tools/misc/tokei/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/tokei/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "tokei-${version}"; - version = "9.0.0"; + pname = "tokei"; + version = "9.1.1"; src = fetchFromGitHub { - owner = "Aaronepower"; - repo = "tokei"; + owner = "XAMPPRocky"; + repo = pname; rev = "v${version}"; - sha256 = "04d32w3yc98f6swxap19d6vrv8vi3w843cgnmf28mxcy4nbnls1n"; + sha256 = "0gz8m5j9p7hwylyl7cdxbli9rpy1p6lsrbym4zk647819pg4k1jp"; }; - cargoSha256 = "0vjb4j8qwlmvw55i2jif1a7hwv928h90dzwlpcqb0h6nlv812fav"; + cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4"; meta = with stdenv.lib; { description = "Program that displays statistics about your code"; - homepage = https://github.com/Aaronepower/tokei; + homepage = https://github.com/XAMPPRocky/tokei; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/development/tools/mod/default.nix b/nixpkgs/pkgs/development/tools/mod/default.nix index cb5743745c1b..6390c1d7fd24 100644 --- a/nixpkgs/pkgs/development/tools/mod/default.nix +++ b/nixpkgs/pkgs/development/tools/mod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1v7qy0q6fb9amcggwzdygl290zhr3w3zgmig2rm5zx91kw973sqc"; }; - modSha256 = "0j0c5idgwclszsmay7av9y3lcwfk72ml06nwll3fz404hx8vla6y"; + modSha256 = "1s33i4kp1vzfp97909pyzdlvi69siw1i2lbi2kbp9yrn163w6928"; subPackages = [ "cmd/mod" ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/META b/nixpkgs/pkgs/development/tools/ocaml/camlp5/META deleted file mode 100644 index e13b108ff247..000000000000 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/META +++ /dev/null @@ -1,94 +0,0 @@ -# Specifications for the "camlp5" preprocessor: -requires = "" -version = "[distributed with Ocaml]" -description = "Base for camlp5 syntax extensions" - -# For the toploop: -archive(byte,toploop,camlp5o) = "camlp5o.cma" -archive(byte,toploop,camlp5r) = "camlp5r.cma" - -# Scheme-like syntax: -# Do #predicates "syntax,camlp5scheme", followed by #require "camlp5" -archive(byte,toploop,camlp5scheme) = "camlp5sch.cma" - -# Standard ML-like syntax: -# Do #predicates "syntax,camlp5sml", followed by #require "camlp5" -archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo" - -# Lisp-like syntax: -# Do #predicates "syntax,camlp5lisp", followed by #require "camlp5" -archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo" - -# For the preprocessor itself: -archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo" -archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo" -archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo" -archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo" -archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo" -preprocessor = "camlp5 -nolib" - -package "gramlib" ( - requires(toploop) = "camlp5" - version = "[distributed with Ocaml]" - description = "Grammar library to create syntax extensions" - archive(byte) = "gramlib.cma" - archive(byte,toploop) = "" # already contained in camlp5*.cma - archive(native) = "gramlib.cmxa" -) - -package "quotations" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Quotations to create AST nodes" - archive(syntax,preprocessor) = "q_MLast.cmo" - archive(syntax,toploop) = "q_MLast.cmo" -) - -package "phony_quotations" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Phony quotations" - archive(syntax,preprocessor) = "q_phony.cmo" - archive(syntax,toploop) = "q_phony.cmo" -) - -package "extend" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: EXTEND the camlp5 grammar" - archive(syntax,preprocessor) = "pa_extend.cmo" - archive(syntax,toploop) = "pa_extend.cmo" -) - -package "extfun" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Extensible functions" - archive(syntax,preprocessor) = "pa_extfun.cmo" - archive(syntax,toploop) = "pa_extfun.cmo" -) - -package "fstream" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Functional stream parsers" - archive(syntax,preprocessor) = "pa_fstream.cmo" - archive(syntax,toploop) = "pa_fstream.cmo" -) - -package "macro" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Conditional compilation" - archive(syntax,preprocessor) = "pa_macro.cmo" - archive(syntax,toploop) = "pa_macro.cmo" -) - -package "unit_constraints" ( - requires = "camlp5" - version = "[distributed with Ocaml]" - description = "Syntax extension: Type constraints of type unit (revised syntax only)" - archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo" - archive(syntax,toploop,camlp5r) = "pa_ru.cmo" - error(syntax,-camlp5r) = "Not available" -) diff --git a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix index ca053138d800..efd6e562c29a 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,35 +1,16 @@ -{ stdenv, fetchzip, ocaml, legacy ? false }: - -let params = - if legacy then { - minor-version = "06"; - sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf"; - } else { - minor-version = "07"; - sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"; - }; - metafile = ./META; - opt = stdenv.lib.optionalString legacy; -in +{ stdenv, fetchzip, ocaml }: stdenv.mkDerivation { - name = "camlp5-7.${params.minor-version}"; + name = "camlp5-7.07"; src = fetchzip { - url = "https://github.com/camlp5/camlp5/archive/rel7${params.minor-version}.tar.gz"; - inherit (params) sha256; + url = "https://github.com/camlp5/camlp5/archive/rel707.tar.gz"; + sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn"; }; buildInputs = [ ocaml ]; - postPatch = opt '' - for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh - do - substituteInPlace $p --replace '/bin/rm' rm - done - ''; - prefixKey = "-prefix "; preConfigure = "configureFlagsArray=(--strict" + @@ -37,8 +18,6 @@ stdenv.mkDerivation { buildFlags = "world.opt"; - postInstall = opt "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META"; - dontStrip = true; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix index be7a488e96e8..80aeb17bef31 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, opaline }: +{ stdenv, fetchurl, ocaml, findlib, opaline }: stdenv.mkDerivation rec { name = "dune-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = [ ocaml findlib ]; buildFlags = "release"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A composable build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.mit; - inherit (ocamlPackages.ocaml.meta) platforms; + inherit (ocaml.meta) platforms; }; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix index 10088cce4912..fa5393c1871c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.3.2"; name = "opaline-${version}"; src = fetchFromGitHub { owner = "jaapb"; repo = "opaline"; rev = "v${version}"; - sha256 = "0vd5xaf272hk4iqfj347jvbppy7my5p5gz8yqpkvl1d1i6lzh08v"; + sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m"; }; buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild opam-file-format ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index b3e9e71ebc05..a7f06e734530 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 537997eb8a45..59a1cd223b5d 100755 --- a/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -114,7 +114,7 @@ print <<'EOF'; makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/nixpkgs/pkgs/development/tools/pet/default.nix b/nixpkgs/pkgs/development/tools/pet/default.nix index a2b6a8cf25a9..93eea81d0438 100644 --- a/nixpkgs/pkgs/development/tools/pet/default.nix +++ b/nixpkgs/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; }; - modSha256 = "04zizcq6x1sshnkbvcy197k6axmjnazi9r7cfvcq7g2ng818y2yb"; + modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix index e283c162092a..9292d124545a 100644 --- a/nixpkgs/pkgs/development/tools/quicktemplate/default.nix +++ b/nixpkgs/pkgs/development/tools/quicktemplate/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "quicktemplate-unstable-${version}"; - version = "2018-11-26"; + version = "2019-01-31"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/tools/scalafmt/default.nix b/nixpkgs/pkgs/development/tools/scalafmt/default.nix index 40ed7f44d8c3..db3a2af8f5b5 100644 --- a/nixpkgs/pkgs/development/tools/scalafmt/default.nix +++ b/nixpkgs/pkgs/development/tools/scalafmt/default.nix @@ -2,18 +2,18 @@ let baseName = "scalafmt"; - version = "1.5.1"; + version = "2.0.0-RC5"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' export COURSIER_CACHE=$(pwd) - ${coursier}/bin/coursier fetch com.geirsson:scalafmt-cli_2.12:${version} > deps + ${coursier}/bin/coursier fetch org.scalameta:scalafmt-cli_2.12:${version} > deps mkdir -p $out/share/java cp $(< deps) $out/share/java/ ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "15xfys9wdlx3rrqb2ab6qcfngkf6sa8v8q8shh10kk8jrc30g6dk"; + outputHash = "0y2nja4dj3l7f7m9dxr8xwda8vv27dwj090gfsa78a20vq1d3xxw"; }; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Opinionated code formatter for Scala"; - homepage = http://scalafmt.org; + homepage = http://scalameta.org/scalafmt; license = licenses.asl20; maintainers = [ maintainers.markus1189 ]; }; diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index b7f8da657644..3d08a6b787d8 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.24.0"; - # rev is the 0.24.0 commit, mainly for skaffold version command output - rev = "6a829c4b29e3a102b0b14c4584cd174f780402e9"; + version = "0.26.0"; + # rev is the 0.25.0 commit, mainly for skaffold version command output + rev = "d88680e9ede62da65500702670ef72fc9272a06f"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0i1gafyi8wlnfpmkivxarvh2kiickz105cdmpjkxya54rhl4c7i7"; + sha256 = "151x7hs1876ij5kc1xlm1m7pyff6i22ddhfvjsgwb8sjl4h1ays5"; }; meta = { diff --git a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix index 2182f8697aab..42042b87198d 100644 --- a/nixpkgs/pkgs/development/tools/sourcetrail/default.nix +++ b/nixpkgs/pkgs/development/tools/sourcetrail/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "sourcetrail-${version}"; - version = "2018.3.55"; + version = "2019.1.11"; src = fetchurl { name = "sourtrail.tar.gz"; url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit"; - sha256 = "6f5fbbecc221e7165ecbf1c4d208e302dade4feea9d43eb3265521efc0a376e2"; + sha256 = "09f3qdgdqg6dlai43050qh4iv1d4j43isk81q68swalpnvjn72w0"; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index 5100b3624c42..c9df2703daa5 100644 --- a/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -1,38 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, python }: - +{ stdenv, fetchFromGitHub, cmake, python, spirv-headers }: let - -spirv_sources = { - # `glslang` requires a specific version of `spirv-tools` and `spirv-headers` as specified in `known-good.json`. - tools = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Tools"; - rev = "9bfe0eb25e3dfdf4f3fd86ab6c0cda009c9bd661"; - sha256 = "1spfii4zib1lmz40vnz1d1cr6is7q2n7rvar1vfzi33gwrn8rqhi"; - }; - headers = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Headers"; - rev = "d5b2e1255f706ce1f88812217e9a554f299848af"; - sha256 = "18530mpa030ckjhn78z9vbfd35l5jgh3mg22ra6k8gw8zx4wjhsl"; - }; -}; - + # Update spirv-headers rev in lockstep according to DEPs file + version = "2019.1"; in +assert version == spirv-headers.version; stdenv.mkDerivation rec { name = "spirv-tools-${version}"; - version = "2018-09-20"; + inherit version; - src = spirv_sources.tools; - patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers''; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "v${version}"; + sha256 = "0vddjzhkrhrm3l3i57nxmq2smv3r1s0ka5ff2kziaahr4hqb479r"; + }; enableParallelBuilding = true; buildInputs = [ cmake python ]; - passthru = { - headers = spirv_sources.headers; - }; + cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/development/tools/stagit/default.nix b/nixpkgs/pkgs/development/tools/stagit/default.nix index ad23ed7e9dc4..21068a8b05f6 100644 --- a/nixpkgs/pkgs/development/tools/stagit/default.nix +++ b/nixpkgs/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "stagit-${version}"; - version = "0.6"; + version = "0.9.1"; src = fetchgit { url = git://git.codemadness.org/stagit; rev = version; - sha256 = "1xwjdqkf5akxa66ak7chd9gna89kgbdzjrpx4ch7f770ycp2s5sr"; + sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; makeFlags = "PREFIX=$(out)"; diff --git a/nixpkgs/pkgs/development/tools/statik/default.nix b/nixpkgs/pkgs/development/tools/statik/default.nix new file mode 100644 index 000000000000..0ad7d7f78d4a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/statik/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "statik-unstable-${version}"; + version = "2018-11-28"; + goPackagePath = "github.com/rakyll/statik"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "rakyll"; + repo = "statik"; + rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; + sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/rakyll/statik"; + description = "Embed files into a Go executable "; + license = licenses.asl20; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/statik/deps.nix b/nixpkgs/pkgs/development/tools/statik/deps.nix new file mode 100644 index 000000000000..0429d8876b29 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/statik/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ +] diff --git a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index c76c670739e1..702b7a564b22 100644 --- a/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, writeText, python3 +{ stdenv, callPackage, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang , pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: - stdenv.mkDerivation rec { name = "vulkan-validation-layers-${version}"; - version = "1.1.85.0"; + version = "1.1.101.0"; # WARNING: glslang overrides in all-packages.nix must be updated to match known-good.json! src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "1y5ny587h62139fxnz760hsyv1dmw29m1a9vq096sn8qafh3jzbz"; + sha256 = "00gz72m393i3m3rh5hv9d0znzlz39cpw35ifchzb4cr11bi4mzyz"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/bin/yarn2nix.js b/nixpkgs/pkgs/development/tools/yarn2nix/bin/yarn2nix.js deleted file mode 100755 index 3eadea559032..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/bin/yarn2nix.js +++ /dev/null @@ -1,144 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const crypto = require('crypto'); -const fs = require("fs"); -const https = require("https"); -const path = require("path"); -const util = require("util"); - -const lockfile = require("@yarnpkg/lockfile") -const docopt = require("docopt").docopt; - -//////////////////////////////////////////////////////////////////////////////// - -const USAGE = ` -Usage: yarn2nix [options] - -Options: - -h --help Shows this help. - --no-nix Hide the nix output - --no-patch Don't patch the lockfile if hashes are missing - --lockfile=FILE Specify path to the lockfile [default: ./yarn.lock]. -` - -const HEAD = ` -{fetchurl, linkFarm}: rec { - offline_cache = linkFarm "offline" packages; - packages = [ -`.trim(); - -//////////////////////////////////////////////////////////////////////////////// - -function generateNix(lockedDependencies) { - let found = {}; - - console.log(HEAD) - - for (var depRange in lockedDependencies) { - let dep = lockedDependencies[depRange]; - - let depRangeParts = depRange.split('@'); - let [url, sha1] = dep["resolved"].split("#"); - let file_name = path.basename(url) - - if (found.hasOwnProperty(file_name)) { - continue; - } else { - found[file_name] = null; - } - - - console.log(` - { - name = "${file_name}"; - path = fetchurl { - name = "${file_name}"; - url = "${url}"; - sha1 = "${sha1}"; - }; - }`) - } - - console.log(" ];") - console.log("}") -} - - -function getSha1(url) { - return new Promise((resolve, reject) => { - https.get(url, (res) => { - const { statusCode } = res; - const hash = crypto.createHash('sha1'); - if (statusCode !== 200) { - const err = new Error('Request Failed.\n' + - `Status Code: ${statusCode}`); - // consume response data to free up memory - res.resume(); - reject(err); - } - - res.on('data', (chunk) => { hash.update(chunk); }); - res.on('end', () => { resolve(hash.digest('hex')) }); - res.on('error', reject); - }); - }); -}; - -function updateResolvedSha1(pkg) { - // local dependency - if (!pkg.resolved) { return Promise.resolve(); } - let [url, sha1] = pkg.resolved.split("#", 2) - if (!sha1) { - return new Promise((resolve, reject) => { - getSha1(url).then(sha1 => { - pkg.resolved = `${url}#${sha1}`; - resolve(); - }).catch(reject); - }); - } else { - // nothing to do - return Promise.resolve(); - }; -} - -function values(obj) { - var entries = []; - for (let key in obj) { - entries.push(obj[key]); - } - return entries; -} - -//////////////////////////////////////////////////////////////////////////////// -// Main -//////////////////////////////////////////////////////////////////////////////// - -var options = docopt(USAGE); - -let data = fs.readFileSync(options['--lockfile'], 'utf8') -let json = lockfile.parse(data) -if (json.type != "success") { - throw new Error("yarn.lock parse error") -} - -// Check fore missing hashes in the yarn.lock and patch if necessary -var pkgs = values(json.object); -Promise.all(pkgs.map(updateResolvedSha1)).then(() => { - let newData = lockfile.stringify(json.object); - - if (newData != data) { - console.error("found changes in the lockfile", options["--lockfile"]); - - if (options["--no-patch"]) { - console.error("...aborting"); - process.exit(1); - } - - fs.writeFileSync(options['--lockfile'], newData); - } - - if (!options['--no-nix']) { - generateNix(json.object); - } -}) diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/default.nix b/nixpkgs/pkgs/development/tools/yarn2nix/default.nix deleted file mode 100644 index e86c0aac2c99..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/default.nix +++ /dev/null @@ -1,199 +0,0 @@ -{ stdenv, lib, fetchurl, linkFarm, runCommand, nodejs, yarn }: - -let - unlessNull = item: alt: - if item == null then alt else item; - - yarn2nix = mkYarnPackage { - src = ./.; - yarnNix = ./yarn.nix; - - passthru = { - inherit - defaultYarnFlags - linkNodeModulesHook - mkYarnModules - mkYarnNix - mkYarnPackage - # Export yarn again to make it easier to find out which yarn was used. - yarn - ; - }; - - meta = with lib; { - description = "generate nix expressions from a yarn.lock file"; - homepage = "https://github.com/moretea/yarn2nix"; - license = licenses.gpl3; - maintainers = with maintainers; [ manveru zimbatm ]; - }; - }; - - # Generates the yarn.nix from the yarn.lock file - mkYarnNix = yarnLock: - runCommand "yarn.nix" {} - "${yarn2nix}/bin/yarn2nix --lockfile ${yarnLock} --no-patch > $out"; - - # Loads the generated offline cache. This will be used by yarn as - # the package source. - importOfflineCache = yarnNix: - let - pkg = import yarnNix { inherit fetchurl linkFarm; }; - in - pkg.offline_cache; - - defaultYarnFlags = [ - "--offline" - "--frozen-lockfile" - "--ignore-engines" - "--ignore-scripts" - ]; - - mkYarnModules = { - name, - packageJSON, - yarnLock, - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - pkgConfig ? {}, - preBuild ? "", - }: - let - offlineCache = importOfflineCache yarnNix; - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key} . buildInputs or [] - ) (builtins.attrNames pkgConfig))); - postInstall = (builtins.map (key: - if (pkgConfig.${key} ? postInstall) then - '' - for f in $(find -L -path '*/node_modules/${key}' -type d); do - (cd "$f" && (${pkgConfig.${key}.postInstall})) - done - '' - else - "" - ) (builtins.attrNames pkgConfig)); - in - stdenv.mkDerivation { - inherit name preBuild; - phases = ["configurePhase" "buildPhase"]; - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - configurePhase = '' - # Yarn writes cache directories etc to $HOME. - export HOME=$PWD/yarn_home - ''; - - buildPhase = '' - runHook preBuild - - cp ${packageJSON} ./package.json - cp ${yarnLock} ./yarn.lock - chmod +w ./yarn.lock - - yarn config --offline set yarn-offline-mirror ${offlineCache} - - # Do not look up in the registry, but in the offline cache. - # TODO: Ask upstream to fix this mess. - sed -i -E 's|^(\s*resolved\s*")https?://.*/|\1|' yarn.lock - yarn install ${lib.escapeShellArgs yarnFlags} - - ${lib.concatStringsSep "\n" postInstall} - - mkdir $out - mv node_modules $out/ - patchShebangs $out - ''; - }; - - # This can be used as a shellHook in mkYarnPackage. It brings the built node_modules into - # the shell-hook environment. - linkNodeModulesHook = '' - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Replacing." - rm -rf node_modules - fi - - ln -s "$node_modules" node_modules - ''; - - mkYarnPackage = { - name ? null, - src, - packageJSON ? src + "/package.json", - yarnLock ? src + "/yarn.lock", - yarnNix ? mkYarnNix yarnLock, - yarnFlags ? defaultYarnFlags, - yarnPreBuild ? "", - pkgConfig ? {}, - extraBuildInputs ? [], - publishBinsFor ? null, - ... - }@attrs: - let - package = lib.importJSON packageJSON; - pname = package.name; - version = package.version; - deps = mkYarnModules { - name = "${pname}-modules-${version}"; - preBuild = yarnPreBuild; - inherit packageJSON yarnLock yarnNix yarnFlags pkgConfig; - }; - publishBinsFor_ = unlessNull publishBinsFor [pname]; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["pkgConfig"] // { - inherit src; - - name = unlessNull name "${pname}-${version}"; - - buildInputs = [ yarn nodejs ] ++ extraBuildInputs; - - node_modules = deps + "/node_modules"; - - configurePhase = attrs.configurePhase or '' - runHook preConfigure - - if [ -d npm-packages-offline-cache ]; then - echo "npm-pacakges-offline-cache dir present. Removing." - rm -rf npm-packages-offline-cache - fi - - if [[ -d node_modules || -L node_modules ]]; then - echo "./node_modules is present. Removing." - rm -rf node_modules - fi - - mkdir -p node_modules - ln -s $node_modules/* node_modules/ - ln -s $node_modules/.bin node_modules/ - - if [ -d node_modules/${pname} ]; then - echo "Error! There is already an ${pname} package in the top level node_modules dir!" - exit 1 - fi - - runHook postConfigure - ''; - - # Replace this phase on frontend packages where only the generated - # files are an interesting output. - installPhase = attrs.installPhase or '' - runHook preInstall - - mkdir -p $out - cp -r node_modules $out/node_modules - cp -r . $out/node_modules/${pname} - rm -rf $out/node_modules/${pname}/node_modules - - mkdir $out/bin - node ${./fixup_bin.js} $out ${lib.concatStringsSep " " publishBinsFor_} - - runHook postInstall - ''; - - passthru = { - inherit package deps; - } // (attrs.passthru or {}); - - # TODO: populate meta automatically - }); -in - yarn2nix diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/fixup_bin.js b/nixpkgs/pkgs/development/tools/yarn2nix/fixup_bin.js deleted file mode 100644 index dab1759c2046..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/fixup_bin.js +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -/* Usage: - * node fixup_bin.js <output_dir> [<bin_pkg_1>, <bin_pkg_2> ... ] - */ - -const fs = require("fs"); -const path = require("path"); - -const output = process.argv[2]; -const packages_to_publish_bin = process.argv.slice(3); -const derivation_bin_path = output + "/bin"; - -function processPackage(name) { - console.log("Processing ", name); - const package_path = output + "/node_modules/" + name; - const package_json_path = package_path + "/package.json"; - const package_json = JSON.parse(fs.readFileSync(package_json_path)); - - if (!package_json.bin) { - console.log("No binaries provided"); - return; - } - - // There are two alternative syntaxes for `bin` - // a) just a plain string, in which case the name of the package is the name of the binary. - // b) an object, where key is the name of the eventual binary, and the value the path to that binary. - if (typeof package_json.bin == "string") { - let bin_name = package_json.bin; - package_json.bin = { }; - package_json.bin[package_json.name] = bin_name; - } - - for (let binName in package_json.bin) { - const bin_path = package_json.bin[binName]; - const full_bin_path = path.normalize(package_path + "/" + bin_path); - fs.symlinkSync(full_bin_path, derivation_bin_path + "/"+ binName); - console.log("Linked", binName); - } -} - -packages_to_publish_bin.forEach((pkg) => { - processPackage(pkg); -}); diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/package.json b/nixpkgs/pkgs/development/tools/yarn2nix/package.json deleted file mode 100644 index 130eee67c560..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "yarn2nix", - "version": "1.0.0", - "description": "Convert packages.json and yarn.lock into a Nix expression that downloads all the dependencies", - "main": "index.js", - "repository": ".", - "author": "Maarten Hoogendoorn <maarten@moretea.nl>", - "license": "MIT", - "scripts": { - "yarn2nix": "bin/yarn2nix.js" - }, - "bin": { - "yarn2nix": "bin/yarn2nix.js" - }, - "dependencies": { - "@yarnpkg/lockfile": "^1.0.0", - "docopt": "^0.6.2" - } -} diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/yarn.lock b/nixpkgs/pkgs/development/tools/yarn2nix/yarn.lock deleted file mode 100644 index 976d2c530e1e..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/yarn.lock +++ /dev/null @@ -1,11 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@yarnpkg/lockfile@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz#33d1dbb659a23b81f87f048762b35a446172add3" - -docopt@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz#b28e9e2220da5ec49f7ea5bb24a47787405eeb11" \ No newline at end of file diff --git a/nixpkgs/pkgs/development/tools/yarn2nix/yarn.nix b/nixpkgs/pkgs/development/tools/yarn2nix/yarn.nix deleted file mode 100644 index a9e42e7d986c..000000000000 --- a/nixpkgs/pkgs/development/tools/yarn2nix/yarn.nix +++ /dev/null @@ -1,23 +0,0 @@ -{fetchurl, linkFarm}: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - - { - name = "lockfile-1.0.0.tgz"; - path = fetchurl { - name = "lockfile-1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.0.0.tgz"; - sha1 = "33d1dbb659a23b81f87f048762b35a446172add3"; - }; - } - - { - name = "docopt-0.6.2.tgz"; - path = fetchurl { - name = "docopt-0.6.2.tgz"; - url = "https://registry.yarnpkg.com/docopt/-/docopt-0.6.2.tgz"; - sha1 = "b28e9e2220da5ec49f7ea5bb24a47787405eeb11"; - }; - } - ]; -} diff --git a/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock index c953a311077e..560213897c91 100644 --- a/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/nixpkgs/pkgs/development/web/mailcatcher/Gemfile.lock @@ -1,11 +1,11 @@ GEM remote: https://rubygems.org/ specs: - daemons (1.2.4) + daemons (1.3.1) eventmachine (1.0.9.1) - mail (2.6.6) - mime-types (>= 1.16, < 4) - mailcatcher (0.6.5) + mail (2.7.1) + mini_mime (>= 0.1.1) + mailcatcher (0.7.1) eventmachine (= 1.0.9.1) mail (~> 2.3) rack (~> 1.5) @@ -13,11 +13,9 @@ GEM skinny (~> 0.2.3) sqlite3 (~> 1.3) thin (~> 1.5.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mini_mime (1.0.1) rack (1.6.11) - rack-protection (1.5.3) + rack-protection (1.5.5) rack sinatra (1.4.8) rack (~> 1.5) @@ -26,12 +24,12 @@ GEM skinny (0.2.4) eventmachine (~> 1.0.0) thin (>= 1.5, < 1.7) - sqlite3 (1.3.13) + sqlite3 (1.4.0) thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - tilt (2.0.7) + tilt (2.0.9) PLATFORMS ruby @@ -40,4 +38,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.16.4 + 1.17.2 diff --git a/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix index 75e1336b1c3c..7603e8ff2ef1 100644 --- a/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix +++ b/nixpkgs/pkgs/development/web/mailcatcher/gemset.nix @@ -1,13 +1,17 @@ { daemons = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bmb4qrd95b5gl3ym5j3q6mf090209f4vkczggn49n56w6s6zldz"; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; type = "gem"; }; - version = "1.2.4"; + version = "1.3.1"; }; eventmachine = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; @@ -16,41 +20,40 @@ version = "1.0.9.1"; }; mail = { - dependencies = ["mime-types"]; + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; type = "gem"; }; - version = "2.6.6"; + version = "2.7.1"; }; mailcatcher = { dependencies = ["eventmachine" "mail" "rack" "sinatra" "skinny" "sqlite3" "thin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx"; + sha256 = "02w1ycyfv7x0sh9799lz7xa65p5qvl5z4pa8a7prb68h2zwkfq0n"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.1"; }; - mime-types = { - dependencies = ["mime-types-data"]; + mini_mime = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; type = "gem"; }; - version = "3.1"; - }; - mime-types-data = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; - type = "gem"; - }; - version = "3.2016.0521"; + version = "1.0.1"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -60,15 +63,19 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.5"; }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -78,6 +85,8 @@ }; skinny = { dependencies = ["eventmachine" "thin"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9"; @@ -86,15 +95,19 @@ version = "0.2.4"; }; sqlite3 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "0pmgpqx2sg8pms54rk7kjjy8jwsw21g1f7mb02fggbdcqy8jk3fx"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.0"; }; thin = { dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga"; @@ -103,11 +116,13 @@ version = "1.5.1"; }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.9"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/development/web/nodejs/v11.nix b/nixpkgs/pkgs/development/web/nodejs/v11.nix index 3858061eaee3..5f2931e9b27d 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v11.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v11.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "11.11.0"; - sha256 = "1732jv95xza8813wk7qy22jxh2x9lnc9lr0rqkql7ggf03wymn56"; + version = "11.13.0"; + sha256 = "12n3bm21q8nm6wn116c0af8fpmxhaa7xd4srrba36q0zl4nra4bl"; } diff --git a/nixpkgs/pkgs/development/web/postman/default.nix b/nixpkgs/pkgs/development/web/postman/default.nix index 5466bb8c7c84..a09a84e4bf75 100644 --- a/nixpkgs/pkgs/development/web/postman/default.nix +++ b/nixpkgs/pkgs/development/web/postman/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "postman-${version}"; - version = "6.7.3"; + version = "7.0.7"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "04gfdb2pk2y8yv9ixq4ac5pk0rdfspd0810izij3hjnyqlv32hfg"; + sha256 = "47be1b955759520f3a2c7dcdecb85b4c52c38df717da294ba184f46f2058014a"; name = "${name}.tar.gz"; }; @@ -36,9 +36,11 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ - iconDir=$out/share/icons/hicolor/128x128/apps - mkdir -p $iconDir - ln -s $out/share/postman/resources/app/assets/icon.png $iconDir/postman.png + iconRootDir=$out/share/icons + iconSizeDir=$out/share/icons/hicolor/128x128/apps + mkdir -p $iconSizeDir + ln -s $out/share/postman/resources/app/assets/icon.png $iconRootDir/postman.png + ln -s $out/share/postman/resources/app/assets/icon.png $iconSizeDir/postman.png ''; preFixup = let diff --git a/nixpkgs/pkgs/games/assaultcube/assaultcube-next.patch b/nixpkgs/pkgs/games/assaultcube/assaultcube-next.patch deleted file mode 100644 index 92fc79966707..000000000000 --- a/nixpkgs/pkgs/games/assaultcube/assaultcube-next.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 1.1.0.4/source/src/Makefile -+++ 1.1.0.4/source/src/Makefile -@@ -6,7 +6,7 @@ - # found to have been caused by the g++ compiler in the past. This seems to have - # been fixed now by relaxing the optimization that g++ does, so although we'll - # continue using clang++ (just in case), you can use g++ if you prefer. --CXX=clang++ -+#CXX=clang++ - - # Changing this to ACDEBUG=yes will compile a debug version of AssaultCube. - ACDEBUG=no diff --git a/nixpkgs/pkgs/games/assaultcube/default.nix b/nixpkgs/pkgs/games/assaultcube/default.nix index 71e885a04d34..593622c3008b 100644 --- a/nixpkgs/pkgs/games/assaultcube/default.nix +++ b/nixpkgs/pkgs/games/assaultcube/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, makeDesktopItem, openal, pkgconfig, libogg, - libvorbis, SDL, SDL_image, makeWrapper, zlib, + libvorbis, SDL, SDL_image, makeWrapper, zlib, file, client ? true, server ? true }: with stdenv.lib; @@ -8,38 +8,21 @@ stdenv.mkDerivation rec { # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. pname = "assaultcube"; - version = "unstable-2017-05-01"; - - meta = { - description = "Fast and fun first-person-shooter based on the Cube fps"; - homepage = https://assault.cubers.net; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; # should work on darwin with a little effort. - license = stdenv.lib.licenses.zlib; - }; + version = "unstable-2018-05-20"; src = fetchFromGitHub { owner = "assaultcube"; repo = "AC"; - rev = "9f537b0876a39d7686e773040469fbb1417de18b"; - sha256 = "0nvckn67mmfaa7x3j41xyxjllxqzfx1dxg8pnqsaak3kkzds34pl"; + rev = "f58ea22b46b5013a520520670434b3c235212371"; + sha256 = "1vfn3d55vmmipdykrcfvgk6dddi9y95vlclsliirm7jdp20f15hd"; }; - # ${branch} not accepted as a value ? - # TODO: write a functional BUNDLED_ENET option and restore it in deps. - patches = [ ./assaultcube-next.patch ]; - - nativeBuildInputs = [ pkgconfig ]; - - # add optional for server only ? - buildInputs = [ makeWrapper openal SDL SDL_image libogg libvorbis zlib ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; - #makeFlags = [ "CXX=g++" ]; + buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; targets = (optionalString server "server") + (optionalString client " client"); - buildPhase = '' - make -C source/src ${targets} - ''; + makeFlags = [ "-C source/src" "CXX=c++" "${targets}" ]; desktop = makeDesktopItem { name = "AssaultCube"; @@ -61,21 +44,29 @@ stdenv.mkDerivation rec { cp -r config packages $out/$gamedatadir - # install custom script - substituteAll ${./launcher.sh} $bindir/assaultcube - chmod +x $bindir/assaultcube - if (test -e source/src/ac_client) then cp source/src/ac_client $bindir mkdir -p $out/share/applications cp ${desktop}/share/applications/* $out/share/applications install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png + + makeWrapper $out/bin/ac_client $out/bin/${pname} \ + --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init" fi if (test -e source/src/ac_server) then cp source/src/ac_server $bindir - ln -s $bindir/${pname} $bindir/${pname}-server + makeWrapper $out/bin/ac_server $out/bin/${pname}-server \ + --run "cd $out/$gamedatadir" --add-flags "-Cconfig/servercmdline.txt" fi ''; + + meta = { + description = "Fast and fun first-person-shooter based on the Cube fps"; + homepage = https://assault.cubers.net; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; # should work on darwin with a little effort. + license = stdenv.lib.licenses.zlib; + }; } diff --git a/nixpkgs/pkgs/games/assaultcube/launcher.sh b/nixpkgs/pkgs/games/assaultcube/launcher.sh deleted file mode 100644 index 331cb861f66c..000000000000 --- a/nixpkgs/pkgs/games/assaultcube/launcher.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!@shell@ -# original scripts are very awful - -CUBE_DIR=@out@@gamedatadir@ - -case $(basename "$0") in - assaultcube-server) - CUBE_OPTIONS="-Cconfig/servercmdline.txt" - BINARYPATH=@out@/bin/ac_server - ;; - assaultcube) - CUBE_OPTIONS="--home=${HOME}/.assaultcube/v1.2next --init" - BINARYPATH=@out@/bin/ac_client - ;; - *) echo "$0" is not supported. - exit 1 -esac - -cd $CUBE_DIR -exec "${BINARYPATH}" ${CUBE_OPTIONS} "$@" diff --git a/nixpkgs/pkgs/games/crispy-doom/default.nix b/nixpkgs/pkgs/games/crispy-doom/default.nix index 730c7f764cc2..8b549d93fb22 100644 --- a/nixpkgs/pkgs/games/crispy-doom/default.nix +++ b/nixpkgs/pkgs/games/crispy-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchurl }: stdenv.mkDerivation rec { - name = "crispy-doom-5.4"; + name = "crispy-doom-5.5.1"; src = fetchurl { url = "https://github.com/fabiangreffrath/crispy-doom/archive/${name}.tar.gz"; - sha256 = "0kks7vzp6cwmfv2s39z09vl9w897i8xijg1s8lfbg17viq8azb3x"; + sha256 = "0qnqyyjnclmwls34m7nk8lpvpaffdmhxshlarsiggcsn9py96kns"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; diff --git a/nixpkgs/pkgs/games/duckmarines/default.nix b/nixpkgs/pkgs/games/duckmarines/default.nix index b4dca34b11fd..6da1e8ffe4b5 100644 --- a/nixpkgs/pkgs/games/duckmarines/default.nix +++ b/nixpkgs/pkgs/games/duckmarines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "duckmarines"; @@ -25,21 +25,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0-love.zip"; - sha256 = "0fpzbsgrhbwm1lff9gyzh6c9jigw328ngddvrj5w7qmjcm2lv6lv"; + url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0c.love"; + sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v ./${pname}-1.0.love $out/share/games/lovegames/${pname}.love + cp -v ${src} $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { description = "Duck-themed action puzzle video game"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; + hydraPlatforms = []; license = licenses.free; downloadPage = http://tangramgames.dk/games/duckmarines; }; diff --git a/nixpkgs/pkgs/games/eduke32/default.nix b/nixpkgs/pkgs/games/eduke32/default.nix index c51f014b179d..3407659d977b 100644 --- a/nixpkgs/pkgs/games/eduke32/default.nix +++ b/nixpkgs/pkgs/games/eduke32/default.nix @@ -1,76 +1,78 @@ -{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm -, pkgconfig, SDL2, SDL2_mixer, runtimeShell }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem +, flac, gtk2, libvorbis, libvpx, libGLU_combined +, SDL2, SDL2_mixer }: let - year = "2015"; - date = "20150420"; - rev = "5160"; -in stdenv.mkDerivation rec { + version = "20190330"; + rev = "7470"; + + desktopItem = makeDesktopItem { + name = "eduke32"; + exec = "@out@/bin/${wrapper}"; + comment = "Duke Nukem 3D port"; + desktopName = "Enhanced Duke Nukem 3D"; + genericName = "Duke Nukem 3D port"; + categories = "Application;Game;"; + }; + + wrapper = "eduke32-wrapper"; + +in stdenv.mkDerivation { name = "eduke32-${version}"; - version = "${date}-${rev}"; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/old/${year}/${version}/eduke32_src_${version}.tar.xz"; - sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz"; + sha256 = "09a7l23i6sygicc82w1in9hjw0jvivlf7q0vw8kcx9j98lm23mkn"; }; - buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ]; + + nativeBuildInputs = [ makeWrapper pkgconfig ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; - nativeBuildInputs = [ pkgconfig ]; postPatch = '' - substituteInPlace build/src/glbuild.c \ - --replace libGL.so ${libGLU_combined}/lib/libGL.so \ - --replace libGLU.so ${libGLU_combined}/lib/libGLU.so + substituteInPlace source/build/src/glbuild.cpp \ + --replace libGLU.so ${libGLU_combined}/lib/libGLU.so + + for f in glad.c glad_wgl.c ; do + substituteInPlace source/glad/src/$f \ + --replace libGL.so ${libGLU_combined}/lib/libGL.so + done ''; - NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; - NIX_LDFLAGS = "-L${SDL2}/lib"; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2.dev}/include/SDL2" + "-I${SDL2_mixer}/include/SDL2" + ]; makeFlags = [ - "LINKED_GTK=1" "SDLCONFIG=${SDL2}/bin/sdl2-config" - "VC_REV=${rev}" ]; - desktopItem = makeDesktopItem { - name = "eduke32"; - exec = "eduke32-wrapper"; - comment = "Duke Nukem 3D port"; - desktopName = "Enhanced Duke Nukem 3D"; - genericName = "Duke Nukem 3D port"; - categories = "Application;Game;"; - }; + enableParallelBuilding = true; installPhase = '' - # Make wrapper script - cat > eduke32-wrapper <<EOF - #!${runtimeShell} - - if [ "$EDUKE32_DATA_DIR" = "" ]; then - EDUKE32_DATA_DIR=/var/lib/games/eduke32 - fi - if [ "$EDUKE32_GRP_FILE" = "" ]; then - EDUKE32_GRP_FILE=\$EDUKE32_DATA_DIR/DUKE3D.GRP - fi - - cd \$EDUKE32_DATA_DIR - exec $out/bin/eduke32 -g \$EDUKE32_GRP_FILE - EOF - - # Install binaries - mkdir -p $out/bin - install -Dm755 eduke32{,-wrapper} mapster32 $out/bin - - # Install desktop item + runHook preInstall + + install -Dm755 -t $out/bin eduke32 mapster32 + + makeWrapper $out/bin/eduke32 $out/bin/${wrapper} \ + --set-default EDUKE32_DATA_DIR /var/lib/games/eduke32 \ + --add-flags '-g "$EDUKE32_DATA_DIR/DUKE3D.GRP"' + cp -rv ${desktopItem}/share $out + substituteInPlace $out/share/applications/eduke32.desktop \ + --subst-var out + + runHook postInstall ''; meta = with stdenv.lib; { description = "Enhanched port of Duke Nukem 3D for various platforms"; - license = licenses.gpl2Plus; homepage = http://eduke32.com; + license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; - platforms = with platforms; linux; + # Darwin is untested (supported by upstream) + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/games/factorio/default.nix b/nixpkgs/pkgs/games/factorio/default.nix index 7ec27d29fc6f..2bf41a3cc321 100644 --- a/nixpkgs/pkgs/games/factorio/default.nix +++ b/nixpkgs/pkgs/games/factorio/default.nix @@ -53,11 +53,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; - experimental = bdist { sha256 = "0piprfkywja35m5x4wv9xdykp6ywfs5f2z1y6fmszfv26jz234sg"; version = "0.17.14"; withAuth = true; }; + experimental = bdist { sha256 = "11vwyyf3him2bi0c5cgv0h0k304kvw667ygqplq5giyzcvadjix8"; version = "0.17.16"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; - experimental = bdist { sha256 = "1h8psnrwdd2h3myndw35723qsgbn3xpmrz94r7mdyirfabi870a9"; version = "0.17.14"; }; + experimental = bdist { sha256 = "1sxv4kc5vg53lgjrm5c250hvbg6hqz0ijfxpvfjk7bzps5g6n1fx"; version = "0.17.16"; }; }; demo = { stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; diff --git a/nixpkgs/pkgs/games/gscrabble/default.nix b/nixpkgs/pkgs/games/gscrabble/default.nix new file mode 100644 index 000000000000..fc73f89f66c0 --- /dev/null +++ b/nixpkgs/pkgs/games/gscrabble/default.nix @@ -0,0 +1,40 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub +, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection +, python3Packages, gnome3, hicolor-icon-theme }: + +buildPythonApplication rec { + pname = "gscrabble"; + version = "unstable-2019-03-11"; + + src = fetchFromGitHub { + owner = "RaaH"; + repo = "gscrabble"; + rev = "4b6e4e151a4cd4a4f66a5be2c8616becac3f2a29"; + sha256 = "0a89kqh04x52q7qyv1rfa7xif0pdw3zc0dw5a24msala919g90q2"; + }; + + doCheck = false; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = with gst_all_1; [ + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad + hicolor-icon-theme gnome3.adwaita-icon-theme gtk3 gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$out/share/GScrabble/modules" + ) + ''; + + meta = with stdenv.lib; { + description = "Golden Scrabble crossword puzzle game"; + homepage = https://github.com/RaaH/gscrabble/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.genesis ]; + }; +} diff --git a/nixpkgs/pkgs/games/leela-zero/default.nix b/nixpkgs/pkgs/games/leela-zero/default.nix index c1238b7b3bbb..efe7a6a76e98 100644 --- a/nixpkgs/pkgs/games/leela-zero/default.nix +++ b/nixpkgs/pkgs/games/leela-zero/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "leela-zero-${version}"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "gcp"; repo = "leela-zero"; rev = "v${version}"; - sha256 = "1px7wqvlv414gklzgrmppp8wzc2mkskinm1p75j4snbqr8qpbn5s"; + sha256 = "1k04ld1ysabxb8ivci3ji5by9vb3yvnflkf2fscs1x0bp7d6j101"; fetchSubmodules = true; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Go engine modeled after AlphaGo Zero"; homepage = https://github.com/gcp/leela-zero; license = licenses.gpl3; - maintainers = [ maintainers.averelld ]; + maintainers = [ maintainers.averelld maintainers.omnipotententity ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/games/lugaru/default.nix b/nixpkgs/pkgs/games/lugaru/default.nix new file mode 100644 index 000000000000..cad98650c24e --- /dev/null +++ b/nixpkgs/pkgs/games/lugaru/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitLab, cmake, openal, pkgconfig, libogg, + libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + pname = "lugaru"; + version = "1.2"; + + src = fetchFromGitLab { + owner = "osslugaru"; + repo = "lugaru"; + rev = version; + sha256 = "089rblf8xw3c6dq96vnfla6zl8gxcpcbc1bj5jysfpq63hhdpypz"; + }; + + nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; + + buildInputs = [ libGLU openal SDL2 libogg libvorbis libpng libjpeg_turbo ]; + + cmakeFlags = [ "-DSYSTEM_INSTALL=ON" ]; + + meta = { + description = "Lugaru HD: Third person ninja rabbit fighting game"; + homepage = https://osslugaru.gitlab.io; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/nixpkgs/pkgs/games/minetest/default.nix b/nixpkgs/pkgs/games/minetest/default.nix index 217697e1b104..cf20651aa3ea 100644 --- a/nixpkgs/pkgs/games/minetest/default.nix +++ b/nixpkgs/pkgs/games/minetest/default.nix @@ -72,9 +72,9 @@ let }; v5 = { - version = "5.0.0"; - sha256 = "1b8n8nzlvmld1hl3zgs1xg4jbc1nsf1m2bn7fi794vdr06s6n911"; - dataSha256 = "186i1pna2f3fwa2001y8mw5131h0sndhfdxzfqq2gnr1m83sjm0w"; + version = "5.0.1"; + sha256 = "11i8fqjpdggqfdlx440k5758zy0nbf9phxan9r63mavc7mph88ay"; + dataSha256 = "1hw3n7qqpasq6bivxhq01kr0d58w0gp46s0baxixp1fakd79p8a7"; }; in { diff --git a/nixpkgs/pkgs/games/openmw/default.nix b/nixpkgs/pkgs/games/openmw/default.nix index 47527a13b7b7..c57fe642dc3d 100644 --- a/nixpkgs/pkgs/games/openmw/default.nix +++ b/nixpkgs/pkgs/games/openmw/default.nix @@ -11,14 +11,14 @@ let }; }); in stdenv.mkDerivation rec { - version = "0.44.0"; + version = "0.45.0"; name = "openmw-${version}"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0rxkw0bzag7qffifg28dyyga47aaaf5ziiccpv7p8yax1wglvymh"; + sha256 = "1r87zrsnza2v9brksh809zzqj6zhk5xj15qs8iq11v1bscm2a2j4"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/games/openrct2/default.nix b/nixpkgs/pkgs/games/openrct2/default.nix index e41caa3db978..926e360a1b4c 100644 --- a/nixpkgs/pkgs/games/openrct2/default.nix +++ b/nixpkgs/pkgs/games/openrct2/default.nix @@ -5,20 +5,20 @@ let name = "openrct2-${version}"; - version = "0.2.1"; + version = "0.2.2"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "0dl1f0gvq0ifaii66c7bwp8k822krcdn9l44prnyds6smrdmd3dq"; + sha256 = "1bfqmb6cbmsjcvj77vppy5lw1m4lkvxd1w3f218ah4788xnkysq2"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.6"; - sha256 = "1yhyafsk2lyasgj1r7h2n4k7vp5q792aj86ggpbmd6bcp4kk6hbm"; + rev = "v1.0.9"; + sha256 = "1kng0mz8dsdbfd3g6qsk69ap2nq75aizw76j4a6lkfygnbcv8m3j"; }; title-sequences-src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/openttd/default.nix b/nixpkgs/pkgs/games/openttd/default.nix index 237021e98010..d0e880f5f2cc 100644 --- a/nixpkgs/pkgs/games/openttd/default.nix +++ b/nixpkgs/pkgs/games/openttd/default.nix @@ -6,8 +6,8 @@ let opengfx = fetchzip { - url = "http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip"; - sha256 = "1sjzwl8wfdj0izlx2qdq15bqiy1vzq7gq7drydfwwryk173ig5sa"; + url = "http://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip"; + sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8"; }; opensfx = fetchzip { @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "0zq8xdg0k92p3s4j9x76591zaqz7k9ra69q008m209vdfffjvly2"; + url = "http://proxy.binaries.openttd.org/openttd-releases/${version}/${name}-source.tar.xz"; + sha256 = "06blx844q6a248jwzqlgi82692vvkmvb00bfdx4jhcwp9mayvza5"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/games/stuntrally/default.nix b/nixpkgs/pkgs/games/stuntrally/default.nix index c147bfb77ad7..3865d8fbef9e 100644 --- a/nixpkgs/pkgs/games/stuntrally/default.nix +++ b/nixpkgs/pkgs/games/stuntrally/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "stunt-rally-${version}"; - version = "2.6"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz"; - sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc"; + sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v"; }; tracks = fetchurl { url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz"; - sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb"; + sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs"; }; # include/OGRE/OgreException.h:265:126: error: invalid conversion from @@ -22,14 +22,10 @@ stdenv.mkDerivation rec { preConfigure = '' pushd data tar xf ${tracks} - mv tracks-2.6 tracks + mv tracks-${version} tracks popd ''; - patches = [ - ./gcc6.patch - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal diff --git a/nixpkgs/pkgs/games/stuntrally/gcc6.patch b/nixpkgs/pkgs/games/stuntrally/gcc6.patch deleted file mode 100644 index 6632ea4e8856..000000000000 --- a/nixpkgs/pkgs/games/stuntrally/gcc6.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp -index 834eac7..47ec647 100644 ---- i/source/ogre/CarModel_Create.cpp -+++ w/source/ogre/CarModel_Create.cpp -@@ -130,7 +130,8 @@ void CarModel::Load(int startId) - - /// load config .car - string pathCar; -- pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient); // force orig for newtorked games -+ string empty; -+ pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient)); // force orig for newtorked games - LoadConfig(pathCar); - - -diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp -index 76ed8e9..9444271 100644 ---- i/source/ogre/Gui_Tweak.cpp -+++ w/source/ogre/Gui_Tweak.cpp -@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar, - pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/", - pathUser = pathUserD + file; - -- if (pathSave) *pathSave = pathUser; -- if (pathSaveDir) *pathSaveDir = pathUserD; -+ if (pathSave != "") *pathSave = pathUser; -+ if (pathSaveDir != "") *pathSaveDir = pathUserD; - - if (!forceOrig && PATHMANAGER::FileExists(pathUser)) - { -diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp -index dd6dd48..083fa0c 100644 ---- i/source/vdrift/cartire.cpp -+++ w/source/vdrift/cartire.cpp -@@ -3,6 +3,7 @@ - #include "cardefs.h" - //#include "../ogre/common/Def_Str.h" - -+using namespace std; - - void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations) - { -diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp -index 338d122..e67c1db 100644 ---- i/source/vdrift/model_obj.cpp -+++ w/source/vdrift/model_obj.cpp -@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu - std::ofstream f(strFileName.c_str()); - if (!f) - { -- error_output << "Error opening file for writing: " << error_output << endl; -+ error_output << "Error opening file for writing: " << endl; - return false; - } - -diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h -index b21846a..c115fd6 100644 ---- i/source/vdrift/texture.h -+++ w/source/vdrift/texture.h -@@ -125,7 +125,7 @@ class TEXTURELIBRARY - bool FileExists(const std::string & filename) - { - std::ifstream f(filename.c_str()); -- return f; -+ return bool(f); - } - - public: diff --git a/nixpkgs/pkgs/games/torcs/default.nix b/nixpkgs/pkgs/games/torcs/default.nix index f1718201998c..7497084f8d02 100644 --- a/nixpkgs/pkgs/games/torcs/default.nix +++ b/nixpkgs/pkgs/games/torcs/default.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/gcc6-isnan.patch"; sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; }) (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/format-argument.patch"; sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; }) (fetchpatch { - url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch"; + url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/glibc-default-source.patch"; sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp"; }) ]; diff --git a/nixpkgs/pkgs/misc/acpilight/default.nix b/nixpkgs/pkgs/misc/acpilight/default.nix index 20efe6342859..e36e41885008 100644 --- a/nixpkgs/pkgs/misc/acpilight/default.nix +++ b/nixpkgs/pkgs/misc/acpilight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python36, udev, coreutils }: +{ stdenv, fetchgit, python3, udev, coreutils }: stdenv.mkDerivation rec { pname = "acpilight"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0kykrl71fb146vaq8207c3qp03h2djkn8hn6psryykk8gdzkv3xd"; }; - pyenv = python36.withPackages (pythonPackages: with pythonPackages; [ + pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ ConfigArgParse ]); diff --git a/nixpkgs/pkgs/misc/apulse/default.nix b/nixpkgs/pkgs/misc/apulse/default.nix index 58e50a50f0f9..273e358184d3 100644 --- a/nixpkgs/pkgs/misc/apulse/default.nix +++ b/nixpkgs/pkgs/misc/apulse/default.nix @@ -4,13 +4,13 @@ let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { - name = "apulse-${version}"; - version = "0.1.11.1"; + pname = "apulse"; + version = "0.1.12"; src = fetchFromGitHub { owner = "i-rinat"; - repo = "apulse"; - rev = "602b3a02b4b459d4652a3a0a836fab6f892d4080"; + repo = pname; + rev = "v${version}"; sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio emulation for ALSA"; - homepage = https://github.com/i-rinat/apulse; + homepage = "https://github.com/i-rinat/apulse"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix new file mode 100644 index 000000000000..872e49dc3c7a --- /dev/null +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -0,0 +1,116 @@ +{ stdenv, fetchurl, glibc, cups, libusb, libxml2, ghostscript, perl }: + +let + + arch = if stdenv.system == "x86_64-linux" + then "x86_64" + else "i386"; + +in stdenv.mkDerivation rec { + name = "samsung-unified-linux-driver-${version}"; + version = "1.00.36"; + + src = fetchurl { + sha256 = "1a7ngd03x0bkdl7pszy5zqqic0plxvdxqm5w7klr6hbdskx1lir9"; + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + }; + + buildInputs = [ + cups + libusb + libxml2 + perl + ]; + + installPhase = '' + + mkdir -p $out/bin + cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin + + mkdir -p $out/etc/sane.d/dll.d/ + install -m644 noarch/etc/smfp.conf $out/etc/sane.d + echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf + + mkdir -p $out/etc/smfp-common/scanner/share/ + install -m644 noarch/libsane-smfp.cfg $out/etc/smfp-common/scanner/share/ + install -m644 noarch/pagesize.xml $out/etc/smfp-common/scanner/share/ + + mkdir -p $out/etc/samsung/scanner/share/ + install -m644 noarch/oem.conf $out/etc/samsung/scanner/share/ + + mkdir -p $out/lib + install -m755 ${arch}/libscmssc.so* $out/lib + + mkdir -p $out/lib/cups/backend + ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend + + mkdir -p $out/lib/cups/filter + ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $ghostscript/bin/gs $out/lib/cups/filter + + mkdir -p $out/lib/sane + install -m755 ${arch}/libsane-smfp.so* $out/lib/sane + ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1 + ln -s libsane-smfp.so.1 $out/lib/sane/libsane-smfp.so + + perl -pi -e \ + 's|/opt/smfp-common/scanner/.usedby/|/tmp/\0\0fp-common/scanner/.usedby/|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 + perl -pi -e 's|/opt|/etc|g' \ + $out/lib/sane/libsane-smfp.so.1.0.1 \ + $out/bin/rastertospl \ + noarch/package_utils \ + noarch/pre_install.sh + + mkdir -p $out/lib/udev/rules.d + ( + OEM_FILE=noarch/oem.conf + INSTALL_LOG_FILE=/dev/null + . noarch/scripting_utils + . noarch/package_utils + . noarch/scanner-script.pkg + fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules + chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules + ) + + mkdir -p $out/share + cp -R noarch/share/* $out/share + gzip -9 $out/share/ppd/*.ppd + rm -r $out/share/locale/*/*/install.mo + + mkdir -p $out/share/cups + cd $out/share/cups + ln -s ../ppd . + ln -s ppd model + ''; + + preFixup = '' + for bin in "$out/bin/"*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin" + done + + patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "Unified Linux Driver for Samsung printers and scanners"; + homepage = http://www.bchemnet.com/suldr; + downloadPage = http://www.bchemnet.com/suldr/driver/; + license = licenses.unfree; + + # Tested on linux-x86_64. Might work on linux-i386. + # Probably won't work on anything else. + platforms = platforms.linux; + maintainers = with maintainers; [ tohl ]; + }; +} diff --git a/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix new file mode 100644 index 000000000000..e98da9de2b60 --- /dev/null +++ b/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/module.nix @@ -0,0 +1,44 @@ +# the original samsung-unified-linux-driver_1_00_36 has some paths +# hardcoded in binary files +# +# nixos samsung-unified-linux-driver_1_00_36 tries to fix those paths +# by patching the binaries +# +# this module is needed to put the expected files in the new paths +# +# printing works without problems +# +# scanning works, except one detail: sometimes it is possible to scan +# more pages in sequence. most of the time though, scanning stops +# working after one page. this problem happens both with scanimage +# and simple-scan. errors indicate an I/O error. scanning works +# again after turning the device off and on. atm i have no idea how +# to fix this and no time to do more about it. +{config, pkgs, lib ? pkgs.lib, ...}: +with lib; +let + cfg = config.services.samsung-unified-linux-driver_1_00_36; + pkg = pkgs.samsung-unified-linux-driver_1_00_36; +in { + options = { + services.samsung-unified-linux-driver_1_00_36 = { + enable = mkEnableOption "enable samsung-unified-linux-driver_1_00_36"; + }; + }; + config = mkIf cfg.enable { + services.printing.drivers = [pkg]; + hardware.sane.extraBackends = [pkg]; + environment.etc = { + "samsung/scanner/share/oem.conf".source + = "${pkg}/etc/samsung/scanner/share/oem.conf"; + "smfp-common/scanner/share/libsane-smfp.cfg".source + = "${pkg}/etc/smfp-common/scanner/share/libsane-smfp.cfg"; + "smfp-common/scanner/share/pagesize.xml".source + = "${pkg}/etc/smfp-common/scanner/share/pagesize.xml"; + "sane.d/smfp.conf".source + = "${pkg}/etc/sane.d/smfp.conf"; + "sane.d/dll.d/smfp-scanner.conf".source + = "${pkg}/etc/sane.d/dll.d/smfp-scanner.conf"; + }; + }; +} diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 34761df5ea14..d063ec912b97 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "cups-filters-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${name}.tar.xz"; - sha256 = "08szgpmac7xlf6vqkvg3pbphnrk2mal3gy382q2y3cm7k4plys3y"; + sha256 = "06gy3wv6p7kswz3mjn17f17mqpadvqj2riwc42kksnvp8x0h08cw"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/nixpkgs/pkgs/misc/drivers/hplip/default.nix index 789cb6fc4de0..ea9554288091 100644 --- a/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/nixpkgs/pkgs/misc/drivers/hplip/default.nix @@ -77,6 +77,7 @@ pythonPackages.buildPythonApplication { sip ] ++ stdenv.lib.optionals withQt5 [ pyqt5 + enum-compat ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index bd2be99a2843..77d9f5094d05 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -3,19 +3,19 @@ }: let - version = "1.1.0"; - rev = "a12239148332ca7a0b1c44a93e1585452d3631c9"; + version = "1.1.1"; + rev = "af12e2e4da586275ba931eae8f40a2201251bf59"; baseUrl = "https://emux.cc/versions/${stdenv.lib.substring 0 8 rev}/CCEmuX"; jar = if useCCTweaked then fetchurl { url = "${baseUrl}-cct.jar"; - sha256 = "1i767v3wnb8jsh7ciqqvw548pka1b8vl18k1rdv5dn21la6n0r1d"; + sha256 = "0d9gzi1h5vz32fp4lfn7dam189jcm7bwbqwmlpj0c47p8l0d4lsv"; } else fetchurl { url = "${baseUrl}-cc.jar"; - sha256 = "0x9hs814ln193cwybd565mcj6vhnii4wirkiz9na7vcas0y5vmmq"; + sha256 = "0ky5vxh8m1v98zllifxif8xxd25j2xdp19hjnj4xlkck71lbnb34"; }; desktopIcon = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix index 87893a931363..a57fda56ddd4 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,15 +1,20 @@ -{ callPackage, gtk3, glib, libxml2, gnuplot, makeWrapper, gnome3, gdk_pixbuf, librsvg, intltool }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "image-analyzer"; - pkgSha256 = "1pr23kxx83xp83h27fkdv86f3bxclkx056f9jx8jhnpn113xp7r2"; + pkgSha256 = "0by3nd5c413cvk3jmv3md6q0axbiidy061g9dhf37qzwgcakcx8j"; }; in callPackage pkg { - buildInputs = [ glib gtk3 libxml2 gnuplot (callPackage ./libmirage.nix {}) makeWrapper - gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool ]; + buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper + gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool + python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/image-analyzer \ + --set PYTHONPATH "$PYTHONPATH" \ + --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; }; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/client.nix b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix index ec4341a29459..dbf471d35d1d 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/client.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/client.nix @@ -1,11 +1,11 @@ -{ callPackage, pythonPackages, intltool, makeWrapper }: +{ callPackage, python3Packages, intltool, makeWrapper }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "cdemu-client"; - pkgSha256 = "0s6q923g5vkahw5fki6c7a25f68y78zfx4pfsy0xww0z1f5hfsik"; + pkgSha256 = "1d8m24qvv62xcwafw5zs4yf39vs64kxl4idqcngd8yyjhrb2ykg5"; }; in callPackage pkg { - buildInputs = [ pythonPackages.python pythonPackages.dbus-python pythonPackages.pygobject3 + buildInputs = [ python3Packages.python python3Packages.dbus-python python3Packages.pygobject3 intltool makeWrapper ]; drvParams = { postFixup = '' diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix index 587224e71d78..a80327ce91c0 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/daemon.nix @@ -1,9 +1,9 @@ -{ callPackage, glib, libao, intltool }: +{ callPackage, glib, libao, intltool, libmirage }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "cdemu-daemon"; - pkgSha256 = "0kxwhwjvcr40sjlrvln9gasjwkkfc3wxpcz0rxmffp92w8phz3s9"; + pkgSha256 = "0himyrhhfjsr4ff5aci7240bpm9x34h20pid412ci8fm16nk929b"; }; in callPackage pkg { - buildInputs = [ glib libao (callPackage ./libmirage.nix {}) intltool ]; + buildInputs = [ glib libao libmirage intltool ]; } diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix index 14560919b71a..331ad0ded248 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/gui.nix @@ -1,15 +1,17 @@ -{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gnome3, gdk_pixbuf, librsvg }: +{ callPackage, makeWrapper, gobject-introspection, cmake +, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }: let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.1"; pkgName = "gcdemu"; - pkgSha256 = "0rmnw302fk9vli22v54qx19lqxy23syxi154klxz2vma009q0p02"; + pkgSha256 = "0lmyvhbf57wcm8k2a33j2dhy4gblaiycy33q070gdrxi37xk7w5g"; }; - inherit (pythonPackages) python pygobject3; + inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.adwaita-icon-theme gdk_pixbuf librsvg ]; drvParams = { + nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' wrapProgram $out/bin/gcdemu \ --set PYTHONPATH "$PYTHONPATH" \ diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix index 3813ceef6115..0ead78305cd0 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,9 +1,18 @@ -{ callPackage, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool }: +{ callPackage, gobject-introspection, cmake, pkgconfig +, glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool +, pcre, utillinux, libselinux, libsepol }: + let pkg = import ./base.nix { - version = "3.1.0"; + version = "3.2.2"; pkgName = "libmirage"; - pkgSha256 = "0qvkvnvxqx8hqzcqzh7sqjzgbc1nrd91lzv33lr8c6fgaq8cqzmn"; + pkgSha256 = "0gwrfia0fyhi0b3p2pfyyvrcfcb0qysfzgpdqsqjqbx4xaqx5wpi"; }; in callPackage pkg { buildInputs = [ glib libsndfile zlib bzip2 lzma libsamplerate intltool ]; + drvParams = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + nativeBuildInputs = [ cmake gobject-introspection pkgconfig ]; + propagatedBuildInputs = [ pcre utillinux libselinux libsepol ]; + }; } diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix index 73ef7bc6a180..2ce3f606d733 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "vhba-${version}"; - version = "20170610"; + version = "20190302"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; - sha256 = "1v6r0bgx0a65vlh36b1l2965xybngbpga6rp54k4z74xk0zwjw3r"; + sha256 = "0wvxxc064i8czza91gh0dhmh55x2nbs7szzyh4g30w0c98hmc1n5"; }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/nixpkgs/pkgs/misc/emulators/hatari/default.nix b/nixpkgs/pkgs/misc/emulators/hatari/default.nix index 287df4db01be..3cb0f787ce76 100644 --- a/nixpkgs/pkgs/misc/emulators/hatari/default.nix +++ b/nixpkgs/pkgs/misc/emulators/hatari/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, SDL, cmake }: stdenv.mkDerivation rec { - name = "hatari-2.1.0"; + name = "hatari-2.2.1"; src = fetchurl { - url = "https://download.tuxfamily.org/hatari/2.1.0/${name}.tar.bz2"; - sha256 = "0909l9fq20ninf8xgv5qf0a5y64cpk5ja1rsk2iaid1dx5h98agb"; + url = "https://download.tuxfamily.org/hatari/2.2.1/${name}.tar.bz2"; + sha256 = "0q3g23vnx58w666723v76ilh9j353md3sn48cmlq9gkll8qfzbqi"; }; # For pthread_cancel diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index a3177b07f08b..32201c48ee98 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdsk-${version}"; - version = "1.5.9"; + version = "1.5.10"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; - sha256 = "1r0y07qd3zixi53vql5yqakvv77qm86s6qjwypk9ckggrp5r3w60"; + sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index 59f0252259cc..66e17fd3a7a3 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { name = "visualboyadvance-m-${version}"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1dppfvy24rgg3h84gv33l1y7zznkv3zxn2hf98w85pca6k1y2afz"; + sha256 = "03cs7wn01flx925sxhpz1j5sxa6s7wfxq71955kasn7a3xr1kxwn"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix index 10481c217851..a12d7d7d5acd 100644 --- a/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2 +, libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./urw-font-files.patch ./doc-no-ref.diff + (fetchpatch { + name = "CVE-2019-6116"; + url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=d3537a54740d78c5895ec83694a07b3e4f616f61"; + sha256 = "1hr8bpi87bbg1kvv28kflmfh1dhzxw66p9q0ddvbrj72qd86p3kx"; + }) ]; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix index 87762eb4b258..20ba1295c422 100644 --- a/nixpkgs/pkgs/misc/scrcpy/default.nix +++ b/nixpkgs/pkgs/misc/scrcpy/default.nix @@ -9,33 +9,30 @@ }: let - version = "1.5"; + version = "1.8"; prebuilt_server = fetchurl { - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar"; - sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr"; + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; + sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443"; }; in stdenv.mkDerivation rec { - name = "scrcpy-${version}"; + pname = "scrcpy"; inherit version; + src = fetchFromGitHub { owner = "Genymobile"; - repo = "scrcpy"; - rev = "v${version}-fixversion"; - sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i"; + repo = pname; + rev = "v${version}"; + sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7"; }; # postPatch: # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. # It would be better to fix the OpenGL problem, but that seems much more intrusive. - # - # command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally. postPatch = '' substituteInPlace app/src/screen.c \ --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" - substituteInPlace app/src/command.c \ - --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};' ''; nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ]; diff --git a/nixpkgs/pkgs/misc/themes/solarc/default.nix b/nixpkgs/pkgs/misc/themes/solarc/default.nix new file mode 100644 index 000000000000..55cd6e1dac04 --- /dev/null +++ b/nixpkgs/pkgs/misc/themes/solarc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, + gtk-engine-murrine, gtk3 +}: + +stdenv.mkDerivation rec { + name = "solarc-gtk-theme-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "schemar"; + repo = "solarc-theme"; + rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643"; + sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; + + buildPhase = '' + ./autogen.sh --prefix=$out + ''; + + meta = with stdenv.lib; { + description = "Solarized version of the Arc theme"; + homepage = https://github.com/schemar/solarc-theme; + license = licenses.gpl3; + maintainers = [ maintainers.bricewge ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 2e269e185e4d..8d1a8e64b61f 100644 --- a/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -228,6 +228,15 @@ in rec { dependencies = [ pkgs.urlview ]; }; + vim-tmux-navigator = mkDerivation { + pluginName = "vim-tmux-navigator"; + src = fetchgit { + url = "https://github.com/christoomey/vim-tmux-navigator"; + rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; + sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; + }; + }; + yank = mkDerivation { pluginName = "yank"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index e1746b675832..d66a79e4df91 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-03-13"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "80ef7ea2d0b22f0d8de7387a3d5bf6e9e5b72e9d"; - sha256 = "1i767mxfgwn804hwr088n9n9xmj49bwrvb8nv8qjxynqzp3hxsfb"; + rev = "cdf89f8269aec31d0dfddf3a2769027d72d38155"; + sha256 = "13zj7sahhan1w50jkncina979cyk3kca5ly68571bzccyzm8dazi"; }; }; @@ -127,12 +127,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2019-02-16"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "88d883cc89b2d13b3bae60aa294cef57067e17e2"; - sha256 = "0f6xa50r9fv9qhw8slfqq0g0p8y2zc08bpg09f2g0lp69gidi7rg"; + rev = "dec452fcf71c8d09c4029fe28d9ac12af935f6ac"; + sha256 = "1gsh0dibbwz7vypvc23h230x56n7i8a5y6c872lqflf2as62x0xr"; }; }; @@ -248,12 +248,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2018-09-19"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "7364a410bc4f0d7febc183678cd565066dfd1e73"; - sha256 = "1a14ddq6jkfklicdgkpbizzlrx2r4isxarbav5q86w86rwkx3jfi"; + rev = "792d6079d32f1973c142c6fab89d2fdc94019ac8"; + sha256 = "0bi2bmx0k6fwi1jwajgafbb750ajlzz1jncvvg0cssv6h5syxvpk"; fetchSubmodules = true; }; }; @@ -381,34 +381,34 @@ let denite-extra = buildVimPluginFrom2Nix { pname = "denite-extra"; - version = "2018-09-20"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-extra"; - rev = "57ab8e6d8756e294c12a6177bef0155b736eaf1f"; - sha256 = "0in7dg23gh6h39jjn84b2sqkcyd02dvv8pvnp6c3413dnjzmiryz"; + rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; + sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; }; }; denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2018-07-19"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "chemzqm"; repo = "denite-git"; - rev = "edd2c202e05c3f84e31b94a841fef236b923d559"; - sha256 = "0x8nf4x49859lgyi83vhqvpdhb1mxv55a9l8vbdflfagagj0gnzd"; + rev = "c86a6b2b22ac16544a8bccbefb608604f9252349"; + sha256 = "19rx46xd9hi7z1n9adxa9yf4ljv38jhwinplsszwlpcq518ac4i6"; }; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-03-17"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "885ca6711b25d77ef69f9704c847d940ceae41c9"; - sha256 = "0f5s51axdpwl5f041rxdl53h5ldysf80kqkx79hkx9f6022b80z5"; + rev = "280ea09f278d7301910e7b6abefccd75400bec0b"; + sha256 = "0dcmbmwh29svin6gn4x5carlgy9plax64p4w0f0cx69440zhl4r0"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-03-17"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a6ed6a909a238b1583b84496c60075f474421973"; - sha256 = "0s7qg4kzvj1sdc9b9adnxk4x0svnaxa6n7b2slajbbkxpj3bc1pi"; + rev = "19f1dc07f382534d16e5e21f2dddf5109d64ae68"; + sha256 = "1l9zpvh9hwbd32l2g8h0pq3xh5cixbmqdqznwrksx1da12v2w7aa"; }; }; @@ -527,12 +527,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2019-03-15"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "fbbf01311cec8aa8741564b361341c722379e9a8"; - sha256 = "1p0zx4r6v25qbq1avl2gyc4s3nsi9vkrp6vrq8kb3q2y1sx6r3p3"; + rev = "1dfd4d45eb169bba4a5d5a3a4210e663e4a18dfe"; + sha256 = "021qx04ka3w3w7wlv0p3lrpwxnlvxn0xkv7qwx6fk6594xfbaxi7"; }; }; @@ -550,12 +550,12 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2018-11-13"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "d22c0ba13afb554257a8c176962e2216cc18edd1"; - sha256 = "03lmbv4zkjdnyzrna7g9pqdgf3jqhi9g59fzjnay4af59hijs1v3"; + rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; + sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; }; }; @@ -584,23 +584,23 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-03-04"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "440ee9e14fc854cf5aeb0971e4ab8b9f5204fcb0"; - sha256 = "0dyw4d103h9cwxr2z19c6mj5sxprb47p865vknrf4yny9sdrqrcd"; + rev = "5526c8e9345f3c3953757bb13511e4bb49878456"; + sha256 = "18drq44lnh4d0pq6b30jiinlkylaq68llc0gyxvgpy6gy0k77gyk"; }; }; fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2019-01-13"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "6de79db47e6990c075ea0d05442a5cd4b6a650f2"; - sha256 = "1blsy9xfklviflnh2psn9xgnh1v9x4nnibfibmzsa0parpyczsfb"; + rev = "69d455dcf1ee40bf050a0d1e94f49f02bb2f4832"; + sha256 = "1hk9ir47c7rds3fya9vd2rsvc2mfj602fhqvz1h0acvxkqy34lsk"; }; }; @@ -838,23 +838,23 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2018-08-26"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1"; - sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm"; + rev = "e552c65165b42df79d462d9222ae022116bdb26a"; + sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5"; }; }; jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-02-24"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "1f7e661d9d29fa1485e781eaa97a4491f952e316"; - sha256 = "1x96bjw25kmwgi86h0ama4xl6qrbyk7yia5fiw9qkicy1j7yk7j1"; + rev = "f26b2a8802ad47406a0ab1e7b68234fa22d88891"; + sha256 = "01bbs70j5z00rn4bmf05zvl3mavyv8w6faj59z0mldvxnfidw2bb"; fetchSubmodules = true; }; }; @@ -1081,12 +1081,12 @@ let neocomplete-vim = buildVimPluginFrom2Nix { pname = "neocomplete-vim"; - version = "2018-11-19"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neocomplete.vim"; - rev = "d3b4d2860ec34648a2d6df4631718a6a7cfa5d40"; - sha256 = "0fqlnh2786wc9barmfz42z7qcp3cly82jhzrwhrx15z4sw4sbjsq"; + rev = "5f3e213c629b7fe1aa3723bf56fe3ead5555a526"; + sha256 = "1x5hnh7riv50c7ywnn2mch0rgks5r2y4k32y8bb616ld0xndaa4b"; }; }; @@ -1103,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-03-13"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f9c53c383596b2c12d0bba87ab92bb67042eca33"; - sha256 = "1avgffzc5dxs783kr0nvb2fr6vc8vy4ypqlk74vlfq534gkky68a"; + rev = "8db90526af3655e32f803e18176150f593cd08a6"; + sha256 = "0vv81hxc2f53299xvb8m0px6f0kpmmr4h5h6h5wzqyg7xixfjg0i"; }; }; @@ -1125,23 +1125,23 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-03-16"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "716a6a44a7d6d80cb2e5f90220d31bf25b960e68"; - sha256 = "0n6ppv3m7yrahsd5khyvshrh69swfv5s5anjk6n1vab26kmd1c2y"; + rev = "36c91c3b8f0f731b3ab6a3a01a9eb2e1be15ab86"; + sha256 = "0fkkssy38hcp23mgbwgkcnmhlnxj7iqn2iq39k8g7fbhhmnbixik"; }; }; neomru-vim = buildVimPluginFrom2Nix { pname = "neomru-vim"; - version = "2019-03-02"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neomru.vim"; - rev = "8ad581e0925ecefb94a7d2251803e9b3ba78818e"; - sha256 = "0nwvx6416z1vhp7wyh862ifzid1fmj6ld5nyj4inn7b9njg9v8p5"; + rev = "d3d47938fb3f3205bbb9eb8796a5da33f1d7c2cc"; + sha256 = "0cvj2y6i55x04rcv8cpvgy7grgc0rq7z2sxjxn6xxi0ligqpvjp7"; }; }; @@ -1191,12 +1191,12 @@ let neoyank-vim = buildVimPluginFrom2Nix { pname = "neoyank-vim"; - version = "2018-12-03"; + version = "2019-03-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "9ff9d9df82a7671c3ffd7735953d6cf269bac213"; - sha256 = "1jaiw86gvb6dnzwnzq7hp04cc3b9yibzw0z868izpnc1696hkb3d"; + rev = "6a41fd651c00b1ff6a6298cb2be088e8d27d3629"; + sha256 = "1p084xbycwkghfih41z1sc6nn2xi7471vj8zgc9jgw0qkxbmbcnn"; }; }; @@ -1213,12 +1213,12 @@ let nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-03-07"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "288669db1fa888947deaf715d7469233f476909f"; - sha256 = "0k5420f8y311c717ifamyhqhqzlca2y9sy7qw3z2np9z7ms5dask"; + rev = "7513f256aa1d59b6a749cefe5ac505375b1b8a6a"; + sha256 = "0163bvsmnnw598x2nyi9lzdk6akzj62cbsldp8prhl6d7x3gdmaf"; }; }; @@ -1244,6 +1244,17 @@ let }; }; + nord-vim = buildVimPluginFrom2Nix { + pname = "nord-vim"; + version = "2019-03-21"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-vim"; + rev = "bfa069b12b3af000b07eb23c01ff516bab452db7"; + sha256 = "1wyslhazi9vwnk3z68ibd4gswvc340mwnffg9lnpskqi56qpw005"; + }; + }; + nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -1312,12 +1323,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-02-27"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "c4a4dfdc21c14f58c12d077242ae33b729c894b2"; - sha256 = "01136926mr8z0b78srzvx6wkm8ipf3hv2vb8cj5sj8zgq6xs7kwg"; + rev = "6f34e06ac4b3e1ac7c5755a0216791066fbe74c8"; + sha256 = "13kdglkxdwxpmv0xwcwgzivb8x74bfypw2xn8w237niryvxg4y7z"; }; }; @@ -1455,12 +1466,12 @@ let Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-02-02"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "493d80ef7a4f16926d10b8c3923cf69c5209fe34"; - sha256 = "0nqs98g6lq45yrrlwgxckkgq90n73s7nibih2906s0zvsr1x95s8"; + rev = "abc1073aac08279523c35546e4a2c85cbd8d656d"; + sha256 = "11y6ha65j35cb73x6wdcwqs7k12lcdd38ygirsmhk4216mnl2p7f"; }; }; @@ -1521,12 +1532,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-02-18"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "fdb2d39fb04b139fcdb9b707f9b2ccc219566632"; - sha256 = "0vamhy95gkjybikcf5cifdd66scjf4wmjh2nw67f65n4narw1lps"; + rev = "2234f0d3f8204b44f30ff6eb3b6f7345c23aef92"; + sha256 = "1s0v14na6vlzazw95ssfcqkpylnqxaj7kh1qyni97ixiqqw7vrjw"; }; }; @@ -1708,12 +1719,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-01-08"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "d6466f6f281f920e178637882a2e6e4f40c3acc2"; - sha256 = "04fzg94y37hm917klzz2k0j26wacnf0848nwa8br9b9vx5a6ixnv"; + rev = "5915a1a3cef7c60dbea2ff50153417e5f6371952"; + sha256 = "1013d1rkdg6ddnsf0j033q0a14aq65jbv2wrkj1d6i5jr4zjh3f0"; }; }; @@ -1763,12 +1774,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-02-18"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "2bfc63174002903e350de418006eea83efcc8901"; - sha256 = "0k88j7k4jnjql98v55r70kw1igg2s2jaw5lvf9adi3pprsypszf8"; + rev = "1220a0ca044ce9a1622ec2aa60d0d9ef5e801cb4"; + sha256 = "0j7yhhgfl1ymqkl5lp9vqm3w9l2jkf863xpffw9f0ddmjmk3b7am"; }; }; @@ -1829,34 +1840,34 @@ let unite-vim = buildVimPluginFrom2Nix { pname = "unite-vim"; - version = "2019-02-02"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "b55994a18b19499f8de19cf7ea48670113a45e4f"; - sha256 = "1mcspmnd7qvscf1zxn0i7gzb4yxa5xcpg7piyvssx9nbb8w57jr1"; + rev = "e1d3bb9f836a8645807b790345b69666bf22bb2f"; + sha256 = "0i0lys3926s7n6iq03fg0flsp2rmvzwvfjmldcv31vjjrhzlbqmx"; }; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-03-06"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "bbb0826fc2641f2b0fc3beb2ce5fc506515a4ffb"; - sha256 = "1ribz8g5jfvq160957p8b98ihb1sh42w1k670s65i6i45vgkws9r"; + rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e"; + sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll"; }; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-03-16"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "f46e029b4a1cb16c014d8ddbf88e9d361fd2fcf0"; - sha256 = "1sh72zjjg12s6jx1vinj7j3mnx03mb4s44mpa4y62r78j48pfc0p"; + rev = "9b856347b905dc616baf02b48d7631bc3084726e"; + sha256 = "0w9aj42hb8x7601gbgf0ggs7p3sm5wrv23bnvrjgdlf3mapg6dwy"; }; }; @@ -2082,23 +2093,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-03-16"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b84e5485221096dc8c2bbc18f130e52265b367cc"; - sha256 = "0cflxpqiqs4dy0jplbciwy3v7ybxj1wmfijic0z6gvbcj6h0hxsv"; + rev = "86e73cade71651263715f21e58eed87cfed4518e"; + sha256 = "0xlvnzsnfkzg9qz5n87gvm75xlhgihf3y300zxvsyhk6ihnajyzp"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2018-11-15"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9"; - sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8"; + rev = "78cc30cb90b50fab024098bf2a55a4441665ff03"; + sha256 = "15mddh41vb44p1ppcsk3kb50fhqrlkdv4bmr2r7crny53cjfslh9"; }; }; @@ -2126,12 +2137,12 @@ let vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-02-26"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "d0ef603f037e8abf24ae1d959566722427a1bf92"; - sha256 = "12nqnvdhqv6wsksnd7hd3llw8vyxn0r8v98r0w1hsp7hw8mn1cgf"; + rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; + sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; }; }; @@ -2203,12 +2214,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2018-12-29"; + version = "2019-03-27"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "54d1eacb2e96f6862894bff53a48846b6470e870"; - sha256 = "1j88my182dwlvwrnfpkdgda4qgam28l7hdmmfgjh6h745ax0mghg"; + rev = "b4aafd5b0f7e5c2b44ba6d92a18196331ac1003a"; + sha256 = "0plr53xaavwwxvzk1rb724i1cpknh6z09zvbg2y0bgl5cj51b665"; }; }; @@ -2313,12 +2324,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-02-22"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "83808e891068490f2b2325e39edcde5c585bd4ea"; - sha256 = "18j3sa36zz5vx6hamdmjl25n7ilvh1q2fqfqs6casbdnqmmds1dy"; + rev = "3a23ac26fd68a2db158cbe3c2ebbae2c142861ce"; + sha256 = "1n324w9dxp9h7k1bg1hhad5f7pva05kns6mqd5d3yhsidfsxshlb"; }; }; @@ -2335,23 +2346,23 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2018-12-04"; + version = "2019-04-01"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "d33796c460229b2cf0dd09fedf1b272da9d13a42"; - sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd"; + rev = "ae60a79106dd32d75d3c5cf4dfe44fd658d634ec"; + sha256 = "1dpyavqhsn7japg5li2fflhn4rq5y5c5m24772550awzd5nx0bif"; }; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-02-28"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "929e0d0aa1139d483c070e4ee2a05f4a3425b0af"; - sha256 = "05js06pvrvjxpwhdp68hmzxskfacmkj2i15khav75f93rsih75dw"; + rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5"; + sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k"; }; }; @@ -2390,12 +2401,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2018-06-04"; + version = "2019-03-23"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "1a0244c90c3ff46219cf9597bb13662be4232407"; - sha256 = "1gsfn4fgivfg821wmnrdzpmqdimjkvkqi3gwr0nwf07ygjbr2csy"; + rev = "85e90c9759e14633d878ed534ef313876ab96555"; + sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq"; }; }; @@ -2423,12 +2434,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-03-13"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "d58efec5cef84c0a6eaeb0fea39e273ad438bd39"; - sha256 = "0djvnxirjjd9shyr76xy2saqbiw9albavddsc1vnsxw5hzlamfc9"; + rev = "d51d5f7eb5c46992ac718ac648e02e38322e073e"; + sha256 = "1n95zybvncfz5w4h77li22dcskb3xpf0jlfrw9g5ix80w1n41aar"; }; }; @@ -2489,12 +2500,12 @@ let vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2019-01-10"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "c6b43f88e4cbce052843e8cbd9593cc7753208fe"; - sha256 = "0z4c2n8b9vi19qqdmljyms173dmkiarlf4yxx1ix1wvqmnpcr6zf"; + rev = "ce9ac790430699d346aa074d7f339f2e738284e3"; + sha256 = "1dlpmsads32c8v49dqgnz1d06bh0aikgl1xq2whiimm2va9vfjng"; }; }; @@ -2511,12 +2522,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-03-01"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "bd0b87d36ad80e8acd94f22028d15ebb441b1c28"; - sha256 = "0ira81j7n2gvrpracag8393yxs5ya4wl8g5ygngl65qrk7y0bj0j"; + rev = "1b3668b89fee230c6025dc47c01c82fc1e282ac0"; + sha256 = "0b2z44cw71c0awlajcsln4b43kchhwlb90l461vq7ipmwp3wm8r1"; }; }; @@ -2577,34 +2588,34 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-03-17"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d769e0909d8a256f6e1031c98abaab71dc4eedce"; - sha256 = "0n6wl472rd2v6qiddpxs9bcg1fgpv1c5y3aax1njyvb1wic1yx35"; + rev = "f04098811b8a7aba3dba699ed98f6f6e39b7d7ac"; + sha256 = "01fsyyqlf1kygy4l3kbb1jcydgaqjmhhzbdf2liv3hx42signcqw"; }; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2018-09-13"; + version = "2019-03-30"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "65e01dd1f19a4cbaade139754d6e8c8cdf45c33a"; - sha256 = "14sjvspnfj5jxghh1vndaxfglr0ypnn59nzrhxnymf6q3g930vcl"; + rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; + sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; }; }; vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2019-03-15"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "e638f75a211885e4b48abe1809db18b108208ce0"; - sha256 = "150ijh9qpvvas9njb0nva58s91g06nbd2zxv9glvbirk75j9d3bc"; + rev = "1b31eeed2fd672300dc0c52ffbb23397c7243215"; + sha256 = "18i241a6v0mdzyznwr0al00zvnr0rqfz0khpjx730w6vk1whrp52"; }; }; @@ -2808,12 +2819,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-02-25"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "8450f06ec2c22bf33934728953b722a3847bbc18"; - sha256 = "0k6zxqd20n003baczgvqfvscblh4qg9lymc0w91pyz7lk336050h"; + rev = "24c896e13d9241024bdb79f48e811748654d7ba2"; + sha256 = "1c89n4rzjdq12h6wjz04np14hnd33i7fyrxlxv3yyl3hdcvs8bk1"; }; }; @@ -2875,12 +2886,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2019-01-18"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "c05db65464e26aef281d4c1e0006d0504f2f76d7"; - sha256 = "0kq44q1ays0wwlfb3yqrfji3bfxpvbsrpzpp9dcf84836p0fpr1j"; + rev = "fbb88789b531e1fc1abe25b2f44f4f4c8a73f14d"; + sha256 = "0661dnm0idaqy28pw03fznq5hpl2pbb4r0c1gvdmf59ywhsa2dav"; }; }; @@ -2930,12 +2941,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2018-11-06"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "e84959d05472ce2000883b1f73ea34302894bdb9"; - sha256 = "1w421wbshxic9yd5862i8c02a9xhnfidrkrj1xi7lxjh71r0kdlw"; + rev = "08f1389285902473a8b2de045c2d916fcc5affbc"; + sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1"; }; }; @@ -2952,12 +2963,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-03-16"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "16f4f994a0414766ee1f1da069eed5230e409b53"; - sha256 = "1wkv09g5i4wgv01q9lvr5bnmpd5ai0xng0yah06faqn56cnhbawi"; + rev = "b02690e167a1b49373245aabbedecd29aa470309"; + sha256 = "0gaqcjdq7rykp4hbac7ibfd3lr19vy9pnzwkn2cmnv18b5sjpbm1"; }; }; @@ -2974,12 +2985,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-02-28"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "691d961a643064ee1feddba8371ff12e44678f5a"; - sha256 = "0yhqszqjfbgyyqkw5ayl2732kdw71dq6s3yg3szcilz2h6z21m7c"; + rev = "a15334cac67237835e62c9dd1470f6162769779f"; + sha256 = "1bdi69ni1mgc9x67k8l886bch70jhi4hi5ram1habml4vklr82np"; }; }; @@ -3007,12 +3018,12 @@ let vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2019-02-21"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "9d40797a352b4e9e4ca36026ccb92fc379f0cffa"; - sha256 = "0pvmij11b5vdxl2dxpsf4qfyl3fify36npbphwl4jq664dz5akdz"; + rev = "8cb8e83ffb040f25cefa597f21608ca6a64aed70"; + sha256 = "1mdi0kbc1k4q8mw8f4anl819mgsll1sj38dd2w1a1lscg179j062"; }; }; @@ -3227,12 +3238,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-03-11"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "1d45a6d4f094127b113470d7710695b280224933"; - sha256 = "1lcvj5q8x0vmx8rnsn4aa2js7ihz99i1b5lj13vlws04rlaf3iga"; + rev = "a55b6aa3aa797c989a4979a13a5bd2ae11cfd4a5"; + sha256 = "0mgxbyz1yimavay54s6a5hv88d497qngp4i06g248d0qf3ivyvrv"; }; }; @@ -3293,12 +3304,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2019-03-01"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "a2bb7be01815dab286735928001a009bcdb0d946"; - sha256 = "1yrg74h2lha4h1c1gxxj2sy462gn6h000bikhfbqk6lmqk2x9afv"; + rev = "ed236e0e3fa9d4c5c286581ee68b6fa7d976674b"; + sha256 = "13gq9qrqdwyiwk6whv4ji77xswbwphji1zgrgiid9l27a9ald43s"; }; }; @@ -3326,23 +3337,23 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2018-11-16"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324"; - sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr"; + rev = "57a350e6327af0074c4bc0d30b62662dfdb993af"; + sha256 = "1vgcy8xc8v0g5g4h1h6dcl0ggg2rxp2pisxj04w5d78qf8b48njc"; }; }; vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2019-03-13"; + version = "2019-04-04"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "4abc4340abff09698fc5c8fe91dec87e3c3e2255"; - sha256 = "0nfhan8gwkv30k7wln2a5b4a144jihnl2hmb8jwrlhw11hh5nrlx"; + rev = "96d5db458f868255393fdc2732d6bef21a45c68f"; + sha256 = "1nv51c441d44igjcb3hlib1zbd65h98ywkjyp50hbz5rjkx17mvv"; }; }; @@ -3414,12 +3425,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-03-15"; + version = "2019-04-05"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "c38d4002e025b568fcd7c26f3fe68cc78c5a8f31"; - sha256 = "1hxbzj7nmf29n4s5nxqm7y7srcxgdl60x5h6mxmvng5b0c9hlbb4"; + rev = "f34fea0eff09d0fb4ec54aec3c07345e6c4486d9"; + sha256 = "0486sqmz33qcvizdicssp4lajgh2rv0sskz6rndpd7qnm54mn968"; }; }; @@ -3436,12 +3447,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-02-08"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "1ff17cc7e8eeaf660daa5efee9e66ef83e00e686"; - sha256 = "1mrgpkyarc6igd7anzlwpbis6cwsy759ssxapfxmj1q69hyvmdl6"; + rev = "9035bef4c91fd730d76b5fdc994f1dcdcef49405"; + sha256 = "1f65nq1hgvblm074hbqy647vixzhkimr1yhqjlrqg7mjiffrkr43"; }; }; @@ -3469,12 +3480,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-03-11"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "08f95628717ebca76e60643e76a84904a4520051"; - sha256 = "1bdmdi72zb87rjz6h03zkmvw2nvpqifsyx5imhz9lc7kjgw53k47"; + rev = "4214407a5eda0d49ad591e41b6eb91f4682fa81f"; + sha256 = "1jvbjnfwpqc53vp5plwyvqnkabi4h6d67sg4dg3byrfs3d0rpzmx"; }; }; @@ -3513,12 +3524,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-03-12"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "a56917282b58c047c64d560aada4029dafeb05ff"; - sha256 = "1g1imvyz34x75c6b9sr4r75ph0zbzy2gglq82mgld67vdpq14ww7"; + rev = "e4d35cc913336d4e17e147c88120e10f58562b4c"; + sha256 = "1kqx113dmsv8pm88g6lp8ahkyib78zln3iz4cls59r1803q1wf97"; }; }; @@ -3546,12 +3557,12 @@ let vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2018-07-23"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "597068870b8f093a8b2d11536c62ff31222ee8d0"; - sha256 = "080kcgb5ayxs49q1p1cms6k1byf2fzzy8bglnspr511m9fql5a9x"; + rev = "ca58a2d886cc18734c90c9665da4775d444b0c04"; + sha256 = "0d4jxp1ahwrwsk277yvkbk76jrhmv3bml83fivlxpj01224kdr2n"; }; }; @@ -3568,12 +3579,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-02-20"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "fdfcb85fb3765f6aede3e909401c24a65e318740"; - sha256 = "136xqj246rckpc01h5y3ax6mnrhb0i22api8wd2dlqsh53glp9p6"; + rev = "a40ef26c5cc1806d3faae829fa149506715ce56f"; + sha256 = "0fis0w3xpsg4wfss61vydic6zisg5bdyvb0wcaf5z4fs5sk380x6"; }; }; @@ -3601,23 +3612,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-03-13"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "e7cd4746946205ab03039f2d0d0af3c0d55d4c4d"; - sha256 = "0fv9w5hadyzp871p739mrjsfj0m4xang3lkz3gsv1cxw3iglkfld"; + rev = "a44bf0b1a142bb39e84e5d525f7d98b5d3a66057"; + sha256 = "12wyjfmwz3lsd45vv4ava361ph6gravggi9vvvr9qgf5zc1shd3b"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-03-12"; + version = "2019-03-29"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "d6ef5871ad7cbc73ee9b1bf1ff3a2b694aa3e3d4"; - sha256 = "0r36q8qqlpkv28byv62f0sqkj1pvnn58ay2c45mzh9awvc47qs76"; + rev = "3c151018ce62b526e0bb4261b416a892c3945dc1"; + sha256 = "0w4lh9l3fh3vfggy6am34vhh1844v3lqhv9fm22y9yvdjf995aa3"; }; }; @@ -3634,12 +3645,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2017-12-27"; + version = "2019-03-26"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "691cd3912ba318dbd8d9fa0035fee629b424766d"; - sha256 = "1mrdaah3iyg35v6cgvr3jav3386czialfcinwa3y9jy14basbqhd"; + rev = "f95b4a888a91cc9373cf2f801658287ff984592f"; + sha256 = "149zspfxdnp10lj8vv7lvbck8bascpxc1kxjqpn00wslw7rjs5yg"; }; }; @@ -3689,12 +3700,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-03-14"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "cb23e3f94abb9db01df5e57cc1ac23a4f42aa6a7"; - sha256 = "18jhlbs93qva5bdwl0j1p631r58j2ppaq9y9ka864m5hjbzvfnr6"; + rev = "e77923053fbce11323194ed04113b8d966be959c"; + sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak"; }; }; @@ -3722,34 +3733,34 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2018-11-11"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "e306929b27bea08ab505de7a4617e642b56b6dcd"; - sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16"; + rev = "c7b133a66ec9dcf2200d1d2a4a7ad38909c5f539"; + sha256 = "1bmpwh0lhdbh6z39w2i27rirc6iy3jd89gp47xmfmgvw7fk1szn4"; }; }; vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-03-13"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5ccfd1b31a290fdb5ee50a31f1629ed5df5cd8a4"; - sha256 = "0avldkcnl1nbz09lq58yrh9cw6gia5wyz3li1gck85j1cnhf1c8x"; + rev = "fdd56e0e1b0f9cafc0268076c4636f97ccd081dc"; + sha256 = "1b1m4d1dn1ymqrj6bbl44hnmf0rh93jipjlrrbk9gr3fc0x99xmh"; }; }; vim-watchdogs = buildVimPluginFrom2Nix { pname = "vim-watchdogs"; - version = "2017-12-03"; + version = "2019-04-03"; src = fetchFromGitHub { owner = "osyo-manga"; repo = "vim-watchdogs"; - rev = "a6415c2d928af8c1aacdbce9b1ed8d315891eb03"; - sha256 = "0n6aqsgn0q1qgpj4yznqwbsbbk2a077gnjlq86ii3jhkzh5fzcff"; + rev = "33d74aaeb1ef71512baff9eea20a42e06f4f0bc4"; + sha256 = "0jkkrlw9x524vvsggq51z0yyvys75dv2h21ijxzdqni49kf4vyhk"; }; }; @@ -3777,12 +3788,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2017-03-27"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "a85ebddb9038e6b05138c48868a319a9e13d1868"; - sha256 = "0v0wckkvsj3pd3a5lj35dqwlvgr1kfz0x6rpnx28mzrcg05p19fr"; + rev = "3c968fd4fd83d3631dec4c0caf289c85917d8ca9"; + sha256 = "17ncq06al2pzqxpx45bmh4b66d48y3kklxcd1f80jfsp9hh5v0vm"; }; }; @@ -3854,12 +3865,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-03-09"; + version = "2019-04-02"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3e23e22d1d15575c25e656503d3a650ad91d0ea4"; - sha256 = "15mwmfgl9w1j8bvida59k6hydgx2x7a78j611lhxrnm89fmkxfka"; + rev = "068ef61e6e9364093272edc4f0cf997a349c0a98"; + sha256 = "1p81l2ckl1s2xddzhd9fxjsv9a6vhz77gn5jxwlp0in284v2lp2i"; }; }; @@ -3876,12 +3887,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-03-09"; + version = "2019-03-24"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "5ab8f8672e6832da8f5a7eb371d2b24e8e0fff2c"; - sha256 = "0rcwng10l23gqbp3mc3i82vs56jzq5dikgcsj875bb9rhi23driy"; + rev = "6766c37ce09a623b3de7ddb86ca30278eea37a82"; + sha256 = "0qz4yx8l0mmwv3s3s4l03af32dymj4b1sz2x4fpdx42g04k1avy2"; }; }; @@ -3986,24 +3997,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-03-07"; + version = "2019-03-31"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "cad825d5af13a59a17fb10369c2d89508f4cae3e"; - sha256 = "197p0gs6x50kiwf6p4r3r5a1paz2lm089xb8zq0xvlab8fb6mfyy"; + rev = "2126e8306cd21a58fb5e089376af8272abe36bb5"; + sha256 = "08pdwq3cw7fszw75450z404ylcb5nni0p350jxsd7bd3vikdfxp9"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-03-14"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "299f8e48e7d34e780d24b4956cd61e4d42a139eb"; - sha256 = "1ix7qv2ijs2i49p6c654wvsqcar25w4w71m0f8i4n0bh7wgc1g33"; + rev = "25ebc0b9abb1b135c809ee850085a0305cbc5533"; + sha256 = "0jv8h8wx8486n8add2ispcr7np278rvdndb2az4s72plh59xk05d"; fetchSubmodules = true; }; }; @@ -4043,12 +4054,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-02-22"; + version = "2019-03-25"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "1036ba58daceb4df155f4b14485eb4864b4c7827"; - sha256 = "0023rdin6n4d1hyxslp3cdag41y4yby9b7ckxf14yxg66v5ylm54"; + rev = "d9b8d83369dac67214097fa79c9c504d6e1ede41"; + sha256 = "1nxlvaxnspmf5gwjm3scqhpj4a7y1db1062dskpxqjp5qnixacp2"; }; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 23914e02c01c..c3865fa1e00f 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -2,7 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchgit, fetchurl , llvmPackages, rustPlatform -, xkb-switch, fzf, skim +, xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake , gobject-introspection, glib, wrapGAppsHook @@ -405,4 +405,12 @@ self: super: { }; }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + 'g:stylish_haskell_command = "stylish-haskell"' \ + 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' + ''; + }); + } diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 101ac0a21121..ba153ea9bb5f 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim ap/vim-css-color +arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 bazelbuild/vim-bazel bbchung/clighter8 diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 9117364b8205..1c4c59f4ecb1 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vscode-utils }: +{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -52,5 +52,19 @@ rec { ms-python.python = callPackage ./python {}; + vscodevim.vim = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vim"; + publisher = "vscodevim"; + version = "1.3.0"; + sha256 = "18z24w7smjjnv945f8qyy6dl95xckyqa6gg3gijfcigvq5sgyawc"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + llvm-org.lldb-vscode = llvmPackages_8.lldb; + WakaTime.vscode-wakatime = callPackage ./wakatime {}; } diff --git a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix index df69cb7065ba..746eeef83668 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,13 +8,13 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.7"; - sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; + version = "1.2.13"; + sha256 = "0zidlc1flgw8h9l5ph98xh6anxhggk4vpmq6k1k2sfzrrjypymgf"; }; postPatch = '' - mkdir -p dist/wakatime-master - cp -rt dist/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir -p wakatime-master + cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/anbox/default.nix b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix new file mode 100644 index 000000000000..a21a0bb58bd8 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/anbox/default.nix @@ -0,0 +1,138 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl +, cmake, pkgconfig, dbus, makeWrapper +, gtest +, boost +, libcap +, systemd +, mesa +, libGL +, libglvnd +, glib +, git +, SDL2 +, SDL2_image +, properties-cpp +, protobuf +, protobufc +, python +, lxc +, writeText +, writeScript +, runtimeShell +}: + +let + + dbus-service = writeText "org.anbox.service" '' + [D-BUS Service] + Name=org.anbox + Exec=@out@/libexec/anbox-session-manager + ''; + + anbox-application-manager = writeScript "anbox-application-manager" '' + #!${runtimeShell} + + ${systemd}/bin/busctl --user call \ + org.freedesktop.DBus \ + /org/freedesktop/DBus \ + org.freedesktop.DBus \ + StartServiceByName "su" org.anbox 0 + + @out@/bin/anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity + ''; + +in + +stdenv.mkDerivation rec { + pname = "anbox"; + version = "unstable-2019-03-07"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "d521e282965462e82465045ab95d4ae1c4619685"; + sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz"; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + cmake pkgconfig dbus boost libcap gtest systemd mesa glib + SDL2 SDL2_image protobuf protobufc properties-cpp lxc python + libGL + ]; + + patchPhase = '' + patchShebangs scripts + + cat >cmake/FindGMock.cmake <<'EOF' + add_library(gtest INTERFACE) + target_include_directories(gtest INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT}) + add_dependencies(gtest GMock) + + add_library(gtest_main INTERFACE) + target_include_directories(gtest_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest) + + add_library(gmock INTERFACE) + target_include_directories(gmock INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest) + + add_library(gmock_main INTERFACE) + target_include_directories(gmock_main INTERFACE ${gtest.dev}/include) + target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main) + + set(GTEST_LIBRARIES gtest) + set(GTEST_MAIN_LIBRARIES gtest_main) + set(GMOCK_LIBRARIES gmock gmock_main) + set(GTEST_BOTH_LIBRARIES ''${GTEST_LIBRARIES} ''${GTEST_MAIN_LIBRARIES}) + EOF + ''; + + postInstall = '' + wrapProgram $out/bin/anbox \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ + --prefix PATH : ${git}/bin + + mkdir -p $out/share/dbus-1/services + substitute ${dbus-service} $out/share/dbus-1/services/org.anbox.service \ + --subst-var out + + mkdir $out/libexec + makeWrapper $out/bin/anbox $out/libexec/anbox-session-manager \ + --add-flags session-manager + + substitute ${anbox-application-manager} $out/bin/anbox-application-manager \ + --subst-var out + ''; + + passthru.image = let + imgroot = "https://build.anbox.io/android-images"; + in + { + armv7l-linux = fetchurl { + url = imgroot + "/2017/06/12/android_1_armhf.img"; + sha256 = "1za4q6vnj8wgphcqpvyq1r8jg6khz7v6b7h6ws1qkd5ljangf1w5"; + }; + aarch64-linux = fetchurl { + url = imgroot + "/2017/08/04/android_1_arm64.img"; + sha256 = "02yvgpx7n0w0ya64y5c7bdxilaiqj9z3s682l5s54vzfnm5a2bg5"; + }; + x86_64-linux = fetchurl { + url = imgroot + "/2018/07/19/android_amd64.img"; + sha256 = "1jlcda4q20w30cm9ikm6bjq01p547nigik1dz7m4v0aps4rws13b"; + }; + }.${stdenv.system} or null; + + meta = with stdenv.lib; { + homepage = https://anbox.io; + description = "Android in a box"; + license = licenses.gpl2; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "armv7l-linux" "aarch64-linux" "x86_64-linux" ]; + }; + +} diff --git a/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix new file mode 100644 index 000000000000..8a102996cab6 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/anbox/kmod.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, kernel, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "anbox-modules"; + version = "2018-09-08-" + kernel.version; + + src = fetchFromGitHub { + owner = "anbox"; + repo = "anbox-modules"; + rev = "27fd47e11ef6eef93738f8f3df3e42c88975544e"; + sha256 = "1hnf5x5swjcws6mnxmd3byll8l7qsxxj9pgki2k31rbmqqf2sb0x"; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + KERNEL_SRC="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + buildPhase = '' + for d in ashmem binder;do + cd $d + make + cd - + done + ''; + + installPhase = '' + modDir=$out/lib/modules/${kernel.modDirVersion}/kernel/updates/ + mkdir -p $modDir + for d in ashmem binder;do + mv $d/$d*.ko $modDir/. + done + ''; + + meta = with stdenv.lib; { + description = "Anbox ashmem and binder drivers."; + homepage = https://github.com/anbox/anbox-modules; + license = licenses.gpl2; + platforms = platforms.linux; + broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + maintainers = with maintainers; [ edwtjo ]; + }; + +} diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix index 1227d22916c9..671b13c4d79c 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.0"; + ver = "2019.1"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0sml6z90kpchmn61597j7yag97gk59fscz4xjxdfh9zycd3nfsn0"; + sha256 = "0nsi5g77zsl0s683r0hqz91xs2bz91ic9c1qdsa3ikd46z8s8lkj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix index b84338ed258b..44c975b8dcc1 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2019.0"; + ver = "2019.1"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0cdmb3zkjh8xcsicwyrimwzj8f4x3rjsfzk9im7695pkdw4j2xwr"; + sha256 = "14wp8rvm2m1r5qz7p1m08bzg2gmqyldkw1p6gk8rkdyqb3q0abg8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix index 52ef018cbfeb..c6e23be8b89d 100644 --- a/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2019.0"; in +let base = "batman-adv-2019.1"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1h5xxf6nkdhk9dxf3d4fsasmiahy0y7bhlicyhnppgfdf6kxi5ry"; + sha256 = "1af5q4631b72q0gg0xmhxx2k3adky2ahk4dq97k0436a0rg617dr"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix b/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix index 9acb011b4633..6ba86036a52a 100644 --- a/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cgmanager/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, libnih, dbus, pam }: +{ stdenv, fetchurl, pkgconfig, libnih, dbus, pam, popt }: stdenv.mkDerivation rec { - name = "cgmanager-0.41"; + pname = "cgmanager"; + version = "0.42"; src = fetchurl { - url = "https://linuxcontainers.org/downloads/cgmanager/${name}.tar.gz"; - sha256 = "0n5l4g78ifvyfnj8x9xz06mqn4y8j73sgg4xsbak7hiszfz5bc99"; + url = "https://linuxcontainers.org/downloads/${pname}/${pname}-${version}.tar.gz"; + sha256 = "15np08h9jrvc1y1iafr8v654mzgsv5hshzc0n4p3pbf0rkra3h7c"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libnih dbus pam ]; + buildInputs = [ libnih dbus pam popt ]; configureFlags = [ "--with-init-script=systemd" diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index df917888dc77..ee0a02763d14 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2019-02-13"; + version = "2019-03-12"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "710963fe53ee3f227556d36839df3858daf6e232"; - sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; + rev = "20190312"; + sha256 = "1wk8l75rg7idvsyli29a1fii4xwz3vnm8d65fjw8d3azihdrhbyy"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { # Firmware blobs do not need fixing and should not be modified dontFixup = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; - meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; homepage = http://packages.debian.org/sid/firmware-linux-nonfree; diff --git a/nixpkgs/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch b/nixpkgs/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch new file mode 100644 index 000000000000..7ce1b4f527ec --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/iputils/build-ninfod-with-openssl.patch @@ -0,0 +1,13 @@ +diff --git a/ninfod/meson.build b/ninfod/meson.build +index ea7ec1b..fada05b 100644 +--- a/ninfod/meson.build ++++ b/ninfod/meson.build +@@ -10,7 +10,7 @@ ninfod_sources = files(''' + ninfod_name.c + '''.split()) + executable('ninfod', [ninfod_sources, git_version_h], +- dependencies : [cap_dep, crypto_dep, rt_dep, threads], ++ dependencies : [cap_dep, dependency('openssl'), rt_dep, threads], + link_with : [libcommon], + include_directories : inc, + install: true, diff --git a/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index 2248f0329c60..223d5c4fe0fb 100644 --- a/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, fetchpatch -, libxslt, docbook_xsl, docbook_xml_dtd_44 -, libcap, nettle, libidn2, openssl +, meson, ninja, pkgconfig, gettext, libxslt, docbook_xsl_ns +, libcap, nettle, libidn2, openssl, systemd }: with stdenv.lib; let - time = "20180629"; + time = "20190324"; # ninfod probably could build on cross, but the Makefile doesn't pass --host # etc to the sub configure... withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; @@ -21,63 +21,37 @@ in stdenv.mkDerivation { owner = "iputils"; repo = "iputils"; rev = "s${time}"; - sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0"; + sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; }; - patches = [ - (fetchpatch { - name = "dont-hardcode-the-location-of-xsltproc.patch"; - url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch"; - sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx"; - }) - (fetchpatch { - name = "add-missing-idn-declarations.patch"; - url = "https://github.com/iputils/iputils/commit/5007d7067918fb3d950d34c01d059e5222db679a.patch"; - sha256 = "0dhgxdhjcbb2q6snm3mjp38l066knykmrx4k8rn167cizn7akpdx"; - }) - (fetchpatch { - name = "fix-ping-idn.patch"; - url = "https://github.com/iputils/iputils/commit/25899e849aa3abc1ad29ebf0b830262a859eaed5.patch"; - sha256 = "1bqjcdjjnc2j6indcli7s7gbbhkcaligvh94asixfrmjzkbn533n"; - }) - ]; - - prePatch = '' - substituteInPlace doc/custom-man.xsl \ - --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" - for xmlFile in doc/*.xml; do - substituteInPlace $xmlFile \ - --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" - done - ''; - - # Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111 - makeFlags = optional stdenv.hostPlatform.isMusl "USE_IDN=no"; - - nativeBuildInputs = [ libxslt.bin ]; - buildInputs = [ libcap nettle ] + # ninfod cannot be build with nettle yet: + patches = + [ ./build-ninfod-with-openssl.patch + (fetchpatch { # tracepath: fix musl build, again + url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; + sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; + }) + (fetchpatch { # doc: Use namespace correctly + url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; + sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; + }) + ]; + + mesonFlags = + [ "-DUSE_CRYPTO=nettle" + "-DBUILD_RARPD=true" + "-DBUILD_TRACEROUTE6=true" + "-Dsystemdunitdir=etc/systemd/system" + ] + ++ optional (!withNinfod) "-DBUILD_NINFOD=false" + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + + nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; + buildInputs = [ libcap nettle systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional withNinfod openssl; # TODO: Build with nettle - buildFlags = "man all" + optionalString withNinfod " ninfod"; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man8 - - for tool in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do - cp $tool $out/bin/ - cp doc/$tool.8 $out/share/man/man8/ - done - - # TODO: Requires kernel module pg3 - cp ipg $out/bin/ - cp doc/pg3.8 $out/share/man/man8/ - '' + optionalString withNinfod '' - cp ninfod/ninfod $out/bin/ - cp doc/ninfod.8 $out/share/man/man8/ - ''; - meta = { homepage = https://github.com/iputils/iputils; description = "A set of small useful utilities for Linux networking"; diff --git a/nixpkgs/pkgs/os-specific/linux/it87/default.nix b/nixpkgs/pkgs/os-specific/linux/it87/default.nix new file mode 100644 index 000000000000..c115eab1503e --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/it87/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "it87-${version}-${kernel.version}"; + version = "2018-08-14"; + + # The original was deleted from github, but this seems to be an active fork + src = fetchFromGitHub { + owner = "hannesha"; + repo = "it87"; + rev = "5515f5b78838cb6be551943ffef5d1792012724c"; + sha256 = "1ygi4mwds4q7byhg8gqnh3syamdj5rpjy3jj012k7vl54gdgrmgm"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + preConfigure = '' + sed -i 's|depmod|#depmod|' Makefile + ''; + + makeFlags = [ + "TARGET=${kernel.modDirVersion}" + "KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}" + "MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon" + ]; + + meta = with stdenv.lib; { + description = "Patched module for IT87xx superio chip sensors support"; + homepage = https://github.com/hannesha/it87; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ yorickvp ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 189110445792..5711e019f95b 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -240,7 +240,7 @@ let FANOTIFY = yes; TMPFS = yes; TMPFS_POSIX_ACL = yes; - FS_ENCRYPTION = { optional = true; tristate = whenAtLeast "4.9" "m"; }; + FS_ENCRYPTION = if (versionAtLeast version "5.1") then yes else whenAtLeast "4.9" (option module); EXT2_FS_XATTR = yes; EXT2_FS_POSIX_ACL = yes; @@ -681,6 +681,9 @@ let HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support + # Enable AMD's ROCm GPU compute stack + HSA_AMD = whenAtLeast "4.20" yes; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable memory hotplug support # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index f2c50942648e..89639d34a6c3 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.107"; + version = "4.14.110"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1x2fkcgywiyzjynnz9pldp20nz97zbkpylj3wh1rsfcf8q0hz3g4"; + sha256 = "0wlysm6j8mmfwcja8pxg6a5c611m3x597591hswpm2nwcja3bslr"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index dea1e7909c7c..d043a18844b1 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.30"; + version = "4.19.33"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hkhxbdxck1hc9hbja5afshmd4afngi4haff57vammrkxfc0jkpy"; + sha256 = "14yk5hli62q1g8vghjjghbxjkpxns8zp0l2wmyhlx0v21bx2v89r"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.20.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.20.nix deleted file mode 100644 index 24db21a536d6..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.20.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "4.20.17"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version))); - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0glabx4v5pgyfwslllbv2qaz5ah492sq1w7bbz0x905r55b284fh"; - }; -} // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 0b5c5f3e095d..1698c9d70942 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.176"; + version = "4.4.178"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pf7y4dcnf4mn11wgjd65v09kx3p712ky50w6vrn45v9m80m9ni7"; + sha256 = "0g84g808v7zjnfm1nh7ba0swa4n2bfw8m7h5qgmknjwrnwi8qnf3"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4c8e7f6139c6..f583ced1a631 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.164"; + version = "4.9.167"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rzqfcz3zlc86n7df1rmpgpdbk388vbcqm571q890lrsimsrixdd"; + sha256 = "130a7z31sdha84w67vfx0j1sq68v15aksfkcshz219p75y561f52"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix index d0c7c6439c2f..4038a89f6c63 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.3"; + version = "5.0.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "12gzpz53kgznk5xg2cgbhfrgxflbx5zsnbpwki8zsjvq59wk7ma0"; + sha256 = "04zl3xqgr6rlkc44raz3rz74ag7l5j16wkvkdmlzrdq7ia6rljly"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 7375daf61da5..d96853eb7cfc 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,10 +1,11 @@ -{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, ... } @ args: - -buildLinux (rec { - mptcpVersion = "0.94.1"; - modDirVersion = "4.14.70"; +{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args: +let + mptcpVersion = "0.94.3"; + modDirVersion = "4.14.105"; +in +buildLinux ({ version = "${modDirVersion}-mptcp_v${mptcpVersion}"; - # autoModules= true; + inherit modDirVersion; extraMeta = { branch = "4.4"; @@ -15,32 +16,34 @@ buildLinux (rec { owner = "multipath-tcp"; repo = "mptcp"; rev = "v${mptcpVersion}"; - sha256 = "13mi672jr1x463kzig1hi9cpdi8x6nqdfd4bqlrjn8zca48f4ln4"; + sha256 = "1pic86icrlmxajw4hkqyljha8a3k4w9kb5z74xj4yiyapmk9wprm"; }; - extraConfig = '' - IPV6 y - MPTCP y - IP_MULTIPLE_TABLES y + structuredExtraConfig = with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; }; + stdenv.lib.mkMerge [ { + IPV6 = yes; + MPTCP = yes; + IP_MULTIPLE_TABLES = yes; # Enable advanced path-managers... - MPTCP_PM_ADVANCED y - MPTCP_FULLMESH y - MPTCP_NDIFFPORTS y + MPTCP_PM_ADVANCED = yes; + MPTCP_FULLMESH = yes; + MPTCP_NDIFFPORTS = yes; # ... but use none by default. # The default is safer if source policy routing is not setup. - DEFAULT_DUMMY y - DEFAULT_MPTCP_PM default + DEFAULT_DUMMY = yes; + DEFAULT_MPTCP_PM.freeform = "default"; # MPTCP scheduler selection. - MPTCP_SCHED_ADVANCED y - DEFAULT_MPTCP_SCHED default + MPTCP_SCHED_ADVANCED = yes; + DEFAULT_MPTCP_SCHED.freeform = "default"; # Smarter TCP congestion controllers - TCP_CONG_LIA m - TCP_CONG_OLIA m - TCP_CONG_WVEGAS m - TCP_CONG_BALIA m - - '' + (args.extraConfig or ""); + TCP_CONG_LIA = module; + TCP_CONG_OLIA = module; + TCP_CONG_WVEGAS = module; + TCP_CONG_BALIA = module; + } + structuredExtraConfig + ]; } // args) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 375a71789bee..fde9e560c46f 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc8"; - modDirVersion = "5.0.0-rc8"; - extraMeta.branch = "5.0"; + version = "5.1-rc3"; + modDirVersion = "5.1.0-rc3"; + extraMeta.branch = "5.1"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1i58jljwc2y58ggahmh5643h3nckf3k00d0qnni4s9z1xw3w143p"; + sha256 = "1nc5h0rfd40wfp8ld0d6n90haxp4xqcapwkg4vgn2m0c6dcspl2n"; }; # Should the testing kernels ever be built on Hydra? diff --git a/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix index 3c8c71bdde57..018f8c624350 100644 --- a/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev }: +{ stdenv, fetchurl, pkgconfig, udev, buildPackages }: stdenv.mkDerivation rec { name = "libatasmart-0.19"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ udev ]; diff --git a/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix index edba8b090df8..5dab4b34f466 100644 --- a/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libratbag/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libratbag-${version}"; - version = "0.9.904"; + version = "0.9.905"; src = fetchFromGitHub { owner = "libratbag"; repo = "libratbag"; rev = "v${version}"; - sha256 = "0d2gw4bviy6zf1q9a18chlsbqylhppbby336fznh6nkpdl3jckfd"; + sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix new file mode 100644 index 000000000000..c215d9401940 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -0,0 +1,19 @@ +{ stdenv, solaar }: + +# ltunifi and solaar both provide udev rules but solaar's rules are more +# up-to-date so we simply use that instead of having to maintain our own rules + +stdenv.mkDerivation rec { + name = "logitech-udev-rules-${version}"; + inherit (solaar) version; + + buildCommand = '' + install -Dm644 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules + ''; + + meta = with stdenv.lib; { + description = "udev rules for Logitech devices"; + inherit (solaar.meta) homepage license platforms; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix index c0e8e1292330..394dbf63f170 100644 --- a/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "161"; + version = "162"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "1bqz53xgvwab3r487ihri3nvk7nsgjykdv8m993983vxsi2bgjmz"; + sha256 = "1zxj545wslp92npll0411grc49l53cgp8dqqn3zb4vcxrvfc4vh9"; }; postPatch = '' diff --git a/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index cbcab06f56ad..2af0e60b9c1a 100644 --- a/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, libarchive, iucode-tool }: +{ stdenv, fetchFromGitHub, libarchive, iucode-tool }: stdenv.mkDerivation rec { - name = "microcode-intel-${version}"; - version = "20180807a"; - - src = fetchurl { - url = "https://downloadmirror.intel.com/28087/eng/microcode-${version}.tgz"; - sha256 = "0dw1akgzdqk95pwmc8gfdmv7kabw9pn4c67f076bcbn4krliias6"; + pname = "microcode-intel"; + version = "20190312"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "Intel-Linux-Processor-Microcode-Data-Files"; + rev = "microcode-${version}"; + sha256 = "0n381dai2mv9indsbbr4nfbmp4y4qhshgflr095fyvq5a8acw94m"; }; nativeBuildInputs = [ iucode-tool libarchive ]; - sourceRoot = "."; - installPhase = '' runHook preInstall diff --git a/nixpkgs/pkgs/os-specific/linux/netatop/default.nix b/nixpkgs/pkgs/os-specific/linux/netatop/default.nix index 8dbacc46154f..718cf4815baf 100644 --- a/nixpkgs/pkgs/os-specific/linux/netatop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/netatop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel, zlib }: let - version = "1.0"; + version = "2.0"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.atoptool.nl/download/netatop-${version}.tar.gz"; - sha256 = "1l7xs3hnfbk6h5gdrw1ikfa0fvfpb5vd447xhwfllvicblqyip8b"; + sha256 = "03n248p1l3ps7gj2hdlcbrb1fsw1zcmgzypj4j4l4rynjjh7qvf6"; }; buildInputs = [ zlib ]; @@ -38,6 +38,5 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/powertop/default.nix b/nixpkgs/pkgs/os-specific/linux/powertop/default.nix index 54fdfb354d1f..691b216073fd 100644 --- a/nixpkgs/pkgs/os-specific/linux/powertop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/powertop/default.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } - ); + ) ++ [ + # Fix vertical scrolling, see: https://lists.01.org/pipermail/powertop/2019-March/002046.html + ./fix-vertical-scrolling.patch + ]; postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" diff --git a/nixpkgs/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch b/nixpkgs/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch new file mode 100644 index 000000000000..b9b3fdbaf343 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/powertop/fix-vertical-scrolling.patch @@ -0,0 +1,13 @@ +diff --git a/src/display.cpp b/src/display.cpp +index 07227c5..7b3a7a2 100644 +--- a/src/display.cpp ++++ b/src/display.cpp +@@ -244,7 +244,7 @@ void cursor_down(void) + w = tab_windows[tab_names[current_tab]]; + if (w) { + if (w->ypad_pos < 1000) { +- if (tab_names[current_tab] == "Tunables" || "WakeUp") { ++ if (tab_names[current_tab] == "Tunables" || tab_names[current_tab] == "WakeUp") { + if ((w->cursor_pos + 7) >= LINES) { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, + 1, 0, LINES - 3, COLS - 1); diff --git a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index ea52fbf08e78..192e1d61e43e 100644 --- a/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "22.1"; + version = "23"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04772rsn5a0gr4yss63fk35zfl05hz2l27q9yva922i8qq38f90a"; + sha256 = "1n0v075ndczwrc87b70vxhx42nv1p953cqycmgnz334790zg002g"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; diff --git a/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/nixpkgs/pkgs/os-specific/linux/setools/default.nix index 89375563ae67..039d875060a2 100644 --- a/nixpkgs/pkgs/os-specific/linux/setools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/setools/default.nix @@ -17,8 +17,8 @@ buildPythonApplication rec { sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; }; - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libsepol swig ]; + nativeBuildInputs = [ bison flex swig ]; + buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; diff --git a/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index 79a79ac34a0f..fdde2bedf552 100644 --- a/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -12,21 +12,13 @@ let in stdenv.mkDerivation rec { name = "sssd-${version}"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; - sha256 = "1i2fq37w0k71xwqcq1i4l3nglmwybc4694xbrccrih33qsh1fpgf"; + sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; - patches = [ - (fetchpatch { - name = "duplicate-case-value.diff"; - url = "https://github.com/SSSD/sssd/commit/1ee12b05570fcfb8.diff"; - sha256 = "01y8i8cfs2gydn84097cl5fynx0db8b0vr345gh57ypp84in3ixw"; - }) - ]; - # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h> NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 2f873f34b885..d54972c055be 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -34,10 +34,12 @@ in stdenv.mkDerivation rec { # Upstream's maintenance branches are still too intrusive: # https://github.com/systemd/systemd-stable/tree/v239-stable patches-deb = fetchurl { - # When the URL disappears, it typically means that Debian has new patches - # (probably security) and updating to new tarball will apply them as well. + # This URL should point to a stable location that does not easily + # disappear. In the past we were using `mirror://debian` but that + # eventually causes the files to disappear. While that was a good sign + # for us to update our patch collection it does break reproducibility. name = "systemd-debian-patches.tar.xz"; - url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz; + url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz; sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg"; }; # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/* diff --git a/nixpkgs/pkgs/servers/apache-kafka/default.nix b/nixpkgs/pkgs/servers/apache-kafka/default.nix index 348a9a88566b..8b65fa65f22b 100644 --- a/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/nixpkgs/pkgs/servers/apache-kafka/default.nix @@ -34,9 +34,14 @@ let sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl"; }; "2.1" = { - kafkaVersion = "2.1.0"; + kafkaVersion = "2.1.1"; scalaVersion = "2.12"; - sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7"; + sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0"; + }; + "2.2" = { + kafkaVersion = "2.2.0"; + scalaVersion = "2.12"; + sha256 = "09q028kagpkzrvfdb040z8q9mspv8n7f2igrd1cs73v7mr7n42d0"; }; }; in diff --git a/nixpkgs/pkgs/servers/asterisk/default.nix b/nixpkgs/pkgs/servers/asterisk/default.nix index 37f93c8e87e8..1b9f1e698d4d 100644 --- a/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/nixpkgs/pkgs/servers/asterisk/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, fetchsvn, - jansson, libxml2, libxslt, ncurses, openssl, sqlite, + jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl, iksemel + srtp, wget, curl, iksemel, pkgconfig }: let @@ -10,7 +10,11 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ]; + buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite + dmidecode libuuid newt + lua speex + srtp wget curl iksemel ]; + nativeBuildInputs = [ utillinux pkgconfig ]; patches = [ # We want the Makefile to install the default /var skeleton @@ -39,8 +43,11 @@ let # you're likely missing an automatically downloaded dependency preConfigure = '' mkdir externals_cache - '' + lib.concatStringsSep "\n" - (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + '' + + ${lib.concatStringsSep "\n" + (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals)} + + ${lib.optionalString (externals ? "addons/mp3") "bash contrib/scripts/get_mp3_source.sh || true"} chmod -w externals_cache ''; @@ -53,7 +60,9 @@ let preBuild = '' make menuselect.makeopts - substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ${lib.optionalString (externals ? "addons/mp3") '' + substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ''} ''; postInstall = '' @@ -69,56 +78,78 @@ let }; }; - pjproject-27 = fetchurl { + pjproject_2_7_1 = fetchurl { url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; + pjproject_2_8 = fetchurl { + url = http://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2; + sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; + }; + mp3-202 = fetchsvn { url = http://svn.digium.com/svn/thirdparty/mp3/trunk; rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; -in -{ +in rec { + # Supported releases (as of 2018-11-20). + # + # Series Type Rel. Date Sec. Fixes EOL + # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 + # 15.x Standard 2017-10-03 2018-10-03 2019-10-03 + asterisk-stable = asterisk_15; + # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 + asterisk-lts = asterisk_16; + asterisk = asterisk_16; + + asterisk_13 = common { + version = "13.24.1"; + sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3"; + externals = { + "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1; + "addons/mp3" = mp3-202; + }; + }; - asterisk-lts = common { - version = "13.20.0"; - sha256 = "a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5"; + asterisk_15 = common { + version = "15.7.0"; + sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv"; externals = { - "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; + "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; "addons/mp3" = mp3-202; }; }; - asterisk-stable = common { - version = "15.3.0"; - sha256 = "f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c"; + asterisk_16 = common { + version = "16.1.1"; + sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv"; externals = { - "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; + "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; "addons/mp3" = mp3-202; }; }; - # asterisk-git = common { - # version = "15-pre"; - # sha256 = "..."; - # externals = { + #asterisk-git = common { + # version = "15-pre"; + # sha256 = "..."; + # externals = { # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; - # Note that these sounds are included with the release tarball. They are - # provided here verbatim for the convenience of anyone wanting to build - # Asterisk from other sources. Include in externals. - # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; - # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; - # }; - # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; - # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; - # }; - # TODO: Sounds for other languages could be added here - # } - # }.overrideDerivation (_: {src = fetchgit {...}}) + # # Note that these sounds are included with the release tarball. They are + # # provided here verbatim for the convenience of anyone wanting to build + # # Asterisk from other sources. Include in externals. + # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; + # }; + # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; + # }; + # # TODO: Sounds for other languages could be added here + # } + #}.overrideDerivation (_: {src = fetchgit {...}}) } diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index 586b51ee346d..f7b39c3cf7c6 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.14.1"; + version = "6.14.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${name}.tar.gz"; - sha256 = "1pmxfikkydfi2m0bx1rgaj1ijhwh84zwwxkpw1f0vryvkl7av2gz"; + sha256 = "012lh2838l2n7wkj42isxspxw3ix54467vnzvxbsq8wnf2m367ln"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 5ae985ca0488..7a01342e5ac0 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.5.2"; + version = "18.08.6.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0x1pdq58sdf0m28cai0lcyzvhhjl7l85gq324pwh8fi3zy2h0n4k"; + sha256 = "0py1795jrgip00k46gr9f9y49gpv5478kc3v68d90nl158fngixc"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/dns/nsd/default.nix b/nixpkgs/pkgs/servers/dns/nsd/default.nix index 8c0fc7377661..4b86ccbdfe6e 100644 --- a/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.26"; + name = "nsd-4.1.27"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1x0mvj4872dzj1rr9adnchdm4dhn41xmc459p5j4s0r13m1l32lz"; + sha256 = "1sjfbwr4vq25304hr9vmd9j821g2vzv8lpy95hpsravc80q5zaqv"; }; prePatch = '' diff --git a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index e8603d249421..0e5ea98f30e8 100644 --- a/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pdns-recursor-${version}"; - version = "4.1.11"; + version = "4.1.12"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "0w6nyjiid8d9rv6qsq42x210val6lqrm9shpid4s8gjxahmxbiwy"; + sha256 = "1j5hrpz4c9dqd30piqd8xyjmirdxp4dy71nx9rwq8l4i4nc0l774"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/dns/powerdns/default.nix b/nixpkgs/pkgs/servers/dns/powerdns/default.nix index fff678395319..722ae26b166a 100644 --- a/nixpkgs/pkgs/servers/dns/powerdns/default.nix +++ b/nixpkgs/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "powerdns-${version}"; - version = "4.1.6"; + version = "4.1.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0ggpcvzj90a31qf71m8788ql0hbxnkb9y6c3wgqr9l0qwv8dsgpm"; + sha256 = "11c4r0mbq6ybbihm0jbl9hspb01pj1gi6x3m374liw9jij7dw8b4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix index 42faa01db480..ca8ddbc7af33 100644 --- a/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix +++ b/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix @@ -23,6 +23,14 @@ let }; }); + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.10"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"; + }; + }); + aiohttp-jinja2 = super.aiohttp-jinja2.overridePythonAttrs (oldAttrs: rec { version = "0.15.0"; src = oldAttrs.src.override { @@ -31,16 +39,24 @@ let }; }); + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95"; + }; + }); + }; }; in python.pkgs.buildPythonApplication rec { pname = "appdaemon"; - version = "3.0.2"; + version = "3.0.4"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "c32d9139566cc8147c39196a18c317accd1f0b2ef8e6c0ff31bddd4bc0f80bd3"; + sha256 = "e2393b5e0bb34e94e61f5debc95ad74c1c6929635b74bf8ba15c22b40cbdec69"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 046aa1bb4251..26dd0fa877b6 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.89.2"; + version = "0.91.1"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; @@ -13,33 +13,29 @@ "abode.lock" = ps: with ps; [ ]; "abode.sensor" = ps: with ps; [ ]; "abode.switch" = ps: with ps; [ ]; + "acer_projector" = ps: with ps; [ ]; + "acer_projector.switch" = ps: with ps; [ pyserial ]; + "actiontec" = ps: with ps; [ ]; + "actiontec.device_tracker" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; "ads.binary_sensor" = ps: with ps; [ ]; "ads.light" = ps: with ps; [ ]; "ads.sensor" = ps: with ps; [ ]; "ads.switch" = ps: with ps; [ ]; + "aftership" = ps: with ps; [ ]; + "aftership.sensor" = ps: with ps; [ ]; "air_quality" = ps: with ps; [ ]; - "air_quality.demo" = ps: with ps; [ ]; - "air_quality.nilu" = ps: with ps; [ ]; - "air_quality.norway_air" = ps: with ps; [ ]; - "air_quality.opensensemap" = ps: with ps; [ ]; + "airvisual" = ps: with ps; [ ]; + "airvisual.sensor" = ps: with ps; [ pyairvisual ]; + "aladdin_connect" = ps: with ps; [ ]; + "aladdin_connect.cover" = ps: with ps; [ ]; "alarm_control_panel" = ps: with ps; [ ]; - "alarm_control_panel.alarmdotcom" = ps: with ps; [ ]; - "alarm_control_panel.canary" = ps: with ps; [ ]; - "alarm_control_panel.concord232" = ps: with ps; [ ]; - "alarm_control_panel.demo" = ps: with ps; [ ]; - "alarm_control_panel.ialarm" = ps: with ps; [ ]; - "alarm_control_panel.manual" = ps: with ps; [ ]; - "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; - "alarm_control_panel.ness_alarm" = ps: with ps; [ ]; - "alarm_control_panel.nx584" = ps: with ps; [ ]; - "alarm_control_panel.spc" = ps: with ps; [ ]; - "alarm_control_panel.totalconnect" = ps: with ps; [ ]; - "alarm_control_panel.yale_smart_alarm" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; "alarmdecoder.alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder.binary_sensor" = ps: with ps; [ ]; "alarmdecoder.sensor" = ps: with ps; [ ]; + "alarmdotcom" = ps: with ps; [ ]; + "alarmdotcom.alarm_control_panel" = ps: with ps; [ ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; "alexa.auth" = ps: with ps; [ ]; @@ -47,6 +43,10 @@ "alexa.flash_briefings" = ps: with ps; [ ]; "alexa.intent" = ps: with ps; [ ]; "alexa.smart_home" = ps: with ps; [ ]; + "alpha_vantage" = ps: with ps; [ ]; + "alpha_vantage.sensor" = ps: with ps; [ ]; + "amazon_polly" = ps: with ps; [ ]; + "amazon_polly.tts" = ps: with ps; [ boto3 ]; "ambient_station" = ps: with ps; [ ]; "ambient_station.binary_sensor" = ps: with ps; [ ]; "ambient_station.config_flow" = ps: with ps; [ ]; @@ -60,34 +60,61 @@ "android_ip_webcam.binary_sensor" = ps: with ps; [ ]; "android_ip_webcam.sensor" = ps: with ps; [ ]; "android_ip_webcam.switch" = ps: with ps; [ ]; + "androidtv" = ps: with ps; [ ]; + "androidtv.media_player" = ps: with ps; [ ]; + "anel_pwrctrl" = ps: with ps; [ ]; + "anel_pwrctrl.switch" = ps: with ps; [ ]; + "anthemav" = ps: with ps; [ ]; + "anthemav.media_player" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; "apcupsd.binary_sensor" = ps: with ps; [ ]; "apcupsd.sensor" = ps: with ps; [ ]; "api" = ps: with ps; [ aiohttp-cors ]; + "api_streams" = ps: with ps; [ ]; + "apns" = ps: with ps; [ ]; + "apns.notify" = ps: with ps; [ ]; "apple_tv" = ps: with ps; [ pyatv ]; "apple_tv.media_player" = ps: with ps; [ pyatv ]; "apple_tv.remote" = ps: with ps; [ pyatv ]; "aqualogic" = ps: with ps; [ ]; "aqualogic.sensor" = ps: with ps; [ ]; "aqualogic.switch" = ps: with ps; [ ]; + "aquostv" = ps: with ps; [ ]; + "aquostv.media_player" = ps: with ps; [ ]; "arduino" = ps: with ps; [ ]; "arduino.sensor" = ps: with ps; [ ]; "arduino.switch" = ps: with ps; [ ]; + "arest" = ps: with ps; [ ]; + "arest.binary_sensor" = ps: with ps; [ ]; + "arest.sensor" = ps: with ps; [ ]; + "arest.switch" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ]; "arlo.alarm_control_panel" = ps: with ps; [ ]; "arlo.camera" = ps: with ps; [ ha-ffmpeg ]; "arlo.sensor" = ps: with ps; [ ]; + "aruba" = ps: with ps; [ ]; + "aruba.device_tracker" = ps: with ps; [ pexpect ]; + "arwn" = ps: with ps; [ ]; + "arwn.sensor" = ps: with ps; [ paho-mqtt ]; + "asterisk_cdr" = ps: with ps; [ ]; + "asterisk_cdr.mailbox" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; "asterisk_mbox.mailbox" = ps: with ps; [ ]; "asuswrt" = ps: with ps; [ ]; + "asuswrt.device_tracker" = ps: with ps; [ ]; + "asuswrt.sensor" = ps: with ps; [ ]; "august" = ps: with ps; [ ]; "august.binary_sensor" = ps: with ps; [ ]; "august.camera" = ps: with ps; [ ]; "august.lock" = ps: with ps; [ ]; + "aurora" = ps: with ps; [ ]; + "aurora.binary_sensor" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "auth.indieauth" = ps: with ps; [ ]; "auth.login_flow" = ps: with ps; [ ]; "auth.mfa_setup_flow" = ps: with ps; [ ]; + "automatic" = ps: with ps; [ ]; + "automatic.device_tracker" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; "automation.geo_location" = ps: with ps; [ ]; @@ -102,159 +129,203 @@ "automation.time_pattern" = ps: with ps; [ ]; "automation.webhook" = ps: with ps; [ aiohttp-cors ]; "automation.zone" = ps: with ps; [ ]; + "avion" = ps: with ps; [ ]; + "avion.light" = ps: with ps; [ ]; + "awair" = ps: with ps; [ ]; + "awair.sensor" = ps: with ps; [ ]; + "aws" = ps: with ps; [ ]; + "aws.config_flow" = ps: with ps; [ ]; + "aws.const" = ps: with ps; [ ]; + "aws.notify" = ps: with ps; [ ]; + "aws_lambda" = ps: with ps; [ ]; + "aws_lambda.notify" = ps: with ps; [ boto3 ]; + "aws_sns" = ps: with ps; [ ]; + "aws_sns.notify" = ps: with ps; [ boto3 ]; + "aws_sqs" = ps: with ps; [ ]; + "aws_sqs.notify" = ps: with ps; [ boto3 ]; "axis" = ps: with ps; [ ]; "axis.binary_sensor" = ps: with ps; [ ]; "axis.camera" = ps: with ps; [ ]; + "axis.config_flow" = ps: with ps; [ ]; + "axis.const" = ps: with ps; [ ]; + "axis.device" = ps: with ps; [ ]; + "axis.errors" = ps: with ps; [ ]; + "baidu" = ps: with ps; [ ]; + "baidu.tts" = ps: with ps; [ ]; + "bayesian" = ps: with ps; [ ]; + "bayesian.binary_sensor" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; "bbb_gpio.binary_sensor" = ps: with ps; [ ]; "bbb_gpio.switch" = ps: with ps; [ ]; + "bbox" = ps: with ps; [ ]; + "bbox.device_tracker" = ps: with ps; [ ]; + "bbox.sensor" = ps: with ps; [ ]; + "bh1750" = ps: with ps; [ ]; + "bh1750.sensor" = ps: with ps; [ ]; "binary_sensor" = ps: with ps; [ ]; - "binary_sensor.arest" = ps: with ps; [ ]; - "binary_sensor.aurora" = ps: with ps; [ ]; - "binary_sensor.bayesian" = ps: with ps; [ ]; - "binary_sensor.command_line" = ps: with ps; [ ]; - "binary_sensor.concord232" = ps: with ps; [ ]; - "binary_sensor.demo" = ps: with ps; [ ]; - "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; - "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "binary_sensor.flic" = ps: with ps; [ ]; - "binary_sensor.hikvision" = ps: with ps; [ ]; - "binary_sensor.iss" = ps: with ps; [ ]; - "binary_sensor.mystrom" = ps: with ps; [ aiohttp-cors ]; - "binary_sensor.ness_alarm" = ps: with ps; [ ]; - "binary_sensor.nx584" = ps: with ps; [ ]; - "binary_sensor.ping" = ps: with ps; [ ]; - "binary_sensor.random" = ps: with ps; [ ]; - "binary_sensor.rest" = ps: with ps; [ ]; - "binary_sensor.rflink" = ps: with ps; [ ]; - "binary_sensor.ring" = ps: with ps; [ ]; - "binary_sensor.sleepiq" = ps: with ps; [ ]; - "binary_sensor.spc" = ps: with ps; [ ]; - "binary_sensor.tapsaff" = ps: with ps; [ ]; - "binary_sensor.tcp" = ps: with ps; [ ]; - "binary_sensor.template" = ps: with ps; [ ]; - "binary_sensor.threshold" = ps: with ps; [ ]; - "binary_sensor.tod" = ps: with ps; [ ]; - "binary_sensor.trend" = ps: with ps; [ numpy ]; - "binary_sensor.uptimerobot" = ps: with ps; [ ]; - "binary_sensor.vultr" = ps: with ps; [ vultr ]; - "binary_sensor.workday" = ps: with ps; [ ]; + "bitcoin" = ps: with ps; [ ]; + "bitcoin.sensor" = ps: with ps; [ ]; + "blackbird" = ps: with ps; [ ]; + "blackbird.media_player" = ps: with ps; [ ]; "blink" = ps: with ps; [ ]; "blink.alarm_control_panel" = ps: with ps; [ ]; "blink.binary_sensor" = ps: with ps; [ ]; "blink.camera" = ps: with ps; [ ]; "blink.sensor" = ps: with ps; [ ]; + "blinksticklight" = ps: with ps; [ ]; + "blinksticklight.light" = ps: with ps; [ BlinkStick ]; + "blinkt" = ps: with ps; [ ]; + "blinkt.light" = ps: with ps; [ ]; + "blockchain" = ps: with ps; [ ]; + "blockchain.sensor" = ps: with ps; [ ]; "bloomsky" = ps: with ps; [ ]; "bloomsky.binary_sensor" = ps: with ps; [ ]; "bloomsky.camera" = ps: with ps; [ ]; "bloomsky.sensor" = ps: with ps; [ ]; + "bluesound" = ps: with ps; [ ]; + "bluesound.media_player" = ps: with ps; [ xmltodict ]; + "bluetooth_le_tracker" = ps: with ps; [ ]; + "bluetooth_le_tracker.device_tracker" = ps: with ps; [ ]; + "bluetooth_tracker" = ps: with ps; [ ]; + "bluetooth_tracker.device_tracker" = ps: with ps; [ bt_proximity ]; + "bme280" = ps: with ps; [ ]; + "bme280.sensor" = ps: with ps; [ ]; + "bme680" = ps: with ps; [ ]; + "bme680.sensor" = ps: with ps; [ ]; "bmw_connected_drive" = ps: with ps; [ ]; "bmw_connected_drive.binary_sensor" = ps: with ps; [ ]; "bmw_connected_drive.device_tracker" = ps: with ps; [ ]; "bmw_connected_drive.lock" = ps: with ps; [ ]; "bmw_connected_drive.sensor" = ps: with ps; [ ]; + "bom" = ps: with ps; [ ]; + "bom.sensor" = ps: with ps; [ ]; + "bom.weather" = ps: with ps; [ ]; + "braviatv" = ps: with ps; [ ]; + "braviatv.media_player" = ps: with ps; [ ]; + "broadlink" = ps: with ps; [ ]; + "broadlink.sensor" = ps: with ps; [ broadlink ]; + "broadlink.switch" = ps: with ps; [ broadlink ]; + "brottsplatskartan" = ps: with ps; [ ]; + "brottsplatskartan.sensor" = ps: with ps; [ ]; "browser" = ps: with ps; [ ]; + "brunt" = ps: with ps; [ ]; + "brunt.cover" = ps: with ps; [ ]; + "bt_home_hub_5" = ps: with ps; [ ]; + "bt_home_hub_5.device_tracker" = ps: with ps; [ ]; + "bt_smarthub" = ps: with ps; [ ]; + "bt_smarthub.device_tracker" = ps: with ps; [ ]; + "buienradar" = ps: with ps; [ ]; + "buienradar.sensor" = ps: with ps; [ ]; + "buienradar.weather" = ps: with ps; [ ]; + "caldav" = ps: with ps; [ ]; + "caldav.calendar" = ps: with ps; [ ]; "calendar" = ps: with ps; [ aiohttp-cors ]; - "calendar.caldav" = ps: with ps; [ ]; - "calendar.demo" = ps: with ps; [ ]; - "calendar.todoist" = ps: with ps; [ todoist ]; "camera" = ps: with ps; [ aiohttp-cors ]; - "camera.canary" = ps: with ps; [ ha-ffmpeg ]; - "camera.demo" = ps: with ps; [ ]; - "camera.familyhub" = ps: with ps; [ ]; - "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ]; - "camera.foscam" = ps: with ps; [ ]; - "camera.generic" = ps: with ps; [ ]; - "camera.local_file" = ps: with ps; [ ]; - "camera.mjpeg" = ps: with ps; [ ]; - "camera.onvif" = ps: with ps; [ ha-ffmpeg ]; - "camera.proxy" = ps: with ps; [ pillow ]; - "camera.push" = ps: with ps; [ aiohttp-cors ]; - "camera.ring" = ps: with ps; [ ha-ffmpeg ]; - "camera.rpi_camera" = ps: with ps; [ ]; - "camera.synology" = ps: with ps; [ ]; - "camera.uvc" = ps: with ps; [ ]; - "camera.xeoma" = ps: with ps; [ ]; - "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "camera.yi" = ps: with ps; [ ha-ffmpeg ]; + "camera.const" = ps: with ps; [ ]; + "camera.prefs" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; + "canary.alarm_control_panel" = ps: with ps; [ ]; + "canary.camera" = ps: with ps; [ ha-ffmpeg ]; + "canary.sensor" = ps: with ps; [ ]; "cast" = ps: with ps; [ PyChromecast ]; "cast.media_player" = ps: with ps; [ PyChromecast ]; + "cert_expiry" = ps: with ps; [ ]; + "cert_expiry.sensor" = ps: with ps; [ ]; + "channels" = ps: with ps; [ ]; + "channels.media_player" = ps: with ps; [ ]; + "cisco_ios" = ps: with ps; [ ]; + "cisco_ios.device_tracker" = ps: with ps; [ pexpect ]; + "cisco_mobility_express" = ps: with ps; [ ]; + "cisco_mobility_express.device_tracker" = ps: with ps; [ ]; + "ciscospark" = ps: with ps; [ ]; + "ciscospark.notify" = ps: with ps; [ ]; + "citybikes" = ps: with ps; [ ]; + "citybikes.sensor" = ps: with ps; [ ]; + "clementine" = ps: with ps; [ ]; + "clementine.media_player" = ps: with ps; [ ]; + "clickatell" = ps: with ps; [ ]; + "clickatell.notify" = ps: with ps; [ ]; + "clicksend" = ps: with ps; [ ]; + "clicksend.notify" = ps: with ps; [ ]; + "clicksend_tts" = ps: with ps; [ ]; + "clicksend_tts.notify" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; "climate.const" = ps: with ps; [ ]; - "climate.coolmaster" = ps: with ps; [ ]; - "climate.demo" = ps: with ps; [ ]; - "climate.dyson" = ps: with ps; [ ]; - "climate.ephember" = ps: with ps; [ ]; - "climate.eq3btsmart" = ps: with ps; [ construct ]; - "climate.flexit" = ps: with ps; [ ]; - "climate.generic_thermostat" = ps: with ps; [ ]; - "climate.heatmiser" = ps: with ps; [ ]; - "climate.honeywell" = ps: with ps; [ ]; - "climate.melissa" = ps: with ps; [ ]; - "climate.mill" = ps: with ps; [ ]; - "climate.nuheat" = ps: with ps; [ ]; - "climate.oem" = ps: with ps; [ ]; - "climate.proliphix" = ps: with ps; [ ]; - "climate.radiotherm" = ps: with ps; [ ]; "climate.reproduce_state" = ps: with ps; [ ]; - "climate.sensibo" = ps: with ps; [ ]; - "climate.touchline" = ps: with ps; [ ]; - "climate.venstar" = ps: with ps; [ ]; - "climate.zhong_hong" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors warrant ]; - "cloud.auth_api" = ps: with ps; [ ]; - "cloud.cloud_api" = ps: with ps; [ ]; - "cloud.cloudhooks" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ aiohttp-cors ]; + "cloud.binary_sensor" = ps: with ps; [ aiohttp-cors ]; "cloud.const" = ps: with ps; [ ]; "cloud.http_api" = ps: with ps; [ ]; - "cloud.iot" = ps: with ps; [ ]; "cloud.prefs" = ps: with ps; [ ]; "cloud.utils" = ps: with ps; [ ]; "cloudflare" = ps: with ps; [ ]; + "cmus" = ps: with ps; [ ]; + "cmus.media_player" = ps: with ps; [ ]; + "co2signal" = ps: with ps; [ ]; + "co2signal.sensor" = ps: with ps; [ ]; "coinbase" = ps: with ps; [ ]; + "coinbase.sensor" = ps: with ps; [ ]; + "coinmarketcap" = ps: with ps; [ ]; + "coinmarketcap.sensor" = ps: with ps; [ coinmarketcap ]; + "comed_hourly_pricing" = ps: with ps; [ ]; + "comed_hourly_pricing.sensor" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; "comfoconnect.fan" = ps: with ps; [ ]; "comfoconnect.sensor" = ps: with ps; [ ]; + "command_line" = ps: with ps; [ ]; + "command_line.binary_sensor" = ps: with ps; [ ]; + "command_line.cover" = ps: with ps; [ ]; + "command_line.notify" = ps: with ps; [ ]; + "command_line.sensor" = ps: with ps; [ ]; + "command_line.switch" = ps: with ps; [ ]; + "concord232" = ps: with ps; [ ]; + "concord232.alarm_control_panel" = ps: with ps; [ ]; + "concord232.binary_sensor" = ps: with ps; [ ]; "config" = ps: with ps; [ aiohttp-cors ]; - "config.area_registry" = ps: with ps; [ aiohttp-cors ]; + "config.area_registry" = ps: with ps; [ ]; "config.auth" = ps: with ps; [ ]; "config.automation" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; - "config.device_registry" = ps: with ps; [ aiohttp-cors ]; - "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; + "config.device_registry" = ps: with ps; [ ]; + "config.entity_registry" = ps: with ps; [ ]; "config.group" = ps: with ps; [ ]; - "config.hassbian" = ps: with ps; [ ]; "config.script" = ps: with ps; [ ]; "config.zwave" = ps: with ps; [ ]; "configurator" = ps: with ps; [ ]; "conversation" = ps: with ps; [ aiohttp-cors ]; "conversation.util" = ps: with ps; [ ]; + "coolmaster" = ps: with ps; [ ]; + "coolmaster.climate" = ps: with ps; [ ]; "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; - "cover.aladdin_connect" = ps: with ps; [ ]; - "cover.brunt" = ps: with ps; [ ]; - "cover.command_line" = ps: with ps; [ ]; - "cover.demo" = ps: with ps; [ ]; - "cover.garadget" = ps: with ps; [ ]; - "cover.gogogate2" = ps: with ps; [ ]; - "cover.group" = ps: with ps; [ ]; - "cover.myq" = ps: with ps; [ ]; - "cover.opengarage" = ps: with ps; [ ]; - "cover.rflink" = ps: with ps; [ ]; - "cover.template" = ps: with ps; [ ]; + "cppm_tracker" = ps: with ps; [ ]; + "cppm_tracker.device_tracker" = ps: with ps; [ ]; + "cpuspeed" = ps: with ps; [ ]; + "cpuspeed.sensor" = ps: with ps; [ py-cpuinfo ]; + "crimereports" = ps: with ps; [ ]; + "crimereports.sensor" = ps: with ps; [ ]; + "cups" = ps: with ps; [ ]; + "cups.sensor" = ps: with ps; [ pycups ]; + "currencylayer" = ps: with ps; [ ]; + "currencylayer.sensor" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; "daikin.climate" = ps: with ps; [ ]; "daikin.config_flow" = ps: with ps; [ ]; "daikin.const" = ps: with ps; [ ]; "daikin.sensor" = ps: with ps; [ ]; + "daikin.switch" = ps: with ps; [ ]; "danfoss_air" = ps: with ps; [ ]; "danfoss_air.binary_sensor" = ps: with ps; [ ]; "danfoss_air.sensor" = ps: with ps; [ ]; "danfoss_air.switch" = ps: with ps; [ ]; + "darksky" = ps: with ps; [ ]; + "darksky.sensor" = ps: with ps; [ python-forecastio ]; + "darksky.weather" = ps: with ps; [ python-forecastio ]; "datadog" = ps: with ps; [ datadog ]; + "ddwrt" = ps: with ps; [ ]; + "ddwrt.device_tracker" = ps: with ps; [ ]; "deconz" = ps: with ps; [ ]; "deconz.binary_sensor" = ps: with ps; [ ]; "deconz.climate" = ps: with ps; [ ]; @@ -262,67 +333,77 @@ "deconz.const" = ps: with ps; [ ]; "deconz.cover" = ps: with ps; [ ]; "deconz.deconz_device" = ps: with ps; [ ]; + "deconz.errors" = ps: with ps; [ ]; "deconz.gateway" = ps: with ps; [ ]; "deconz.light" = ps: with ps; [ ]; "deconz.scene" = ps: with ps; [ ]; "deconz.sensor" = ps: with ps; [ ]; "deconz.switch" = ps: with ps; [ ]; - "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy warrant ]; + "decora" = ps: with ps; [ ]; + "decora.light" = ps: with ps; [ ]; + "decora_wifi" = ps: with ps; [ ]; + "decora_wifi.light" = ps: with ps; [ ]; + "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ]; + "deluge" = ps: with ps; [ ]; + "deluge.sensor" = ps: with ps; [ deluge-client ]; + "deluge.switch" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; + "demo.air_quality" = ps: with ps; [ ]; + "demo.alarm_control_panel" = ps: with ps; [ ]; + "demo.binary_sensor" = ps: with ps; [ ]; + "demo.calendar" = ps: with ps; [ ]; + "demo.camera" = ps: with ps; [ ]; + "demo.climate" = ps: with ps; [ ]; + "demo.cover" = ps: with ps; [ ]; + "demo.device_tracker" = ps: with ps; [ ]; + "demo.fan" = ps: with ps; [ ]; + "demo.geo_location" = ps: with ps; [ ]; + "demo.image_processing" = ps: with ps; [ ]; + "demo.light" = ps: with ps; [ ]; + "demo.lock" = ps: with ps; [ ]; + "demo.mailbox" = ps: with ps; [ ]; + "demo.media_player" = ps: with ps; [ ]; + "demo.notify" = ps: with ps; [ ]; "demo.remote" = ps: with ps; [ ]; + "demo.sensor" = ps: with ps; [ ]; + "demo.switch" = ps: with ps; [ ]; + "demo.tts" = ps: with ps; [ ]; + "demo.vacuum" = ps: with ps; [ ]; + "demo.water_heater" = ps: with ps; [ ]; + "demo.weather" = ps: with ps; [ ]; + "denon" = ps: with ps; [ ]; + "denon.media_player" = ps: with ps; [ ]; + "denonavr" = ps: with ps; [ ]; + "denonavr.media_player" = ps: with ps; [ ]; + "deutsche_bahn" = ps: with ps; [ ]; + "deutsche_bahn.sensor" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ ]; "device_tracker" = ps: with ps; [ ]; - "device_tracker.actiontec" = ps: with ps; [ ]; - "device_tracker.aruba" = ps: with ps; [ pexpect ]; - "device_tracker.asuswrt" = ps: with ps; [ ]; - "device_tracker.automatic" = ps: with ps; [ aiohttp-cors ]; - "device_tracker.bbox" = ps: with ps; [ ]; - "device_tracker.bluetooth_le_tracker" = ps: with ps; [ ]; - "device_tracker.bluetooth_tracker" = ps: with ps; [ bt_proximity ]; - "device_tracker.bt_home_hub_5" = ps: with ps; [ ]; - "device_tracker.bt_smarthub" = ps: with ps; [ ]; - "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; - "device_tracker.ddwrt" = ps: with ps; [ ]; - "device_tracker.demo" = ps: with ps; [ ]; - "device_tracker.ee_brightbox" = ps: with ps; [ ]; - "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; - "device_tracker.google_maps" = ps: with ps; [ ]; - "device_tracker.hitron_coda" = ps: with ps; [ ]; - "device_tracker.huawei_router" = ps: with ps; [ ]; - "device_tracker.icloud" = ps: with ps; [ ]; - "device_tracker.keenetic_ndms2" = ps: with ps; [ ]; - "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ]; - "device_tracker.linksys_smart" = ps: with ps; [ ]; - "device_tracker.luci" = ps: with ps; [ ]; - "device_tracker.meraki" = ps: with ps; [ aiohttp-cors ]; - "device_tracker.mikrotik" = ps: with ps; [ ]; - "device_tracker.mqtt_json" = ps: with ps; [ paho-mqtt ]; - "device_tracker.netgear" = ps: with ps; [ ]; - "device_tracker.nmap_tracker" = ps: with ps; [ ]; - "device_tracker.ping" = ps: with ps; [ ]; - "device_tracker.quantum_gateway" = ps: with ps; [ ]; - "device_tracker.ritassist" = ps: with ps; [ ]; - "device_tracker.sky_hub" = ps: with ps; [ ]; - "device_tracker.snmp" = ps: with ps; [ pysnmp ]; - "device_tracker.swisscom" = ps: with ps; [ ]; - "device_tracker.synology_srm" = ps: with ps; [ ]; - "device_tracker.thomson" = ps: with ps; [ ]; - "device_tracker.tile" = ps: with ps; [ ]; - "device_tracker.tomato" = ps: with ps; [ ]; - "device_tracker.tplink" = ps: with ps; [ ]; - "device_tracker.traccar" = ps: with ps; [ ]; - "device_tracker.trackr" = ps: with ps; [ ]; - "device_tracker.ubee" = ps: with ps; [ ]; - "device_tracker.ubus" = ps: with ps; [ ]; - "device_tracker.unifi" = ps: with ps; [ pyunifi ]; - "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; - "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; - "device_tracker.xiaomi" = ps: with ps; [ ]; + "dht" = ps: with ps; [ ]; + "dht.sensor" = ps: with ps; [ ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digital_ocean.binary_sensor" = ps: with ps; [ digital-ocean ]; "digital_ocean.switch" = ps: with ps; [ digital-ocean ]; + "digitalloggers" = ps: with ps; [ ]; + "digitalloggers.switch" = ps: with ps; [ ]; + "directv" = ps: with ps; [ ]; + "directv.media_player" = ps: with ps; [ ]; + "discogs" = ps: with ps; [ ]; + "discogs.sensor" = ps: with ps; [ discogs_client ]; + "discord" = ps: with ps; [ ]; + "discord.notify" = ps: with ps; [ discordpy ]; "discovery" = ps: with ps; [ netdisco ]; + "dlib_face_detect" = ps: with ps; [ ]; + "dlib_face_detect.image_processing" = ps: with ps; [ face_recognition ]; + "dlib_face_identify" = ps: with ps; [ ]; + "dlib_face_identify.image_processing" = ps: with ps; [ face_recognition ]; + "dlink" = ps: with ps; [ ]; + "dlink.switch" = ps: with ps; [ ]; + "dlna_dmr" = ps: with ps; [ ]; + "dlna_dmr.media_player" = ps: with ps; [ ]; + "dnsip" = ps: with ps; [ ]; + "dnsip.sensor" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; "doorbird" = ps: with ps; [ ]; "doorbird.camera" = ps: with ps; [ ]; @@ -331,10 +412,28 @@ "dovado.notify" = ps: with ps; [ ]; "dovado.sensor" = ps: with ps; [ ]; "downloader" = ps: with ps; [ ]; + "dsmr" = ps: with ps; [ ]; + "dsmr.sensor" = ps: with ps; [ ]; + "dte_energy_bridge" = ps: with ps; [ ]; + "dte_energy_bridge.sensor" = ps: with ps; [ ]; + "dublin_bus_transport" = ps: with ps; [ ]; + "dublin_bus_transport.sensor" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; + "duke_energy" = ps: with ps; [ ]; + "duke_energy.sensor" = ps: with ps; [ ]; + "dunehd" = ps: with ps; [ ]; + "dunehd.media_player" = ps: with ps; [ ]; + "dwd_weather_warnings" = ps: with ps; [ ]; + "dwd_weather_warnings.sensor" = ps: with ps; [ ]; "dweet" = ps: with ps; [ ]; "dweet.sensor" = ps: with ps; [ ]; "dyson" = ps: with ps; [ ]; + "dyson.climate" = ps: with ps; [ ]; + "dyson.fan" = ps: with ps; [ ]; + "dyson.sensor" = ps: with ps; [ ]; + "dyson.vacuum" = ps: with ps; [ ]; + "ebox" = ps: with ps; [ ]; + "ebox.sensor" = ps: with ps; [ ]; "ebusd" = ps: with ps; [ ]; "ebusd.const" = ps: with ps; [ ]; "ebusd.sensor" = ps: with ps; [ ]; @@ -347,17 +446,29 @@ "ecobee.notify" = ps: with ps; [ ]; "ecobee.sensor" = ps: with ps; [ ]; "ecobee.weather" = ps: with ps; [ ]; + "econet" = ps: with ps; [ ]; + "econet.water_heater" = ps: with ps; [ ]; "ecovacs" = ps: with ps; [ ]; "ecovacs.vacuum" = ps: with ps; [ ]; + "eddystone_temperature" = ps: with ps; [ ]; + "eddystone_temperature.sensor" = ps: with ps; [ construct ]; + "edimax" = ps: with ps; [ ]; + "edimax.switch" = ps: with ps; [ ]; "edp_redy" = ps: with ps; [ ]; "edp_redy.sensor" = ps: with ps; [ ]; "edp_redy.switch" = ps: with ps; [ ]; + "ee_brightbox" = ps: with ps; [ ]; + "ee_brightbox.device_tracker" = ps: with ps; [ ]; + "efergy" = ps: with ps; [ ]; + "efergy.sensor" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "egardia.alarm_control_panel" = ps: with ps; [ ]; "egardia.binary_sensor" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; "eight_sleep.binary_sensor" = ps: with ps; [ ]; "eight_sleep.sensor" = ps: with ps; [ ]; + "eliqonline" = ps: with ps; [ ]; + "eliqonline.sensor" = ps: with ps; [ ]; "elkm1" = ps: with ps; [ ]; "elkm1.alarm_control_panel" = ps: with ps; [ ]; "elkm1.climate" = ps: with ps; [ ]; @@ -365,6 +476,10 @@ "elkm1.scene" = ps: with ps; [ ]; "elkm1.sensor" = ps: with ps; [ ]; "elkm1.switch" = ps: with ps; [ ]; + "emby" = ps: with ps; [ ]; + "emby.media_player" = ps: with ps; [ ]; + "emoncms" = ps: with ps; [ ]; + "emoncms.sensor" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; @@ -373,36 +488,67 @@ "emulated_roku.binding" = ps: with ps; [ ]; "emulated_roku.config_flow" = ps: with ps; [ ]; "emulated_roku.const" = ps: with ps; [ ]; + "enigma2" = ps: with ps; [ ]; + "enigma2.media_player" = ps: with ps; [ ]; "enocean" = ps: with ps; [ ]; "enocean.binary_sensor" = ps: with ps; [ ]; "enocean.light" = ps: with ps; [ ]; "enocean.sensor" = ps: with ps; [ ]; "enocean.switch" = ps: with ps; [ ]; + "enphase_envoy" = ps: with ps; [ ]; + "enphase_envoy.sensor" = ps: with ps; [ ]; + "entur_public_transport" = ps: with ps; [ ]; + "entur_public_transport.sensor" = ps: with ps; [ ]; + "envirophat" = ps: with ps; [ ]; + "envirophat.sensor" = ps: with ps; [ ]; "envisalink" = ps: with ps; [ ]; "envisalink.alarm_control_panel" = ps: with ps; [ ]; "envisalink.binary_sensor" = ps: with ps; [ ]; "envisalink.sensor" = ps: with ps; [ ]; - "esphome" = ps: with ps; [ ]; - "esphome.binary_sensor" = ps: with ps; [ ]; + "ephember" = ps: with ps; [ ]; + "ephember.climate" = ps: with ps; [ ]; + "epson" = ps: with ps; [ ]; + "epson.media_player" = ps: with ps; [ ]; + "eq3btsmart" = ps: with ps; [ ]; + "eq3btsmart.climate" = ps: with ps; [ construct ]; + "esphome" = ps: with ps; [ aioesphomeapi ]; + "esphome.binary_sensor" = ps: with ps; [ aioesphomeapi ]; + "esphome.camera" = ps: with ps; [ aioesphomeapi ]; "esphome.config_flow" = ps: with ps; [ ]; - "esphome.cover" = ps: with ps; [ ]; - "esphome.fan" = ps: with ps; [ ]; - "esphome.light" = ps: with ps; [ ]; - "esphome.sensor" = ps: with ps; [ ]; - "esphome.switch" = ps: with ps; [ ]; + "esphome.cover" = ps: with ps; [ aioesphomeapi ]; + "esphome.fan" = ps: with ps; [ aioesphomeapi ]; + "esphome.light" = ps: with ps; [ aioesphomeapi ]; + "esphome.sensor" = ps: with ps; [ aioesphomeapi ]; + "esphome.switch" = ps: with ps; [ aioesphomeapi ]; + "etherscan" = ps: with ps; [ ]; + "etherscan.sensor" = ps: with ps; [ ]; "eufy" = ps: with ps; [ ]; "eufy.light" = ps: with ps; [ ]; "eufy.switch" = ps: with ps; [ ]; + "everlights" = ps: with ps; [ ]; + "everlights.light" = ps: with ps; [ ]; "evohome" = ps: with ps; [ ]; "evohome.climate" = ps: with ps; [ ]; + "facebook" = ps: with ps; [ ]; + "facebook.notify" = ps: with ps; [ ]; + "facebox" = ps: with ps; [ ]; + "facebox.image_processing" = ps: with ps; [ ]; + "fail2ban" = ps: with ps; [ ]; + "fail2ban.sensor" = ps: with ps; [ ]; + "familyhub" = ps: with ps; [ ]; + "familyhub.camera" = ps: with ps; [ ]; "fan" = ps: with ps; [ ]; - "fan.demo" = ps: with ps; [ ]; - "fan.dyson" = ps: with ps; [ ]; - "fan.template" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; "fastdotcom.sensor" = ps: with ps; [ ]; + "fedex" = ps: with ps; [ ]; + "fedex.sensor" = ps: with ps; [ ]; "feedreader" = ps: with ps; [ ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg.camera" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_motion" = ps: with ps; [ ]; + "ffmpeg_motion.binary_sensor" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_noise" = ps: with ps; [ ]; + "ffmpeg_noise.binary_sensor" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; "fibaro.binary_sensor" = ps: with ps; [ ]; "fibaro.cover" = ps: with ps; [ ]; @@ -410,30 +556,100 @@ "fibaro.scene" = ps: with ps; [ ]; "fibaro.sensor" = ps: with ps; [ ]; "fibaro.switch" = ps: with ps; [ ]; + "fido" = ps: with ps; [ ]; + "fido.sensor" = ps: with ps; [ ]; + "file" = ps: with ps; [ ]; + "file.notify" = ps: with ps; [ ]; + "file.sensor" = ps: with ps; [ ]; + "filesize" = ps: with ps; [ ]; + "filesize.sensor" = ps: with ps; [ ]; + "filter" = ps: with ps; [ ]; + "filter.sensor" = ps: with ps; [ ]; + "fints" = ps: with ps; [ ]; + "fints.sensor" = ps: with ps; [ fints ]; + "fitbit" = ps: with ps; [ ]; + "fitbit.sensor" = ps: with ps; [ aiohttp-cors ]; + "fixer" = ps: with ps; [ ]; + "fixer.sensor" = ps: with ps; [ ]; + "flexit" = ps: with ps; [ ]; + "flexit.climate" = ps: with ps; [ ]; + "flic" = ps: with ps; [ ]; + "flic.binary_sensor" = ps: with ps; [ ]; + "flock" = ps: with ps; [ ]; + "flock.notify" = ps: with ps; [ ]; + "flunearyou" = ps: with ps; [ ]; + "flunearyou.sensor" = ps: with ps; [ ]; + "flux" = ps: with ps; [ ]; + "flux.switch" = ps: with ps; [ ]; + "flux_led" = ps: with ps; [ ]; + "flux_led.light" = ps: with ps; [ ]; + "folder" = ps: with ps; [ ]; + "folder.sensor" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; + "foobot" = ps: with ps; [ ]; + "foobot.sensor" = ps: with ps; [ ]; + "foscam" = ps: with ps; [ ]; + "foscam.camera" = ps: with ps; [ ]; "foursquare" = ps: with ps; [ aiohttp-cors ]; + "free_mobile" = ps: with ps; [ ]; + "free_mobile.notify" = ps: with ps; [ ]; "freebox" = ps: with ps; [ ]; "freebox.device_tracker" = ps: with ps; [ ]; "freebox.sensor" = ps: with ps; [ ]; + "freebox.switch" = ps: with ps; [ ]; "freedns" = ps: with ps; [ ]; + "fritz" = ps: with ps; [ ]; + "fritz.device_tracker" = ps: with ps; [ fritzconnection ]; "fritzbox" = ps: with ps; [ ]; "fritzbox.binary_sensor" = ps: with ps; [ ]; "fritzbox.climate" = ps: with ps; [ ]; "fritzbox.sensor" = ps: with ps; [ ]; "fritzbox.switch" = ps: with ps; [ ]; + "fritzbox_callmonitor" = ps: with ps; [ ]; + "fritzbox_callmonitor.sensor" = ps: with ps; [ fritzconnection ]; + "fritzbox_netmonitor" = ps: with ps; [ ]; + "fritzbox_netmonitor.sensor" = ps: with ps; [ fritzconnection ]; + "fritzdect" = ps: with ps; [ ]; + "fritzdect.switch" = ps: with ps; [ ]; "frontend" = ps: with ps; [ aiohttp-cors ]; "frontend.storage" = ps: with ps; [ ]; + "frontier_silicon" = ps: with ps; [ ]; + "frontier_silicon.media_player" = ps: with ps; [ ]; + "futurenow" = ps: with ps; [ ]; + "futurenow.light" = ps: with ps; [ ]; + "garadget" = ps: with ps; [ ]; + "garadget.cover" = ps: with ps; [ ]; "gc100" = ps: with ps; [ ]; "gc100.binary_sensor" = ps: with ps; [ ]; "gc100.switch" = ps: with ps; [ ]; + "gearbest" = ps: with ps; [ ]; + "gearbest.sensor" = ps: with ps; [ ]; + "geizhals" = ps: with ps; [ ]; + "geizhals.sensor" = ps: with ps; [ ]; + "generic" = ps: with ps; [ ]; + "generic.camera" = ps: with ps; [ ]; + "generic_thermostat" = ps: with ps; [ ]; + "generic_thermostat.climate" = ps: with ps; [ ]; + "geo_json_events" = ps: with ps; [ ]; + "geo_json_events.geo_location" = ps: with ps; [ ]; "geo_location" = ps: with ps; [ ]; - "geo_location.demo" = ps: with ps; [ ]; - "geo_location.geo_json_events" = ps: with ps; [ ]; - "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; - "geo_location.usgs_earthquakes_feed" = ps: with ps; [ ]; + "geo_rss_events" = ps: with ps; [ ]; + "geo_rss_events.sensor" = ps: with ps; [ ]; "geofency" = ps: with ps; [ aiohttp-cors ]; "geofency.device_tracker" = ps: with ps; [ aiohttp-cors ]; + "github" = ps: with ps; [ ]; + "github.sensor" = ps: with ps; [ PyGithub ]; + "gitlab_ci" = ps: with ps; [ ]; + "gitlab_ci.sensor" = ps: with ps; [ python-gitlab ]; + "gitter" = ps: with ps; [ ]; + "gitter.sensor" = ps: with ps; [ ]; + "glances" = ps: with ps; [ ]; + "glances.sensor" = ps: with ps; [ ]; + "gntp" = ps: with ps; [ ]; + "gntp.notify" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; + "gogogate2" = ps: with ps; [ ]; + "gogogate2.cover" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google.calendar" = ps: with ps; [ ]; "google.tts" = ps: with ps; [ ]; @@ -444,16 +660,38 @@ "google_assistant.smart_home" = ps: with ps; [ ]; "google_assistant.trait" = ps: with ps; [ ]; "google_domains" = ps: with ps; [ ]; + "google_maps" = ps: with ps; [ ]; + "google_maps.device_tracker" = ps: with ps; [ ]; "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_travel_time" = ps: with ps; [ ]; + "google_travel_time.sensor" = ps: with ps; [ ]; + "google_wifi" = ps: with ps; [ ]; + "google_wifi.sensor" = ps: with ps; [ ]; "googlehome" = ps: with ps; [ ]; "googlehome.device_tracker" = ps: with ps; [ ]; "googlehome.sensor" = ps: with ps; [ ]; + "gpmdp" = ps: with ps; [ ]; + "gpmdp.media_player" = ps: with ps; [ websocket_client ]; + "gpsd" = ps: with ps; [ ]; + "gpsd.sensor" = ps: with ps; [ ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; "gpslogger.device_tracker" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; + "greeneye_monitor.sensor" = ps: with ps; [ ]; + "greenwave" = ps: with ps; [ ]; + "greenwave.light" = ps: with ps; [ ]; "group" = ps: with ps; [ ]; + "group.cover" = ps: with ps; [ ]; + "group.light" = ps: with ps; [ ]; + "group.notify" = ps: with ps; [ ]; "group.reproduce_state" = ps: with ps; [ ]; + "gstreamer" = ps: with ps; [ ]; + "gstreamer.media_player" = ps: with ps; [ ]; + "gtfs" = ps: with ps; [ ]; + "gtfs.sensor" = ps: with ps; [ ]; + "gtt" = ps: with ps; [ ]; + "gtt.sensor" = ps: with ps; [ ]; "habitica" = ps: with ps; [ ]; "habitica.sensor" = ps: with ps; [ ]; "hangouts" = ps: with ps; [ ]; @@ -462,6 +700,8 @@ "hangouts.hangouts_bot" = ps: with ps; [ ]; "hangouts.intents" = ps: with ps; [ ]; "hangouts.notify" = ps: with ps; [ ]; + "harman_kardon_avr" = ps: with ps; [ ]; + "harman_kardon_avr.media_player" = ps: with ps; [ ]; "harmony" = ps: with ps; [ ]; "harmony.remote" = ps: with ps; [ ]; "hassio" = ps: with ps; [ aiohttp-cors ]; @@ -470,11 +710,28 @@ "hassio.discovery" = ps: with ps; [ ]; "hassio.handler" = ps: with ps; [ ]; "hassio.http" = ps: with ps; [ ]; + "hassio.ingress" = ps: with ps; [ ]; + "haveibeenpwned" = ps: with ps; [ ]; + "haveibeenpwned.sensor" = ps: with ps; [ ]; + "hddtemp" = ps: with ps; [ ]; + "hddtemp.sensor" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; "hdmi_cec.media_player" = ps: with ps; [ ]; "hdmi_cec.switch" = ps: with ps; [ ]; + "heatmiser" = ps: with ps; [ ]; + "heatmiser.climate" = ps: with ps; [ ]; + "hikvision" = ps: with ps; [ ]; + "hikvision.binary_sensor" = ps: with ps; [ ]; + "hikvisioncam" = ps: with ps; [ ]; + "hikvisioncam.switch" = ps: with ps; [ ]; + "hipchat" = ps: with ps; [ ]; + "hipchat.notify" = ps: with ps; [ ]; "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ ]; + "history_stats.sensor" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "hitron_coda" = ps: with ps; [ ]; + "hitron_coda.device_tracker" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; "hive.binary_sensor" = ps: with ps; [ ]; "hive.climate" = ps: with ps; [ ]; @@ -483,6 +740,8 @@ "hive.switch" = ps: with ps; [ ]; "hlk_sw16" = ps: with ps; [ ]; "hlk_sw16.switch" = ps: with ps; [ ]; + "homeassistant" = ps: with ps; [ ]; + "homeassistant.scene" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; "homekit.const" = ps: with ps; [ ]; "homekit.util" = ps: with ps; [ ]; @@ -490,9 +749,13 @@ "homekit_controller.alarm_control_panel" = ps: with ps; [ ]; "homekit_controller.binary_sensor" = ps: with ps; [ ]; "homekit_controller.climate" = ps: with ps; [ ]; + "homekit_controller.config_flow" = ps: with ps; [ ]; + "homekit_controller.connection" = ps: with ps; [ ]; + "homekit_controller.const" = ps: with ps; [ ]; "homekit_controller.cover" = ps: with ps; [ ]; "homekit_controller.light" = ps: with ps; [ ]; "homekit_controller.lock" = ps: with ps; [ ]; + "homekit_controller.sensor" = ps: with ps; [ ]; "homekit_controller.switch" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematic.binary_sensor" = ps: with ps; [ pyhomematic ]; @@ -516,8 +779,19 @@ "homematicip_cloud.light" = ps: with ps; [ ]; "homematicip_cloud.sensor" = ps: with ps; [ ]; "homematicip_cloud.switch" = ps: with ps; [ ]; + "homematicip_cloud.weather" = ps: with ps; [ ]; "homeworks" = ps: with ps; [ ]; "homeworks.light" = ps: with ps; [ ]; + "honeywell" = ps: with ps; [ ]; + "honeywell.climate" = ps: with ps; [ ]; + "hook" = ps: with ps; [ ]; + "hook.switch" = ps: with ps; [ ]; + "horizon" = ps: with ps; [ ]; + "horizon.media_player" = ps: with ps; [ ]; + "hp_ilo" = ps: with ps; [ ]; + "hp_ilo.sensor" = ps: with ps; [ ]; + "html5" = ps: with ps; [ ]; + "html5.notify" = ps: with ps; [ aiohttp-cors ]; "http" = ps: with ps; [ aiohttp-cors ]; "http.auth" = ps: with ps; [ ]; "http.ban" = ps: with ps; [ ]; @@ -527,23 +801,39 @@ "http.real_ip" = ps: with ps; [ ]; "http.static" = ps: with ps; [ ]; "http.view" = ps: with ps; [ ]; + "htu21d" = ps: with ps; [ ]; + "htu21d.sensor" = ps: with ps; [ ]; "huawei_lte" = ps: with ps; [ ]; "huawei_lte.device_tracker" = ps: with ps; [ ]; "huawei_lte.notify" = ps: with ps; [ ]; "huawei_lte.sensor" = ps: with ps; [ ]; + "huawei_router" = ps: with ps; [ ]; + "huawei_router.device_tracker" = ps: with ps; [ ]; "hue" = ps: with ps; [ aiohue ]; "hue.bridge" = ps: with ps; [ ]; "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; "hue.light" = ps: with ps; [ aiohue ]; + "hunterdouglas_powerview" = ps: with ps; [ ]; + "hunterdouglas_powerview.scene" = ps: with ps; [ ]; "hydrawise" = ps: with ps; [ ]; "hydrawise.binary_sensor" = ps: with ps; [ ]; "hydrawise.sensor" = ps: with ps; [ ]; "hydrawise.switch" = ps: with ps; [ ]; + "hydroquebec" = ps: with ps; [ ]; + "hydroquebec.sensor" = ps: with ps; [ ]; + "hyperion" = ps: with ps; [ ]; + "hyperion.light" = ps: with ps; [ ]; + "ialarm" = ps: with ps; [ ]; + "ialarm.alarm_control_panel" = ps: with ps; [ ]; + "icloud" = ps: with ps; [ ]; + "icloud.device_tracker" = ps: with ps; [ ]; "idteck_prox" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "ifttt.alarm_control_panel" = ps: with ps; [ aiohttp-cors pyfttt ]; + "iglo" = ps: with ps; [ ]; + "iglo.light" = ps: with ps; [ ]; "ihc" = ps: with ps; [ defusedxml ]; "ihc.binary_sensor" = ps: with ps; [ defusedxml ]; "ihc.const" = ps: with ps; [ ]; @@ -551,20 +841,14 @@ "ihc.light" = ps: with ps; [ defusedxml ]; "ihc.sensor" = ps: with ps; [ defusedxml ]; "ihc.switch" = ps: with ps; [ defusedxml ]; + "ihc.util" = ps: with ps; [ ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; - "image_processing.demo" = ps: with ps; [ ]; - "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; - "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; - "image_processing.facebox" = ps: with ps; [ ]; - "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; - "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; - "image_processing.openalpr_cloud" = ps: with ps; [ ]; - "image_processing.openalpr_local" = ps: with ps; [ ]; - "image_processing.opencv" = ps: with ps; [ numpy ]; - "image_processing.qrcode" = ps: with ps; [ pillow ]; - "image_processing.seven_segments" = ps: with ps; [ ]; - "image_processing.tensorflow" = ps: with ps; [ numpy pillow protobuf ]; + "imap" = ps: with ps; [ ]; + "imap.sensor" = ps: with ps; [ ]; + "imap_email_content" = ps: with ps; [ ]; + "imap_email_content.sensor" = ps: with ps; [ ]; "influxdb" = ps: with ps; [ influxdb ]; + "influxdb.sensor" = ps: with ps; [ influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -579,6 +863,8 @@ "insteon.switch" = ps: with ps; [ ]; "insteon_local" = ps: with ps; [ ]; "insteon_plm" = ps: with ps; [ ]; + "integration" = ps: with ps; [ ]; + "integration.sensor" = ps: with ps; [ ]; "intent_script" = ps: with ps; [ ]; "introduction" = ps: with ps; [ ]; "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; @@ -592,6 +878,12 @@ "ipma.config_flow" = ps: with ps; [ ]; "ipma.const" = ps: with ps; [ ]; "ipma.weather" = ps: with ps; [ ]; + "irish_rail_transport" = ps: with ps; [ ]; + "irish_rail_transport.sensor" = ps: with ps; [ ]; + "islamic_prayer_times" = ps: with ps; [ ]; + "islamic_prayer_times.sensor" = ps: with ps; [ ]; + "iss" = ps: with ps; [ ]; + "iss.binary_sensor" = ps: with ps; [ ]; "isy994" = ps: with ps; [ ]; "isy994.binary_sensor" = ps: with ps; [ ]; "isy994.cover" = ps: with ps; [ ]; @@ -602,15 +894,25 @@ "isy994.switch" = ps: with ps; [ ]; "itach" = ps: with ps; [ ]; "itach.remote" = ps: with ps; [ ]; + "itunes" = ps: with ps; [ ]; + "itunes.media_player" = ps: with ps; [ ]; + "jewish_calendar" = ps: with ps; [ ]; + "jewish_calendar.sensor" = ps: with ps; [ ]; "joaoapps_join" = ps: with ps; [ ]; "joaoapps_join.notify" = ps: with ps; [ ]; "juicenet" = ps: with ps; [ ]; "juicenet.sensor" = ps: with ps; [ ]; + "kankun" = ps: with ps; [ ]; + "kankun.switch" = ps: with ps; [ ]; + "keenetic_ndms2" = ps: with ps; [ ]; + "keenetic_ndms2.device_tracker" = ps: with ps; [ ]; "keyboard" = ps: with ps; [ ]; "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "kira.remote" = ps: with ps; [ ]; "kira.sensor" = ps: with ps; [ ]; + "kiwi" = ps: with ps; [ ]; + "kiwi.lock" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; "knx.binary_sensor" = ps: with ps; [ ]; "knx.climate" = ps: with ps; [ ]; @@ -620,77 +922,91 @@ "knx.scene" = ps: with ps; [ ]; "knx.sensor" = ps: with ps; [ ]; "knx.switch" = ps: with ps; [ ]; + "kodi" = ps: with ps; [ ]; + "kodi.media_player" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "kodi.notify" = ps: with ps; [ jsonrpc-async ]; "konnected" = ps: with ps; [ aiohttp-cors ]; "konnected.binary_sensor" = ps: with ps; [ aiohttp-cors ]; + "konnected.const" = ps: with ps; [ ]; + "konnected.handlers" = ps: with ps; [ ]; + "konnected.sensor" = ps: with ps; [ aiohttp-cors ]; "konnected.switch" = ps: with ps; [ aiohttp-cors ]; + "kwb" = ps: with ps; [ ]; + "kwb.sensor" = ps: with ps; [ ]; + "lacrosse" = ps: with ps; [ ]; + "lacrosse.sensor" = ps: with ps; [ ]; "lametric" = ps: with ps; [ ]; "lametric.notify" = ps: with ps; [ ]; + "lannouncer" = ps: with ps; [ ]; + "lannouncer.notify" = ps: with ps; [ ]; + "lastfm" = ps: with ps; [ ]; + "lastfm.sensor" = ps: with ps; [ pylast ]; + "launch_library" = ps: with ps; [ ]; + "launch_library.sensor" = ps: with ps; [ ]; "lcn" = ps: with ps; [ ]; "lcn.const" = ps: with ps; [ ]; "lcn.cover" = ps: with ps; [ ]; "lcn.light" = ps: with ps; [ ]; + "lcn.sensor" = ps: with ps; [ ]; "lcn.switch" = ps: with ps; [ ]; + "lg_netcast" = ps: with ps; [ ]; + "lg_netcast.media_player" = ps: with ps; [ ]; + "lg_soundbar" = ps: with ps; [ ]; + "lg_soundbar.media_player" = ps: with ps; [ ]; "lifx" = ps: with ps; [ aiolifx ]; "lifx.light" = ps: with ps; [ aiolifx aiolifx-effects ]; + "lifx_cloud" = ps: with ps; [ ]; + "lifx_cloud.scene" = ps: with ps; [ ]; + "lifx_legacy" = ps: with ps; [ ]; + "lifx_legacy.light" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; - "light.avion" = ps: with ps; [ ]; - "light.blinksticklight" = ps: with ps; [ BlinkStick ]; - "light.blinkt" = ps: with ps; [ ]; - "light.decora" = ps: with ps; [ ]; - "light.decora_wifi" = ps: with ps; [ ]; - "light.demo" = ps: with ps; [ ]; - "light.everlights" = ps: with ps; [ ]; - "light.flux_led" = ps: with ps; [ ]; - "light.futurenow" = ps: with ps; [ ]; - "light.greenwave" = ps: with ps; [ ]; - "light.group" = ps: with ps; [ ]; - "light.hyperion" = ps: with ps; [ ]; - "light.iglo" = ps: with ps; [ ]; - "light.lifx_legacy" = ps: with ps; [ ]; - "light.limitlessled" = ps: with ps; [ limitlessled ]; - "light.litejet" = ps: with ps; [ ]; - "light.lw12wifi" = ps: with ps; [ ]; - "light.mystrom" = ps: with ps; [ ]; - "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; - "light.niko_home_control" = ps: with ps; [ ]; - "light.opple" = ps: with ps; [ ]; - "light.osramlightify" = ps: with ps; [ ]; - "light.piglow" = ps: with ps; [ ]; - "light.rflink" = ps: with ps; [ ]; - "light.rpi_gpio_pwm" = ps: with ps; [ ]; - "light.sensehat" = ps: with ps; [ ]; - "light.switch" = ps: with ps; [ ]; - "light.template" = ps: with ps; [ ]; - "light.tikteck" = ps: with ps; [ ]; - "light.x10" = ps: with ps; [ ]; - "light.yeelight" = ps: with ps; [ ]; - "light.yeelightsunflower" = ps: with ps; [ ]; - "light.zengge" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; "lightwave.light" = ps: with ps; [ ]; "lightwave.switch" = ps: with ps; [ ]; + "limitlessled" = ps: with ps; [ ]; + "limitlessled.light" = ps: with ps; [ limitlessled ]; + "linksys_ap" = ps: with ps; [ ]; + "linksys_ap.device_tracker" = ps: with ps; [ beautifulsoup4 ]; + "linksys_smart" = ps: with ps; [ ]; + "linksys_smart.device_tracker" = ps: with ps; [ ]; + "linky" = ps: with ps; [ ]; + "linky.sensor" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; "linode.binary_sensor" = ps: with ps; [ linode-api ]; "linode.switch" = ps: with ps; [ linode-api ]; + "linux_battery" = ps: with ps; [ ]; + "linux_battery.sensor" = ps: with ps; [ batinfo ]; "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; + "litejet.light" = ps: with ps; [ ]; + "litejet.scene" = ps: with ps; [ ]; + "litejet.switch" = ps: with ps; [ ]; + "liveboxplaytv" = ps: with ps; [ ]; + "liveboxplaytv.media_player" = ps: with ps; [ ]; + "llamalab_automate" = ps: with ps; [ ]; + "llamalab_automate.notify" = ps: with ps; [ ]; + "local_file" = ps: with ps; [ ]; + "local_file.camera" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; "locative.device_tracker" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "lock.demo" = ps: with ps; [ ]; - "lock.kiwi" = ps: with ps; [ ]; - "lock.lockitron" = ps: with ps; [ ]; - "lock.nello" = ps: with ps; [ ]; - "lock.nuki" = ps: with ps; [ ]; - "lock.sesame" = ps: with ps; [ ]; - "lock.template" = ps: with ps; [ ]; + "lockitron" = ps: with ps; [ ]; + "lockitron.lock" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ]; "logi_circle.camera" = ps: with ps; [ ]; "logi_circle.sensor" = ps: with ps; [ ]; + "london_air" = ps: with ps; [ ]; + "london_air.sensor" = ps: with ps; [ ]; + "london_underground" = ps: with ps; [ ]; + "london_underground.sensor" = ps: with ps; [ ]; + "loopenergy" = ps: with ps; [ ]; + "loopenergy.sensor" = ps: with ps; [ ]; "lovelace" = ps: with ps; [ ]; + "luci" = ps: with ps; [ ]; + "luci.device_tracker" = ps: with ps; [ ]; "luftdaten" = ps: with ps; [ luftdaten ]; "luftdaten.config_flow" = ps: with ps; [ ]; "luftdaten.const" = ps: with ps; [ ]; @@ -709,12 +1025,24 @@ "lutron_caseta.light" = ps: with ps; [ ]; "lutron_caseta.scene" = ps: with ps; [ ]; "lutron_caseta.switch" = ps: with ps; [ ]; + "lw12wifi" = ps: with ps; [ ]; + "lw12wifi.light" = ps: with ps; [ ]; + "lyft" = ps: with ps; [ ]; + "lyft.sensor" = ps: with ps; [ ]; + "magicseaweed" = ps: with ps; [ ]; + "magicseaweed.sensor" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; - "mailbox.asterisk_cdr" = ps: with ps; [ ]; - "mailbox.demo" = ps: with ps; [ ]; "mailgun" = ps: with ps; [ aiohttp-cors ]; "mailgun.notify" = ps: with ps; [ aiohttp-cors ]; + "manual" = ps: with ps; [ ]; + "manual.alarm_control_panel" = ps: with ps; [ ]; + "manual_mqtt" = ps: with ps; [ ]; + "manual_mqtt.alarm_control_panel" = ps: with ps; [ paho-mqtt ]; "map" = ps: with ps; [ ]; + "marytts" = ps: with ps; [ ]; + "marytts.tts" = ps: with ps; [ ]; + "mastodon" = ps: with ps; [ ]; + "mastodon.notify" = ps: with ps; [ ]; "matrix" = ps: with ps; [ matrix-client ]; "matrix.notify" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; @@ -722,72 +1050,58 @@ "maxcube.climate" = ps: with ps; [ ]; "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; "media_player" = ps: with ps; [ aiohttp-cors ]; - "media_player.anthemav" = ps: with ps; [ ]; - "media_player.aquostv" = ps: with ps; [ ]; - "media_player.blackbird" = ps: with ps; [ ]; - "media_player.bluesound" = ps: with ps; [ xmltodict ]; - "media_player.braviatv" = ps: with ps; [ ]; - "media_player.channels" = ps: with ps; [ ]; - "media_player.clementine" = ps: with ps; [ ]; - "media_player.cmus" = ps: with ps; [ ]; "media_player.const" = ps: with ps; [ ]; - "media_player.demo" = ps: with ps; [ ]; - "media_player.denon" = ps: with ps; [ ]; - "media_player.denonavr" = ps: with ps; [ ]; - "media_player.directv" = ps: with ps; [ ]; - "media_player.dlna_dmr" = ps: with ps; [ ]; - "media_player.dunehd" = ps: with ps; [ ]; - "media_player.emby" = ps: with ps; [ ]; - "media_player.epson" = ps: with ps; [ ]; - "media_player.firetv" = ps: with ps; [ firetv ]; - "media_player.frontier_silicon" = ps: with ps; [ ]; - "media_player.gpmdp" = ps: with ps; [ websocket_client ]; - "media_player.gstreamer" = ps: with ps; [ ]; - "media_player.harman_kardon_avr" = ps: with ps; [ ]; - "media_player.horizon" = ps: with ps; [ ]; - "media_player.itunes" = ps: with ps; [ ]; - "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; - "media_player.lg_netcast" = ps: with ps; [ ]; - "media_player.lg_soundbar" = ps: with ps; [ ]; - "media_player.liveboxplaytv" = ps: with ps; [ ]; - "media_player.mediaroom" = ps: with ps; [ ]; - "media_player.monoprice" = ps: with ps; [ ]; - "media_player.mpchc" = ps: with ps; [ ]; - "media_player.mpd" = ps: with ps; [ mpd2 ]; - "media_player.nad" = ps: with ps; [ ]; - "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; - "media_player.openhome" = ps: with ps; [ ]; - "media_player.panasonic_bluray" = ps: with ps; [ ]; - "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ]; - "media_player.pandora" = ps: with ps; [ pexpect ]; - "media_player.philips_js" = ps: with ps; [ ]; - "media_player.pioneer" = ps: with ps; [ ]; - "media_player.pjlink" = ps: with ps; [ ]; - "media_player.plex" = ps: with ps; [ ]; "media_player.reproduce_state" = ps: with ps; [ ]; - "media_player.russound_rio" = ps: with ps; [ ]; - "media_player.russound_rnet" = ps: with ps; [ ]; - "media_player.samsungtv" = ps: with ps; [ wakeonlan ]; - "media_player.snapcast" = ps: with ps; [ snapcast ]; - "media_player.songpal" = ps: with ps; [ ]; - "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "media_player.spotify" = ps: with ps; [ aiohttp-cors ]; - "media_player.squeezebox" = ps: with ps; [ ]; - "media_player.ue_smart_radio" = ps: with ps; [ ]; - "media_player.universal" = ps: with ps; [ ]; - "media_player.vizio" = ps: with ps; [ ]; - "media_player.vlc" = ps: with ps; [ ]; - "media_player.volumio" = ps: with ps; [ ]; - "media_player.xiaomi_tv" = ps: with ps; [ ]; - "media_player.yamaha" = ps: with ps; [ ]; - "media_player.yamaha_musiccast" = ps: with ps; [ ]; - "media_player.ziggo_mediabox_xl" = ps: with ps; [ ]; + "mediaroom" = ps: with ps; [ ]; + "mediaroom.media_player" = ps: with ps; [ ]; "melissa" = ps: with ps; [ ]; + "melissa.climate" = ps: with ps; [ ]; + "meraki" = ps: with ps; [ ]; + "meraki.device_tracker" = ps: with ps; [ aiohttp-cors ]; + "message_bird" = ps: with ps; [ ]; + "message_bird.notify" = ps: with ps; [ ]; + "met" = ps: with ps; [ ]; + "met.weather" = ps: with ps; [ ]; "meteo_france" = ps: with ps; [ ]; "meteo_france.sensor" = ps: with ps; [ ]; "meteo_france.weather" = ps: with ps; [ ]; + "metoffice" = ps: with ps; [ ]; + "metoffice.sensor" = ps: with ps; [ ]; + "metoffice.weather" = ps: with ps; [ ]; + "mfi" = ps: with ps; [ ]; + "mfi.sensor" = ps: with ps; [ ]; + "mfi.switch" = ps: with ps; [ ]; + "mhz19" = ps: with ps; [ ]; + "mhz19.sensor" = ps: with ps; [ ]; + "microsoft" = ps: with ps; [ ]; + "microsoft.tts" = ps: with ps; [ ]; "microsoft_face" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ ]; + "microsoft_face_detect.image_processing" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ ]; + "microsoft_face_identify.image_processing" = ps: with ps; [ aiohttp-cors ]; + "miflora" = ps: with ps; [ ]; + "miflora.sensor" = ps: with ps; [ ]; + "mikrotik" = ps: with ps; [ ]; + "mikrotik.device_tracker" = ps: with ps; [ ]; + "mill" = ps: with ps; [ ]; + "mill.climate" = ps: with ps; [ ]; + "min_max" = ps: with ps; [ ]; + "min_max.sensor" = ps: with ps; [ ]; + "mitemp_bt" = ps: with ps; [ ]; + "mitemp_bt.sensor" = ps: with ps; [ ]; + "mjpeg" = ps: with ps; [ ]; + "mjpeg.camera" = ps: with ps; [ ]; "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.binary_sensor" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.const" = ps: with ps; [ ]; + "mobile_app.entity" = ps: with ps; [ ]; + "mobile_app.helpers" = ps: with ps; [ ]; + "mobile_app.http_api" = ps: with ps; [ ]; + "mobile_app.notify" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.sensor" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.webhook" = ps: with ps; [ ]; + "mobile_app.websocket_api" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "mochad.light" = ps: with ps; [ ]; "mochad.switch" = ps: with ps; [ ]; @@ -796,6 +1110,22 @@ "modbus.climate" = ps: with ps; [ ]; "modbus.sensor" = ps: with ps; [ ]; "modbus.switch" = ps: with ps; [ ]; + "modem_callerid" = ps: with ps; [ ]; + "modem_callerid.sensor" = ps: with ps; [ ]; + "mold_indicator" = ps: with ps; [ ]; + "mold_indicator.sensor" = ps: with ps; [ ]; + "monoprice" = ps: with ps; [ ]; + "monoprice.media_player" = ps: with ps; [ ]; + "moon" = ps: with ps; [ ]; + "moon.sensor" = ps: with ps; [ ]; + "mopar" = ps: with ps; [ ]; + "mopar.lock" = ps: with ps; [ ]; + "mopar.sensor" = ps: with ps; [ ]; + "mopar.switch" = ps: with ps; [ ]; + "mpchc" = ps: with ps; [ ]; + "mpchc.media_player" = ps: with ps; [ ]; + "mpd" = ps: with ps; [ ]; + "mpd.media_player" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ paho-mqtt ]; "mqtt.alarm_control_panel" = ps: with ps; [ paho-mqtt ]; "mqtt.binary_sensor" = ps: with ps; [ paho-mqtt ]; @@ -815,11 +1145,20 @@ "mqtt.switch" = ps: with ps; [ paho-mqtt ]; "mqtt.vacuum" = ps: with ps; [ paho-mqtt ]; "mqtt_eventstream" = ps: with ps; [ paho-mqtt ]; + "mqtt_json" = ps: with ps; [ ]; + "mqtt_json.device_tracker" = ps: with ps; [ paho-mqtt ]; + "mqtt_room" = ps: with ps; [ ]; + "mqtt_room.sensor" = ps: with ps; [ paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ paho-mqtt ]; + "mvglive" = ps: with ps; [ ]; + "mvglive.sensor" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; "mychevy.binary_sensor" = ps: with ps; [ ]; "mychevy.sensor" = ps: with ps; [ ]; "mycroft" = ps: with ps; [ ]; + "mycroft.notify" = ps: with ps; [ ]; + "myq" = ps: with ps; [ ]; + "myq.cover" = ps: with ps; [ ]; "mysensors" = ps: with ps; [ ]; "mysensors.binary_sensor" = ps: with ps; [ ]; "mysensors.climate" = ps: with ps; [ ]; @@ -834,13 +1173,27 @@ "mysensors.notify" = ps: with ps; [ ]; "mysensors.sensor" = ps: with ps; [ ]; "mysensors.switch" = ps: with ps; [ ]; + "mystrom" = ps: with ps; [ ]; + "mystrom.binary_sensor" = ps: with ps; [ aiohttp-cors ]; + "mystrom.light" = ps: with ps; [ ]; + "mystrom.switch" = ps: with ps; [ ]; "mythicbeastsdns" = ps: with ps; [ ]; + "nad" = ps: with ps; [ ]; + "nad.media_player" = ps: with ps; [ ]; "namecheapdns" = ps: with ps; [ defusedxml ]; + "nanoleaf" = ps: with ps; [ ]; + "nanoleaf.light" = ps: with ps; [ ]; "neato" = ps: with ps; [ pybotvac ]; "neato.camera" = ps: with ps; [ pybotvac ]; "neato.switch" = ps: with ps; [ pybotvac ]; "neato.vacuum" = ps: with ps; [ pybotvac ]; + "nederlandse_spoorwegen" = ps: with ps; [ ]; + "nederlandse_spoorwegen.sensor" = ps: with ps; [ ]; + "nello" = ps: with ps; [ ]; + "nello.lock" = ps: with ps; [ ]; "ness_alarm" = ps: with ps; [ ]; + "ness_alarm.alarm_control_panel" = ps: with ps; [ ]; + "ness_alarm.binary_sensor" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; "nest.binary_sensor" = ps: with ps; [ ]; "nest.camera" = ps: with ps; [ ]; @@ -854,70 +1207,93 @@ "netatmo.camera" = ps: with ps; [ aiohttp-cors ]; "netatmo.climate" = ps: with ps; [ aiohttp-cors ]; "netatmo.sensor" = ps: with ps; [ aiohttp-cors ]; + "netatmo_public" = ps: with ps; [ ]; + "netatmo_public.sensor" = ps: with ps; [ aiohttp-cors ]; + "netdata" = ps: with ps; [ ]; + "netdata.sensor" = ps: with ps; [ ]; + "netgear" = ps: with ps; [ ]; + "netgear.device_tracker" = ps: with ps; [ ]; "netgear_lte" = ps: with ps; [ ]; "netgear_lte.notify" = ps: with ps; [ ]; "netgear_lte.sensor" = ps: with ps; [ ]; + "netgear_lte.sensor_types" = ps: with ps; [ ]; + "netio" = ps: with ps; [ ]; + "netio.switch" = ps: with ps; [ aiohttp-cors ]; + "neurio_energy" = ps: with ps; [ ]; + "neurio_energy.sensor" = ps: with ps; [ ]; + "nfandroidtv" = ps: with ps; [ ]; + "nfandroidtv.notify" = ps: with ps; [ ]; + "niko_home_control" = ps: with ps; [ ]; + "niko_home_control.light" = ps: with ps; [ ]; + "nilu" = ps: with ps; [ ]; + "nilu.air_quality" = ps: with ps; [ ]; "nissan_leaf" = ps: with ps; [ ]; "nissan_leaf.binary_sensor" = ps: with ps; [ ]; "nissan_leaf.device_tracker" = ps: with ps; [ ]; "nissan_leaf.sensor" = ps: with ps; [ ]; "nissan_leaf.switch" = ps: with ps; [ ]; + "nmap_tracker" = ps: with ps; [ ]; + "nmap_tracker.device_tracker" = ps: with ps; [ ]; + "nmbs" = ps: with ps; [ ]; + "nmbs.sensor" = ps: with ps; [ ]; "no_ip" = ps: with ps; [ ]; + "noaa_tides" = ps: with ps; [ ]; + "noaa_tides.sensor" = ps: with ps; [ ]; + "norway_air" = ps: with ps; [ ]; + "norway_air.air_quality" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; - "notify.apns" = ps: with ps; [ ]; - "notify.aws_lambda" = ps: with ps; [ boto3 ]; - "notify.aws_sns" = ps: with ps; [ boto3 ]; - "notify.aws_sqs" = ps: with ps; [ boto3 ]; - "notify.ciscospark" = ps: with ps; [ ]; - "notify.clickatell" = ps: with ps; [ ]; - "notify.clicksend" = ps: with ps; [ ]; - "notify.clicksend_tts" = ps: with ps; [ ]; - "notify.command_line" = ps: with ps; [ ]; - "notify.demo" = ps: with ps; [ ]; - "notify.discord" = ps: with ps; [ discordpy ]; - "notify.facebook" = ps: with ps; [ ]; - "notify.file" = ps: with ps; [ ]; - "notify.flock" = ps: with ps; [ ]; - "notify.free_mobile" = ps: with ps; [ ]; - "notify.gntp" = ps: with ps; [ ]; - "notify.group" = ps: with ps; [ ]; - "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ aiohttp-cors ]; - "notify.kodi" = ps: with ps; [ jsonrpc-async ]; - "notify.lannouncer" = ps: with ps; [ ]; - "notify.llamalab_automate" = ps: with ps; [ ]; - "notify.mastodon" = ps: with ps; [ ]; - "notify.message_bird" = ps: with ps; [ ]; - "notify.mycroft" = ps: with ps; [ ]; - "notify.nfandroidtv" = ps: with ps; [ ]; - "notify.prowl" = ps: with ps; [ ]; - "notify.pushbullet" = ps: with ps; [ pushbullet ]; - "notify.pushetta" = ps: with ps; [ ]; - "notify.pushover" = ps: with ps; [ python-pushover ]; - "notify.pushsafer" = ps: with ps; [ ]; - "notify.rest" = ps: with ps; [ ]; - "notify.rocketchat" = ps: with ps; [ ]; - "notify.sendgrid" = ps: with ps; [ ]; - "notify.simplepush" = ps: with ps; [ ]; - "notify.slack" = ps: with ps; [ ]; - "notify.smtp" = ps: with ps; [ ]; - "notify.stride" = ps: with ps; [ ]; - "notify.synology_chat" = ps: with ps; [ ]; - "notify.syslog" = ps: with ps; [ ]; - "notify.telegram" = ps: with ps; [ python-telegram-bot ]; - "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; - "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "notify.twitter" = ps: with ps; [ ]; - "notify.xmpp" = ps: with ps; [ slixmpp ]; - "notify.yessssms" = ps: with ps; [ ]; + "nsw_fuel_station" = ps: with ps; [ ]; + "nsw_fuel_station.sensor" = ps: with ps; [ ]; + "nsw_rural_fire_service_feed" = ps: with ps; [ ]; + "nsw_rural_fire_service_feed.geo_location" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; + "nuheat.climate" = ps: with ps; [ ]; "nuimo_controller" = ps: with ps; [ ]; + "nuki" = ps: with ps; [ ]; + "nuki.lock" = ps: with ps; [ ]; + "nut" = ps: with ps; [ ]; + "nut.sensor" = ps: with ps; [ ]; + "nx584" = ps: with ps; [ ]; + "nx584.alarm_control_panel" = ps: with ps; [ ]; + "nx584.binary_sensor" = ps: with ps; [ ]; + "nzbget" = ps: with ps; [ ]; + "nzbget.sensor" = ps: with ps; [ ]; "octoprint" = ps: with ps; [ ]; "octoprint.binary_sensor" = ps: with ps; [ ]; "octoprint.sensor" = ps: with ps; [ ]; + "oem" = ps: with ps; [ ]; + "oem.climate" = ps: with ps; [ ]; + "ohmconnect" = ps: with ps; [ ]; + "ohmconnect.sensor" = ps: with ps; [ defusedxml ]; "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "onewire" = ps: with ps; [ ]; + "onewire.sensor" = ps: with ps; [ ]; + "onkyo" = ps: with ps; [ ]; + "onkyo.media_player" = ps: with ps; [ onkyo-eiscp ]; + "onvif" = ps: with ps; [ ]; + "onvif.camera" = ps: with ps; [ ha-ffmpeg ]; + "openalpr_cloud" = ps: with ps; [ ]; + "openalpr_cloud.image_processing" = ps: with ps; [ ]; + "openalpr_local" = ps: with ps; [ ]; + "openalpr_local.image_processing" = ps: with ps; [ ]; + "opencv" = ps: with ps; [ ]; + "opencv.image_processing" = ps: with ps; [ numpy ]; + "openevse" = ps: with ps; [ ]; + "openevse.sensor" = ps: with ps; [ ]; + "openexchangerates" = ps: with ps; [ ]; + "openexchangerates.sensor" = ps: with ps; [ ]; + "opengarage" = ps: with ps; [ ]; + "opengarage.cover" = ps: with ps; [ ]; + "openhardwaremonitor" = ps: with ps; [ ]; + "openhardwaremonitor.sensor" = ps: with ps; [ ]; + "openhome" = ps: with ps; [ ]; + "openhome.media_player" = ps: with ps; [ ]; + "opensensemap" = ps: with ps; [ ]; + "opensensemap.air_quality" = ps: with ps; [ ]; + "opensky" = ps: with ps; [ ]; + "opensky.sensor" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; "opentherm_gw.binary_sensor" = ps: with ps; [ ]; "opentherm_gw.climate" = ps: with ps; [ ]; @@ -927,6 +1303,17 @@ "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; "openuv.sensor" = ps: with ps; [ ]; + "openweathermap" = ps: with ps; [ ]; + "openweathermap.sensor" = ps: with ps; [ pyowm ]; + "openweathermap.weather" = ps: with ps; [ pyowm ]; + "opple" = ps: with ps; [ ]; + "opple.light" = ps: with ps; [ ]; + "orvibo" = ps: with ps; [ ]; + "orvibo.switch" = ps: with ps; [ ]; + "osramlightify" = ps: with ps; [ ]; + "osramlightify.light" = ps: with ps; [ ]; + "otp" = ps: with ps; [ ]; + "otp.sensor" = ps: with ps; [ pyotp ]; "owlet" = ps: with ps; [ ]; "owlet.binary_sensor" = ps: with ps; [ ]; "owlet.const" = ps: with ps; [ ]; @@ -934,30 +1321,95 @@ "owntracks" = ps: with ps; [ pynacl aiohttp-cors ]; "owntracks.config_flow" = ps: with ps; [ ]; "owntracks.device_tracker" = ps: with ps; [ pynacl aiohttp-cors ]; + "panasonic_bluray" = ps: with ps; [ ]; + "panasonic_bluray.media_player" = ps: with ps; [ ]; + "panasonic_viera" = ps: with ps; [ ]; + "panasonic_viera.media_player" = ps: with ps; [ wakeonlan ]; + "pandora" = ps: with ps; [ ]; + "pandora.media_player" = ps: with ps; [ pexpect ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ]; + "pencom" = ps: with ps; [ ]; + "pencom.switch" = ps: with ps; [ ]; "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ ]; + "philips_js" = ps: with ps; [ ]; + "philips_js.media_player" = ps: with ps; [ ]; + "pi_hole" = ps: with ps; [ ]; + "pi_hole.sensor" = ps: with ps; [ ]; + "picotts" = ps: with ps; [ ]; + "picotts.tts" = ps: with ps; [ ]; + "piglow" = ps: with ps; [ ]; + "piglow.light" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ]; "pilight.binary_sensor" = ps: with ps; [ ]; "pilight.sensor" = ps: with ps; [ ]; "pilight.switch" = ps: with ps; [ ]; + "ping" = ps: with ps; [ ]; + "ping.binary_sensor" = ps: with ps; [ ]; + "ping.device_tracker" = ps: with ps; [ ]; + "pioneer" = ps: with ps; [ ]; + "pioneer.media_player" = ps: with ps; [ ]; + "pjlink" = ps: with ps; [ ]; + "pjlink.media_player" = ps: with ps; [ ]; "plant" = ps: with ps; [ ]; + "plex" = ps: with ps; [ ]; + "plex.media_player" = ps: with ps; [ ]; + "plex.sensor" = ps: with ps; [ ]; "plum_lightpad" = ps: with ps; [ ]; "plum_lightpad.light" = ps: with ps; [ ]; + "pocketcasts" = ps: with ps; [ ]; + "pocketcasts.sensor" = ps: with ps; [ ]; "point" = ps: with ps; [ aiohttp-cors ]; "point.alarm_control_panel" = ps: with ps; [ ]; "point.binary_sensor" = ps: with ps; [ ]; "point.config_flow" = ps: with ps; [ ]; "point.const" = ps: with ps; [ ]; "point.sensor" = ps: with ps; [ ]; + "pollen" = ps: with ps; [ ]; + "pollen.sensor" = ps: with ps; [ numpy ]; + "postnl" = ps: with ps; [ ]; + "postnl.sensor" = ps: with ps; [ ]; + "prezzibenzina" = ps: with ps; [ ]; + "prezzibenzina.sensor" = ps: with ps; [ ]; + "proliphix" = ps: with ps; [ ]; + "proliphix.climate" = ps: with ps; [ ]; "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prowl" = ps: with ps; [ ]; + "prowl.notify" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; + "proxy" = ps: with ps; [ ]; + "proxy.camera" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; "ps4.config_flow" = ps: with ps; [ ]; "ps4.const" = ps: with ps; [ ]; "ps4.media_player" = ps: with ps; [ ]; + "pulseaudio_loopback" = ps: with ps; [ ]; + "pulseaudio_loopback.switch" = ps: with ps; [ ]; + "push" = ps: with ps; [ ]; + "push.camera" = ps: with ps; [ aiohttp-cors ]; + "pushbullet" = ps: with ps; [ ]; + "pushbullet.notify" = ps: with ps; [ pushbullet ]; + "pushbullet.sensor" = ps: with ps; [ pushbullet ]; + "pushetta" = ps: with ps; [ ]; + "pushetta.notify" = ps: with ps; [ ]; + "pushover" = ps: with ps; [ ]; + "pushover.notify" = ps: with ps; [ python-pushover ]; + "pushsafer" = ps: with ps; [ ]; + "pushsafer.notify" = ps: with ps; [ ]; + "pvoutput" = ps: with ps; [ ]; + "pvoutput.sensor" = ps: with ps; [ ]; + "pyload" = ps: with ps; [ ]; + "pyload.sensor" = ps: with ps; [ ]; "python_script" = ps: with ps; [ ]; + "qbittorrent" = ps: with ps; [ ]; + "qbittorrent.sensor" = ps: with ps; [ ]; + "qnap" = ps: with ps; [ ]; + "qnap.sensor" = ps: with ps; [ ]; + "qrcode" = ps: with ps; [ ]; + "qrcode.image_processing" = ps: with ps; [ pillow ]; + "quantum_gateway" = ps: with ps; [ ]; + "quantum_gateway.device_tracker" = ps: with ps; [ ]; "qwikswitch" = ps: with ps; [ ]; "qwikswitch.binary_sensor" = ps: with ps; [ ]; "qwikswitch.light" = ps: with ps; [ ]; @@ -966,7 +1418,13 @@ "rachio" = ps: with ps; [ ]; "rachio.binary_sensor" = ps: with ps; [ ]; "rachio.switch" = ps: with ps; [ ]; + "radarr" = ps: with ps; [ ]; + "radarr.sensor" = ps: with ps; [ ]; + "radiotherm" = ps: with ps; [ ]; + "radiotherm.climate" = ps: with ps; [ ]; "rainbird" = ps: with ps; [ ]; + "rainbird.sensor" = ps: with ps; [ ]; + "rainbird.switch" = ps: with ps; [ ]; "raincloud" = ps: with ps; [ ]; "raincloud.binary_sensor" = ps: with ps; [ ]; "raincloud.sensor" = ps: with ps; [ ]; @@ -977,20 +1435,41 @@ "rainmachine.const" = ps: with ps; [ ]; "rainmachine.sensor" = ps: with ps; [ ]; "rainmachine.switch" = ps: with ps; [ ]; + "random" = ps: with ps; [ ]; + "random.binary_sensor" = ps: with ps; [ ]; + "random.sensor" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ ]; "raspihats.binary_sensor" = ps: with ps; [ ]; "raspihats.switch" = ps: with ps; [ ]; + "raspyrfm" = ps: with ps; [ ]; + "raspyrfm.switch" = ps: with ps; [ ]; + "recollect_waste" = ps: with ps; [ ]; + "recollect_waste.sensor" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recorder.const" = ps: with ps; [ ]; "recorder.migration" = ps: with ps; [ ]; "recorder.purge" = ps: with ps; [ ]; "recorder.util" = ps: with ps; [ ]; + "recswitch" = ps: with ps; [ ]; + "recswitch.switch" = ps: with ps; [ ]; "reddit" = ps: with ps; [ ]; "reddit.sensor" = ps: with ps; [ praw ]; + "rejseplanen" = ps: with ps; [ ]; + "rejseplanen.sensor" = ps: with ps; [ ]; "remember_the_milk" = ps: with ps; [ httplib2 ]; "remote" = ps: with ps; [ ]; + "rest" = ps: with ps; [ ]; + "rest.binary_sensor" = ps: with ps; [ ]; + "rest.notify" = ps: with ps; [ ]; + "rest.sensor" = ps: with ps; [ ]; + "rest.switch" = ps: with ps; [ ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; + "rflink.binary_sensor" = ps: with ps; [ ]; + "rflink.cover" = ps: with ps; [ ]; + "rflink.light" = ps: with ps; [ ]; + "rflink.sensor" = ps: with ps; [ ]; + "rflink.switch" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "rfxtrx.binary_sensor" = ps: with ps; [ ]; "rfxtrx.cover" = ps: with ps; [ ]; @@ -998,280 +1477,122 @@ "rfxtrx.sensor" = ps: with ps; [ ]; "rfxtrx.switch" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "ring.binary_sensor" = ps: with ps; [ ]; + "ring.camera" = ps: with ps; [ ha-ffmpeg ]; + "ring.sensor" = ps: with ps; [ ]; + "ripple" = ps: with ps; [ ]; + "ripple.sensor" = ps: with ps; [ ]; + "ritassist" = ps: with ps; [ ]; + "ritassist.device_tracker" = ps: with ps; [ ]; + "rmvtransport" = ps: with ps; [ ]; + "rmvtransport.sensor" = ps: with ps; [ ]; + "rocketchat" = ps: with ps; [ ]; + "rocketchat.notify" = ps: with ps; [ ]; "roku" = ps: with ps; [ ]; "roku.media_player" = ps: with ps; [ ]; "roku.remote" = ps: with ps; [ ]; + "roomba" = ps: with ps; [ ]; + "roomba.vacuum" = ps: with ps; [ ]; "route53" = ps: with ps; [ boto3 ]; + "rova" = ps: with ps; [ ]; + "rova.sensor" = ps: with ps; [ ]; + "rpi_camera" = ps: with ps; [ ]; + "rpi_camera.camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_gpio.binary_sensor" = ps: with ps; [ ]; "rpi_gpio.cover" = ps: with ps; [ ]; "rpi_gpio.switch" = ps: with ps; [ ]; + "rpi_gpio_pwm" = ps: with ps; [ ]; + "rpi_gpio_pwm.light" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rpi_pfio.binary_sensor" = ps: with ps; [ ]; "rpi_pfio.switch" = ps: with ps; [ ]; + "rpi_rf" = ps: with ps; [ ]; + "rpi_rf.switch" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; + "rtorrent" = ps: with ps; [ ]; + "rtorrent.sensor" = ps: with ps; [ ]; + "russound_rio" = ps: with ps; [ ]; + "russound_rio.media_player" = ps: with ps; [ ]; + "russound_rnet" = ps: with ps; [ ]; + "russound_rnet.media_player" = ps: with ps; [ ]; + "ruter" = ps: with ps; [ ]; + "ruter.sensor" = ps: with ps; [ ]; "sabnzbd" = ps: with ps; [ ]; "sabnzbd.sensor" = ps: with ps; [ ]; + "samsungtv" = ps: with ps; [ ]; + "samsungtv.media_player" = ps: with ps; [ wakeonlan ]; "satel_integra" = ps: with ps; [ ]; "satel_integra.alarm_control_panel" = ps: with ps; [ ]; "satel_integra.binary_sensor" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; - "scene.homeassistant" = ps: with ps; [ ]; - "scene.hunterdouglas_powerview" = ps: with ps; [ ]; - "scene.lifx_cloud" = ps: with ps; [ ]; - "scene.litejet" = ps: with ps; [ ]; + "scrape" = ps: with ps; [ ]; + "scrape.sensor" = ps: with ps; [ beautifulsoup4 ]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; "scsgate.cover" = ps: with ps; [ ]; "scsgate.light" = ps: with ps; [ ]; "scsgate.switch" = ps: with ps; [ ]; + "season" = ps: with ps; [ ]; + "season.sensor" = ps: with ps; [ ephem ]; + "sendgrid" = ps: with ps; [ ]; + "sendgrid.notify" = ps: with ps; [ ]; "sense" = ps: with ps; [ ]; "sense.binary_sensor" = ps: with ps; [ ]; "sense.sensor" = ps: with ps; [ ]; + "sensehat" = ps: with ps; [ ]; + "sensehat.light" = ps: with ps; [ ]; + "sensehat.sensor" = ps: with ps; [ ]; + "sensibo" = ps: with ps; [ ]; + "sensibo.climate" = ps: with ps; [ ]; "sensor" = ps: with ps; [ ]; - "sensor.aftership" = ps: with ps; [ ]; - "sensor.airvisual" = ps: with ps; [ pyairvisual ]; - "sensor.alpha_vantage" = ps: with ps; [ ]; - "sensor.api_streams" = ps: with ps; [ ]; - "sensor.arest" = ps: with ps; [ ]; - "sensor.arwn" = ps: with ps; [ paho-mqtt ]; - "sensor.asuswrt" = ps: with ps; [ ]; - "sensor.awair" = ps: with ps; [ ]; - "sensor.bbox" = ps: with ps; [ ]; - "sensor.bh1750" = ps: with ps; [ ]; - "sensor.bitcoin" = ps: with ps; [ ]; - "sensor.blockchain" = ps: with ps; [ ]; - "sensor.bme280" = ps: with ps; [ ]; - "sensor.bme680" = ps: with ps; [ ]; - "sensor.bom" = ps: with ps; [ ]; - "sensor.broadlink" = ps: with ps; [ broadlink ]; - "sensor.brottsplatskartan" = ps: with ps; [ ]; - "sensor.buienradar" = ps: with ps; [ ]; - "sensor.canary" = ps: with ps; [ ]; - "sensor.cert_expiry" = ps: with ps; [ ]; - "sensor.citybikes" = ps: with ps; [ ]; - "sensor.co2signal" = ps: with ps; [ ]; - "sensor.coinbase" = ps: with ps; [ ]; - "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ]; - "sensor.comed_hourly_pricing" = ps: with ps; [ ]; - "sensor.command_line" = ps: with ps; [ ]; - "sensor.cpuspeed" = ps: with ps; [ py-cpuinfo ]; - "sensor.crimereports" = ps: with ps; [ ]; - "sensor.cups" = ps: with ps; [ pycups ]; - "sensor.currencylayer" = ps: with ps; [ ]; - "sensor.darksky" = ps: with ps; [ python-forecastio ]; - "sensor.deluge" = ps: with ps; [ deluge-client ]; - "sensor.demo" = ps: with ps; [ ]; - "sensor.deutsche_bahn" = ps: with ps; [ ]; - "sensor.dht" = ps: with ps; [ ]; - "sensor.discogs" = ps: with ps; [ discogs_client ]; - "sensor.dnsip" = ps: with ps; [ aiodns ]; - "sensor.dsmr" = ps: with ps; [ ]; - "sensor.dte_energy_bridge" = ps: with ps; [ ]; - "sensor.dublin_bus_transport" = ps: with ps; [ ]; - "sensor.duke_energy" = ps: with ps; [ ]; - "sensor.dwd_weather_warnings" = ps: with ps; [ ]; - "sensor.dyson" = ps: with ps; [ ]; - "sensor.ebox" = ps: with ps; [ ]; - "sensor.eddystone_temperature" = ps: with ps; [ construct ]; - "sensor.efergy" = ps: with ps; [ ]; - "sensor.eliqonline" = ps: with ps; [ ]; - "sensor.emoncms" = ps: with ps; [ ]; - "sensor.enphase_envoy" = ps: with ps; [ ]; - "sensor.entur_public_transport" = ps: with ps; [ ]; - "sensor.envirophat" = ps: with ps; [ ]; - "sensor.etherscan" = ps: with ps; [ ]; - "sensor.fail2ban" = ps: with ps; [ ]; - "sensor.fedex" = ps: with ps; [ ]; - "sensor.fido" = ps: with ps; [ ]; - "sensor.file" = ps: with ps; [ ]; - "sensor.filesize" = ps: with ps; [ ]; - "sensor.filter" = ps: with ps; [ ]; - "sensor.fints" = ps: with ps; [ fints ]; - "sensor.fitbit" = ps: with ps; [ aiohttp-cors ]; - "sensor.fixer" = ps: with ps; [ ]; - "sensor.flunearyou" = ps: with ps; [ ]; - "sensor.folder" = ps: with ps; [ ]; - "sensor.foobot" = ps: with ps; [ ]; - "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; - "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; - "sensor.gearbest" = ps: with ps; [ ]; - "sensor.geizhals" = ps: with ps; [ ]; - "sensor.geo_rss_events" = ps: with ps; [ ]; - "sensor.github" = ps: with ps; [ PyGithub ]; - "sensor.gitlab_ci" = ps: with ps; [ python-gitlab ]; - "sensor.gitter" = ps: with ps; [ ]; - "sensor.glances" = ps: with ps; [ ]; - "sensor.google_travel_time" = ps: with ps; [ ]; - "sensor.google_wifi" = ps: with ps; [ ]; - "sensor.gpsd" = ps: with ps; [ ]; - "sensor.greeneye_monitor" = ps: with ps; [ ]; - "sensor.gtfs" = ps: with ps; [ ]; - "sensor.gtt" = ps: with ps; [ ]; - "sensor.haveibeenpwned" = ps: with ps; [ ]; - "sensor.hddtemp" = ps: with ps; [ ]; - "sensor.history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; - "sensor.hp_ilo" = ps: with ps; [ ]; - "sensor.htu21d" = ps: with ps; [ ]; - "sensor.hydroquebec" = ps: with ps; [ ]; - "sensor.iliad_italy" = ps: with ps; [ ]; - "sensor.imap" = ps: with ps; [ ]; - "sensor.imap_email_content" = ps: with ps; [ ]; - "sensor.influxdb" = ps: with ps; [ influxdb ]; - "sensor.integration" = ps: with ps; [ ]; - "sensor.irish_rail_transport" = ps: with ps; [ ]; - "sensor.islamic_prayer_times" = ps: with ps; [ ]; - "sensor.jewish_calendar" = ps: with ps; [ ]; - "sensor.kwb" = ps: with ps; [ ]; - "sensor.lacrosse" = ps: with ps; [ ]; - "sensor.lastfm" = ps: with ps; [ pylast ]; - "sensor.launch_library" = ps: with ps; [ ]; - "sensor.linky" = ps: with ps; [ ]; - "sensor.linux_battery" = ps: with ps; [ batinfo ]; - "sensor.london_air" = ps: with ps; [ ]; - "sensor.london_underground" = ps: with ps; [ ]; - "sensor.loopenergy" = ps: with ps; [ ]; - "sensor.lyft" = ps: with ps; [ ]; - "sensor.magicseaweed" = ps: with ps; [ ]; - "sensor.metoffice" = ps: with ps; [ ]; - "sensor.mfi" = ps: with ps; [ ]; - "sensor.mhz19" = ps: with ps; [ ]; - "sensor.miflora" = ps: with ps; [ ]; - "sensor.min_max" = ps: with ps; [ ]; - "sensor.mitemp_bt" = ps: with ps; [ ]; - "sensor.modem_callerid" = ps: with ps; [ ]; - "sensor.mold_indicator" = ps: with ps; [ ]; - "sensor.moon" = ps: with ps; [ ]; - "sensor.mopar" = ps: with ps; [ ]; - "sensor.mqtt_room" = ps: with ps; [ paho-mqtt ]; - "sensor.mvglive" = ps: with ps; [ PyMVGLive ]; - "sensor.nederlandse_spoorwegen" = ps: with ps; [ ]; - "sensor.netatmo_public" = ps: with ps; [ aiohttp-cors ]; - "sensor.netdata" = ps: with ps; [ ]; - "sensor.neurio_energy" = ps: with ps; [ ]; - "sensor.nmbs" = ps: with ps; [ ]; - "sensor.noaa_tides" = ps: with ps; [ ]; - "sensor.nsw_fuel_station" = ps: with ps; [ ]; - "sensor.nut" = ps: with ps; [ ]; - "sensor.nzbget" = ps: with ps; [ ]; - "sensor.ohmconnect" = ps: with ps; [ defusedxml ]; - "sensor.onewire" = ps: with ps; [ ]; - "sensor.openevse" = ps: with ps; [ ]; - "sensor.openexchangerates" = ps: with ps; [ ]; - "sensor.openhardwaremonitor" = ps: with ps; [ ]; - "sensor.opensky" = ps: with ps; [ ]; - "sensor.openweathermap" = ps: with ps; [ pyowm ]; - "sensor.otp" = ps: with ps; [ pyotp ]; - "sensor.pi_hole" = ps: with ps; [ ]; - "sensor.plex" = ps: with ps; [ ]; - "sensor.pocketcasts" = ps: with ps; [ ]; - "sensor.pollen" = ps: with ps; [ numpy ]; - "sensor.postnl" = ps: with ps; [ ]; - "sensor.prezzibenzina" = ps: with ps; [ ]; - "sensor.pushbullet" = ps: with ps; [ pushbullet ]; - "sensor.pvoutput" = ps: with ps; [ ]; - "sensor.pyload" = ps: with ps; [ ]; - "sensor.qbittorrent" = ps: with ps; [ ]; - "sensor.qnap" = ps: with ps; [ ]; - "sensor.radarr" = ps: with ps; [ ]; - "sensor.rainbird" = ps: with ps; [ ]; - "sensor.random" = ps: with ps; [ ]; - "sensor.recollect_waste" = ps: with ps; [ ]; - "sensor.rejseplanen" = ps: with ps; [ ]; - "sensor.rest" = ps: with ps; [ ]; - "sensor.rflink" = ps: with ps; [ ]; - "sensor.ring" = ps: with ps; [ ]; - "sensor.ripple" = ps: with ps; [ ]; - "sensor.rmvtransport" = ps: with ps; [ ]; - "sensor.rova" = ps: with ps; [ ]; - "sensor.rtorrent" = ps: with ps; [ ]; - "sensor.ruter" = ps: with ps; [ ]; - "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; - "sensor.season" = ps: with ps; [ ephem ]; - "sensor.sensehat" = ps: with ps; [ ]; - "sensor.serial" = ps: with ps; [ ]; - "sensor.serial_pm" = ps: with ps; [ ]; - "sensor.seventeentrack" = ps: with ps; [ ]; - "sensor.shodan" = ps: with ps; [ shodan ]; - "sensor.sht31" = ps: with ps; [ ]; - "sensor.sigfox" = ps: with ps; [ ]; - "sensor.simulated" = ps: with ps; [ ]; - "sensor.skybeacon" = ps: with ps; [ ]; - "sensor.sleepiq" = ps: with ps; [ ]; - "sensor.sma" = ps: with ps; [ ]; - "sensor.snmp" = ps: with ps; [ pysnmp ]; - "sensor.sochain" = ps: with ps; [ ]; - "sensor.socialblade" = ps: with ps; [ ]; - "sensor.solaredge" = ps: with ps; [ ]; - "sensor.sonarr" = ps: with ps; [ ]; - "sensor.spotcrime" = ps: with ps; [ ]; - "sensor.sql" = ps: with ps; [ sqlalchemy ]; - "sensor.srp_energy" = ps: with ps; [ ]; - "sensor.starlingbank" = ps: with ps; [ ]; - "sensor.startca" = ps: with ps; [ xmltodict ]; - "sensor.statistics" = ps: with ps; [ ]; - "sensor.steam_online" = ps: with ps; [ ]; - "sensor.supervisord" = ps: with ps; [ ]; - "sensor.swiss_hydrological_data" = ps: with ps; [ ]; - "sensor.swiss_public_transport" = ps: with ps; [ ]; - "sensor.syncthru" = ps: with ps; [ ]; - "sensor.synologydsm" = ps: with ps; [ ]; - "sensor.systemmonitor" = ps: with ps; [ psutil ]; - "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ]; - "sensor.tank_utility" = ps: with ps; [ ]; - "sensor.tautulli" = ps: with ps; [ ]; - "sensor.tcp" = ps: with ps; [ ]; - "sensor.ted5000" = ps: with ps; [ xmltodict ]; - "sensor.teksavvy" = ps: with ps; [ ]; - "sensor.temper" = ps: with ps; [ ]; - "sensor.template" = ps: with ps; [ ]; - "sensor.thermoworks_smoke" = ps: with ps; [ ]; - "sensor.time_date" = ps: with ps; [ ]; - "sensor.torque" = ps: with ps; [ aiohttp-cors ]; - "sensor.trafikverket_weatherstation" = ps: with ps; [ ]; - "sensor.transport_nsw" = ps: with ps; [ ]; - "sensor.travisci" = ps: with ps; [ ]; - "sensor.twitch" = ps: with ps; [ ]; - "sensor.uber" = ps: with ps; [ ]; - "sensor.uk_transport" = ps: with ps; [ ]; - "sensor.ups" = ps: with ps; [ ]; - "sensor.uptime" = ps: with ps; [ ]; - "sensor.uscis" = ps: with ps; [ ]; - "sensor.vasttrafik" = ps: with ps; [ ]; - "sensor.version" = ps: with ps; [ ]; - "sensor.viaggiatreno" = ps: with ps; [ ]; - "sensor.volkszaehler" = ps: with ps; [ ]; - "sensor.vultr" = ps: with ps; [ vultr ]; - "sensor.waqi" = ps: with ps; [ ]; - "sensor.waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; - "sensor.whois" = ps: with ps; [ ]; - "sensor.worldclock" = ps: with ps; [ ]; - "sensor.worldtidesinfo" = ps: with ps; [ ]; - "sensor.worxlandroid" = ps: with ps; [ ]; - "sensor.wsdot" = ps: with ps; [ ]; - "sensor.wunderground" = ps: with ps; [ ]; - "sensor.xbox_live" = ps: with ps; [ ]; - "sensor.yr" = ps: with ps; [ xmltodict ]; - "sensor.yweather" = ps: with ps; [ yahooweather ]; - "sensor.zamg" = ps: with ps; [ ]; - "sensor.zestimate" = ps: with ps; [ xmltodict ]; + "serial" = ps: with ps; [ ]; + "serial.sensor" = ps: with ps; [ ]; + "serial_pm" = ps: with ps; [ ]; + "serial_pm.sensor" = ps: with ps; [ ]; + "sesame" = ps: with ps; [ ]; + "sesame.lock" = ps: with ps; [ ]; + "seven_segments" = ps: with ps; [ ]; + "seven_segments.image_processing" = ps: with ps; [ ]; + "seventeentrack" = ps: with ps; [ ]; + "seventeentrack.sensor" = ps: with ps; [ ]; "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; + "shodan" = ps: with ps; [ ]; + "shodan.sensor" = ps: with ps; [ shodan ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "sht31" = ps: with ps; [ ]; + "sht31.sensor" = ps: with ps; [ ]; + "sigfox" = ps: with ps; [ ]; + "sigfox.sensor" = ps: with ps; [ ]; + "simplepush" = ps: with ps; [ ]; + "simplepush.notify" = ps: with ps; [ ]; "simplisafe" = ps: with ps; [ ]; "simplisafe.alarm_control_panel" = ps: with ps; [ ]; "simplisafe.config_flow" = ps: with ps; [ ]; "simplisafe.const" = ps: with ps; [ ]; + "simulated" = ps: with ps; [ ]; + "simulated.sensor" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; "sisyphus.light" = ps: with ps; [ ]; "sisyphus.media_player" = ps: with ps; [ ]; + "sky_hub" = ps: with ps; [ ]; + "sky_hub.device_tracker" = ps: with ps; [ ]; + "skybeacon" = ps: with ps; [ ]; + "skybeacon.sensor" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "skybell.binary_sensor" = ps: with ps; [ ]; "skybell.camera" = ps: with ps; [ ]; "skybell.light" = ps: with ps; [ ]; "skybell.sensor" = ps: with ps; [ ]; "skybell.switch" = ps: with ps; [ ]; + "slack" = ps: with ps; [ ]; + "slack.notify" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; + "sleepiq.binary_sensor" = ps: with ps; [ ]; + "sleepiq.sensor" = ps: with ps; [ ]; + "sma" = ps: with ps; [ ]; + "sma.sensor" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "smappee.sensor" = ps: with ps; [ ]; "smappee.switch" = ps: with ps; [ ]; @@ -1292,11 +1613,35 @@ "smhi.config_flow" = ps: with ps; [ ]; "smhi.const" = ps: with ps; [ ]; "smhi.weather" = ps: with ps; [ ]; + "smtp" = ps: with ps; [ ]; + "smtp.notify" = ps: with ps; [ ]; + "snapcast" = ps: with ps; [ ]; + "snapcast.media_player" = ps: with ps; [ snapcast ]; "snips" = ps: with ps; [ paho-mqtt ]; + "snmp" = ps: with ps; [ ]; + "snmp.device_tracker" = ps: with ps; [ pysnmp ]; + "snmp.sensor" = ps: with ps; [ pysnmp ]; + "snmp.switch" = ps: with ps; [ pysnmp ]; + "sochain" = ps: with ps; [ ]; + "sochain.sensor" = ps: with ps; [ ]; + "socialblade" = ps: with ps; [ ]; + "socialblade.sensor" = ps: with ps; [ ]; + "solaredge" = ps: with ps; [ ]; + "solaredge.sensor" = ps: with ps; [ ]; + "sonarr" = ps: with ps; [ ]; + "sonarr.sensor" = ps: with ps; [ ]; + "songpal" = ps: with ps; [ ]; + "songpal.media_player" = ps: with ps; [ ]; "sonos" = ps: with ps; [ ]; "sonos.media_player" = ps: with ps; [ ]; + "sony_projector" = ps: with ps; [ ]; + "sony_projector.switch" = ps: with ps; [ ]; + "soundtouch" = ps: with ps; [ ]; + "soundtouch.media_player" = ps: with ps; [ libsoundtouch ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; + "spc.alarm_control_panel" = ps: with ps; [ ]; + "spc.binary_sensor" = ps: with ps; [ ]; "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "speedtestdotnet.const" = ps: with ps; [ ]; "speedtestdotnet.sensor" = ps: with ps; [ speedtest-cli ]; @@ -1304,48 +1649,66 @@ "spider.climate" = ps: with ps; [ ]; "spider.switch" = ps: with ps; [ ]; "splunk" = ps: with ps; [ ]; + "spotcrime" = ps: with ps; [ ]; + "spotcrime.sensor" = ps: with ps; [ ]; + "spotify" = ps: with ps; [ ]; + "spotify.media_player" = ps: with ps; [ aiohttp-cors ]; + "sql" = ps: with ps; [ ]; + "sql.sensor" = ps: with ps; [ sqlalchemy ]; + "squeezebox" = ps: with ps; [ ]; + "squeezebox.media_player" = ps: with ps; [ ]; + "srp_energy" = ps: with ps; [ ]; + "srp_energy.sensor" = ps: with ps; [ ]; + "starlingbank" = ps: with ps; [ ]; + "starlingbank.sensor" = ps: with ps; [ ]; + "startca" = ps: with ps; [ ]; + "startca.sensor" = ps: with ps; [ xmltodict ]; + "statistics" = ps: with ps; [ ]; + "statistics.sensor" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; + "steam_online" = ps: with ps; [ ]; + "steam_online.sensor" = ps: with ps; [ ]; + "stream" = ps: with ps; [ aiohttp-cors av ]; + "stream.const" = ps: with ps; [ ]; + "stream.core" = ps: with ps; [ ]; + "stream.hls" = ps: with ps; [ ]; + "stream.recorder" = ps: with ps; [ ]; + "stream.worker" = ps: with ps; [ ]; + "stride" = ps: with ps; [ ]; + "stride.notify" = ps: with ps; [ ]; "sun" = ps: with ps; [ ]; + "supervisord" = ps: with ps; [ ]; + "supervisord.sensor" = ps: with ps; [ ]; + "swiss_hydrological_data" = ps: with ps; [ ]; + "swiss_hydrological_data.sensor" = ps: with ps; [ ]; + "swiss_public_transport" = ps: with ps; [ ]; + "swiss_public_transport.sensor" = ps: with ps; [ ]; + "swisscom" = ps: with ps; [ ]; + "swisscom.device_tracker" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; - "switch.acer_projector" = ps: with ps; [ pyserial ]; - "switch.anel_pwrctrl" = ps: with ps; [ ]; - "switch.arest" = ps: with ps; [ ]; - "switch.broadlink" = ps: with ps; [ broadlink ]; - "switch.command_line" = ps: with ps; [ ]; - "switch.deluge" = ps: with ps; [ deluge-client ]; - "switch.demo" = ps: with ps; [ ]; - "switch.digitalloggers" = ps: with ps; [ ]; - "switch.dlink" = ps: with ps; [ ]; - "switch.edimax" = ps: with ps; [ ]; - "switch.flux" = ps: with ps; [ ]; - "switch.fritzdect" = ps: with ps; [ ]; - "switch.hikvisioncam" = ps: with ps; [ ]; - "switch.hook" = ps: with ps; [ ]; - "switch.kankun" = ps: with ps; [ ]; - "switch.litejet" = ps: with ps; [ ]; - "switch.mfi" = ps: with ps; [ ]; - "switch.mystrom" = ps: with ps; [ ]; - "switch.netio" = ps: with ps; [ aiohttp-cors ]; - "switch.orvibo" = ps: with ps; [ ]; - "switch.pencom" = ps: with ps; [ ]; - "switch.pulseaudio_loopback" = ps: with ps; [ ]; - "switch.rainbird" = ps: with ps; [ ]; - "switch.raspyrfm" = ps: with ps; [ ]; - "switch.recswitch" = ps: with ps; [ ]; - "switch.rest" = ps: with ps; [ ]; - "switch.rflink" = ps: with ps; [ ]; - "switch.rpi_rf" = ps: with ps; [ ]; - "switch.snmp" = ps: with ps; [ pysnmp ]; - "switch.sony_projector" = ps: with ps; [ ]; - "switch.switchbot" = ps: with ps; [ ]; - "switch.switchmate" = ps: with ps; [ ]; - "switch.telnet" = ps: with ps; [ ]; - "switch.template" = ps: with ps; [ ]; - "switch.vesync" = ps: with ps; [ ]; - "switch.vultr" = ps: with ps; [ vultr ]; - "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; + "switch.light" = ps: with ps; [ ]; + "switchbot" = ps: with ps; [ ]; + "switchbot.switch" = ps: with ps; [ ]; + "switchmate" = ps: with ps; [ ]; + "switchmate.switch" = ps: with ps; [ ]; + "syncthru" = ps: with ps; [ ]; + "syncthru.sensor" = ps: with ps; [ ]; + "synology" = ps: with ps; [ ]; + "synology.camera" = ps: with ps; [ ]; + "synology_chat" = ps: with ps; [ ]; + "synology_chat.notify" = ps: with ps; [ ]; + "synology_srm" = ps: with ps; [ ]; + "synology_srm.device_tracker" = ps: with ps; [ ]; + "synologydsm" = ps: with ps; [ ]; + "synologydsm.sensor" = ps: with ps; [ ]; + "syslog" = ps: with ps; [ ]; + "syslog.notify" = ps: with ps; [ ]; "system_health" = ps: with ps; [ aiohttp-cors ]; "system_log" = ps: with ps; [ aiohttp-cors ]; + "systemmonitor" = ps: with ps; [ ]; + "systemmonitor.sensor" = ps: with ps; [ psutil ]; + "sytadin" = ps: with ps; [ ]; + "sytadin.sensor" = ps: with ps; [ beautifulsoup4 ]; "tado" = ps: with ps; [ ]; "tado.climate" = ps: with ps; [ ]; "tado.device_tracker" = ps: with ps; [ ]; @@ -1356,6 +1719,21 @@ "tahoma.scene" = ps: with ps; [ ]; "tahoma.sensor" = ps: with ps; [ ]; "tahoma.switch" = ps: with ps; [ ]; + "tank_utility" = ps: with ps; [ ]; + "tank_utility.sensor" = ps: with ps; [ ]; + "tapsaff" = ps: with ps; [ ]; + "tapsaff.binary_sensor" = ps: with ps; [ ]; + "tautulli" = ps: with ps; [ ]; + "tautulli.sensor" = ps: with ps; [ ]; + "tcp" = ps: with ps; [ ]; + "tcp.binary_sensor" = ps: with ps; [ ]; + "tcp.sensor" = ps: with ps; [ ]; + "ted5000" = ps: with ps; [ ]; + "ted5000.sensor" = ps: with ps; [ xmltodict ]; + "teksavvy" = ps: with ps; [ ]; + "teksavvy.sensor" = ps: with ps; [ ]; + "telegram" = ps: with ps; [ ]; + "telegram.notify" = ps: with ps; [ python-telegram-bot ]; "telegram_bot" = ps: with ps; [ python-telegram-bot ]; "telegram_bot.broadcast" = ps: with ps; [ ]; "telegram_bot.polling" = ps: with ps; [ ]; @@ -1374,6 +1752,20 @@ "tellstick.light" = ps: with ps; [ ]; "tellstick.sensor" = ps: with ps; [ ]; "tellstick.switch" = ps: with ps; [ ]; + "telnet" = ps: with ps; [ ]; + "telnet.switch" = ps: with ps; [ ]; + "temper" = ps: with ps; [ ]; + "temper.sensor" = ps: with ps; [ ]; + "template" = ps: with ps; [ ]; + "template.binary_sensor" = ps: with ps; [ ]; + "template.cover" = ps: with ps; [ ]; + "template.fan" = ps: with ps; [ ]; + "template.light" = ps: with ps; [ ]; + "template.lock" = ps: with ps; [ ]; + "template.sensor" = ps: with ps; [ ]; + "template.switch" = ps: with ps; [ ]; + "tensorflow" = ps: with ps; [ ]; + "tensorflow.image_processing" = ps: with ps; [ numpy pillow protobuf ]; "tesla" = ps: with ps; [ ]; "tesla.binary_sensor" = ps: with ps; [ ]; "tesla.climate" = ps: with ps; [ ]; @@ -1381,45 +1773,78 @@ "tesla.lock" = ps: with ps; [ ]; "tesla.sensor" = ps: with ps; [ ]; "tesla.switch" = ps: with ps; [ ]; + "tfiac" = ps: with ps; [ ]; + "tfiac.climate" = ps: with ps; [ ]; + "thermoworks_smoke" = ps: with ps; [ ]; + "thermoworks_smoke.sensor" = ps: with ps; [ ]; "thethingsnetwork" = ps: with ps; [ ]; "thethingsnetwork.sensor" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; "thinkingcleaner" = ps: with ps; [ ]; "thinkingcleaner.sensor" = ps: with ps; [ ]; "thinkingcleaner.switch" = ps: with ps; [ ]; + "thomson" = ps: with ps; [ ]; + "thomson.device_tracker" = ps: with ps; [ ]; + "threshold" = ps: with ps; [ ]; + "threshold.binary_sensor" = ps: with ps; [ ]; "tibber" = ps: with ps; [ ]; "tibber.notify" = ps: with ps; [ ]; "tibber.sensor" = ps: with ps; [ ]; + "tikteck" = ps: with ps; [ ]; + "tikteck.light" = ps: with ps; [ ]; + "tile" = ps: with ps; [ ]; + "tile.device_tracker" = ps: with ps; [ ]; + "time_date" = ps: with ps; [ ]; + "time_date.sensor" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; + "tod" = ps: with ps; [ ]; + "tod.binary_sensor" = ps: with ps; [ ]; + "todoist" = ps: with ps; [ ]; + "todoist.calendar" = ps: with ps; [ todoist ]; + "tof" = ps: with ps; [ ]; + "tof.sensor" = ps: with ps; [ ]; + "tomato" = ps: with ps; [ ]; + "tomato.device_tracker" = ps: with ps; [ ]; "toon" = ps: with ps; [ ]; "toon.binary_sensor" = ps: with ps; [ ]; "toon.climate" = ps: with ps; [ ]; "toon.config_flow" = ps: with ps; [ ]; "toon.const" = ps: with ps; [ ]; "toon.sensor" = ps: with ps; [ ]; + "torque" = ps: with ps; [ ]; + "torque.sensor" = ps: with ps; [ aiohttp-cors ]; + "totalconnect" = ps: with ps; [ ]; + "totalconnect.alarm_control_panel" = ps: with ps; [ ]; + "touchline" = ps: with ps; [ ]; + "touchline.climate" = ps: with ps; [ ]; "tplink" = ps: with ps; [ ]; + "tplink.device_tracker" = ps: with ps; [ ]; "tplink.light" = ps: with ps; [ ]; "tplink.switch" = ps: with ps; [ ]; "tplink_lte" = ps: with ps; [ ]; "tplink_lte.notify" = ps: with ps; [ ]; + "traccar" = ps: with ps; [ ]; + "traccar.device_tracker" = ps: with ps; [ ]; + "trackr" = ps: with ps; [ ]; + "trackr.device_tracker" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; "tradfri.config_flow" = ps: with ps; [ ]; "tradfri.const" = ps: with ps; [ ]; "tradfri.light" = ps: with ps; [ ]; "tradfri.sensor" = ps: with ps; [ ]; "tradfri.switch" = ps: with ps; [ ]; + "trafikverket_weatherstation" = ps: with ps; [ ]; + "trafikverket_weatherstation.sensor" = ps: with ps; [ ]; "transmission" = ps: with ps; [ transmissionrpc ]; "transmission.sensor" = ps: with ps; [ transmissionrpc ]; "transmission.switch" = ps: with ps; [ transmissionrpc ]; + "transport_nsw" = ps: with ps; [ ]; + "transport_nsw.sensor" = ps: with ps; [ ]; + "travisci" = ps: with ps; [ ]; + "travisci.sensor" = ps: with ps; [ ]; + "trend" = ps: with ps; [ ]; + "trend.binary_sensor" = ps: with ps; [ numpy ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tts.amazon_polly" = ps: with ps; [ boto3 ]; - "tts.baidu" = ps: with ps; [ ]; - "tts.demo" = ps: with ps; [ ]; - "tts.marytts" = ps: with ps; [ ]; - "tts.microsoft" = ps: with ps; [ ]; - "tts.picotts" = ps: with ps; [ ]; - "tts.voicerss" = ps: with ps; [ ]; - "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "tuya.climate" = ps: with ps; [ ]; "tuya.cover" = ps: with ps; [ ]; @@ -1428,11 +1853,36 @@ "tuya.scene" = ps: with ps; [ ]; "tuya.switch" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_call" = ps: with ps; [ ]; + "twilio_call.notify" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_sms" = ps: with ps; [ ]; + "twilio_sms.notify" = ps: with ps; [ aiohttp-cors twilio ]; + "twitch" = ps: with ps; [ ]; + "twitch.sensor" = ps: with ps; [ ]; + "twitter" = ps: with ps; [ ]; + "twitter.notify" = ps: with ps; [ ]; + "ubee" = ps: with ps; [ ]; + "ubee.device_tracker" = ps: with ps; [ ]; + "uber" = ps: with ps; [ ]; + "uber.sensor" = ps: with ps; [ ]; + "ubus" = ps: with ps; [ ]; + "ubus.device_tracker" = ps: with ps; [ ]; + "ue_smart_radio" = ps: with ps; [ ]; + "ue_smart_radio.media_player" = ps: with ps; [ ]; + "uk_transport" = ps: with ps; [ ]; + "uk_transport.sensor" = ps: with ps; [ ]; "unifi" = ps: with ps; [ aiounifi ]; "unifi.const" = ps: with ps; [ ]; "unifi.controller" = ps: with ps; [ ]; + "unifi.device_tracker" = ps: with ps; [ pyunifi ]; "unifi.errors" = ps: with ps; [ ]; "unifi.switch" = ps: with ps; [ aiounifi ]; + "unifi_direct" = ps: with ps; [ ]; + "unifi_direct.device_tracker" = ps: with ps; [ pexpect ]; + "universal" = ps: with ps; [ ]; + "universal.media_player" = ps: with ps; [ ]; + "upc_connect" = ps: with ps; [ ]; + "upc_connect.device_tracker" = ps: with ps; [ defusedxml ]; "upcloud" = ps: with ps; [ ]; "upcloud.binary_sensor" = ps: with ps; [ ]; "upcloud.switch" = ps: with ps; [ ]; @@ -1441,16 +1891,27 @@ "upnp.const" = ps: with ps; [ ]; "upnp.device" = ps: with ps; [ ]; "upnp.sensor" = ps: with ps; [ ]; + "ups" = ps: with ps; [ ]; + "ups.sensor" = ps: with ps; [ ]; + "uptime" = ps: with ps; [ ]; + "uptime.sensor" = ps: with ps; [ ]; + "uptimerobot" = ps: with ps; [ ]; + "uptimerobot.binary_sensor" = ps: with ps; [ ]; + "uscis" = ps: with ps; [ ]; + "uscis.sensor" = ps: with ps; [ ]; + "usgs_earthquakes_feed" = ps: with ps; [ ]; + "usgs_earthquakes_feed.geo_location" = ps: with ps; [ ]; "usps" = ps: with ps; [ ]; "usps.camera" = ps: with ps; [ ]; "usps.sensor" = ps: with ps; [ ]; "utility_meter" = ps: with ps; [ ]; "utility_meter.const" = ps: with ps; [ ]; "utility_meter.sensor" = ps: with ps; [ ]; + "uvc" = ps: with ps; [ ]; + "uvc.camera" = ps: with ps; [ ]; "vacuum" = ps: with ps; [ ]; - "vacuum.demo" = ps: with ps; [ ]; - "vacuum.dyson" = ps: with ps; [ ]; - "vacuum.roomba" = ps: with ps; [ ]; + "vasttrafik" = ps: with ps; [ ]; + "vasttrafik.sensor" = ps: with ps; [ ]; "velbus" = ps: with ps; [ ]; "velbus.binary_sensor" = ps: with ps; [ ]; "velbus.climate" = ps: with ps; [ ]; @@ -1460,6 +1921,8 @@ "velux" = ps: with ps; [ ]; "velux.cover" = ps: with ps; [ ]; "velux.scene" = ps: with ps; [ ]; + "venstar" = ps: with ps; [ ]; + "venstar.climate" = ps: with ps; [ ]; "vera" = ps: with ps; [ ]; "vera.binary_sensor" = ps: with ps; [ ]; "vera.climate" = ps: with ps; [ ]; @@ -1476,6 +1939,22 @@ "verisure.lock" = ps: with ps; [ ]; "verisure.sensor" = ps: with ps; [ ]; "verisure.switch" = ps: with ps; [ ]; + "version" = ps: with ps; [ ]; + "version.sensor" = ps: with ps; [ ]; + "vesync" = ps: with ps; [ ]; + "vesync.switch" = ps: with ps; [ ]; + "viaggiatreno" = ps: with ps; [ ]; + "viaggiatreno.sensor" = ps: with ps; [ ]; + "vizio" = ps: with ps; [ ]; + "vizio.media_player" = ps: with ps; [ ]; + "vlc" = ps: with ps; [ ]; + "vlc.media_player" = ps: with ps; [ ]; + "voicerss" = ps: with ps; [ ]; + "voicerss.tts" = ps: with ps; [ ]; + "volkszaehler" = ps: with ps; [ ]; + "volkszaehler.sensor" = ps: with ps; [ ]; + "volumio" = ps: with ps; [ ]; + "volumio.media_player" = ps: with ps; [ ]; "volvooncall" = ps: with ps; [ ]; "volvooncall.binary_sensor" = ps: with ps; [ ]; "volvooncall.device_tracker" = ps: with ps; [ ]; @@ -1483,25 +1962,22 @@ "volvooncall.sensor" = ps: with ps; [ ]; "volvooncall.switch" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; + "vultr.binary_sensor" = ps: with ps; [ vultr ]; + "vultr.sensor" = ps: with ps; [ vultr ]; + "vultr.switch" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; "w800rf32.binary_sensor" = ps: with ps; [ ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "wake_on_lan.switch" = ps: with ps; [ wakeonlan ]; + "waqi" = ps: with ps; [ ]; + "waqi.sensor" = ps: with ps; [ ]; "water_heater" = ps: with ps; [ ]; - "water_heater.demo" = ps: with ps; [ ]; - "water_heater.econet" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "waterfurnace.sensor" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; + "waze_travel_time" = ps: with ps; [ ]; + "waze_travel_time.sensor" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; - "weather.bom" = ps: with ps; [ ]; - "weather.buienradar" = ps: with ps; [ ]; - "weather.darksky" = ps: with ps; [ python-forecastio ]; - "weather.demo" = ps: with ps; [ ]; - "weather.met" = ps: with ps; [ ]; - "weather.metoffice" = ps: with ps; [ ]; - "weather.openweathermap" = ps: with ps; [ pyowm ]; - "weather.yweather" = ps: with ps; [ yahooweather ]; - "weather.zamg" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; "weblink" = ps: with ps; [ ]; "webostv" = ps: with ps; [ ]; @@ -1516,11 +1992,15 @@ "websocket_api.error" = ps: with ps; [ ]; "websocket_api.http" = ps: with ps; [ ]; "websocket_api.messages" = ps: with ps; [ ]; + "websocket_api.permissions" = ps: with ps; [ ]; + "websocket_api.sensor" = ps: with ps; [ ]; "wemo" = ps: with ps; [ ]; "wemo.binary_sensor" = ps: with ps; [ ]; "wemo.fan" = ps: with ps; [ ]; "wemo.light" = ps: with ps; [ ]; "wemo.switch" = ps: with ps; [ ]; + "whois" = ps: with ps; [ ]; + "whois.sensor" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; "wink.alarm_control_panel" = ps: with ps; [ ]; "wink.binary_sensor" = ps: with ps; [ ]; @@ -1537,7 +2017,30 @@ "wirelesstag.binary_sensor" = ps: with ps; [ ]; "wirelesstag.sensor" = ps: with ps; [ ]; "wirelesstag.switch" = ps: with ps; [ ]; + "workday" = ps: with ps; [ ]; + "workday.binary_sensor" = ps: with ps; [ ]; + "worldclock" = ps: with ps; [ ]; + "worldclock.sensor" = ps: with ps; [ ]; + "worldtidesinfo" = ps: with ps; [ ]; + "worldtidesinfo.sensor" = ps: with ps; [ ]; + "worxlandroid" = ps: with ps; [ ]; + "worxlandroid.sensor" = ps: with ps; [ ]; + "wsdot" = ps: with ps; [ ]; + "wsdot.sensor" = ps: with ps; [ ]; + "wunderground" = ps: with ps; [ ]; + "wunderground.sensor" = ps: with ps; [ ]; "wunderlist" = ps: with ps; [ ]; + "x10" = ps: with ps; [ ]; + "x10.light" = ps: with ps; [ ]; + "xbox_live" = ps: with ps; [ ]; + "xbox_live.sensor" = ps: with ps; [ ]; + "xeoma" = ps: with ps; [ ]; + "xeoma.camera" = ps: with ps; [ ]; + "xfinity" = ps: with ps; [ ]; + "xfinity.device_tracker" = ps: with ps; [ ]; + "xiaomi" = ps: with ps; [ ]; + "xiaomi.camera" = ps: with ps; [ ha-ffmpeg ]; + "xiaomi.device_tracker" = ps: with ps; [ ]; "xiaomi_aqara" = ps: with ps; [ ]; "xiaomi_aqara.binary_sensor" = ps: with ps; [ ]; "xiaomi_aqara.cover" = ps: with ps; [ ]; @@ -1553,13 +2056,46 @@ "xiaomi_miio.sensor" = ps: with ps; [ construct ]; "xiaomi_miio.switch" = ps: with ps; [ construct ]; "xiaomi_miio.vacuum" = ps: with ps; [ construct ]; + "xiaomi_tv" = ps: with ps; [ ]; + "xiaomi_tv.media_player" = ps: with ps; [ ]; + "xmpp" = ps: with ps; [ ]; + "xmpp.notify" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; "xs1.climate" = ps: with ps; [ ]; "xs1.sensor" = ps: with ps; [ ]; "xs1.switch" = ps: with ps; [ ]; + "yale_smart_alarm" = ps: with ps; [ ]; + "yale_smart_alarm.alarm_control_panel" = ps: with ps; [ ]; + "yamaha" = ps: with ps; [ ]; + "yamaha.media_player" = ps: with ps; [ ]; + "yamaha_musiccast" = ps: with ps; [ ]; + "yamaha_musiccast.media_player" = ps: with ps; [ ]; + "yandextts" = ps: with ps; [ ]; + "yandextts.tts" = ps: with ps; [ ]; + "yeelight" = ps: with ps; [ ]; + "yeelight.binary_sensor" = ps: with ps; [ ]; + "yeelight.light" = ps: with ps; [ ]; + "yeelightsunflower" = ps: with ps; [ ]; + "yeelightsunflower.light" = ps: with ps; [ ]; + "yessssms" = ps: with ps; [ ]; + "yessssms.notify" = ps: with ps; [ ]; + "yi" = ps: with ps; [ ]; + "yi.camera" = ps: with ps; [ ha-ffmpeg ]; + "yr" = ps: with ps; [ ]; + "yr.sensor" = ps: with ps; [ xmltodict ]; + "yweather" = ps: with ps; [ ]; + "yweather.sensor" = ps: with ps; [ yahooweather ]; + "yweather.weather" = ps: with ps; [ yahooweather ]; "zabbix" = ps: with ps; [ ]; "zabbix.sensor" = ps: with ps; [ ]; + "zamg" = ps: with ps; [ ]; + "zamg.sensor" = ps: with ps; [ ]; + "zamg.weather" = ps: with ps; [ ]; + "zengge" = ps: with ps; [ ]; + "zengge.light" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; + "zestimate" = ps: with ps; [ ]; + "zestimate.sensor" = ps: with ps; [ xmltodict ]; "zha" = ps: with ps; [ ]; "zha.api" = ps: with ps; [ ]; "zha.binary_sensor" = ps: with ps; [ ]; @@ -1572,11 +2108,15 @@ "zha.light" = ps: with ps; [ ]; "zha.sensor" = ps: with ps; [ ]; "zha.switch" = ps: with ps; [ ]; + "zhong_hong" = ps: with ps; [ ]; + "zhong_hong.climate" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; "zigbee.binary_sensor" = ps: with ps; [ ]; "zigbee.light" = ps: with ps; [ ]; "zigbee.sensor" = ps: with ps; [ ]; "zigbee.switch" = ps: with ps; [ ]; + "ziggo_mediabox_xl" = ps: with ps; [ ]; + "ziggo_mediabox_xl.media_player" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zone.config_flow" = ps: with ps; [ ]; "zone.const" = ps: with ps; [ ]; diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 6b146459e8f1..85aa4caf0833 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -44,10 +44,12 @@ let "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik") (mkOverride "python-slugify" "1.2.6" "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245") + (mkOverride "pyyaml" "3.13" + "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") - (mkOverride "ruamel_yaml" "0.15.88" - "ac56193c47a31c9efa151064a9e921865cdad0f7a991d229e7197e12fe8e0cd7") + (mkOverride "ruamel_yaml" "0.15.89" + "86d034aa9e2ab3eacc5f75f5cd6a469a2af533b6d9e60ea92edbba540d21b9b7") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.1.0" @@ -95,7 +97,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.89.2"; + hassVersion = "0.91.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -110,7 +112,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1k91mq45nq80dwkzqrlax7bvmv556ipr3pqh7i3k1lcaryn5p0l7"; + sha256 = "1y2sv9qq7zmb85n2f5b3csnc60xi87ccpkmhz8ii9gkjw6swikyh"; }; propagatedBuildInputs = [ @@ -131,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec { # Some basic components should be tested however py.test \ tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \ - tests/components/{http,init,introduction,logger,script,shell_command,system_log,websocket_api} + tests/components/{homeassistant,http,introduction,logger,script,shell_command,system_log,websocket_api} ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix index cb5ddbc9c50e..f8349c24f7fb 100644 --- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -2,15 +2,18 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190305.1"; + version = "20190331.0"; src = fetchPypi { inherit pname version; - sha256 = "1b07b7efb3e0004df752f9aa40c42e80d5da13371f48df8e21c7579093849aae"; + sha256 = "2d266a4d3d31af9a50debb99b0e9e9650044698f9157753bec785785057264cf"; }; propagatedBuildInputs = [ user-agents ]; + # no Python tests implemented + doCheck = false; + meta = with lib; { description = "Polymer frontend for Home Assistant"; homepage = https://github.com/home-assistant/home-assistant-polymer; diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 64e57f64236e..5933a71e5159 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.38"; + version = "2.4.39"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0jiriyyf3pm6axf4mrz6c2z08yhs21hb4d23viq87jclm5bmiikx"; + sha256 = "18ngvsjq65qxk3biggnkhkq8jlll9dsg9n3csra9p99sfw2rvjml"; }; # FIXME: -dev depends on -doc diff --git a/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix index db459dc81c8e..2993809c5563 100644 --- a/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.52"; + name = "lighttpd-1.4.53"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17"; + sha256 = "0y6b3lvv0cmn7mlm832k7z31fmrc6hazn9lcd9ahlrg9ycfcxprv"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix index 691ca014257b..02bef43c184f 100644 --- a/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -9,6 +9,17 @@ with stdenv.lib; +let + + mapModules = attrPath: flip concatMap modules + (mod: + let supports = mod.supports or (_: true); + in + if supports version then mod.${attrPath} or [] + else throw "Module at ${toString mod.src} does not support nginx version ${version}!"); + +in + stdenv.mkDerivation { name = "nginx-${version}"; @@ -18,7 +29,7 @@ stdenv.mkDerivation { }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] - ++ concatMap (mod: mod.inputs or []) modules; + ++ mapModules "inputs"; configureFlags = [ "--with-http_ssl_module" @@ -77,7 +88,7 @@ stdenv.mkDerivation { url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; }) - ]; + ] ++ mapModules "patches"; hardeningEnable = optional (!stdenv.isDarwin) "pie"; diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index d86a78187e5f..d7ee0a0af0a9 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.9"; - sha256 = "0hxfsz1117r91b9fb5hjddyrf1czvb36lh1z7zalqqdskfcbmkz4"; + version = "1.15.10"; + sha256 = "0g3wadbf9r730p0j5c0pnsmbmbrwvvnpyzhgbmsf9g2jplx78rdq"; }) diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix index 57884bcfdb96..6a0114a6ba55 100644 --- a/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -1,5 +1,22 @@ { fetchFromGitHub, lib, pkgs }: +let + + http_proxy_connect_module_generic = patchName: rec { + src = fetchFromGitHub { + owner = "chobits"; + repo = "ngx_http_proxy_connect_module"; + rev = "8201639082cba702211585b03d4cc7bc51c65167"; + sha256 = "0z71x3xnlczrr2kq43w3drxj9g14fkk4jz66x921v0yb8r9mnn5a"; + }; + + patches = [ + "${src}/patch/${patchName}.patch" + ]; + }; + +in + { brotli = { src = let gitsrc = pkgs.fetchFromGitHub { @@ -318,4 +335,12 @@ sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7"; }; }; + + http_proxy_connect_module_v15 = http_proxy_connect_module_generic "proxy_connect_rewrite_1015" // { + supports = with lib.versions; version: major version == "1" && minor version == "15"; + }; + + http_proxy_connect_module_v14 = http_proxy_connect_module_generic "proxy_connect_rewrite_1014" // { + supports = with lib.versions; version: major version == "1" && minor version == "14"; + }; } diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index f250dd5e9bb4..d798d5d231ec 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -16,14 +16,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.8.0"; name = "unit-${version}"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = "${version}"; - sha256 = "1nz5xcwbwpr0jdbx9j052byarnc2qn987pdainy85in1aj0b57kf"; + sha256 = "1s5pfyhabnf9p5z2h1fh0wb4hqzkrha5bxahjnikmlkhw59s8zip"; }; nativeBuildInputs = [ which ]; @@ -40,9 +40,14 @@ stdenv.mkDerivation rec { ++ optional withRuby ruby ++ optional withSSL openssl; + # Used patch to enable work with unprivileged user - https://github.com/nginx/unit/issues/228 + patches = [ ./unit-rootless.patch ]; + configureFlags = [ - "--control=unix:/run/control.unit.sock" - "--pid=/run/unit.pid" + "--control=unix:/run/unit/control.unit.sock" + "--pid=/run/unit/unit.pid" + "--user=unit" + "--group=unit" ] ++ optional withSSL [ "--openssl" ] ++ optional (!withIPv6) [ "--no-ipv6" ] ++ optional withDebug [ "--debug" ]; diff --git a/nixpkgs/pkgs/servers/http/unit/unit-rootless.patch b/nixpkgs/pkgs/servers/http/unit/unit-rootless.patch new file mode 100644 index 000000000000..36506847f915 --- /dev/null +++ b/nixpkgs/pkgs/servers/http/unit/unit-rootless.patch @@ -0,0 +1,24 @@ +diff --git a/src/nxt_process.c b/src/nxt_process.c +index 5952029..7b29369 100644 +--- a/src/nxt_process.c ++++ b/src/nxt_process.c +@@ -136,7 +136,7 @@ nxt_process_start(nxt_task_t *task, nxt_process_t *process) + + nxt_random_init(&thread->random); + +- if (init->user_cred != NULL && getuid() == 0) { ++ if (init->user_cred != NULL) { + /* Super-user. */ + + ret = nxt_user_cred_set(task, init->user_cred); +@@ -434,9 +434,7 @@ nxt_user_cred_get(nxt_task_t *task, nxt_user_cred_t *uc, const char *group) + uc->base_gid = grp->gr_gid; + } + +- if (getuid() == 0) { + return nxt_user_groups_get(task, uc); +- } + + return NXT_OK; + } + diff --git a/nixpkgs/pkgs/servers/hydron/default.nix b/nixpkgs/pkgs/servers/hydron/default.nix index c96eed7a57b3..912e520180e6 100644 --- a/nixpkgs/pkgs/servers/hydron/default.nix +++ b/nixpkgs/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-10-08"; + version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "0a834bcaf9af3a6bac8873fad981aa3736115258"; - sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww"; + rev = "824789fb108966432e507143db39b358dd7ff233"; + sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/hydron/deps.nix b/nixpkgs/pkgs/servers/hydron/deps.nix index 92ac9a8325d9..08f165af76b2 100644 --- a/nixpkgs/pkgs/servers/hydron/deps.nix +++ b/nixpkgs/pkgs/servers/hydron/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; - sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; + rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; + sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; + }; + } + { + goPackagePath = "github.com/bakape/boorufetch"; + fetch = { + type = "git"; + url = "https://github.com/bakape/boorufetch"; + rev = "90aee10269a138a08ce49cd91635500336657a82"; + sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; }; } { @@ -14,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; - sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; + rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; + sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; + }; + } + { + goPackagePath = "github.com/chai2010/webp"; + fetch = { + type = "git"; + url = "https://github.com/chai2010/webp"; + rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; + sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; - sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; + rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; + sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; }; } { @@ -32,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; - sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; + rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; + sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; }; } { @@ -64,12 +82,30 @@ }; } { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "1de009706dbeb9d05f18586f0735fcdb7c524481"; + sha256 = "0y4wq6wwj9ivqr397wcr6n0bd9m85qpk367bp65hkfi9x3mnlcb4"; + }; + } + { goPackagePath = "github.com/mattn/go-sqlite3"; fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; - sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; + rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; + sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; + sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; }; } { @@ -86,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; }; } { @@ -95,8 +131,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + rev = "d8887717615a059821345a5c23649351b52a1c0b"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; }; } ] diff --git a/nixpkgs/pkgs/servers/irc/ngircd/default.nix b/nixpkgs/pkgs/servers/irc/ngircd/default.nix index f3b67741c191..5194ab278bf7 100644 --- a/nixpkgs/pkgs/servers/irc/ngircd/default.nix +++ b/nixpkgs/pkgs/servers/irc/ngircd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, openssl, pam, libiconv }: stdenv.mkDerivation rec { - name = "ngircd-24"; + name = "ngircd-25"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${name}.tar.xz"; - sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp"; + sha256 = "0kpf5qi98m9f833r4rx9n6h9p31biwk798jwc1mgzmix7sp7r6f4"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/servers/mail/dovecot/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/default.nix index 2d9d2fe0f154..802c6698df64 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.4.1"; + name = "dovecot-2.3.5.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq"; + sha256 = "0gy3qzwbp6zsyn44pcfq8iiv9iy9q7z6py30h60alb1vkr3rv3yp"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 73d6b5d593c9..0dc037a06ca7 100644 --- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; - sha256 = "05l5y0gc8ycswdbl58j7kbx5gq1z7mjkazjccmgbq6h0gbk9jyal"; + sha256 = "19a9a6rdvdlrm00k2npprj6lrikjhngnmpgg412848rb3ip11anb"; }; buildInputs = [ dovecot openssl ]; diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix index 4c1420b1ae20..634bba2e57c9 100644 --- a/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation rec { name = "postfix-${version}"; - version = "3.4.3"; + version = "3.4.5"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "1c4ga3p0jshs9xyfq07j6jl9hj42p47q6nbmy42cijax90bhayz3"; + sha256 = "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb"; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index fda7a1a80ef7..a8c09945fa92 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -14,13 +14,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "1aikmscb3hywac4sf4xkl4kw0x3syzphfrmxhigz2jjqzxn8f50k"; + sha256 = "0n5abzs2i3mz65p5dwbph5bdamqv28wc1iw4gc4f84m0cda1vs0r"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 783c0b5bde82..d942e5fa8d31 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "0.99.2"; + version = "0.99.3"; src = fetchPypi { inherit pname version; - sha256 = "0y6vic0fjx9k8178vsns0ab4ngqx8qhiyampqnil0b1biqcd68bw"; + sha256 = "03300dplzckydwfvbn4w1sfc77b461cvgpi3qkhbv9jnnzz5y28g"; }; patches = [ diff --git a/nixpkgs/pkgs/servers/mattermost/default.nix b/nixpkgs/pkgs/servers/mattermost/default.nix index 02aa4fbab7da..2fc8232f0a28 100644 --- a/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/nixpkgs/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.7.1"; + version = "5.9.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "1k4rd8383bz9q23wgxnqcp69hcixaa0zd256h54wmwqw6fdn3bc0"; + sha256 = "08h7n9smv6f1njazn4pl6pwkfmqxn93rzg69h6asicp9c4vad3m2"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "0rxbgd3cb9m7rf0yg1vpd1af6x6bn0jilb0pfqr46dg42a70dx09"; + sha256 = "19ys5mwmw99fbj44gd00vrl2qj09lrwvj1ihic0fsn6nd3hnx3mw"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 9aa4fc24e4bf..7c50c9cb27b8 100644 --- a/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -1,30 +1,16 @@ -{ lib, fetchpatch, python3 }: +{ lib, python3 }: with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.4.0.post1"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "7a51e55a7f362013ce1cce7d850c65dc8d4651dd05c63004429bc521b461d029"; + sha256 = "51951845e52c4ca5410e0f4a51d99014dd6df2fcedfca8b7241e045359cbf112"; }; - patches = [ - (fetchpatch { - url = "https://github.com/tulir/mautrix-telegram/commit/a258c59ca3558ad91b1fee190c624763ca835d2f.patch"; - sha256 = "04z4plsmqmg38rsw9irp5xc9wdgjvg6xba69mixi5v82h9lg3zzp"; - }) - - ./fix_patch_conflicts.patch - - (fetchpatch { - url = "https://github.com/tulir/mautrix-telegram/commit/8021fcc24cbf8c88d9bcb2601333863c9615bd4f.patch"; - sha256 = "0cdfv8ggnjdwdhls1lk6498b233lvnb6175xbxr206km5mxyvqyk"; - }) - ]; - propagatedBuildInputs = [ aiohttp mautrix-appservice @@ -36,10 +22,16 @@ buildPythonPackage rec { python_magic telethon telethon-session-sqlalchemy + pillow + lxml ]; - # No tests available - doCheck = false; + checkInputs = [ + pytest + pytestrunner + pytest-mock + pytest-asyncio + ]; meta = with lib; { homepage = https://github.com/tulir/mautrix-telegram; diff --git a/nixpkgs/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch b/nixpkgs/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch deleted file mode 100644 index 99c902ce03b7..000000000000 --- a/nixpkgs/pkgs/servers/mautrix-telegram/fix_patch_conflicts.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/mautrix_telegram/abstract_user.py b/mautrix_telegram/abstract_user.py -index 11273f8..aadaf5d 100644 ---- a/mautrix_telegram/abstract_user.py -+++ b/mautrix_telegram/abstract_user.py -@@ -21,14 +21,14 @@ import logging - import platform - - from sqlalchemy import orm --from telethon.tl.types import Channel, ChannelForbidden, Chat, ChatForbidden, Message, \ -- MessageActionChannelMigrateFrom, MessageService, PeerUser, TypeUpdate, \ -- UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, \ -- UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, \ -- UpdateDeleteMessages, UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, \ -- UpdateNewMessage, UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, \ -- UpdateUserName, UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, \ -- UserStatusOnline -+from telethon.tl.patched import MessageService, Message -+from telethon.tl.types import ( -+ Channel, ChannelForbidden, Chat, ChatForbidden, MessageActionChannelMigrateFrom, PeerUser, -+ TypeUpdate, UpdateChannelPinnedMessage, UpdateChatAdmins, UpdateChatParticipantAdmin, -+ UpdateChatParticipants, UpdateChatUserTyping, UpdateDeleteChannelMessages, UpdateDeleteMessages, -+ UpdateEditChannelMessage, UpdateEditMessage, UpdateNewChannelMessage, UpdateNewMessage, -+ UpdateReadHistoryOutbox, UpdateShortChatMessage, UpdateShortMessage, UpdateUserName, -+ UpdateUserPhoto, UpdateUserStatus, UpdateUserTyping, User, UserStatusOffline, UserStatusOnline) - - from mautrix_appservice import MatrixRequestError, AppService - from alchemysession import AlchemySessionContainer diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index ea3fbd58e2eb..f6526ab1f715 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "mautrix-unstable-${version}"; - version = "2019-02-11"; + version = "2019-02-24"; goPackagePath = "maunium.net/go/mautrix-whatsapp"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "f689297ba6704265a938951f307b365e829fcfa1"; - sha256 = "1658bika9ylhm64k9lxavp43dxilygn6vx7yn6y1l10j8by2akxk"; + rev = "485acf6de654b8fb70007876c074fb004eb9717b"; + sha256 = "1v7h3s8h0aiq6g06h9j1sidw8y5aiw24sgdh9knr1c90pvvc7pmv"; }; goDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix b/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix index 8a1543ac012f..8624889e3468 100644 --- a/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix +++ b/nixpkgs/pkgs/servers/mautrix-whatsapp/deps.nix @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Rhymen/go-whatsapp"; - rev = "2ca6af00572c"; - sha256 = "0lrscj59n9nmd5z0h9r2c952m0da672r3aj33bi443ap0h97w19i"; + rev = "c1173899de99"; + sha256 = "1f46zpbfgv3k38lgdrcwqf4cm34dgqxlfs9qzg380in61460lcri"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + rev = "v1.7.0"; + sha256 = "09cn5v1gxrrrydzyllp1asbhgm5xsawb92as7cg9jqg6iyqajvlc"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "v0.1.1"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "v0.0.5"; + sha256 = "114d5xm8rfxplzd7nxz97gfngb4bhqy102szl084d1afcxsvm4aa"; }; } { @@ -113,8 +113,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ff983b9c42bc"; - sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; + rev = "ffb98f73852f"; + sha256 = "0hil543q2zq8wxsz6ljrfnrhhxg5j0mrjfwskf2x6q0ppqizsa4h"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "48ac38b7c8cb"; - sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; + rev = "cd391775e71e"; + sha256 = "12wk5ylx0jjajipr68yn50wcd0c9shzhq9y4an40ldnv4bsdp2rj"; }; } { diff --git a/nixpkgs/pkgs/servers/meguca/default.nix b/nixpkgs/pkgs/servers/meguca/default.nix index 504df8bae0cb..d983c0677191 100644 --- a/nixpkgs/pkgs/servers/meguca/default.nix +++ b/nixpkgs/pkgs/servers/meguca/default.nix @@ -1,34 +1,35 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript -, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full +, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson +, nodePackages, emscripten, opencv, statik }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-12-06"; + version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "meguca"; - rev = "300b007cab238838f813faa9aad6abb3f22ad4d2"; - sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9"; + rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525"; + sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i"; fetchSubmodules = true; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ]; + + buildInputs = [ + ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata + easyjson emscripten opencv statik + ]; buildPhase = '' export HOME=`pwd` - export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server - cd $HOME/go/src/github.com/bakape/meguca + cd go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile - make generate_clean - go generate meguca/... - go build -v -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client + make -j $NIX_BUILD_CORES generate all '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' make -j $NIX_BUILD_CORES wasm ''; diff --git a/nixpkgs/pkgs/servers/meguca/server_deps.nix b/nixpkgs/pkgs/servers/meguca/server_deps.nix index 5dc53820a9d2..bff9d5624e83 100644 --- a/nixpkgs/pkgs/servers/meguca/server_deps.nix +++ b/nixpkgs/pkgs/servers/meguca/server_deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/ErikDubbelboer/gspt"; - rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0"; - sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81"; + rev = "e68493906b8382891943ddc9960cb9c6ecd1a1f0"; + sha256 = "17xjyg6zw02yzly30hs92pwgn0w85naixr4kb2c0mgp5zavl1ffz"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; - sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; + rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; + sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; }; } { @@ -23,17 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; - }; - } - { - goPackagePath = "github.com/Soreil/apngdetector"; - fetch = { - type = "git"; - url = "https://github.com/Soreil/apngdetector"; - rev = "e412c29dbc998dfcffe266b12587b29096ac4d46"; - sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j"; + rev = "3dcf72e6c17f694381a21592651ca1464ded0e10"; + sha256 = "0fpsf6b54z33a7zl28x860jbaj3g5722g8kpqs6rdpaqv99yyvnn"; }; } { @@ -50,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/aquilax/tripcode"; - rev = "db58da84bb12e26032493b73eb3b58ba884590ef"; - sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3"; + rev = "1a14b0a5e89f7fdb8a821562569338ad59ab2da5"; + sha256 = "1ishrg37gkkx04gbchhsk7jp01mmfvln2i2zrncbj4qxs2amnn2l"; }; } { @@ -59,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/badoux/goscraper"; - rev = "363803726ad4e2ab262b4e01362e98458df0b231"; - sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48"; + rev = "9b4686c4b62c22b0489d53dddf5421605caba33e"; + sha256 = "1f1wc4s2b6g1ndpihb0gn7cxmwyi4wfqi5slvsk6i6p9q4kxrkvx"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/boorufetch"; - rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0"; - sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0"; + rev = "90aee10269a138a08ce49cd91635500336657a82"; + sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; }; } { @@ -77,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/captchouli"; - rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680"; - sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm"; + rev = "b57177c8d2f239547e9545354e2f55fbc851ab47"; + sha256 = "1fi24322bbicc2bpfla37nhy2w89cf67345dbybcavgcny5rs65a"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; - sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; + rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; + sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; }; } { @@ -109,12 +100,21 @@ }; } { + goPackagePath = "github.com/chai2010/webp"; + fetch = { + type = "git"; + url = "https://github.com/chai2010/webp"; + rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; + sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; + }; + } + { goPackagePath = "github.com/dimfeld/httptreemux"; fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; - sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; + rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; + sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; }; } { @@ -122,8 +122,17 @@ fetch = { type = "git"; url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + rev = "da652975a8eea9fa0735aba8056747a751db0bd3"; + sha256 = "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "11844c0959f6fff69ba325d097fce35bd85a8e93"; + sha256 = "0driasljawka9r914530mr9df2i5cwldcgj2v94qkhzlkb48ljwc"; }; } { @@ -140,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/errors"; - rev = "9aa88f624b398d37201c30583065aee54071bc0c"; - sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh"; + rev = "4050dd2e2e3b2052ef736048661d1d23a4a4e55d"; + sha256 = "0b3bhf2c9fpv095db3ajyb1fz7nxjn7rfg9rjb83hqfm492wjy86"; }; } { @@ -149,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/log"; - rev = "736ecb55f80c7121af3754a7ea62e96733451fe1"; - sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; + rev = "fdcdf507e3bf20900bc1a44b0cbd73fee5bcbe19"; + sha256 = "0mbzawm09n2kggrkmj0khrhipmdi191z01mw120ahbmmjdjls749"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + rev = "2a8bb927dd31d8daada140a5d09578521ce5c36a"; + sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; }; } { @@ -167,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; - sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; + rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; + sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; }; } { @@ -176,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + rev = "0ec3d1bd7fe50c503d6df98ee649d81f4857c564"; + sha256 = "0mdq489izwy20bpjg31k8qnfgvh5r7mm5yq709q6xyzmzdd5nasx"; }; } { @@ -221,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; - sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; + rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; + sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; }; } { @@ -235,21 +244,12 @@ }; } { - goPackagePath = "github.com/nyarlabo/go-crypt"; - fetch = { - type = "git"; - url = "https://github.com/nyarlabo/go-crypt"; - rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; - sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; - }; - } - { goPackagePath = "github.com/oschwald/maxminddb-golang"; fetch = { type = "git"; url = "https://github.com/oschwald/maxminddb-golang"; - rev = "ed835b22606182ff576f244643e52b25b7d6c4e7"; - sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw"; + rev = "fc04c43d3c694a35570a7e4358b0f4d4ac3fea32"; + sha256 = "16bz3g8mkg2xhb4pxcpk6scxrmn48485jgky7wvi4gzpizlhsxxq"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/otium/ytdl"; - rev = "0227c2bacb82a434f2332d7d8c64093615c08a40"; - sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs"; + rev = "5c8ee71b4175be285baaff66147458254884f748"; + sha256 = "1w22cfc6nr7z5fc3hmcymmx2xfcb66ylhfs89vn4i19ksxbkkcjk"; }; } { @@ -266,8 +266,17 @@ fetch = { type = "git"; url = "https://github.com/pierrec/lz4"; - rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e"; - sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki"; + rev = "062282ea0dcff40c9fb8525789eef9644b1fbd6e"; + sha256 = "04lzigxv2f4yv9gr1dybsjkcnmv1lj0mx9ls2ry1pzy2l9z6i6cp"; + }; + } + { + goPackagePath = "github.com/rakyll/statik"; + fetch = { + type = "git"; + url = "https://github.com/rakyll/statik"; + rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; + sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; }; } { @@ -275,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1"; - sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01"; + rev = "fedf95d0cd0be92511436dbc84c290ff1c104f61"; + sha256 = "1ffjgx75wvpharzq60aqbpl78z1jwx13b21ifcadm1f976vdjq1q"; }; } { @@ -284,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39"; - sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4"; + rev = "dae0fa8d5b0c810a8ab733fbd5510c7cae84eca4"; + sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; }; } { @@ -293,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; - sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { @@ -311,8 +320,17 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; + }; + } + { + goPackagePath = "gitlab.com/nyarla/go-crypt"; + fetch = { + type = "git"; + url = "https://gitlab.com/nyarla/go-crypt.git"; + rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; + sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; }; } { @@ -320,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "c2843e01d9a2bc60bb26ad24e09734fdc2d9ec58"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -329,8 +347,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + rev = "d8887717615a059821345a5c23649351b52a1c0b"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; }; } { @@ -338,8 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695"; - sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; + rev = "fead79001313d15903fb4605b4a1b781532cd93e"; + sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i"; }; } { @@ -347,8 +365,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; - sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + rev = "5d731a35f4867878fc89f7744f7b6debb3beded6"; + sha256 = "1ipmjki0i0dvpal1g0vgr8qc77kkvw3ka6yxlm0qzjk9j3579bsq"; }; } { diff --git a/nixpkgs/pkgs/servers/miniflux/default.nix b/nixpkgs/pkgs/servers/miniflux/default.nix index 3e55ddaf7c55..b7770019f859 100644 --- a/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/nixpkgs/pkgs/servers/miniflux/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1k53dkmd41x5h81arb2fs5s9yb6sy6113nbbzls6dc179slfg9zj"; }; - modSha256 = "1i3xzl6kkpl4v1229rhg61j1952qxzbhav7fb2hv85903rkz51x1"; + modSha256 = "0n5j4rns2w1klgrf5jz0bng9cih9aifjx55hhkf4dfj1x4wsxjdj"; doCheck = true; diff --git a/nixpkgs/pkgs/servers/misc/airsonic/default.nix b/nixpkgs/pkgs/servers/misc/airsonic/default.nix index 059a6b8f0aaa..8dd294bcdf84 100644 --- a/nixpkgs/pkgs/servers/misc/airsonic/default.nix +++ b/nixpkgs/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.1.2"; + version = "10.2.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0hpk801dipmzsswgx0y6m0xhwn5iz97agnb2bzbr5xhkl4a0d33k"; + sha256 = "1gjyg9qnrckm2gmym13yhlvw0iaspl8x0534zdw558gi3mjykm4v"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index bda717b2afb1..7021b2210bd5 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "6.0.1"; + version = "6.1.1"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -11,12 +11,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0dh4yjcg0spv8g0xqxaljwix6yh98lnkd2fwv6rgw5w84j95h9br"; + sha256 = "1n7wr89sbpdi1zpqvmyidp9y0mjdnxgdv7bj6gc9kkp6dskqk1r8"; }; srcStatic = fetchurl { url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0kfi9v0w43nwci575xph3lxa96w8li50jsa1n9pjvz31cjs7hyy2"; + sha256 = "0dbqqm3z2z4bxgq9y2lbjx6znjgqmsyz8qih2b4z6j3fvixfa5sw"; }; postPatch = '' diff --git a/nixpkgs/pkgs/servers/nginx-sso/default.nix b/nixpkgs/pkgs/servers/nginx-sso/default.nix index c4dbbbddffbf..d7c36b0cb416 100644 --- a/nixpkgs/pkgs/servers/nginx-sso/default.nix +++ b/nixpkgs/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nginx-sso-${version}"; - version = "0.16.0"; + version = "0.16.1"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "062ni683x22ss6kj7jmdx0nrhrcgmzsfw24z5l0jj7b4wvpcn02b"; + sha256 = "100k5dxrwj5xa1yh79qmyv6jampijqjbr4vkn1d9avim352yhnk1"; }; postInstall = '' diff --git a/nixpkgs/pkgs/servers/plex/default.nix b/nixpkgs/pkgs/servers/plex/default.nix index f94d185910f9..9a4f96c46ba8 100644 --- a/nixpkgs/pkgs/servers/plex/default.nix +++ b/nixpkgs/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.14.1.5488"; - vsnHash = "cc260c476"; - sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40"; + version = "1.15.2.793"; + vsnHash = "782228f99"; + sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7"; }; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = plexpkg.sha256; src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; + url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; inherit sha256; }; @@ -45,15 +45,12 @@ in stdenv.mkDerivation rec { "Plex Transcoder" \ "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" - patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" + patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin" done find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; - # executables need libstdc++.so.6 - ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6" - # Our next problem is the "Resources" directory in /usr/lib/plexmediaserver. # This is ostensibly a skeleton directory, which contains files that Plex # copies into its folder in /var. Unfortunately, there are some SQLite diff --git a/nixpkgs/pkgs/servers/rippled/default.nix b/nixpkgs/pkgs/servers/rippled/default.nix index 75aced300ed3..3dcb6605a61e 100644 --- a/nixpkgs/pkgs/servers/rippled/default.nix +++ b/nixpkgs/pkgs/servers/rippled/default.nix @@ -101,13 +101,13 @@ let }; in stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "1zx8qs32v5ibkwm9nm6m0qh0gcr0vcigr2wbxpd40pqqk73cqb3q"; + sha256 = "1lm0zzz0hi2sh2f4iqq3scapzdjbxcjgr700fgham9wqgaj2ash5"; }; hardeningDisable = ["format"]; diff --git a/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix new file mode 100644 index 000000000000..684e070292c7 --- /dev/null +++ b/nixpkgs/pkgs/servers/rippled/validator-keys-tool.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchgit, cmake, openssl, boost, zlib, rippled }: + +stdenv.mkDerivation rec { + name = "rippled-validator-keys-tool-20180927-${builtins.substring 0 7 rev}"; + rev = "d7774bcc1dc9439c586ea1c175fcd5ff3960b15f"; + + src = fetchgit { + url = "https://github.com/ripple/validator-keys-tool.git"; + inherit rev; + sha256 = "1hcbwwa21n692qpbm0vqy5jvvnf4aias309610m4kwdsnzfw0902"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl boost zlib rippled ]; + + hardeningDisable = ["format"]; + + preConfigure = '' + export CXX="$(command -v $CXX)" + export CC="$(command -v $CC)" + ''; + + installPhase = '' + install -D validator-keys $out/bin/validator-keys + ''; + + meta = with lib; { + description = "Generate master and ephemeral rippled validator keys"; + homepage = https://github.com/ripple/validator-keys-tool; + maintainers = with maintainers; [ offline ]; + license = licenses.isc; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/servers/sabnzbd/default.nix b/nixpkgs/pkgs/servers/sabnzbd/default.nix index 2e68944c00d0..12253d740b7b 100644 --- a/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -4,7 +4,7 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "2.3.7"; + version = "2.3.8"; pname = "sabnzbd"; name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "08bk2ignm50ki2bqwwl0q9pia7v91cixr5b1yibz6qxsyfprk0mj"; + sha256 = "1kdm2gv4mpdmyzfm9mfv26yxvjks8ii7c12hprp1zrmcindxg03g"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index 4da3ae362c4d..53bfa6df8dc3 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -33,10 +33,18 @@ stdenv.mkDerivation rec { [ ./4.x-no-persistent-install.patch ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch + + # conditionall disable MacOS incompatible tests (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/samba-team/samba/pull/107.patch"; sha256 = "0r6q34vjj0bdzmcbnrkad9rww58k4krbwicv4gs1g3dj49skpvd6"; }) + + (fetchpatch { + name = "CVE-2019-3824.patch"; + url = "https://attachments.samba.org/attachment.cgi?id=14859"; + sha256 = "02qf3zr55mzbimqdv01k3b22jjb084vfr5zabapyr5h1f588mw0q"; + }) ]; buildInputs = diff --git a/nixpkgs/pkgs/servers/sonarr/default.nix b/nixpkgs/pkgs/servers/sonarr/default.nix index 7405f716933b..12cd3bfaad93 100644 --- a/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/nixpkgs/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.5301"; + version = "2.0.0.5322"; src = fetchurl { url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "16jjxs0gj5jdy0r4ynhck36b2balphqj24n2gfabrlgxsc6g20jv"; + sha256 = "0vwljxnlrrssbdzxqq4yr93v323gr3x6jmg30gki58anf012q9pw"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 44559885850f..b42a494ff106 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -60,7 +60,7 @@ let (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch - ]; + ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; installTargets = [ "install-world" ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch b/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch new file mode 100644 index 000000000000..969f80ff8fc7 --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch @@ -0,0 +1,13 @@ +diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h +index 743401cb96..be5c5f61d2 100644 +--- a/src/include/pg_config_manual.h ++++ b/src/include/pg_config_manual.h +@@ -179,7 +179,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + + /* + * This is the default event source for Windows event log. diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index 9ba60416119c..8651c157dab9 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/pkgs/servers/teleport/default.nix @@ -3,14 +3,14 @@ buildGoPackage rec { name = "teleport-${version}"; - version = "2.4.1"; + version = "3.1.8"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "09kmlihv4aqc39f9cyv2vm0kqgdf9vmdrgds5krnzqdgy3svyg7y"; + sha256 = "1jkng8zr5x7z9np2wm9ya1j1zv7bhcv9qsmgmrlfy6y9ld3bq8r2"; }; goPackagePath = "github.com/gravitational/teleport"; diff --git a/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix index 710775f3f16b..d0b279eb859b 100644 --- a/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -14,7 +14,7 @@ installPhase = '' mkdir $out - cp -ra feedly feedly.css $out + cp -ra feedly *.css $out ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index 89de25008113..17cb8be739f6 100644 --- a/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,11 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { - # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again - # url = "https://builds.matomo.org/${name}.tar.gz"; - url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "0ca4fkg2jpkfg0r9hxl45ad5xzz0gxhf404i96j059bn3c41kfi0"; + url = "https://builds.matomo.org/matomo-${version}.tar.gz"; + sha256 = "1y406dnwn4jyrjr2d5qfsg3b4v7nfbh09v74dm1vlcy3mkbhv2bp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/shells/rssh/default.nix b/nixpkgs/pkgs/shells/rssh/default.nix index c58fda28db05..d061c888f60a 100644 --- a/nixpkgs/pkgs/shells/rssh/default.nix +++ b/nixpkgs/pkgs/shells/rssh/default.nix @@ -84,6 +84,11 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; + knownVulnerabilities = [ + "CVE-2019-1000018" + "CVE-2019-3463" + "CVE-2019-3464" + ]; }; passthru = { diff --git a/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/nixpkgs/pkgs/shells/zsh/antibody/default.nix index b68a25630a13..fb8a1802e950 100644 --- a/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "antibody"; - version = "4.1.0"; + version = "4.1.1"; goPackagePath = "github.com/getantibody/antibody"; @@ -10,10 +10,10 @@ buildGoPackage rec { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "027qh535cpk5mbxav199vvzhwfkcs0lm7skgfhshpzps1yw4w4mb"; + sha256 = "1qfic9prdbldvjw0n15jfc9qr4p5h87mjripq2pc4c6x8244phfw"; }; - goDeps = ./deps.nix; + modSha256 = "1p9cw92ivwgpkvjxvwd9anbd1vzhpicm9il4pg37z2kgr2ihhnyh"; meta = with lib; { description = "The fastest shell plugin manager"; diff --git a/nixpkgs/pkgs/shells/zsh/antibody/deps.nix b/nixpkgs/pkgs/shells/zsh/antibody/deps.nix deleted file mode 100644 index 86263b43944e..000000000000 --- a/nixpkgs/pkgs/shells/zsh/antibody/deps.nix +++ /dev/null @@ -1,110 +0,0 @@ -[ - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "a39589180ebd"; - sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3"; - }; - } - { - 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/caarlos0/gohome"; - fetch = { - type = "git"; - url = "https://github.com/caarlos0/gohome"; - rev = "75f08ebc60b1"; - sha256 = "04950r9lzhgkksgqbnlfx0m3n7zqfif3l8fixwb7f271a880i4gz"; - }; - } - { - 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/getantibody/folder"; - fetch = { - type = "git"; - url = "https://github.com/getantibody/folder"; - rev = "v1.0.0"; - sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j"; - }; - } - { - 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/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "1a580b3eff78"; - sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "2491c5de3490"; - sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3"; - }; - } - { - 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 = "7c87d13f8e83"; - sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3"; - }; - } -] diff --git a/nixpkgs/pkgs/stdenv/booter.nix b/nixpkgs/pkgs/stdenv/booter.nix index 668dcabc0499..1df05099fbf5 100644 --- a/nixpkgs/pkgs/stdenv/booter.nix +++ b/nixpkgs/pkgs/stdenv/booter.nix @@ -95,13 +95,25 @@ stageFuns: let __hatPackages = nextStage; }; }; - in - if args.__raw or false - then args' - else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { - buildPackages = if args.selfBuild or true then null else prevStage; - targetPackages = if args.selfBuild or true then null else nextStage; - }); + thisStage = + if args.__raw or false + then args' + else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { + adjacentPackages = if args.selfBuild or true then null else rec { + pkgsBuildBuild = prevStage.buildPackages; + pkgsBuildHost = prevStage; + pkgsBuildTarget = + if args.stdenv.targetPlatform == args.stdenv.hostPlatform + then pkgsBuildHost + else assert args.stdenv.hostPlatform == args.stdenv.buildPlatform; thisStage; + pkgsHostHost = + if args.stdenv.hostPlatform == args.stdenv.targetPlatform + then thisStage + else assert args.stdenv.buildPlatform == args.stdenv.hostPlatform; pkgsBuildHost; + pkgsTargetTarget = nextStage; + }; + }); + in thisStage; # This is a hack for resolving cross-compiled compilers' run-time # deps. (That is, compilers that are themselves cross-compiled, as diff --git a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix index 41f21abd44d6..46f2cb33bb06 100644 --- a/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix +++ b/nixpkgs/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.190"; + version = "1.191"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd"; + sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix index 59b0b4104cc0..897067774a9f 100644 --- a/nixpkgs/pkgs/tools/X11/wpgtk/default.nix +++ b/nixpkgs/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "5.8.7"; + version = "6.0.3"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; - rev = "${version}"; - sha256 = "1pwchmipswk5sld1l5p8mdiicb848glnh7r3s5x9qvijp5s57c5i"; + rev = version; + sha256 = "1ma1d4h751qnxadfn42h29knq0rl1lgzraifx6ypidjph5i5a10l"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/xtruss/default.nix b/nixpkgs/pkgs/tools/X11/xtruss/default.nix new file mode 100644 index 000000000000..043514ebb436 --- /dev/null +++ b/nixpkgs/pkgs/tools/X11/xtruss/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "xtruss"; + version = "20181001.82973f5"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz"; + sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd"; + }; + + meta = with stdenv.lib; { + description = "easy-to-use X protocol tracing program"; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 7a6d4e6d3ab9..36def731afc7 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.02.08"; + version = "2019.03.30"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "14j2vgcck7c6x8bplhfng7mmqcmh7h98jggi30d5xa0anx1271sb"; + sha256 = "05a2n3l6l4ds9vi05hldw7fc6hx9avdh8jbiakazzmyvcsysr12x"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix index f611055a4341..4a0c244f07f7 100644 --- a/nixpkgs/pkgs/tools/audio/gvolicon/default.nix +++ b/nixpkgs/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix index fba85e0f5f00..262d3dd389eb 100644 --- a/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/nixpkgs/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, qttools, alsaLib }: stdenv.mkDerivation rec { - version = "2019-01-12"; + version = "1.5"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = "a254c923df5b385e140de6ae42cf4908af8728d3"; - sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw"; + rev = "v${version}"; + sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/audio/picotts/default.nix b/nixpkgs/pkgs/tools/audio/picotts/default.nix new file mode 100644 index 000000000000..d1b055f1d5f4 --- /dev/null +++ b/nixpkgs/pkgs/tools/audio/picotts/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }: + +stdenv.mkDerivation { + name = "picotts-unstable-2018-10-19"; + src = fetchFromGitHub { + repo = "picotts"; + owner = "naggety"; + rev = "2f86050dc5da9ab68fc61510b594d8e6975c4d2d"; + sha256 = "1k2mdv9llkh77jr4qr68yf0zgjqk87np35fgfmnc3rpdp538sccl"; + }; + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ libtool popt ]; + sourceRoot = "source/pico"; + preConfigure = "./autogen.sh"; + meta = { + description = "Text to speech voice sinthesizer from SVox."; + homepage = https://github.com/naggety/picotts; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.canndrew ]; + platforms = stdenv.lib.platforms.linux; + }; +} + + diff --git a/nixpkgs/pkgs/tools/backup/bacula/default.nix b/nixpkgs/pkgs/tools/backup/bacula/default.nix index 759e2606e198..05d8a7177768 100644 --- a/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.4.1"; + name = "bacula-9.4.2"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "0hpxk0f81yx4p1xndsjbwnj7hvvplqlgrw74gv1scq6krabn2pvb"; + sha256 = "1878jk541b8gvqbh15f0k3bvki1mx02q8mxnxhn9fdc1qk9083d4"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/nixpkgs/pkgs/tools/backup/dar/default.nix b/nixpkgs/pkgs/tools/backup/dar/default.nix index 6bdcad9a21a5..ea9ccdc36e1b 100644 --- a/nixpkgs/pkgs/tools/backup/dar/default.nix +++ b/nixpkgs/pkgs/tools/backup/dar/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.2"; + version = "2.6.3"; name = "dar-${version}"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0bjrv6pxrzmb4d09yikl5wg6hz3llc30xl0ldzik4jzjrr8bcfpn"; + sha256 = "00jlmbg80xam3xg1vvrbi5wl6cwij5bz8w80d4k0bmmk4rrwq4rc"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] diff --git a/nixpkgs/pkgs/tools/backup/duplicacy/default.nix b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix new file mode 100644 index 000000000000..d217864e93e6 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/duplicacy/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "duplicacy"; + version = "2.1.2"; + + goPackagePath = "github.com/gilbertchen/duplicacy/"; + + src = fetchFromGitHub { + owner = "gilbertchen"; + repo = "duplicacy"; + rev = "v${version}"; + sha256 = "0v3rk4da4b6dhqq8zsr4z27wd8p7crxapkn265kwpsaa99xszzbv"; + }; + goDeps = ./deps.nix; + buildPhase = '' + cd go/src/${goPackagePath} + go build duplicacy/duplicacy_main.go + ''; + + installPhase = '' + install -D duplicacy_main $bin/bin/duplicacy + ''; + + meta = with lib; { + homepage = https://duplicacy.com; + description = "A new generation cloud backup tool "; + platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.unfree; + maintainers = with maintainers; [ ffinkdevs ]; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/duplicacy/deps.nix b/nixpkgs/pkgs/tools/backup/duplicacy/deps.nix new file mode 100644 index 000000000000..5511b2e67163 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/duplicacy/deps.nix @@ -0,0 +1,336 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; + sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "b7fadebe0e7f5c5720986080a01495bd8d27be37"; + sha256 = "11zcmd17206byxhgz2a75qascilydlzjbz73l2mrqng3yyr20yk1"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "0ae36a9e544696de46fdadb7b0d5fb38af48c063"; + sha256 = "0f2qcv24l9bx3jys2m9ycyy77vqlx7dbfa3frxlk19wnrwiv3p6g"; + }; + } + { + goPackagePath = "github.com/aryann/difflib"; + fetch = { + type = "git"; + url = "https://github.com/aryann/difflib"; + rev = "e206f873d14a916d3d26c40ab667bca123f365a3"; + sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "a32b1dcd091264b5dee7b386149b6cc3823395c9"; + sha256 = "1yicb7l6m4hs3mi724hz74wn8305qvx6g73mjqafaaqvh6dyn86m"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "dbeaa9332f19a944acb5736b4456cfcc02140e29"; + sha256 = "0zk6l6kzsjdijfn7c4h0aywdjx5j2hjwi67vy1k6wr46hc8ks2hs"; + }; + } + { + goPackagePath = "github.com/gilbertchen/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/azure-sdk-for-go"; + rev = "bbf89bd4d716c184f158d1e1428c2dbef4a18307"; + sha256 = "14563izc2y05k8s20fmhanvjydbcq8k5adp4cgw91d9bs52qivx7"; + }; + } + { + goPackagePath = "github.com/gilbertchen/cli"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/cli"; + rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98"; + sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go-dropbox"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go-dropbox"; + rev = "90711b603312b1f973f3a5da3793ac4f1e5c2f2a"; + sha256 = "0y2ydl3mjbkfbqyygrwq7vqig9hjh7cxvzsn2gxc1851haqp4h19"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go-ole"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go-ole"; + rev = "0e87ea779d9deb219633b828a023b32e1244dd57"; + sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw"; + }; + } + { + goPackagePath = "github.com/gilbertchen/go.dbus"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/go.dbus"; + rev = "9e442e6378618c083fd3b85b703ffd202721fb17"; + sha256 = "0q8ld38gnr4adzw5287lw5f5l14yp8slxsz1za5ryrkprh04bhkv"; + }; + } + { + goPackagePath = "github.com/gilbertchen/goamz"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/goamz"; + rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a"; + sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid"; + }; + } + { + goPackagePath = "github.com/gilbertchen/gopass"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/gopass"; + rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; + sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; + }; + } + { + goPackagePath = "github.com/gilbertchen/keyring"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/keyring"; + rev = "8855f5632086e51468cd7ce91056f8da69687ef6"; + sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m"; + }; + } + { + goPackagePath = "github.com/gilbertchen/xattr"; + fetch = { + type = "git"; + url = "https://github.com/gilbertchen/xattr"; + rev = "68e7a6806b0137a396d7d05601d7403ae1abac58"; + sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a"; + sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f"; + sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b5"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/marstr/guid"; + fetch = { + type = "git"; + url = "https://github.com/marstr/guid"; + rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f"; + sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm"; + }; + } + { + goPackagePath = "github.com/minio/blake2b-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/blake2b-simd"; + rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; + sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = "https://github.com/ncw/swift"; + rev = "ae9f0ea1605b9aa6434ed5c731ca35d83ba67c55"; + sha256 = "0a0iwynhgxsl3czabl7ajnxpyw6x0dzbiqz6il8aw7kn10ld1rvl"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "98203f5a8333288eb3163b7c667d4260fe1333e9"; + sha256 = "09wxyrhwwh20rzpzb06vsj8k2bmw52cjlx7j4115zhky27528sx9"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; + sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"; + sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "9dfe39835686865bff950a07b394c12a98ddc811"; + sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "f95fa95eaa936d9d87489b15d1d18b97c1ba9c28"; + sha256 = "0p9kis69wvhv8a2qbcjxvn9ggpdh81cbfjpq5pjga7n8k6d065fh"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "82aafbf43bf885069dc71b7e7c2f9d7a614d47da"; + sha256 = "1jvngpvy0q40f7krkgmwf5bbjzhv449297awcr0y78kzn0cyawi2"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "88f656faf3f37f690df1a32515b479415e1a6769"; + sha256 = "0zakmgg6dlwnkhignwjajn0dckzqq18zxvnmmg0fq6455x7fs673"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "17b5f22a248d6d3913171c1a557552ace0d9c806"; + sha256 = "0gs78qsxfg89kpiiray1x9jiv6bh328jmjkwd3ghnygf3l98kc8c"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; + sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "891aceb7c239e72692819142dfca057bdcbfcb96"; + sha256 = "1axim84fqzsp6iialk6zl4fsbfpx658vssc6ccakn4yy1xc9h854"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "5a9f7b402fe85096d2e1d0383435ee1876e863d0"; + sha256 = "1hlirgvmzb929jpb1dvh930646ih5ffg3b6pmlilqr7ffdkl5z3j"; + }; + } +] \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix index 70bf187a2283..f13db4572e08 100644 --- a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bluez-alsa-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; rev = "v${version}"; - sha256 = "1rzcl65gipszsmlcg24gh1xkjkyk4929xhakn6y2smrgwv1zjqdh"; + sha256 = "12kc2896rbir8viywd6bjwcklkwf46j4svh9viryn6kmk084nb49"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/compression/ncompress/default.nix b/nixpkgs/pkgs/tools/compression/ncompress/default.nix index e2b03e6f3822..8e55d24fc985 100644 --- a/nixpkgs/pkgs/tools/compression/ncompress/default.nix +++ b/nixpkgs/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.4"; + name = "ncompress-4.2.4.5"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh"; + sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; }; meta = { diff --git a/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix index 4d71d501b3c1..816c09161dcf 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.84"; + version = "1.85"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871"; + sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix new file mode 100644 index 000000000000..5bb209984396 --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/blur-effect/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }: + +stdenv.mkDerivation rec { + pname = "blur-effect"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "sonald"; + repo = pname; + rev = version; + sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj"; + }; + + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + gdk_pixbuf + libGL + mesa + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/sonald/blur-effect; + description = "Off-screen image blurring utility using OpenGL ES 3.0"; + license = licenses.gpl3; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix index 8de7ca3262cf..2046514af6bb 100644 --- a/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,11 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-5.2.5"; + name = "gnuplot-5.2.6"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1ajw8xcb1kg2vy8n3rhrz71knjr2yivfavv9lqqzvp1dwv6b5783"; + sha256 = "1vllgap08nhvdmc03idmkdnk9cfl2bp81hps50q1pqrr640qzp9m"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix index 5a655b9ff162..883453379c4e 100644 --- a/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix +++ b/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, bash, curl, xsel }: stdenv.mkDerivation rec { - name = "imgurbash2-${version}"; - version = "2.1"; + pname = "imgurbash2"; + version = "3.1"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk"; + sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9"; }; installPhase = '' diff --git a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix index 3115b1b72439..ffba2280e8a5 100644 --- a/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix +++ b/nixpkgs/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre +, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings-desktop-schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gnome3.gtk + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.adwaita-icon-theme makeWrapper diff --git a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index 0fdabfe35888..130019c1bc2a 100644 --- a/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "2.2.0"; - name = "oxipng-${version}"; + version = "2.2.1"; + pname = "oxipng"; src = fetchFromGitHub { owner = "shssoichiro"; - repo = "oxipng"; + repo = pname; rev = "v${version}"; - sha256 = "00ys1dy8r1g84j04w50qcjas0qnfw4vphazvbfasd9q2b1p5z69l"; + sha256 = "1r195x3wdkshjwy23fpqsyyrw7iaj7yb39nhcnx9d4nhgq8w0pcl"; }; - cargoSha256 = "125r3jmgwcq8qddm8hjpyzaam96kkifaxixksyaw2iqk9xq0nrpm"; + cargoSha256 = "08mw937s61r4fj9bqrg492ss13zkik9557n9yk90r97a81972zbn"; # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; diff --git a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index 7d5283b3133e..66efb936aa4c 100644 --- a/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "vulkan-tools-${version}"; - version = "1.1.92"; + version = "1.1.101.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "1khbfxp2mha7h0vqs0fkqscxm76gn3zlia8yya11lkhk7sn3h0d3"; + sha256 = "03227qxa8q19qgzk30h0h49sh03idr6vh9srnrhiziw2vzmahmpp"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix new file mode 100644 index 000000000000..1e3da5dddecf --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libpng, xorg }: + +stdenv.mkDerivation rec { + pname = "xcur2png"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "eworm-de"; + repo = pname; + rev = version; + sha256 = "0858wn2p14bxpv9lvaz2bz1rk6zk0g8zgxf8iy595m8fqv4q2fya"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + libpng + xorg.libX11 + xorg.libXcursor + xorg.xorgproto + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/eworm-de/xcur2png/releases; + description = "Convert X cursors to PNG images"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/zbar/default.nix b/nixpkgs/pkgs/tools/graphics/zbar/default.nix index b8bf73fda648..518b88e6d02a 100644 --- a/nixpkgs/pkgs/tools/graphics/zbar/default.nix +++ b/nixpkgs/pkgs/tools/graphics/zbar/default.nix @@ -1,53 +1,35 @@ -{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook +{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl +, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook , enableVideo ? stdenv.isLinux }: let inherit (python2Packages) pygtk python; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "zbar"; - version = "0.10"; - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2"; - sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3"; + version = "0.22"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq"; }; - patches = [ - (fetchpatch { - name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69"; - }) - (fetchpatch { - name = "python-zbar-import-fix-am.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch"; - sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx"; - }) - (fetchpatch { - name = "new_autotools_build_fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch"; - sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3"; - }) - (fetchpatch { - name = "threading-fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch"; - sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7"; - }) - ]; + nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; - buildInputs = - [ imagemagickBig pkgconfig python pygtk perl libX11 - lzma autoreconfHook ] ++ - stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ]; + buildInputs = [ + imagemagickBig python pygtk perl libX11 + ] ++ stdenv.lib.optionals enableVideo [ + libv4l gtk2 qt5.qtbase qt5.qtx11extras + ]; - configureFlags = stdenv.lib.optionals (!enableVideo) [ + configureFlags = [ + "--with-dbusconfdir=$out/etc/dbus-1/system.d" + ] ++ stdenv.lib.optionals (!enableVideo) [ "--disable-video" "--without-gtk" "--without-qt" ]; - hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { description = "Bar code reader"; longDescription = '' @@ -57,15 +39,9 @@ in stdenv.mkDerivation rec { EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. ''; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = http://zbar.sourceforge.net/; - }; - - passthru = { - updateInfo = { - downloadPage = "http://zbar.sourceforge.net/"; - }; + homepage = https://github.com/mchehab/zbar; }; } diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index aab7563cb020..6d6c6d5d5769 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { name = "ibus-typing-booster-${version}"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "124a6yd7g6ws8s6p5146rhvyjswk001fqncc32jsfmjjgmgisqn2"; + sha256 = "1d32p9k9vp64rpmj2cs3552ak9jn54vyi2hqdpzag33v16cydsl4"; }; patches = [ ./hunspell-dirs.patch ]; diff --git a/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 3ebf09bf139b..dff98f236036 100644 --- a/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.7"; + version = "1.8"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "0wpiimc5xai813h7gywwp20svkn35pkw99bnjflmpwz7x8fn8dfz"; + sha256 = "0yhn3gvvkgmfqf3yl3kqlj0biinw0qvli6s88sxa0pybca3j8nll"; }; meta = { diff --git a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 655cbf3bc656..8c310310d43f 100644 --- a/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, dpkg }: stdenv.mkDerivation rec { - name = "bdf2psf-${version}"; - version = "1.190"; + pname = "bdf2psf"; + version = "1.191"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1dm1lwlnr3ikbl2nkmvj60n9qj5qa0g4dyszrv3qx88m2f6zq99w"; + sha256 = "0bqhn9rwrjipj7wd6c8i7rq39fc5jj5nc3mir931mfakknakkimk"; }; buildInputs = [ dpkg ]; diff --git a/nixpkgs/pkgs/tools/misc/brltty/default.nix b/nixpkgs/pkgs/tools/misc/brltty/default.nix index 99ba8e5e5159..fa7457b417e5 100644 --- a/nixpkgs/pkgs/tools/misc/brltty/default.nix +++ b/nixpkgs/pkgs/tools/misc/brltty/default.nix @@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.6"; + name = "brltty-6.0"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; + sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index aca449a4037b..8968950928e3 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1hv9plgbwffdv94d8h6qlmazbwi56967wzqvfzr47iigbvx81vwj"; + sha256 = "1pwbz4ac2zb40g6q6ykzhzfbn0jr5xarkvgw9wxv455mbi67rd6y"; }; cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5"; diff --git a/nixpkgs/pkgs/tools/misc/chafa/default.nix b/nixpkgs/pkgs/tools/misc/chafa/default.nix new file mode 100644 index 000000000000..00ab4cd75d0c --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: + + +stdenv.mkDerivation rec{ + version = "1.0.1"; + pname = "chafa"; + + src = fetchFromGitHub { + owner = "hpjansson"; + repo = "chafa"; + rev = version; + sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04"; + }; + + nativeBuildInputs = [ autoconf + automake + libtool + pkgconfig + which + libxslt + libxml2 + docbook_xml_dtd_412 + docbook_xsl + ]; + + buildInputs = [ glib imagemagick ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + + patches = [ ./xmlcatalog_patch.patch ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ "--enable-man" + "--with-xml-catalog=${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml" + ]; + + meta = with stdenv.lib; { + description = "Terminal graphics for the 21st century."; + homepage = https://hpjansson.org/chafa/; + license = licenses.lgpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.mog ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/chafa/xmlcatalog_patch.patch b/nixpkgs/pkgs/tools/misc/chafa/xmlcatalog_patch.patch new file mode 100644 index 000000000000..6bf988d6117f --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/chafa/xmlcatalog_patch.patch @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index 0055a70..fd4a905 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -111,18 +111,6 @@ AS_IF([ test "$enable_man" != no ], [ + ]) + ]) + +-AS_IF([test "$enable_man" != no], [ +- dnl check for DocBook XSL stylesheets in the local catalog +- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], +- [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no]) +- AS_IF([ test "$have_docbook_style" != yes ], [ +- AS_IF([ test "$enable_man" = yes ], [ +- AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man]) +- ]) +- enable_man=no +- ]) +-]) +- + AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no) + + AC_MSG_CHECKING([whether to generate man pages]) diff --git a/nixpkgs/pkgs/tools/misc/colord/default.nix b/nixpkgs/pkgs/tools/misc/colord/default.nix index e89f93a4a821..0719fb36164b 100644 --- a/nixpkgs/pkgs/tools/misc/colord/default.nix +++ b/nixpkgs/pkgs/tools/misc/colord/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { "-Dlibcolordcompat=true" "-Dsane=true" "-Dvapi=true" + "-Ddaemon_user=colord" ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/nixpkgs/pkgs/tools/misc/dateutils/default.nix index e33376243bd6..05a312bb8bca 100644 --- a/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, tzdata }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.4.6"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn"; + sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/misc/direnv/default.nix b/nixpkgs/pkgs/tools/misc/direnv/default.nix index de8130ff3f1f..4a56e6465e62 100644 --- a/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "direnv-${version}"; - version = "2.19.2"; + version = "2.20.0"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "1iq9wmc63x1c7g1ixdhd6q3w1sx8xl8kf1bprxwq26n9zpd0g13g"; + sha256 = "0ds8abwasymbsn9vak2105gczfgka4mz1i6kf1lvc3zm27v55cij"; }; postConfigure = '' diff --git a/nixpkgs/pkgs/tools/misc/ffsend/default.nix b/nixpkgs/pkgs/tools/misc/ffsend/default.nix index dba608f41af9..c59ddd084983 100644 --- a/nixpkgs/pkgs/tools/misc/ffsend/default.nix +++ b/nixpkgs/pkgs/tools/misc/ffsend/default.nix @@ -1,38 +1,47 @@ { stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl , darwin + +, x11Support ? stdenv.isLinux +, xclip ? null, xsel ? null +, preferXsel ? false # if true and xsel is non-null, use it instead of xclip }: +assert (x11Support && stdenv.isLinux) -> xclip != null || xsel != null; + with rustPlatform; buildRustPackage rec { name = "ffsend-${version}"; - version = "0.2.36"; + version = "0.2.42"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0k2sl1f5isxj8qajmhf36xh6k9j9qq7nkqm27wfm3gvc6b4flk0r"; + sha256 = "0lsdn967rq6hf3fmkynznsvj8fcka5wi1mpcl3wfa7hf58r266yq"; }; - cargoSha256 = "1l4060kawba56gxsngba2yjshhaygrs17k1msjbj38vrg07zrnbp"; - - # Note: On Linux, the clipboard feature requires `xclip` to be in the `PATH`. Ideally we'd - # depend on `xclip` and patch the source to run `xclip` from the Nix store instead of from `PATH`. - # However, as I use macOS and not Linux, I'm not inclined to maintain a patch like that, nor do I - # have a means to test it. To that end, we'll just leave the clipboard feature enabled and - # trust that users that want to copy links to their clipboard will install `xclip` into their - # profile. + cargoSha256 = "1f1npdr8v9vlv3xdraq1qang4l0j0w9slbws4da5ylw195nb4qx5"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) ; + preBuild = stdenv.lib.optionalString (x11Support && stdenv.isLinux) ( + if preferXsel && xsel != null then '' + export XSEL_PATH="${xsel}/bin/xsel" + '' else '' + export XCLIP_PATH="${xclip}/bin/xclip" + '' + ); + postInstall = '' - mkdir -p $out/share/zsh/site-functions - cp contrib/completions/zsh/_ffsend $out/share/zsh/site-functions/_ffsend + install -Dm644 contrib/completions/_ffsend "$out/share/zsh/site-functions/_ffsend" + install -Dm644 contrib/completions/ffsend.bash "$out/share/bash-completion/completions/ffsend.bash" + install -Dm644 contrib/completions/ffsend.fish "$out/share/fish/vendor_completions.d/ffsend.fish" ''; + # There's also .elv and .ps1 completion files but I don't know where to install those meta = with stdenv.lib; { description = "Easily and securely share files from the command line. A fully featured Firefox Send client"; diff --git a/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/nixpkgs/pkgs/tools/misc/flashrom/default.nix index 21a126b04f3b..b45df3f57b56 100644 --- a/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -1,19 +1,19 @@ { lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }: -let version = "1.0"; in stdenv.mkDerivation rec { name = "flashrom-${version}"; + version = "1.0.1"; src = fetchurl { - url = "https://download.flashrom.org/releases/${name}.tar.bz2"; - sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb"; + url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2"; + sha256 = "0i6yrrl69hrqmwd7azj7x3j46m0qpvzmk3b5basym7mnlpfzhyfm"; }; # Newer versions of libusb deprecate some API flashrom uses. - postPatch = '' - substituteInPlace Makefile \ - --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" - ''; + #postPatch = '' + # substituteInPlace Makefile \ + # --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable=" + #''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libftdi pciutils ]; diff --git a/nixpkgs/pkgs/tools/misc/geekbench/default.nix b/nixpkgs/pkgs/tools/misc/geekbench/default.nix index bc6f1a1ff0d4..df623d0c178f 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/default.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "geekbench-${version}"; - version = "4.2.3"; + version = "4.3.3"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1v42hr4p9nj7jvcjkffif6w7icns5iq0mgk9ih2mi5j2h1ngh1f7"; + sha256 = "0bqa0k4cf4w8gjs49lnrvns11jv21kqcgdbqp2zhwqgmkx9gr8ny"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/tools/misc/graylog/default.nix b/nixpkgs/pkgs/tools/misc/graylog/default.nix index 238a60211c81..846fa8e8aca0 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1jcc254z4xqybm1f5r0g4dfyd9ji0z5g45hcnds32w9h8zqk391k"; + sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi"; }; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index c7ae194e426b..139863d36ecb 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -1,42 +1,42 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.0) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) colorize (0.8.1) - concurrent-ruby (1.0.5) - ethon (0.11.0) + concurrent-ruby (1.1.5) + ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.9.23) - html-proofer (3.8.0) + ffi (1.10.0) + html-proofer (3.10.2) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) colorize (~> 0.8) mercenary (~> 0.3.2) - nokogiri (~> 1.8.1) + nokogiri (~> 1.9) parallel (~> 1.3) typhoeus (~> 1.3) yell (~> 2.0) - i18n (1.0.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) mercenary (0.3.6) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) - parallel (1.12.1) - public_suffix (3.0.2) + nokogiri (1.10.2) + mini_portile2 (~> 2.4.0) + parallel (1.17.0) + public_suffix (3.0.3) thread_safe (0.3.6) - typhoeus (1.3.0) + typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - yell (2.0.7) + yell (2.1.0) PLATFORMS ruby @@ -45,4 +45,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 7043c9e355b0..6a6e62b726ed 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -1,23 +1,29 @@ { activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.2.0"; + version = "5.2.3"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; type = "gem"; }; - version = "2.5.2"; + version = "2.6.0"; }; colorize = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; @@ -26,49 +32,61 @@ version = "0.8.1"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.5"; }; ethon = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48"; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.23"; + version = "1.10.0"; }; html-proofer = { dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a"; + sha256 = "0qwy5cdl5l6rl9cqpcydl4126rwv1f4l9ixf3z6j2rdy979l2jaf"; type = "gem"; }; - version = "3.8.0"; + version = "3.10.2"; }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "1.0.1"; + version = "1.6.0"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -77,14 +95,18 @@ version = "0.3.6"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -94,30 +116,38 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + sha256 = "0sy96cc8i5y4p67fhf4d9c6sg8ymrrva21zyvzw55l0pa1582wx2"; type = "gem"; }; - version = "1.8.2"; + version = "1.10.2"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; type = "gem"; }; - version = "1.12.1"; + version = "1.17.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -127,15 +157,19 @@ }; typhoeus = { dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq"; + sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -144,11 +178,13 @@ version = "1.2.5"; }; yell = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib"; + sha256 = "161kfwyv7aq983m2gd90c67sqcs0p1z6nhjall2mdr7iz0gqf9wn"; type = "gem"; }; - version = "2.0.7"; + version = "2.1.0"; }; } \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/ltunify/default.nix b/nixpkgs/pkgs/tools/misc/ltunify/default.nix index cf28fa051326..cb594391e2a1 100644 --- a/nixpkgs/pkgs/tools/misc/ltunify/default.nix +++ b/nixpkgs/pkgs/tools/misc/ltunify/default.nix @@ -1,12 +1,17 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: + +# 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 stdenv.mkDerivation rec { - name = "ltunify-20140331"; + name = "ltunify-${version}"; + version = "unstable-20180330"; - src = fetchgit { - url = "https://git.lekensteyn.nl/ltunify.git"; - rev = "c3a263ff97bcd31e96abbfed33d066f8d2778f58"; - sha256 = "04g7mmljkx8643k53yd9x4k2ndrr98w7fbq10qn8ll6didkph3v8"; + src = fetchFromGitHub { + owner = "Lekensteyn"; + repo = "ltunify"; + rev = "f664d1d41d5c4beeac5b81e485c3498f13109db7"; + sha256 = "07sqhih9jmm7vgiwqsjzihd307cj7l096sxjl25p7nwr1q4180wv"; }; makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; @@ -15,7 +20,7 @@ stdenv.mkDerivation rec { description = "Tool for working with Logitech Unifying receivers and devices"; homepage = https://lekensteyn.nl/logitech-unifying.html; license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - maintainers = [ maintainers.abbradar ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix index 326a3b053ed1..3c2ed1352257 100644 --- a/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig -, ncurses, libiconv }: +{ stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig +, lrzsz, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "minicom-2.7.1"; - - src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/latestfile/3/${name}.tar.gz"; - sha256 = "1wa1l36fa4npd21xa9nz60yrqwkk5cq713fa3p5v0zk7g9mq6bsk"; + name = "minicom-${version}"; + version = "2.7.1"; + + # The repository isn't tagged properly, so we need to use commit refs + src = fetchgit { + url = "https://salsa.debian.org/minicom-team/minicom.git"; + rev = "6ea8033b6864aa35d14fb8b87e104e4f783635ce"; + sha256 = "0j95727xni4r122dalp09963gvc1nqa18l1d4wzz8746kw5s2rrb"; }; buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; enableParallelBuilding = true; @@ -26,18 +29,22 @@ stdenv.mkDerivation rec { # Have `configure' assume that the lock directory exists. substituteInPlace configure \ --replace 'test -d $UUCPLOCK' true + ''; - substituteInPlace src/rwconf.c \ - --replace /usr/bin/ascii-xfr $out/bin/ascii-xfr + postInstall = '' + for f in $out/bin/*minicom ; do + wrapProgram $f \ + --prefix PATH : ${stdenv.lib.makeBinPath [ lrzsz ]}:$out/bin + done ''; meta = with stdenv.lib; { description = "Modem control and terminal emulation program"; - homepage = https://alioth.debian.org/projects/minicom/; + homepage = https://salsa.debian.org/minicom-team/minicom; license = licenses.gpl2; longDescription = '' - Minicom is a menu driven communications program. It emulates ANSI - and VT102 terminals. It has a dialing directory and auto zmodem + Minicom is a menu driven communications program. It emulates ANSI + and VT102 terminals. It has a dialing directory and auto zmodem download. ''; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix index 4a50f7200bbb..04271b610699 100644 --- a/nixpkgs/pkgs/tools/misc/ms-sys/default.nix +++ b/nixpkgs/pkgs/tools/misc/ms-sys/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ms-sys-${version}"; - version = "2.5.3"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; - sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; + sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz"; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix index 37218f848684..e19eac1c51e5 100644 --- a/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/nixpkgs/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { - version = "2016-06-16"; + version = "2019-02-13"; name = "nginx-config-formatter-${version}"; src = fetchFromGitHub { owner = "1connect"; repo = "nginx-config-formatter"; - rev = "fe5c77d2a503644bebee2caaa8b222c201c0603d"; - sha256 = "0akpkbq5136k1i1z1ls6yksis35hbr70k8vd10laqwvr1jj41bga"; + rev = "4ea6bbc1bdeb1d28419548aeca90f323e64e0e05"; + sha256 = "0h6pj9i0wim9pzkafi92l1nhlnl2a530vnm7qqi3n2ra8iwfyw4f"; }; buildInputs = [ python3 ]; diff --git a/nixpkgs/pkgs/tools/misc/paps/default.nix b/nixpkgs/pkgs/tools/misc/paps/default.nix new file mode 100644 index 000000000000..521bebf47a3b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/paps/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, autoconf, automake, pkgconfig, pango }: + +stdenv.mkDerivation rec { + pname = "paps"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "dov"; + repo = pname; + rev = version; + sha256 = "1f0qcawak76zk2xypipb6sy4bd8mixlrjby851x216a7f6z8fd4y"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig ]; + buildInputs = [ pango ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "Pango to PostScript converter"; + homepage = https://github.com/dov/paps; + license = licenses.lgpl2; + maintainers = with maintainers; [ etu ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 4807f5df99b7..a6a4d35b7fe4 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20190222"; + name = "parallel-20190322"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6"; + sha256 = "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index 04151812a078..77331a7f025a 100644 --- a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -3,12 +3,12 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "qt5ct-${version}"; - version = "0.37"; + pname = "qt5ct"; + version = "0.38"; src = fetchurl { - url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0p0317z79h906qwaf0p8ga6lmr1dlabkx12gn31bv9lnp9f55jwg"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/tools/misc/skim/default.nix b/nixpkgs/pkgs/tools/misc/skim/default.nix index 858b45813d55..696074e2e889 100644 --- a/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - name = "skim-${version}"; - version = "0.5.5"; + pname = "skim"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lotabout"; - repo = "skim"; + repo = pname; rev = "v${version}"; - sha256 = "1z9xjqr72r855899pgfrigdzcir18rpp0nh33r7jdz24q57zya10"; + sha256 = "0ywrqfxxqv7mpm4szw8n3hcvc4jn9a490j9s7qh3vzqgrsx2sxk3"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0ksxyivdrrs3z5laxkqzq4lql6w0hqf92daazanxkw8vfcksbzsm"; + cargoSha256 = "0vxyi7f5p9blv1isngvad8jrgpwmmv3dkr39qsb2i217jx3mzj2i"; patchPhase = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 555 bin/sk-tmux -t $out/bin - install -D -m 644 shell/skim.1 $out/man/man1/skim.1 + install -D -m 644 man/man1/* -t $out/man/man1 install -D -m 444 shell/* -t $out/share/skim install -D -m 444 plugin/skim.vim -t $vim/plugin diff --git a/nixpkgs/pkgs/tools/misc/sl/default.nix b/nixpkgs/pkgs/tools/misc/sl/default.nix index 7a5ceb204496..4299073d96ba 100644 --- a/nixpkgs/pkgs/tools/misc/sl/default.nix +++ b/nixpkgs/pkgs/tools/misc/sl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sl-${version}"; - version = "5.02"; + version = "5.04"; src = fetchFromGitHub { - owner = "mtoyoda"; + owner = "eyJhb"; repo = "sl"; - rev = version; - sha256 = "1zrfd71zx2px2xpapg45s8xvi81xii63yl0h60q72j71zh4sif8b"; + rev = "${version}"; + sha256 = "029lv6vw39c7gj8bkfyqs8q4g32174vbmghhhgfk8wrhnxq60qn7"; }; buildInputs = [ ncurses ]; @@ -18,17 +18,18 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp sl $out/bin - cp sl.1 $out/share/man/man1 + cp sl.1 $outputMan ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; - url = https://github.com/mtoyoda/sl/blob/master/LICENSE; + url = https://github.com/eyJhb/sl/blob/master/LICENSE; }; + maintainers = [ maintainers.eyjhb ]; description = "Steam Locomotive runs across your terminal when you type 'sl'"; - platforms = with stdenv.lib.platforms; unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/smenu/default.nix b/nixpkgs/pkgs/tools/misc/smenu/default.nix index ae2e15225415..f5e1fd7b1b4d 100644 --- a/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.14"; + version = "0.9.15"; name = "smenu-${version}"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "1q2jvzia5ggkifkawm791p2nkmnpm6cmd5x3al7zf76gpdm6j87d"; + sha256 = "0s9qhg6dln33x8r2g8igvgkyrv8g1z26wf8gcnqp3kbp6fw12izi"; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/snapper/default.nix b/nixpkgs/pkgs/tools/misc/snapper/default.nix index 87fda19a75fe..cc37326cc5eb 100644 --- a/nixpkgs/pkgs/tools/misc/snapper/default.nix +++ b/nixpkgs/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "snapper-${version}"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "0f3xvvmyln7rjvv4w0zsd4b4d1mzcdx0xrgcscqj2v18xgwwcc4p"; + sha256 = "0f3nsqk8820jh08qdh23n01vxbigsfcn9s5qvgqz6jf4pwin6j0x"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/td/Gemfile b/nixpkgs/pkgs/tools/misc/td/Gemfile new file mode 100644 index 000000000000..d22bf73732c5 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/td/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem 'td' diff --git a/nixpkgs/pkgs/tools/misc/td/Gemfile.lock b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock new file mode 100644 index 000000000000..5726611b9af7 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/td/Gemfile.lock @@ -0,0 +1,40 @@ +GEM + remote: https://rubygems.org/ + specs: + fluent-logger (0.8.0) + msgpack (>= 1.0.0, < 2) + hirb (0.7.3) + httpclient (2.8.3) + msgpack (1.2.6) + parallel (1.13.0) + ruby-progressbar (1.10.0) + rubyzip (1.2.2) + td (0.16.4) + hirb (>= 0.4.5) + msgpack + parallel (~> 1.8) + ruby-progressbar (~> 1.7) + rubyzip (>= 1.2.1) + td-client (>= 1.0.6, < 2) + td-logger (>= 0.3.21, < 2) + yajl-ruby (~> 1.1) + zip-zip (~> 0.3) + td-client (1.0.6) + httpclient (>= 2.7) + msgpack (>= 0.5.6, < 2) + td-logger (0.3.27) + fluent-logger (>= 0.5.0, < 2.0) + msgpack (>= 0.5.6, < 2.0) + td-client (>= 0.8.66, < 2.0) + yajl-ruby (1.4.1) + zip-zip (0.3) + rubyzip (>= 1.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + td + +BUNDLED WITH + 1.16.3 diff --git a/nixpkgs/pkgs/tools/misc/td/default.nix b/nixpkgs/pkgs/tools/misc/td/default.nix new file mode 100644 index 000000000000..121eff450b59 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/td/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "td"; + gemdir = ./.; + exes = [ "td" ]; + + meta = with lib; { + description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; + homepage = https://github.com/treasure-data/td; + license = licenses.asl20; + maintainers = with maintainers; [ groodt ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/td/gemset.nix b/nixpkgs/pkgs/tools/misc/td/gemset.nix new file mode 100644 index 000000000000..e4680640ae2b --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/td/gemset.nix @@ -0,0 +1,103 @@ +{ + fluent-logger = { + dependencies = ["msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yr6vrai4fqajpzybmdlajf8wzsgy29kr1318amn21y9nhjlnys5"; + type = "gem"; + }; + version = "0.8.0"; + }; + hirb = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji"; + type = "gem"; + }; + version = "0.7.3"; + }; + httpclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + type = "gem"; + }; + version = "1.2.6"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "005shcy8dabc7lwydpkbhd3fx8bfqzvsj6g04r90mx0wky10lz84"; + type = "gem"; + }; + version = "1.13.0"; + }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + type = "gem"; + }; + version = "1.10.0"; + }; + rubyzip = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; + type = "gem"; + }; + version = "1.2.2"; + }; + td = { + dependencies = ["hirb" "msgpack" "parallel" "ruby-progressbar" "rubyzip" "td-client" "td-logger" "yajl-ruby" "zip-zip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nlxpc4nasgmv6mqanb6ag1q3wmryja2c174dzgwxngxa0y2j1yn"; + type = "gem"; + }; + version = "0.16.4"; + }; + td-client = { + dependencies = ["httpclient" "msgpack"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5jcsgg020cm8xarbbw67mca4k8cx5pfyd2mm3wcqrnc1cl2bgp"; + type = "gem"; + }; + version = "1.0.6"; + }; + td-logger = { + dependencies = ["fluent-logger" "msgpack" "td-client"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y56gilaqk9a4lfhzb777ysmsq77pi1aqkr4q485a7f5dwnpwl1p"; + type = "gem"; + }; + version = "0.3.27"; + }; + yajl-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; + type = "gem"; + }; + version = "1.4.1"; + }; + zip-zip = { + dependencies = ["rubyzip"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ny3zv1sn9wasamykfkg7b7xgs6w7k5fy8kggiyjj9vrwfzzavqg"; + type = "gem"; + }; + version = "0.3"; + }; +} \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/misc/tlp/default.nix b/nixpkgs/pkgs/tools/misc/tlp/default.nix index 39d3ea1c2086..2cdb8aff472e 100644 --- a/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill , hdparm, ethtool, inetutils , kmod, pciutils, smartmontools , x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux +, checkbashisms, shellcheck , enableRDW ? false, networkmanager }: @@ -14,28 +15,31 @@ let in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "1.1"; + version = "1.2.1"; src = fetchFromGitHub { - owner = "linrunner"; - repo = "TLP"; - rev = "${version}"; - sha256 = "01bhb9hdsck1g2s5jvafr3ywml9k2qz7x2cf42a3z8g5d23pdfpy"; - }; + owner = "linrunner"; + repo = "TLP"; + rev = version; + sha256 = "1msldl6y8fpvxa9p87lv3hvgxwk2vpiahqmapq485ihdjkshc558"; + }; + + outRef = placeholder "out"; - makeFlags = [ "DESTDIR=$(out)" - "TLP_SBIN=$(out)/bin" - "TLP_BIN=$(out)/bin" - "TLP_TLIB=$(out)/share/tlp-pm" - "TLP_PLIB=$(out)/lib/pm-utils" - "TLP_ULIB=$(out)/lib/udev" - "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d" - "TLP_SHCPL=$(out)/share/bash-completion/completions" - "TLP_MAN=$(out)/share/man" + makeFlags = [ + "DESTDIR=${outRef}" + "TLP_SBIN=${outRef}/bin" + "TLP_BIN=${outRef}/bin" + "TLP_TLIB=${outRef}/share/tlp" + "TLP_FLIB=${outRef}/share/tlp/func.d" + "TLP_ULIB=${outRef}/lib/udev" + "TLP_NMDSP=${outRef}/etc/NetworkManager/dispatcher.d" + "TLP_SHCPL=${outRef}/share/bash-completion/completions" + "TLP_MAN=${outRef}/share/man" + "TLP_META=${outRef}/share/metainfo" - "TLP_NO_INIT=1" - "TLP_NO_PMUTILS=1" - ]; + "TLP_NO_INIT=1" + ]; nativeBuildInputs = [ makeWrapper file ]; @@ -43,6 +47,14 @@ in stdenv.mkDerivation rec { installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw"; + checkInputs = [ + checkbashisms + shellcheck + ]; + + doCheck = true; + checkTarget = [ "checkall" ]; + postInstall = '' cp -r $out/$out/* $out rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2) diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index d82c7dda96a4..53a0e0a2992b 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ttyplot-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "0icv40fmf8z3a00csjh4c4svq3y6s6j70jgxjd6zqlxyks9wj7mr"; + sha256 = "1xaqzm71w2n0q532wpa3w818mvjvch3h34m2aq7pldkyk09frjxh"; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix index af8d0862d1bb..603492718d0e 100644 --- a/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, glibcLocales, rustPlatform, pkgconfig, openssl, Security }: +{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, Security }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst @@ -32,9 +32,9 @@ python3Packages.buildPythonApplication rec { shippai ]; - buildInputs = with python3Packages; [ setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ setuptools_scm ]; - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ]; + checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 @@ -66,11 +66,8 @@ python3Packages.buildPythonApplication rec { ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ ''; - LC_ALL = "en_US.utf8"; - checkPhase = '' rm -rf vdirsyncer - export PYTHONPATH=$out/${python3Packages.python.sitePackages}:$PYTHONPATH make DETERMINISTIC_TESTS=true test ''; @@ -78,7 +75,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.all; license = licenses.mit; }; } diff --git a/nixpkgs/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix new file mode 100644 index 000000000000..e9733c7ef799 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, coreutils +, sharutils +, version +, sha256 +}: + +stdenv.mkDerivation rec { + inherit version; + name = "vimpager-${version}"; + + src = fetchFromGitHub { + inherit sha256; + + owner = "rkitover"; + repo = "vimpager"; + rev = "${version}"; + }; + + buildInputs = [ coreutils sharutils ]; # for uuencode + + makeFlags = [ + "PREFIX=$(out)" + ]; + + buildPhase = '' + sed -i 's,/bin/cat,${coreutils}/bin/cat,g' vimpager + make + ''; + + + meta = with stdenv.lib; { + description = "Use Vim as PAGER"; + homepage = "https://www.vim.org/scripts/script.php?script_id = 1723"; + license = with licenses; [ bsd2 mit vim ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/vimpager/default.nix b/nixpkgs/pkgs/tools/misc/vimpager/default.nix new file mode 100644 index 000000000000..1b1512db3cfe --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vimpager/default.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./build.nix { + version = "2.06"; + sha256 = "05yr7j72bw64nx7a0y6w9fjmz54zd4g46fn1qjfbbqvbc19fjpl8"; +} diff --git a/nixpkgs/pkgs/tools/misc/vimpager/latest.nix b/nixpkgs/pkgs/tools/misc/vimpager/latest.nix new file mode 100644 index 000000000000..c98b9a000147 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vimpager/latest.nix @@ -0,0 +1,7 @@ +{ callPackage }: + +callPackage ./build.nix { + version = "a4da4dfac44d1bbc6986c5c76fea45a60ebdd8e5"; + sha256 = "0gcjpw2q263hh8w2sjvq3f3k2d28qpkkv0jnl8hw1l7v604i8zxg"; +} + diff --git a/nixpkgs/pkgs/tools/misc/websocat/default.nix b/nixpkgs/pkgs/tools/misc/websocat/default.nix index 2e91c5c3b63a..dc0280846854 100644 --- a/nixpkgs/pkgs/tools/misc/websocat/default.nix +++ b/nixpkgs/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { @@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0vkb3jmyb3zg3xiig5vlxhh74m27rvqbkgrwdqzprifn9vcj17ir"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = https://github.com/vi/websocat; diff --git a/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix index 708675fb651c..fb4257b35e6b 100644 --- a/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - name = "xtitle-0.4.3"; + name = "xtitle-0.4.4"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.4.3.tar.gz"; - sha256 = "0bk4mxx0vky37f66b2y34nggi1f7fnrmsprkxyc8mskj6qcrbm5h"; + url = "https://github.com/baskerville/xtitle/archive/0.4.4.tar.gz"; + sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; }; diff --git a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index f14825968576..b5bb97ce5724 100644 --- a/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.03.01"; + version = "2019.04.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf"; + sha256 = "0srh04k0p088rxbyxvnhngqyymwqhykqv02sdaqvkl9jhp43r0sm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/autossh/default.nix b/nixpkgs/pkgs/tools/networking/autossh/default.nix index a123e551a90a..3ff06960156a 100644 --- a/nixpkgs/pkgs/tools/networking/autossh/default.nix +++ b/nixpkgs/pkgs/tools/networking/autossh/default.nix @@ -2,14 +2,19 @@ stdenv.mkDerivation rec { name = "autossh-1.4g"; - + src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; - - buildInputs = [ openssh ]; - + + preConfigure = '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; + + nativeBuildInputs = [ openssh ]; + installPhase = '' install -D -m755 autossh $out/bin/autossh || return 1 @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 ''; - + meta = with stdenv.lib; { homepage = http://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index b165142d85a4..45ff2947c685 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/curl-config "$dev" + '' + stdenv.lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so diff --git a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix index cdf9c778838f..7cedd0f23b41 100644 --- a/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "dnscrypt-proxy2-${version}"; - version = "2.0.15"; + version = "2.0.22"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; src = fetchFromGitHub { owner = "jedisct1"; repo = "dnscrypt-proxy"; - rev = "${version}"; - sha256 = "0iwvndk1h550zmwhwablb0smv9n2l51hqbmzj354mcgi6frnx819"; + rev = version; + sha256 = "0rmiyqxbbc3gjnfvyggf2lckckliiijq528993gv0n875r7ahkix"; }; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/tools/networking/fping/default.nix b/nixpkgs/pkgs/tools/networking/fping/default.nix index e0cd0ff8849a..4b5242818b3d 100644 --- a/nixpkgs/pkgs/tools/networking/fping/default.nix +++ b/nixpkgs/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-4.1"; + name = "fping-4.2"; src = fetchurl { url = "https://www.fping.org/dist/${name}.tar.gz"; - sha256 = "0wxbvm480vij8dy4v1pi8f0c7010rx6bidg3qhsvkdf2ijhy4cr7"; + sha256 = "0jmnf4vmr43aiwk3h2b5qdsb95gxar8gz1yli8fswnm9nrs9ccvx"; }; configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index ceadc231143f..2745c8c1d84d 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.38"; + name = "i2p-0.9.39"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "0fxn8q6ccpjxr41s97nmjxg7hx12dzwrm5a7gyxgr44r7l77qlv6"; + sha256 = "0d6g0ffv2b0ghjjp3ndal8n9maw5y0n36vqrylhh5zr1hffvxx9i"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/nixpkgs/pkgs/tools/networking/nbd/default.nix b/nixpkgs/pkgs/tools/networking/nbd/default.nix index 75e2b45110fe..f9df781715ac 100644 --- a/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.18"; + name = "nbd-3.19"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; + sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml"; }; buildInputs = [ glib ] diff --git a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix index 4dbc455103c5..43018e401f1e 100644 --- a/nixpkgs/pkgs/tools/networking/ndisc6/default.nix +++ b/nixpkgs/pkgs/tools/networking/ndisc6/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.3"; + name = "ndisc6-1.0.4"; src = fetchurl { url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; + sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix index 5fc591f0a43d..352b88f39354 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -1,17 +1,18 @@ { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig +, file, findutils , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret , withGnome ? true, gnome3, networkmanagerapplet }: stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.2.10"; + version = "1.2.12"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = "${version}"; - sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x"; + sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4"; }; patches = [ @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ networkmanager ppp ] ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; - nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ]; preConfigure = '' intltoolize -f diff --git a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch index 0a068ee800c6..531672c39362 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch +++ b/nixpkgs/pkgs/tools/networking/network-manager/l2tp/fix-paths.patch @@ -1,6 +1,8 @@ ---- a/src/nm-l2tp-service.c -+++ b/src/nm-l2tp-service.c -@@ -480,7 +480,7 @@ +diff --git a/shared/utils.c b/shared/utils.c +index c978a1f..d2c36cd 100644 +--- a/shared/utils.c ++++ b/shared/utils.c +@@ -52,7 +52,7 @@ nm_find_ipsec (void) { static const char *ipsec_binary_paths[] = { @@ -9,7 +11,7 @@ "/usr/sbin/ipsec", "/usr/local/sbin/ipsec", "/sbin/strongswan", -@@ -505,7 +505,7 @@ +@@ -77,7 +77,7 @@ nm_find_l2tpd (void) { static const char *l2tp_binary_paths[] = { diff --git a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix index d7f558574065..17460bc72f70 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix +++ b/nixpkgs/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gnome3, libsecret }: +, gtk3, gnome3, libsecret }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; }; - buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk networkmanagerapplet ]); + buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix index da598c6fbd5e..89d6a9b454da 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { install -D ngrok $out/bin/ngrok ''; + passthru.updateScript = ./update.sh; + meta = { description = "ngrok"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/networking/ngrok-2/update b/nixpkgs/pkgs/tools/networking/ngrok-2/update.sh index 62b0c7e545e9..7908a1524e59 100755 --- a/nixpkgs/pkgs/tools/networking/ngrok-2/update +++ b/nixpkgs/pkgs/tools/networking/ngrok-2/update.sh @@ -4,10 +4,8 @@ #!nix-shell -i bash set -eu -o pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" get_download_info() { - echo '{ "sys": "'"$1-$2"'", "response": ' http --body \ https://update.equinox.io/check \ 'Accept:application/json; q=1; version=1; charset=utf-8' \ @@ -16,25 +14,20 @@ get_download_info() { channel=stable \ os=$1 \ goarm= \ - arch=$2 - -# target_version=2.2.8 \ - - echo "}" + arch=$2 \ + | jq --arg sys "$1-$2" '{ + sys: $sys, + url: .download_url, + sha256: .checksum, + version: .release.version + }' } ( - echo "[" get_download_info linux 386 - echo "," get_download_info linux amd64 - echo "," get_download_info linux arm - echo "," get_download_info linux arm64 - # echo "," - # get_download_info darwin 386 - echo "," get_download_info darwin amd64 - echo "]" -) | jq 'map ({ (.sys): { "sys": .sys, "url": .response.download_url, "sha256": .response.checksum, "version": .response.release.version } }) | add' >versions.json +) | jq --slurp 'map ({ (.sys): . }) | add' \ + > pkgs/tools/networking/ngrok-2/versions.json diff --git a/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 358c53f453bb..44bbb3779d04 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; + sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 6d4c77d51987..3e9d1f9f5f7e 100644 --- a/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -59,7 +59,7 @@ pythonPackages.buildPythonApplication rec { service-identity pyyaml magic-wormhole treq ]; - checkInputs = with pythonPackages; [ hypothesis ]; + checkInputs = with pythonPackages; [ hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index de4fbbd365db..a51f911b40bf 100644 --- a/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -4,15 +4,15 @@ }: stdenv.mkDerivation rec { - name = "shadowsocks-libev-${version}"; - version = "3.2.3"; + pname = "shadowsocks-libev"; + version = "3.2.5"; # Git tag includes CMake build files which are much more convenient. src = fetchFromGitHub { owner = "shadowsocks"; - repo = "shadowsocks-libev"; + repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1nj2z3j41lqd6gvj6j7xc8g7jbn2f8b75phlkgwvw0j3zsqnbq30"; + sha256 = "09z20y35zjzsx5fd5cnnxxgbfcrh2bp0z7m15l59wlmlsfp7r2pw"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/networking/uget/default.nix b/nixpkgs/pkgs/tools/networking/uget/default.nix index 6779d864ce24..41c39cd27c26 100644 --- a/nixpkgs/pkgs/tools/networking/uget/default.nix +++ b/nixpkgs/pkgs/tools/networking/uget/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, - libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null + libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null }: stdenv.mkDerivation rec { @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { intltool wrapGAppsHook ]; - + buildInputs = [ openssl curl libnotify libappindicator-gtk3 - gnome3.gtk + gtk3 (stdenv.lib.getLib gnome3.dconf) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) diff --git a/nixpkgs/pkgs/tools/networking/whois/default.nix b/nixpkgs/pkgs/tools/networking/whois/default.nix index 6b944ee3ffc4..d13dd8517fe9 100644 --- a/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.4.1"; + version = "5.4.2"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "01pfil456q3241awilszx5iq1x6kr1rddkraj8yyxyab45l2ssk9"; + sha256 = "17i9620gm100plza0qdzfx9nvkvgyb6jcc5g412y5r7wvh7q19mh"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index 2c389c144b1e..b4b339edb5f7 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool -, wget, xxd, desktop-file-utils -, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive +, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, wget, xxd, desktop-file-utils, file +, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools , gtest }: @@ -72,9 +72,13 @@ in stdenv.mkDerivation rec { buildInputs = [ glib zlib cairo openssl fuse xz inotify-tools libarchive - squashfsTools + squashfsTools makeWrapper ]; + postPatch = '' + substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file" + ''; + preConfigure = '' export HOME=$(pwd) ''; @@ -90,6 +94,14 @@ in stdenv.mkDerivation rec { "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; + postInstall = '' + cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" + cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" + + wrapProgram "$out/bin/appimagetool" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + ''; + checkInputs = [ gtest ]; doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why diff --git a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix index a57056569c08..367405f552fb 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q"; + sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0"; }; makeWrapperArgs = [ diff --git a/nixpkgs/pkgs/tools/security/afl/libdislocator.nix b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix new file mode 100644 index 000000000000..c5844702ef38 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/afl/libdislocator.nix @@ -0,0 +1,34 @@ +{ stdenv, afl}: + +stdenv.mkDerivation rec { + version = (builtins.parseDrvName afl.name).version; + name = "libdislocator-${version}"; + + src = afl.src; + sourceRoot = "${afl.name}/libdislocator"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libdislocator-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libdislocator.so + END + chmod +x $out/bin/get-libdislocator-so + ''; + + meta = with stdenv.lib; { + homepage = "http://lcamtuf.coredump.cx/afl/"; + description = '' + Drop-in replacement for the libc allocator which improves + the odds of bumping into heap-related security bugs in + several ways. + ''; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/browserpass/2.nix b/nixpkgs/pkgs/tools/security/browserpass/2.nix new file mode 100644 index 000000000000..fdbd757449a6 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/browserpass/2.nix @@ -0,0 +1,43 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }: + +buildGoPackage rec { + name = "browserpass-${version}"; + version = "2.0.22"; + + goPackagePath = "github.com/dannyvankooten/browserpass"; + + goDeps = ./2deps.nix; + + src = fetchFromGitHub { + repo = "browserpass"; + owner = "dannyvankooten"; + rev = version; + sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx"; + }; + + postPatch = '' + substituteInPlace browserpass.go \ + --replace /usr/local/bin/gpg ${gnupg}/bin/gpg + ''; + + postInstall = '' + host_file="$bin/bin/browserpass" + mkdir -p "$bin/etc" + + sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json + sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json + + install chrome-host.json $bin/etc/ + install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json + install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json + ''; + + meta = with stdenv.lib; { + description = "A Chrome & Firefox extension for zx2c4's pass"; + homepage = https://github.com/dannyvankooten/browserpass; + license = licenses.mit; + platforms = with platforms; linux ++ darwin ++ openbsd; + maintainers = with maintainers; [ rvolosatovs ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/browserpass/2deps.nix b/nixpkgs/pkgs/tools/security/browserpass/2deps.nix new file mode 100644 index 000000000000..631463a69d11 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/browserpass/2deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/gokyle/twofactor"; + fetch = { + type = "git"; + url = "https://github.com/gokyle/twofactor"; + rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7"; + sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; + sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + }; + } + { + goPackagePath = "github.com/sahilm/fuzzy"; + fetch = { + type = "git"; + url = "https://github.com/sahilm/fuzzy"; + rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2"; + sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"; + sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p"; + }; + } +] diff --git a/nixpkgs/pkgs/tools/security/browserpass/default.nix b/nixpkgs/pkgs/tools/security/browserpass/default.nix index dd797fb9348f..c1c9e679f22c 100644 --- a/nixpkgs/pkgs/tools/security/browserpass/default.nix +++ b/nixpkgs/pkgs/tools/security/browserpass/default.nix @@ -1,43 +1,65 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ stdenv, buildGoPackage, fetchFromGitHub, gnupg }: - -buildGoPackage rec { - name = "browserpass-${version}"; - version = "2.0.22"; - - goPackagePath = "github.com/dannyvankooten/browserpass"; - - goDeps = ./deps.nix; +{ lib, callPackage, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg }: +let + # For backwards compatibility with v2 of the browser extension, we embed v2 + # of the native host in v3. Because the extension will auto-update when it + # is released, this code can be removed from that point on. + # Don't forget to remove v2 references down below and the v2 files in this + # folder + v2 = callPackage ./2.nix {}; +in buildGoPackage rec { + pname = "browserpass"; + version = "3.0.1"; src = fetchFromGitHub { - repo = "browserpass"; - owner = "dannyvankooten"; + owner = "browserpass"; + repo = "browserpass-native"; rev = version; - sha256 = "05cacrx08k99c5zra7ksdik9xxn3vih3x6in7536zs5gm55mkbfx"; + sha256 = "1i3xxysiiapz9y2v0gp13inx7j0d7n0khpmcsy9k95pzn53526dx"; }; + nativeBuildInputs = [ makeWrapper ]; + + goPackagePath = "github.com/browserpass/browserpass-native"; + goDeps = ./deps.nix; + postPatch = '' - substituteInPlace browserpass.go \ - --replace /usr/local/bin/gpg ${gnupg}/bin/gpg + # Because this Makefile will be installed to be used by the user, patch + # variables to be valid by default + substituteInPlace Makefile \ + --replace "PREFIX ?= /usr" "" ''; - postInstall = '' - host_file="$bin/bin/browserpass" - mkdir -p "$bin/etc" + DESTDIR = placeholder "bin"; + + postConfigure = '' + cd "go/src/$goPackagePath" + make configure + ''; + + buildPhase = '' + make + ''; + + installPhase = '' + make install + + wrapProgram $bin/bin/browserpass \ + --suffix PATH : ${lib.makeBinPath [ gnupg ]} - sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json - sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json + # This path is used by our firefox wrapper for finding native messaging hosts + mkdir -p $bin/lib/mozilla/native-messaging-hosts + ln -s $bin/lib/browserpass/hosts/firefox/*.json $bin/lib/mozilla/native-messaging-hosts - install chrome-host.json $bin/etc/ - install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json - install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json + # These can be removed too, see comment up top + ln -s ${lib.getBin v2}/etc $bin/etc + ln -s ${lib.getBin v2}/lib/mozilla/native-messaging-hosts/* $bin/lib/mozilla/native-messaging-hosts ''; - meta = with stdenv.lib; { - description = "A Chrome & Firefox extension for zx2c4's pass"; - homepage = https://github.com/dannyvankooten/browserpass; - license = licenses.mit; - platforms = with platforms; linux ++ darwin ++ openbsd; - maintainers = with maintainers; [ rvolosatovs ]; + meta = with lib; { + description = "Browserpass native client app"; + homepage = https://github.com/browserpass/browserpass-native; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ rvolosatovs infinisil ]; }; } diff --git a/nixpkgs/pkgs/tools/security/browserpass/deps.nix b/nixpkgs/pkgs/tools/security/browserpass/deps.nix index 631463a69d11..334a189ad404 100644 --- a/nixpkgs/pkgs/tools/security/browserpass/deps.nix +++ b/nixpkgs/pkgs/tools/security/browserpass/deps.nix @@ -1,12 +1,21 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "github.com/gokyle/twofactor"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; - url = "https://github.com/gokyle/twofactor"; - rev = "eaad1884d40f9cabff98a57a524c17afd00c9fe7"; - sha256 = "07kvga6f2b56kpy52a3xk16garvlqz950s350dax97x7cayba95g"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + 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"; }; } { @@ -14,26 +23,71 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; - sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + rev = "v0.0.1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; + }; + } + { + 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/rifflock/lfshook"; + fetch = { + type = "git"; + url = "https://github.com/rifflock/lfshook"; + rev = "b9218ef580f5"; + sha256 = "0wxqjcjfg8c0klmdgmbw3ckagby3wg9rkga9ihd4fsf05x5scxrc"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.0"; + sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; + }; + } + { + 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/sahilm/fuzzy"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; - url = "https://github.com/sahilm/fuzzy"; - rev = "a154b19bb758dcdd6ede58dc11ea53c2950527b2"; - sha256 = "0jkw6474d5ik2fq2zznqxj4y3p42z47r7mbg856ln5wyara2sg0l"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { - goPackagePath = "rsc.io/qr"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; - url = "https://github.com/rsc/qr"; - rev = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"; - sha256 = "1npxy32glnkvsp0871972jzjzgkwaqmbv6jsj9wgqsa1s2jr004p"; + url = "https://go.googlesource.com/sys"; + rev = "fead79001313"; + sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i"; }; } ] diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile new file mode 100644 index 000000000000..f9fb0e329bd4 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'bundler-audit' diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock new file mode 100644 index 000000000000..28cbcf5a9a66 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -0,0 +1,16 @@ +GEM + remote: https://rubygems.org/ + specs: + bundler-audit (0.6.1) + bundler (>= 1.2.0, < 3) + thor (~> 0.18) + thor (0.20.3) + +PLATFORMS + ruby + +DEPENDENCIES + bundler-audit + +BUNDLED WITH + 1.14.6 diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/default.nix b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix new file mode 100644 index 000000000000..8b19b6103d4a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bundler-audit/default.nix @@ -0,0 +1,26 @@ +{ bundlerEnv, ruby, lib }: + +bundlerEnv rec { + name = "${pname}-${version}"; + pname = "bundler-audit"; + version = (import ./gemset.nix).bundler-audit.version; + + inherit ruby; + gemdir = ./.; + + meta = with lib; { + description = "Patch-level verification for Bundler"; + longDescription = '' + Features: + - Checks for vulnerable versions of gems in Gemfile.lock. + - Checks for insecure gem sources (http://). + - Allows ignoring certain advisories that have been manually worked around. + - Prints advisory information. + - Does not require a network connection. + ''; + homepage = https://github.com/rubysec/bundler-audit; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix new file mode 100644 index 000000000000..56d78b3e8f16 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix @@ -0,0 +1,19 @@ +{ + bundler-audit = { + dependencies = ["thor"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq"; + type = "gem"; + }; + version = "0.6.1"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; +} \ No newline at end of file diff --git a/nixpkgs/pkgs/tools/security/chkrootkit/default.nix b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix index 0cc026f0c877..1d85ba0b5669 100644 --- a/nixpkgs/pkgs/tools/security/chkrootkit/default.nix +++ b/nixpkgs/pkgs/tools/security/chkrootkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "chkrootkit-0.52"; + name = "chkrootkit-0.53"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${name}.tar.gz"; - sha256 = "04d2yxpy99y90rvrlc9fqmlffs6iyfbghxbhvv12j1xfr2ww0y65"; + sha256 = "1da5ry3p7jb6xs6xlfml1ly09q2rs5q6n5axif17d29k7gixlqkj"; }; # TODO: a lazy work-around for linux build failure ... diff --git a/nixpkgs/pkgs/tools/security/clamav/default.nix b/nixpkgs/pkgs/tools/security/clamav/default.nix index 8e641ba4a0ed..4d9beb654ece 100644 --- a/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.101.1"; + version = "0.101.2"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; - sha256 = "01mq3z04fjbq5iq8wfwfim72iv3dn04d3ishc5lkhxpmnalqydps"; + sha256 = "0d3n4y8i5q594h4cjglmvpk4jd73r9ajpp1bvq5lr9zpdzgyn4ha"; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/nixpkgs/pkgs/tools/security/default.nix b/nixpkgs/pkgs/tools/security/default.nix new file mode 100644 index 000000000000..c5987d37889c --- /dev/null +++ b/nixpkgs/pkgs/tools/security/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pkgs }: + +stdenv.mkDerivation rec { + version = "0.0.1"; + name = "ecdsatool-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "kaniini"; + repo = "ecdsatool"; + rev = "7c0b2c51e2e64d1986ab1dc2c57c2d895cc00ed1"; + sha256 = "08z9309znkhrjpwqd4ygvm7cd1ha1qbrnlzw64fr8704jrmx762k"; + }; + + configurePhase = '' + ./autogen.sh + ./configure --prefix=$out + ''; + + nativeBuildInputs = with pkgs; [openssl autoconf automake]; + buildInputs = with pkgs; [libuecc]; + + meta = with stdenv.lib; { + description = "Create and manipulate ECC NISTP256 keypairs."; + homepage = https://github.com/kaniini/ecdsatool/; + license = with licenses; [free]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/security/gnupg/22.nix b/nixpkgs/pkgs/tools/security/gnupg/22.nix index 254a345839b3..fbb370027d7e 100644 --- a/nixpkgs/pkgs/tools/security/gnupg/22.nix +++ b/nixpkgs/pkgs/tools/security/gnupg/22.nix @@ -1,5 +1,6 @@ -{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libgpgerror , libiconv, npth, gettext, texinfo, pcsclite, sqlite +, buildPackages # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -15,13 +16,14 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.13"; + version = "2.2.15"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1n0igfn9nwdajzkcgdx7apwm9m5rpw0fg6vwskmf1rpranlqgivn"; + sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext texinfo @@ -36,7 +38,13 @@ stdenv.mkDerivation rec { ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; - configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "--with-npth-prefix=${npth}" + ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; postInstall = '' mkdir -p $out/lib/systemd/user diff --git a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix index 4db350684bef..0415b10b25d8 100644 --- a/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix @@ -2,15 +2,14 @@ , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "lastpass-cli-${version}"; - - version = "1.3.1"; + pname = "lastpass-cli"; + version = "1.3.2"; src = fetchFromGitHub { owner = "lastpass"; - repo = "lastpass-cli"; + repo = pname; rev = "v${version}"; - sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h"; + sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; @@ -21,11 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" - ]; + installTargets = [ "install" "install-doc" ]; - installTargets = "install install-doc"; + postInstall = '' + install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass + install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish + ''; meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; diff --git a/nixpkgs/pkgs/tools/security/lynis/default.nix b/nixpkgs/pkgs/tools/security/lynis/default.nix index c72f75e24e27..ceff23911c7e 100644 --- a/nixpkgs/pkgs/tools/security/lynis/default.nix +++ b/nixpkgs/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.7.1"; + version = "2.7.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "1nv2dqd2k2n8mcdr6xl5g713xxkgvja6487by1wn4k0b416jij9i"; + sha256 = "0dbbfk47dpxx7zpb98n4w3ls3z5di57qnr2nsgxjvp49gk9j3f6k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/security/modsecurity/default.nix b/nixpkgs/pkgs/tools/security/modsecurity/default.nix index 09f8c63973c7..6ec90cd15a85 100644 --- a/nixpkgs/pkgs/tools/security/modsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/modsecurity/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "modsecurity-${version}"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; - sha256 = "41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5"; + sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/tools/security/pass/default.nix b/nixpkgs/pkgs/tools/security/pass/default.nix index 007ffdf3e3fa..8ddbd60a38d1 100644 --- a/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/default.nix @@ -73,6 +73,9 @@ let # Link extensions env rmdir $out/lib/password-store/extensions ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. + for f in ${extensionsEnv}/share/man/man1/*.1.gz; do + ln -s $f $out/share/man/man1/ + done # Fix program name in --help substituteInPlace $out/bin/pass \ diff --git a/nixpkgs/pkgs/tools/security/sslscan/default.nix b/nixpkgs/pkgs/tools/security/sslscan/default.nix index 0484e8e069ab..d3a8f35d9148 100644 --- a/nixpkgs/pkgs/tools/security/sslscan/default.nix +++ b/nixpkgs/pkgs/tools/security/sslscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.12"; + version = "1.11.13"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "0wa0z6my6aqjp8si6x522ivk0yy55izbs3ch298gxjw5r15f4jb1"; + sha256 = "0sa8iw91wi3515lw761j84wagab1x9rxr0mn8m08qj300z2044yk"; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/tools/security/zzuf/default.nix b/nixpkgs/pkgs/tools/security/zzuf/default.nix new file mode 100644 index 000000000000..dc2cfe81746a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/zzuf/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "zzuf"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "samhocevar"; + repo = "zzuf"; + rev = "v${version}"; + sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig ]; + + preConfigure = "./bootstrap"; + + meta = with stdenv.lib; { + description = "Transparent application input fuzzer."; + homepage = http://caca.zoy.org/wiki/zzuf; + license = licenses.wtfpl; + platforms = platforms.linux; + maintainers = with maintainers; [ lihop ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 6a4a09f4790a..4b0150735e8f 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.63"; + version = "21.64"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "0rwc30vs7clhl0kmniw4vms1ngx3xl6l1a979hywszvzhgmdclxh"; + sha256 = "0jdwd6xvcsyyk03hv0kyz6pn4nzmgn2ynj8gqai1fxh3l8hv48w8"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/system/inxi/default.nix b/nixpkgs/pkgs/tools/system/inxi/default.nix index d69398e64f14..17680de86f0d 100644 --- a/nixpkgs/pkgs/tools/system/inxi/default.nix +++ b/nixpkgs/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "inxi-${version}"; - version = "3.0.32-1"; + version = "3.0.33-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "171xdip2alkp3g0k0sanaavvdcz6d0wlldj9lgj11xsdbhaaknnv"; + sha256 = "19bfdid4zp39irsdq3m6yyqf2336c30da35qgslrzcr2vh815g8c"; }; buildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/tools/system/logcheck/default.nix b/nixpkgs/pkgs/tools/system/logcheck/default.nix index 25a9660aed90..4ec34a68122c 100644 --- a/nixpkgs/pkgs/tools/system/logcheck/default.nix +++ b/nixpkgs/pkgs/tools/system/logcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "logcheck-${version}"; - version = "1.3.19"; + version = "1.3.20"; _name = "logcheck_${version}"; src = fetchurl { url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz"; - sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86"; + sha256 = "1rmkvxhcwr9gb6z4dlgr6rrx5l70hshlxdggs6qx0w1ljcmx1dlz"; }; prePatch = '' diff --git a/nixpkgs/pkgs/tools/system/monit/default.nix b/nixpkgs/pkgs/tools/system/monit/default.nix index 362545285ede..282729f31459 100644 --- a/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/nixpkgs/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.25.2"; + name = "monit-5.25.3"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a"; + sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1"; }; nativeBuildInputs = [ bison flex ]; diff --git a/nixpkgs/pkgs/tools/system/plan9port/default.nix b/nixpkgs/pkgs/tools/system/plan9port/default.nix index 83b006e786f1..c14fbc49e0d5 100644 --- a/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchgit, which, libX11, libXt, fontconfig, freetype +{ stdenv, fetchFromGitHub, which, libX11, libXt, fontconfig, freetype , xorgproto ? null , libXext ? null , zlib ? null - # For building web manuals -, perl ? null -, samChordingSupport ? true #from 9front +, perl ? null # For building web manuals }: stdenv.mkDerivation rec { - name = "plan9port-2018-09-20"; + pname = "plan9port"; + version = "2019-02-25"; + name = "${pname}-${version}"; - src = fetchgit { - # Latest, same as on github, google code is old - url = "https://github.com/9fans/plan9port.git"; - rev = "a82a8b6368274d77d42f526e379b74e79c137e26"; - sha256 = "1icywcnqv0dz1mkm7giakii536nycp0ajxnmzkx4944dxsmhcwq1"; + src = fetchFromGitHub { + owner = "9fans"; + repo = "plan9port"; + rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; + sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; }; - patches = stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; - postPatch = '' #hardcoded path substituteInPlace src/cmd/acme/acme.c \ @@ -36,37 +34,20 @@ stdenv.mkDerivation rec { --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" ''; - builder = ./builder.sh; - - NIX_LDFLAGS="-lgcc_s"; buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ - which - perl - libX11 - fontconfig - xorgproto - libXt - libXext - freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. + which perl libX11 fontconfig xorgproto libXt libXext + freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. ]; - enableParallelBuilding = true; + builder = ./builder.sh; - meta = with stdenv.lib; { - homepage = http://swtch.com/plan9port/; - description = "Plan 9 from User Space"; - license = licenses.lpl-102; - maintainers = with maintainers; [ bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; - }; - libX11_dev = libX11.dev; libXt_dev = libXt.dev; libXext_dev = libXext.dev; fontconfig_dev = fontconfig.dev; freetype_dev = freetype.dev; zlib_dev = zlib.dev; - + xorgproto_exp = xorgproto; libX11_exp = libX11; libXt_exp = libXt; @@ -75,4 +56,21 @@ stdenv.mkDerivation rec { zlib_exp = zlib; fontconfig_lib = fontconfig.lib; + + NIX_LDFLAGS="-lgcc_s"; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://9fans.github.io/plan9port/; + description = "Plan 9 from User Space"; + longDescription = '' + Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs + from their native Plan 9 environment to Unix-like operating systems. + ''; + license = licenses.lpl-102; + maintainers = with maintainers; [ AndersonTorres bbarker + ftrvxmtrx kovirobi ]; + platforms = platforms.unix; + }; } +# TODO: investigate the mouse chording support patch diff --git a/nixpkgs/pkgs/tools/system/plan9port/sam_chord_9front.patch b/nixpkgs/pkgs/tools/system/plan9port/sam_chord_9front.patch deleted file mode 100644 index 8920770e810a..000000000000 --- a/nixpkgs/pkgs/tools/system/plan9port/sam_chord_9front.patch +++ /dev/null @@ -1,215 +0,0 @@ -diff -r -c p9p/src/cmd/sam/xec.c p9p-patched/src/cmd/sam/xec.c -*** p9p/src/cmd/sam/xec.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/sam/xec.c 2016-08-31 06:35:26.910876148 +0300 -*************** -*** 277,282 **** ---- 277,283 ---- - else - while(n++ && undo(FALSE)) - ; -+ moveto(f, f->dot.r); - return TRUE; - } - -diff -r -c p9p/src/cmd/samterm/flayer.c p9p-patched/src/cmd/samterm/flayer.c -*** p9p/src/cmd/samterm/flayer.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/samterm/flayer.c 2016-08-31 06:46:19.441411045 +0300 -*************** -*** 254,274 **** - int - flselect(Flayer *l) - { -- int ret; - if(l->visible!=All) - flupfront(l); -! frselect(&l->f, mousectl); -! ret = 0; -! if(l->f.p0==l->f.p1){ -! if(mousep->msec-l->click<Clicktime && l->f.p0+l->origin==l->p0){ -! ret = 1; - l->click = 0; -! }else -! l->click = mousep->msec; -! }else -! l->click = 0; - l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; -! return ret; - } - - void ---- 254,271 ---- - int - flselect(Flayer *l) - { - if(l->visible!=All) - flupfront(l); -! if(l->f.p0==l->f.p1) -! if(mousep->msec-l->click<Clicktime && l->f.p0+l->origin==l->p0 && -! l->f.p0==frcharofpt(&l->f, mousep->xy)){ - l->click = 0; -! return 1; -! } -! l->click = mousep->msec; -! frselect(&l->f, mousectl); - l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; -! return 0; - } - - void -diff -r -c p9p/src/cmd/samterm/main.c p9p-patched/src/cmd/samterm/main.c -*** p9p/src/cmd/samterm/main.c 2016-04-18 21:07:22.000000000 +0300 ---- p9p-patched/src/cmd/samterm/main.c 2016-08-31 06:52:05.670322598 +0300 -*************** -*** 23,33 **** - char hostlock = 1; - char hasunlocked = 0; - int maxtab = 8; -- int chord; - int autoindent; - -- #define chording 0 /* code here for reference but it causes deadlocks */ -- - void - notifyf(void *a, char *msg) - { ---- 23,30 ---- -*************** -*** 39,45 **** - void - threadmain(int argc, char *argv[]) - { -! int i, got, scr, w; - Text *t; - Rectangle r; - Flayer *nwhich; ---- 36,42 ---- - void - threadmain(int argc, char *argv[]) - { -! int i, got, scr, chord; - Text *t; - Rectangle r; - Flayer *nwhich; -*************** -*** 84,89 **** ---- 81,87 ---- - startnewfile(Tstartcmdfile, &cmd); - - got = 0; -+ chord = 0; - if(protodebug) print("loop\n"); - for(;;got = waitforio()){ - if(hasunlocked && RESIZED()) -*************** -*** 108,163 **** - continue; - } - nwhich = flwhich(mousep->xy); -! scr = which && ptinrect(mousep->xy, which->scroll); - if(mousep->buttons) - flushtyping(1); -! if(chording && chord==1 && !mousep->buttons) - chord = 0; -! if(chording && chord) - chord |= mousep->buttons; -! else if(mousep->buttons&1){ -! if(nwhich){ -! if(nwhich!=which) -! current(nwhich); -! else if(scr) -! scroll(which, 1); -! else{ -! t=(Text *)which->user1; -! if(flselect(which)){ -! outTsl(Tdclick, t->tag, which->p0); -! t->lock++; -! }else if(t!=&cmd) -! outcmd(); -! if(mousep->buttons&1) -! chord = mousep->buttons; - } - } - }else if((mousep->buttons&2) && which){ - if(scr) - scroll(which, 2); - else - menu2hit(); -! }else if((mousep->buttons&4)){ - if(scr) -! scroll(which, 3); - else - menu3hit(); - } - mouseunblock(); - } -- if(chording && chord){ -- t = (Text*)which->user1; -- if(!t->lock && !hostlock){ -- w = which-t->l; -- if(chord&2){ -- cut(t, w, 1, 1); -- chord &= ~2; -- }else if(chord&4){ -- paste(t, w); -- chord &= ~4; -- } -- } -- } - } - } - ---- 106,159 ---- - continue; - } - nwhich = flwhich(mousep->xy); -! scr = which && (ptinrect(mousep->xy, which->scroll) || -! mousep->buttons&(8|16)); - if(mousep->buttons) - flushtyping(1); -! if((mousep->buttons&1)==0) - chord = 0; -! if(chord && which && which==nwhich){ - chord |= mousep->buttons; -! t = (Text *)which->user1; -! if(!t->lock){ -! int w = which-t->l; -! if(chord&2){ -! cut(t, w, 1, 1); -! chord &= ~2; -! } -! if(chord&4){ -! paste(t, w); -! chord &= ~4; - } - } -+ }else if(mousep->buttons&(1|8)){ -+ if(scr) -+ scroll(which, (mousep->buttons&8) ? 4 : 1); -+ else if(nwhich && nwhich!=which) -+ current(nwhich); -+ else{ -+ t=(Text *)which->user1; -+ if(flselect(which)){ -+ outTsl(Tdclick, t->tag, which->p0); -+ t->lock++; -+ }else if(t!=&cmd) -+ outcmd(); -+ if(mousep->buttons&1) -+ chord = mousep->buttons; -+ } - }else if((mousep->buttons&2) && which){ - if(scr) - scroll(which, 2); - else - menu2hit(); -! }else if(mousep->buttons&(4|16)){ - if(scr) -! scroll(which, (mousep->buttons&16) ? 5 : 3); - else - menu3hit(); - } - mouseunblock(); - } - } - } - diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 0ce6cb12a638..a907225914c4 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -11,11 +11,11 @@ let mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; in stdenv.mkDerivation rec { - name = "rsyslog-8.39.0"; + name = "rsyslog-8.1903.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; - sha256 = "1d3ac448b8gj58vg7n99ffv2rvpnhhin1ni5vyby73aksvz9c7y7"; + sha256 = "0vq50k9n3dlb02431zy2c0vhzvb4x27bp887d1xlrinf7m4kmlnh"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix index 7283819f14bf..c906d430d8f6 100644 --- a/nixpkgs/pkgs/tools/system/syslog-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.19.1"; + version = "3.20.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "0y2ixmbl4af4yf0a56pmg1c00nh0yvlfwr9ck9nhxbdysylk3yaw"; + sha256 = "185xixf48rp6isg2bs2y0hm6kf6a8ncncqgz4fd12jf6x6pmhn56"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/nixpkgs/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix index d798c98679c5..a69a527f68fd 100644 --- a/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/nixpkgs/pkgs/tools/system/tree/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { prefix=$out MANDIR=$out/share/man/man1 ${systemFlags} - CC="cc" + CC="$CC" ) ''; diff --git a/nixpkgs/pkgs/tools/text/poedit/default.nix b/nixpkgs/pkgs/tools/text/poedit/default.nix index 53d8cf8a8a24..a5864fbc051c 100644 --- a/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -1,20 +1,46 @@ -{ stdenv, fetchurl, wxGTK29, boost }: +{ stdenv, fetchurl, autoconf, automake, libtool, gettext, pkgconfig, wxGTK30, + boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk2, gtkspell2, pugixml, + nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "poedit-1.5.7"; + name = "poedit-${version}"; + version = "2.2.1"; src = fetchurl { - url = "mirror://sourceforge/poedit/${name}.tar.gz"; - sha256 = "0y0gbkb1jvp61qhh8sh7ar8849mwirizc42pk57zpxy84an5qlr4"; + url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; + sha256 = "0brj6ysisxng2xn8l9ii2rngsj5b4rk27hzfjbp3zwb2caagd3vq"; }; - buildInputs = [ wxGTK29 boost ]; + nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook + libxslt xmlto boost libtool pkgconfig ]; + + buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; + + propagatedBuildInputs = [ gettext ]; + + preConfigure = " + patchShebangs bootstrap + ./bootstrap + "; + + configureFlags = [ + "--without-cld2" + "--without-cpprest" + "--with-boost-libdir=${boost.out}/lib" + "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/" + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}") + ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Cross-platform gettext catalogs (.po files) editor"; - homepage = http://www.poedit.net/; + homepage = https://www.poedit.net/; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar genesis ]; }; } diff --git a/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix new file mode 100644 index 000000000000..31184e11399b --- /dev/null +++ b/nixpkgs/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -0,0 +1,30 @@ +{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: + +stdenv.mkDerivation rec { + version = "0.1.7"; + pname = "pdfsandwich"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/pdfsandwich/code/trunk/src"; + rev = "75"; + sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; + }; + + buildInputs = [ ocaml perl makeWrapper]; + installPhase = '' + mkdir -p $out/bin + cp -p pdfsandwich $out/bin + wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} + + mkdir -p $out/man/man1 + cp -p pdfsandwich.1.gz $out/man/man1 + ''; + +meta = with stdenv.lib; { + description = "OCR tool for scanned PDFs"; + homepage = http://www.tobias-elze.de/pdfsandwich/; + license = licenses.gpl2; + maintainers = [ maintainers.rps ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix new file mode 100644 index 000000000000..6d64b536502e --- /dev/null +++ b/nixpkgs/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -0,0 +1,29 @@ +{ stdenvNoCC, fetchFromGitHub, python3 }: + +stdenvNoCC.mkDerivation { + pname = "latexrun"; + version = "unstable-2015-11-18"; + src = fetchFromGitHub { + owner = "aclements"; + repo = "latexrun"; + rev = "38ff6ec2815654513c91f64bdf2a5760c85da26e"; + sha256 = "0xdl94kn0dbp6r7jk82cwxybglm9wp5qwrjqjxmvadrqix11a48w"; + }; + + buildInputs = [ python3 ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/bin + cp latexrun $out/bin/latexrun + chmod +x $out/bin/latexrun + ''; + + meta = with stdenvNoCC.lib; { + description = "A 21st century LaTeX wrapper"; + homepage = https://github.com/aclements/latexrun; + license = licenses.mit; + maintainers = [ maintainers.lucus16 ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index 7a06689c5e66..1a0a9b877bfe 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -87,7 +87,8 @@ in buildEnv { export TEXMFSYSVAR="$out/share/texmf-var" export PERL5LIB="$out/share/texmf/scripts/texlive" '' + - # patch texmf-{dist,local} -> texmf to be sure + # patch texmf-dist -> $out/share/texmf + # patch texmf-local -> $out/share/texmf-local # TODO: perhaps do lua actions? # tried inspiration from install-tl, sub do_texmf_cnf '' @@ -99,8 +100,7 @@ in buildEnv { rm ./texmfcnf.lua sed \ -e 's,texmf-dist,texmf,g' \ - -e 's,texmf-local,texmf,g' \ - -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf\",g" \ + -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,selfautodir:/,$out/share/,g" \ -e "s,selfautodir:,$out/share/,g" \ @@ -116,7 +116,6 @@ in buildEnv { rm ./texmf.cnf sed \ -e 's,texmf-dist,texmf,g' \ - -e 's,texmf-local,texmf,g' \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ @@ -126,6 +125,8 @@ in buildEnv { patchCnfLua "./texmfcnf.lua" + mkdir $out/share/texmf-local + rm updmap.cfg ) '' + diff --git a/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix new file mode 100644 index 000000000000..590e5704b88d --- /dev/null +++ b/nixpkgs/pkgs/tools/virtualization/rootlesskit/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "rootlesskit-${version}"; + version = "0.3.0-alpha.2"; + goPackagePath = "github.com/rootless-containers/rootlesskit"; + + src = fetchFromGitHub { + owner = "rootless-containers"; + repo = "rootlesskit"; + rev = "v${version}"; + sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6"; + }; + + meta = with lib; { + homepage = https://github.com/rootless-containers/rootlesskit; + description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 96396acb9e62..fac60ece8108 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -49,11 +49,6 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbot = pythonPackages.buildbot; # added 2018-10-11 - buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11 - buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 - buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 - buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index bd9572c8a1a7..6318e334175b 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -25,9 +25,6 @@ let in { - # Allow callPackage to fill in the pkgs argument - inherit pkgs; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. @@ -259,6 +256,7 @@ in curl = buildPackages.curl.override rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; + zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { @@ -268,7 +266,7 @@ in }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; - inherit openssl; + inherit zlib openssl; }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. @@ -280,7 +278,7 @@ in }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig openssl; + inherit zlib pkgconfig openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -477,6 +475,8 @@ in stdenv = clangStdenv; }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; + afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; agrep = callPackage ../tools/text/agrep { }; @@ -673,6 +673,11 @@ in bonfire = callPackage ../tools/misc/bonfire { }; + buildbot = with python3Packages; toPythonApplication buildbot; + buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; + buildbot-full = with python3Packages; toPythonApplication buildbot-full; + buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; + bunny = callPackage ../tools/package-management/bunny { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -825,6 +830,8 @@ in inherit (androidenv.androidPkgs_9_0) platform-tools; }; + anbox = callPackage ../os-specific/linux/anbox { }; + androidenv = callPackage ../development/mobile/androidenv { pkgs_i686 = pkgsi686Linux; }; @@ -972,6 +979,8 @@ in bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + blur-effect = callPackage ../tools/graphics/blur-effect { }; + charles = charles4; inherit (callPackage ../applications/networking/charles {}) charles3 @@ -990,6 +999,8 @@ in cudnn = cudnn_cudatoolkit_9_0; }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; + blink1-tool = callPackage ../tools/misc/blink1-tool { }; bliss = callPackage ../applications/science/math/bliss { }; @@ -1169,6 +1180,8 @@ in cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; + charliecloud = callPackage ../applications/virtualization/charliecloud { }; + chelf = callPackage ../tools/misc/chelf { }; cht-sh = callPackage ../tools/misc/cht.sh { }; @@ -1345,7 +1358,7 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dune = callPackage ../development/tools/ocaml/dune { }; + inherit (ocamlPackages) dune; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1686,6 +1699,8 @@ in ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; + riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; + riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix { conf = config.riot-web.conf or null; }; @@ -1938,7 +1953,7 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = callPackage ../applications/audio/clementine { + clementine = libsForQt5.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; @@ -2115,6 +2130,8 @@ in cfssl = callPackage ../tools/security/cfssl { }; + chafa = callPackage ../tools/misc/chafa { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; civetweb = callPackage ../development/libraries/civetweb { }; @@ -2236,6 +2253,8 @@ in darkstat = callPackage ../tools/networking/darkstat { }; + dav1d = callPackage ../development/libraries/dav1d { }; + davfs2 = callPackage ../tools/filesystems/davfs2 { }; dbeaver = callPackage ../applications/misc/dbeaver { }; @@ -2334,6 +2353,8 @@ in inherit (pythonPackages) mutagen python wrapPython; }; + picotts = callPackage ../tools/audio/picotts { }; + wgetpaste = callPackage ../tools/text/wgetpaste { }; dirmngr = callPackage ../tools/security/dirmngr { }; @@ -2416,6 +2437,8 @@ in duo-unix = callPackage ../tools/security/duo-unix { }; + duplicacy = callPackage ../tools/backup/duplicacy { }; + duplicati = callPackage ../tools/backup/duplicati { }; duplicity = callPackage ../tools/backup/duplicity { @@ -2492,6 +2515,8 @@ in zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + zzuf = callPackage ../tools/security/zzuf { }; + ### DEVELOPMENT / EMSCRIPTEN buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; @@ -2534,6 +2559,18 @@ in callPackage ../servers/search/elasticsearch/plugins.nix { } ); + elasticsearch-curator = with (python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "6.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; + }; + }); + }; + }).pkgs; toPythonApplication elasticsearch-curator; + embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; @@ -2879,6 +2916,8 @@ in gandi-cli = callPackage ../tools/networking/gandi-cli { }; + gandom-fonts = callPackage ../data/fonts/gandom-fonts { }; + garmin-plugin = callPackage ../applications/misc/garmin-plugin {}; garmintools = callPackage ../development/libraries/garmintools {}; @@ -3525,6 +3564,8 @@ in intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -3630,6 +3671,8 @@ in john = callPackage ../tools/security/john { }; + joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; + journalbeat = callPackage ../tools/system/journalbeat { }; journaldriver = callPackage ../tools/misc/journaldriver { }; @@ -3638,6 +3681,8 @@ in jp2a = callPackage ../applications/misc/jp2a { }; + jpeg-archive = callPackage ../applications/graphics/jpeg-archive { }; + jpeginfo = callPackage ../applications/graphics/jpeginfo { }; jpegoptim = callPackage ../applications/graphics/jpegoptim { }; @@ -3988,6 +4033,8 @@ in latex2html = callPackage ../tools/misc/latex2html { }; + latexrun = callPackage ../tools/typesetting/tex/latexrun { }; + ldapvi = callPackage ../tools/misc/ldapvi { }; ldns = callPackage ../development/libraries/ldns { @@ -4068,6 +4115,8 @@ in libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; + libmicrodns = callPackage ../development/libraries/libmicrodns { }; + libnids = callPackage ../tools/networking/libnids { }; libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; @@ -4782,9 +4831,7 @@ in pagmo2 = callPackage ../development/libraries/pagmo2 { }; - pakcs = callPackage ../development/compilers/pakcs { - haskellPackages = haskell.packages.ghc844; - }; + pakcs = callPackage ../development/compilers/pakcs { }; pal = callPackage ../tools/misc/pal { }; @@ -4805,12 +4852,16 @@ in parallel = callPackage ../tools/misc/parallel { }; + parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; + parcellite = callPackage ../tools/misc/parcellite { }; patchutils = callPackage ../tools/text/patchutils { }; parted = callPackage ../tools/misc/parted { }; + paulstretch = callPackage ../applications/audio/paulstretch { }; + pell = callPackage ../applications/misc/pell { }; pepper = callPackage ../tools/admin/salt/pepper { }; @@ -4868,6 +4919,8 @@ in pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; + pdftag = callPackage ../tools/graphics/pdftag { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -5207,6 +5260,8 @@ in redsocks = callPackage ../tools/networking/redsocks { }; + retext = callPackage ../applications/editors/retext { }; + richgo = callPackage ../development/tools/richgo { }; rst2html5 = callPackage ../tools/text/rst2html5 { }; @@ -5387,10 +5442,14 @@ in safeeyes = callPackage ../applications/misc/safeeyes { }; + sahel-fonts = callPackage ../data/fonts/sahel-fonts { }; + salt = callPackage ../tools/admin/salt {}; salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; + samim-fonts = callPackage ../data/fonts/samim-fonts {}; + saml2aws = callPackage ../tools/security/saml2aws {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -5711,6 +5770,8 @@ in strongswanTNC = strongswan.override { enableTNC = true; }; strongswanNM = strongswan.override { enableNetworkManager = true; }; + stylish-haskell = haskell.lib.justStaticExecutables haskellPackages.stylish-haskell; + su = shadow.su; subsonic = callPackage ../servers/misc/subsonic { }; @@ -6098,6 +6159,9 @@ in vimer = callPackage ../tools/misc/vimer { }; + vimpager = callPackage ../tools/misc/vimpager { }; + vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { }; + visidata = (newScope python3Packages) ../applications/misc/visidata { }; @@ -6222,6 +6286,8 @@ in rcm = callPackage ../tools/misc/rcm {}; + td = callPackage ../tools/misc/td { }; + tegola = callPackage ../servers/tegola {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; @@ -6439,6 +6505,8 @@ in xclip = callPackage ../tools/misc/xclip { }; + xcur2png = callPackage ../tools/graphics/xcur2png { }; + xcwd = callPackage ../tools/X11/xcwd { }; xtitle = callPackage ../tools/misc/xtitle { }; @@ -6518,8 +6586,8 @@ in yarn = callPackage ../development/tools/yarn { }; - yarn2nix = callPackage ../development/tools/yarn2nix { }; - inherit (yarn2nix) mkYarnPackage; + yarn2nix = throw "Use upstream https://github.com/moretea/yarn2nix"; + mkYarnPackage = yarn2nix; yasr = callPackage ../applications/audio/yasr { }; @@ -6747,9 +6815,10 @@ in }; }; }; - llvm-polly = llvmPackages_7.llvm-polly; - clang-polly = clang_7.override { cc = llvmPackages_7.clang-polly-unwrapped; }; + llvm-polly = llvmPackages_latest.llvm-polly; + clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; }; + clang_8 = llvmPackages_8.clang; clang_7 = llvmPackages_7.clang; clang_6 = llvmPackages_6.clang; clang_5 = llvmPackages_5.clang; @@ -7143,8 +7212,8 @@ in all-cabal-hashes = callPackage ../data/misc/hackage { }; - # Build with ghc 8.4 due to https://github.com/NixOS/nixpkgs/issues/53597 - purescript = haskell.lib.justStaticExecutables haskell.packages.ghc844.purescript; + purescript = callPackage ../development/compilers/purescript/purescript { }; + psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); @@ -7176,7 +7245,24 @@ in dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); - glslang = callPackage ../development/compilers/glslang { }; + glslang = callPackage ../development/compilers/glslang { + spirv-tools = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "117a1fd11f11e9bef9faa563c3d5156cc6ab529c"; + sha256 = "1w5hb6sgy71g279wsghixxc75r7rsm7wki011mpz039q66827sym"; + }; + }); + spirv-headers = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + }; + }); + }; go_bootstrap = if stdenv.isAarch64 then srcOnly { @@ -7371,16 +7457,19 @@ in lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; lld_7 = llvmPackages_7.lld; + lld_8 = llvmPackages_8.lld; lldb = llvmPackages.lldb; lldb_4 = llvmPackages_4.lldb; lldb_5 = llvmPackages_5.lldb; lldb_6 = llvmPackages_6.lldb; lldb_7 = llvmPackages_7.lldb; + lldb_8 = llvmPackages_8.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_8 = llvmPackages_8.llvm; llvm_7 = llvmPackages_7.llvm; llvm_6 = llvmPackages_6.llvm; llvm_5 = llvmPackages_5.llvm; @@ -7853,6 +7942,8 @@ in j = callPackage ../development/interpreters/j {}; + janet = callPackage ../development/interpreters/janet {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; jmeter = callPackage ../applications/networking/jmeter {}; @@ -8204,6 +8295,8 @@ in bundlerEnv = callPackage ../development/ruby-modules/bundler-env { }; bundlerApp = callPackage ../development/ruby-modules/bundler-app { }; + bundler-audit = callPackage ../tools/security/bundler-audit { }; + solargraph = callPackage ../development/ruby-modules/solargraph { }; inherit (callPackage ../development/interpreters/ruby { @@ -8340,6 +8433,16 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; + + msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; + msp430NewlibCross = callPackage ../development/misc/msp430/newlib.nix { + inherit (buildPackages.xorg) lndir; + newlib = newlibCross; + }; + + mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; + pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; pharo-cog32 = pharo-vms.cog32; @@ -8390,7 +8493,7 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_1; + apacheKafka = apacheKafka_2_2; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; @@ -8398,6 +8501,7 @@ in apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; + apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; kt = callPackage ../tools/misc/kt {}; @@ -8464,6 +8568,8 @@ in bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazelisk = callPackage ../development/tools/bazelisk { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -8510,6 +8616,8 @@ in byacc = callPackage ../development/tools/parsing/byacc { }; + cadre = callPackage ../development/tools/cadre { }; + casperjs = callPackage ../development/tools/casperjs { inherit (texFunctions) fontsConf; }; @@ -8961,6 +9069,8 @@ in libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; + libwhich = callPackage ../development/tools/misc/libwhich { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { }; lit = callPackage ../development/tools/misc/lit { }; @@ -9183,6 +9293,8 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; + semver-tool = callPackage ../development/tools/misc/semver-tool { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; @@ -9233,6 +9345,7 @@ in spin = callPackage ../development/tools/analysis/spin { }; + spirv-headers = callPackage ../development/libraries/spirv-headers { }; spirv-tools = callPackage ../development/tools/spirv-tools { }; splint = callPackage ../development/tools/analysis/splint { @@ -9564,11 +9677,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; - cachix = (callPackage ../development/tools/cachix { }).overrideAttrs (drv: { - meta = drv.meta // { - hydraPlatforms = stdenv.lib.platforms.unix; - }; - }); + cachix = callPackage ../development/tools/cachix { }; capnproto = callPackage ../development/libraries/capnproto { }; @@ -9870,6 +9979,7 @@ in libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; + libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; @@ -10107,6 +10217,7 @@ in else if name == "bionic" then targetPackages.bionic or bionic else if name == "uclibc" then targetPackages.uclibcCross or uclibcCross else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross + else if name == "newlib" && stdenv.targetPlatform.isMsp430 then targetPackages.msp430NewlibCross or msp430NewlibCross else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 @@ -10828,9 +10939,7 @@ in libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - libunity = callPackage ../development/libraries/libunity { - inherit (gnome3) gnome-common; - }; + libunity = callPackage ../development/libraries/libunity { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; @@ -11659,6 +11768,8 @@ in }; }); + libykclient = callPackage ../development/libraries/libykclient { }; + libykneomgr = callPackage ../development/libraries/libykneomgr { }; libytnef = callPackage ../development/libraries/libytnef { }; @@ -11881,6 +11992,8 @@ in nix = nixUnstable; }; + nika-fonts = callPackage ../data/fonts/nika-fonts { }; + nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; @@ -13066,7 +13179,33 @@ in vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; vulkan-tools = callPackage ../tools/graphics/vulkan-tools { }; - vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; + vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { + glslang = (glslang.override { + spirv-tools = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "5994ae2a045015004cce24802dc47c33736486ea"; + sha256 = "1w1zkql03aggma31nz4xb1b5waxxf2jcg99slzvmihg9ngmmlbm6"; + }; + }); + spirv-headers = spirv-tools.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "79b6681aadcb53c27d1052e5f8a0e82a981dbf2f"; + sha256 = "0flng2rdmc4ndq3j71h6wk1ibcjvhjrg2rzd6rv445vcsf0jh2pj"; + }; + }); + }).overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "5432f0dd8f331f15182681664d7486681e8514e6"; + sha256 = "0spdm93qkx83z8bks61am2g3ary7fkibvhqq706nj4z9wx4k0cbm"; + }; + }); + }; vtkWithQt4 = vtk.override { qtLib = qt4; }; @@ -13216,6 +13355,8 @@ in yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { }; + yubico-pam = callPackage ../development/libraries/yubico-pam { }; + yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; @@ -13395,7 +13536,11 @@ in go = buildPackages.go_1_11; }; - buildGoModule = buildGo111Module; + buildGo112Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_12; + }; + + buildGoModule = buildGo112Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -13567,10 +13712,9 @@ in apcupsd = callPackage ../servers/apcupsd { }; - asterisk = asterisk-stable; - inherit (callPackages ../servers/asterisk { }) - asterisk-stable asterisk-lts; + asterisk asterisk-stable asterisk-lts + asterisk_13 asterisk_15 asterisk_16; sabnzbd = callPackage ../servers/sabnzbd { }; @@ -14132,6 +14276,12 @@ in boost = boost167; }; + rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { + boost = boost167.override { + enableStatic = true; + }; + }; + s6 = skawarePackages.s6; s6-rc = skawarePackages.s6-rc; @@ -14728,13 +14878,6 @@ in ]; }; - linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_5_0 = callPackage ../os-specific/linux/kernel/linux-5.0.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14782,6 +14925,8 @@ in amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bcc = callPackage ../os-specific/linux/bcc { @@ -14814,6 +14959,8 @@ in ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + it87 = callPackage ../os-specific/linux/it87 {}; + ena = callPackage ../os-specific/linux/ena {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -14933,7 +15080,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20); linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -15339,6 +15485,8 @@ in speedometer = callPackage ../os-specific/linux/speedometer { }; + statik = callPackage ../development/tools/statik { }; + statifier = callPackage ../os-specific/linux/statifier { }; sysdig = callPackage ../os-specific/linux/sysdig { @@ -15803,6 +15951,8 @@ in lobster-two = callPackage ../data/fonts/lobster-two {}; + logitech-udev-rules = callPackage ../os-specific/linux/logitech-udev-rules {}; + # lohit-fonts.assamese lohit-fonts.bengali lohit-fonts.devanagari lohit-fonts.gujarati lohit-fonts.gurmukhi # lohit-fonts.kannada lohit-fonts.malayalam lohit-fonts.marathi lohit-fonts.nepali lohit-fonts.odia # lohit-fonts.tamil-classical lohit-fonts.tamil lohit-fonts.telugu @@ -15819,6 +15969,8 @@ in man-pages = callPackage ../data/documentation/man-pages { }; + manrope = callPackage ../data/fonts/manrope { }; + matcha = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -15910,6 +16062,8 @@ in papis = callPackage ../tools/misc/papis { }; + paps = callPackage ../tools/misc/paps { }; + pecita = callPackage ../data/fonts/pecita {}; paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; @@ -16017,6 +16171,7 @@ in maligned = callPackage ../development/tools/maligned { }; inter-ui = callPackage ../data/fonts/inter-ui { }; + inter = callPackage ../data/fonts/inter { }; siji = callPackage ../data/fonts/siji { }; @@ -16041,6 +16196,8 @@ in source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; + spleen = callPackage ../data/fonts/spleen { }; + sudo-font = callPackage ../data/fonts/sudo { }; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; @@ -16444,6 +16601,8 @@ in notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + brig = callPackage ../applications/networking/brig { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { }; @@ -16468,6 +16627,7 @@ in calligra = libsForQt5.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; + poppler = poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -16628,6 +16788,8 @@ in cuneiform = callPackage ../tools/graphics/cuneiform {}; + curseradio = callPackage ../applications/audio/curseradio { }; + cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; cutegram = @@ -17593,7 +17755,7 @@ in graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; - grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; + grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; }; gtkpod = callPackage ../applications/audio/gtkpod { }; @@ -17776,6 +17938,10 @@ in swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + waybar = callPackage ../applications/misc/waybar { + pulseSupport = config.pulseaudio or false; + }; + velox = callPackage ../applications/window-managers/velox { stConf = config.st.conf or null; stPatches = config.st.patches or null; @@ -17821,6 +17987,8 @@ in wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; + wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; + i810switch = callPackage ../os-specific/linux/i810switch { }; icewm = callPackage ../applications/window-managers/icewm {}; @@ -18070,7 +18238,13 @@ in kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; - kitty = callPackage ../applications/misc/kitty { }; + kitty = callPackage ../applications/misc/kitty { + harfbuzz = if stdenv.isDarwin then harfbuzz.override { + withCoreText = true; + } else harfbuzz; + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; + }; kiwix = callPackage ../applications/misc/kiwix { }; @@ -19037,8 +19211,14 @@ in python = python3; } // (config.profanity or {})); + properties-cpp = callPackage ../development/libraries/properties-cpp { }; + protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; + protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; + + ps2client = callPackage ../applications/networking/ps2client { }; + psi = callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; @@ -19273,6 +19453,8 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -20479,6 +20661,8 @@ in xtrace = callPackage ../tools/X11/xtrace { }; + xtruss = callPackage ../tools/X11/xtruss { }; + xmacro = callPackage ../tools/X11/xmacro { }; xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; @@ -20713,7 +20897,7 @@ in drumkv1 = callPackage ../applications/audio/drumkv1 { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; + duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); @@ -20846,6 +21030,8 @@ in gogui = callPackage ../games/gogui {}; + gscrabble = python3Packages.callPackage ../games/gscrabble {}; + gshogi = python3Packages.callPackage ../games/gshogi {}; gtetrinet = callPackage ../games/gtetrinet { @@ -20909,6 +21095,8 @@ in liquidwar5 = callPackage ../games/liquidwar/5.nix { }; + lugaru = callPackage ../games/lugaru {}; + macopix = callPackage ../games/macopix { gtk = gtk2; }; @@ -21011,7 +21199,9 @@ in pacvim = callPackage ../games/pacvim { }; - performous = callPackage ../games/performous { }; + performous = callPackage ../games/performous { + boost = boost166; + }; pingus = callPackage ../games/pingus {}; @@ -21417,6 +21607,7 @@ in sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; + tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; @@ -21485,6 +21676,8 @@ in gtk = gtk2; }; + solarc-gtk-theme = callPackage ../misc/themes/solarc { }; + xfce = xfce4-12; xfceUnstable = xfce4-13; @@ -21603,6 +21796,8 @@ in inormalize = callPackage ../applications/science/biology/inormalize { }; + itsx = callPackage ../applications/science/biology/itsx { }; + iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; }; @@ -21627,6 +21822,10 @@ in mrbayes = callPackage ../applications/science/biology/mrbayes { }; + megahit = callPackage ../applications/science/biology/megahit { }; + + messer-slim = callPackage ../applications/science/biology/messer-slim { }; + minc_tools = callPackage ../applications/science/biology/minc-tools { }; minc_widgets = callPackage ../applications/science/biology/minc-widgets { }; @@ -21668,6 +21867,8 @@ in somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; + stacks = callPackage ../applications/science/biology/stacks { }; + star = callPackage ../applications/science/biology/star { }; strelka = callPackage ../applications/science/biology/strelka { }; @@ -22534,7 +22735,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - websocat = callPackage ../tools/misc/websocat { }; + websocat = callPackage ../tools/misc/websocat { + inherit (darwin.apple_sdk.frameworks) Security; + }; epkowa = callPackage ../misc/drivers/epkowa { }; @@ -22544,6 +22747,8 @@ in illum = callPackage ../tools/system/illum { }; + image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -22596,6 +22801,8 @@ in muse = callPackage ../applications/audio/muse { }; + musly = callPackage ../applications/audio/musly { }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackage ../tools/package-management/nix { @@ -22939,6 +23146,7 @@ in mfcl8690cdwcupswrapper = callPackage ../misc/cups/drivers/mfcl8690cdwcupswrapper { }; mfcl8690cdwlpr = callPackage ../misc/cups/drivers/mfcl8690cdwlpr { }; + samsung-unified-linux-driver_1_00_36 = callPackage ../misc/cups/drivers/samsung/1.00.36/default.nix { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung/1.00.37.nix { }; samsung-unified-linux-driver_4_00_39 = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; @@ -23076,6 +23284,8 @@ in vaultenv = haskellPackages.vaultenv; + vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; + vbam = callPackage ../misc/emulators/vbam { ffmpeg = ffmpeg_2; }; @@ -23274,6 +23484,10 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; + bullet-roboschool = callPackage ../development/libraries/bullet/roboschool-fork.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; + }; + inherit (callPackages ../development/libraries/spdlog { }) spdlog_0 spdlog_1; diff --git a/nixpkgs/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix index 5f55d88cb772..f08f2eacc23c 100644 --- a/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/nixpkgs/pkgs/top-level/coq-packages.nix @@ -19,6 +19,7 @@ let coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coq-extensible-records = callPackage ../development/coq-modules/coq-extensible-records {}; coq-haskell = callPackage ../development/coq-modules/coq-haskell { }; + coqhammer = callPackage ../development/coq-modules/coqhammer {}; coqprime = callPackage ../development/coq-modules/coqprime {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; corn = callPackage ../development/coq-modules/corn {}; diff --git a/nixpkgs/pkgs/top-level/dotnet-packages.nix b/nixpkgs/pkgs/top-level/dotnet-packages.nix index bcfef9bdad88..b8aa2cb9bb99 100644 --- a/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -108,6 +108,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; + FsLexYaccRuntime = fetchNuGet { + baseName = "FsLexYacc.Runtime"; + version = "6.1.0"; + sha256 = "18vrx4lxsn4hkfishg4abv0d4q21dsph0bm4mdq5z8afaypp5cr7"; + outputFiles = [ "lib/net40/*" ]; + }; + FsPickler = fetchNuGet { baseName = "FsPickler"; version = "1.2.9"; diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index 46a00b698e34..68e7fde3a521 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -223,6 +223,8 @@ let dtoa = callPackage ../development/ocaml-modules/dtoa { }; + dune = callPackage ../development/tools/ocaml/dune { }; + earley = callPackage ../development/ocaml-modules/earley { }; earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { }; @@ -355,9 +357,7 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { - cairo2 = cairo2.override { enableGtkSupport = false; }; - }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; @@ -381,6 +381,8 @@ let labltk = callPackage ../development/ocaml-modules/labltk { }; + lacaml = callPackage ../development/ocaml-modules/lacaml { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = if lib.versionOlder "4.02" ocaml.version @@ -1057,9 +1059,7 @@ let enableX11 = config.unison.enableX11 or true; }; - hol_light = callPackage ../applications/science/logic/hol_light { - camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; }; - }; + hol_light = callPackage ../applications/science/logic/hol_light { }; })).overrideScope' liftJaneStreet; diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index 044fff3dedbc..598197888b61 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -1752,6 +1752,18 @@ let propagatedBuildInputs = [ CGI ]; }; + CGIMinimal = buildPerlPackage rec { + name = "CGI-Minimal-1.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/${name}.tar.gz"; + sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; + }; + meta = { + description = "A lightweight CGI form processing package"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CGIPSGI = buildPerlPackage { name = "CGI-PSGI-0.15"; src = fetchurl { @@ -4030,6 +4042,8 @@ let DBDmysql = callPackage ../development/perl-modules/DBD-mysql { }; + DBDOracle = callPackage ../development/perl-modules/DBD-Oracle { }; + DBDPg = callPackage ../development/perl-modules/DBD-Pg { }; DBDsybase = callPackage ../development/perl-modules/DBD-sybase { }; diff --git a/nixpkgs/pkgs/top-level/php-packages.nix b/nixpkgs/pkgs/top-level/php-packages.nix index 165064414048..e7763bc557b6 100644 --- a/nixpkgs/pkgs/top-level/php-packages.nix +++ b/nixpkgs/pkgs/top-level/php-packages.nix @@ -253,23 +253,24 @@ let }; composer = pkgs.stdenv.mkDerivation rec { - name = "composer-${version}"; - version = "1.8.0"; + pname = "composer"; + version = "1.8.4"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089"; + sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp"; }; unpackPhase = ":"; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ - --add-flags "$out/libexec/composer/composer.phar" + --add-flags "$out/libexec/composer/composer.phar" \ + --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; meta = with pkgs.lib; { @@ -368,12 +369,12 @@ let }; phpcs = pkgs.stdenv.mkDerivation rec { - name = "phpcs-${version}"; - version = "3.4.0"; + pname = "phpcs"; + version = "3.4.1"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "1d6zf0ab76r5ibb80q46silhy87hrwh50gfvhd0i25wzad7r09mw"; + sha256 = "07zwj8msy0awnrwmv3gcilbsj9jyrvxw0q523yf16ydv55422pl0"; }; phases = [ "installPhase" ]; @@ -395,12 +396,12 @@ let }; phpcbf = pkgs.stdenv.mkDerivation rec { - name = "phpcbf-${version}"; - version = "3.4.0"; + pname = "phpcbf"; + version = "3.4.1"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "0iscs4hg1msk8198pmkdmbxn1g53gbq3i5qgszs0bi6hz3ng9ag9"; + sha256 = "052fsgzc39mfjy34mv1ip2qdghypsy218wfp8vh3a593pzkmzdcv"; }; phases = [ "installPhase" ]; @@ -422,12 +423,12 @@ let }; phpstan = pkgs.stdenv.mkDerivation rec { - name = "phpstan-${version}"; - version = "0.11.3"; + pname = "phpstan"; + version = "0.11.5"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0wiyrjymnhh0bzf0di27k59j2dprczwxiq19spj9gyfkbfw8fgci"; + sha256 = "13akllfr5dav0y61i4ym5ww8z32ynwj5lpvsfiwx6z52avmcrc29"; }; phases = [ "installPhase" ]; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index 770ca8b3d0cb..1cabba8ea42f 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -274,6 +274,8 @@ in { bap = pkgs.ocamlPackages.bap; }; + baselines = callPackage ../development/python-modules/baselines { }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; bayespy = callPackage ../development/python-modules/bayespy { }; @@ -388,6 +390,8 @@ in { face = callPackage ../development/python-modules/face { }; + fastparquet = callPackage ../development/python-modules/fastparquet { }; + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; favicon = callPackage ../development/python-modules/favicon { }; @@ -613,6 +617,8 @@ in { pybind11 = callPackage ../development/python-modules/pybind11 { }; + pybullet = callPackage ../development/python-modules/pybullet { }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) pkgconfig; }; @@ -1361,7 +1367,10 @@ in { cheetah = callPackage ../development/python-modules/cheetah { }; - cherrypy = callPackage ../development/python-modules/cherrypy {}; + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; cfgv = callPackage ../development/python-modules/cfgv { }; @@ -1747,6 +1756,8 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dnslib = callPackage ../development/python-modules/dnslib { }; + dnspython = callPackage ../development/python-modules/dnspython { }; dns = self.dnspython; # Alias for compatibility, 2017-12-10 @@ -3120,6 +3131,8 @@ in { marisa-trie = callPackage ../development/python-modules/marisa-trie { }; + Markups = callPackage ../development/python-modules/Markups { }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; @@ -3179,6 +3192,8 @@ in { minimock = callPackage ../development/python-modules/minimock { }; + minio = callPackage ../development/python-modules/minio { }; + moviepy = callPackage ../development/python-modules/moviepy { }; mozterm = callPackage ../development/python-modules/mozterm { }; @@ -3926,6 +3941,8 @@ in { purepng = callPackage ../development/python-modules/purepng { }; + pyhocon = callPackage ../development/python-modules/pyhocon { }; + pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; @@ -3956,6 +3973,8 @@ in { pysvn = callPackage ../development/python-modules/pysvn { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-wifi = callPackage ../development/python-modules/python-wifi { }; @@ -4015,6 +4034,10 @@ in { retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; quamash = callPackage ../development/python-modules/quamash { }; @@ -4090,6 +4113,8 @@ in { restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + retry = callPackage ../development/python-modules/retry { }; + robomachine = callPackage ../development/python-modules/robomachine { }; robotframework = callPackage ../development/python-modules/robotframework { }; @@ -4713,6 +4738,8 @@ in { zfec = callPackage ../development/python-modules/zfec { }; + zipp = callPackage ../development/python-modules/zipp { }; + zope_broken = callPackage ../development/python-modules/zope_broken { }; zope_component = callPackage ../development/python-modules/zope_component { }; @@ -5433,6 +5460,8 @@ in { lzstring = callPackage ../development/python-modules/lzstring { }; flickrapi = callPackage ../development/python-modules/flickrapi { }; + + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; }); in fix' (extends overrides packages) diff --git a/nixpkgs/pkgs/top-level/release-cross.nix b/nixpkgs/pkgs/top-level/release-cross.nix index b06bb5393bea..f4210fcfc72e 100644 --- a/nixpkgs/pkgs/top-level/release-cross.nix +++ b/nixpkgs/pkgs/top-level/release-cross.nix @@ -140,6 +140,7 @@ in android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { }); + msp430 = mapTestOnCross lib.systems.examples.msp430 embedded; avr = mapTestOnCross lib.systems.examples.avr embedded; arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; powerpc-embedded = mapTestOnCross lib.systems.examples.ppc-embedded embedded; diff --git a/nixpkgs/pkgs/top-level/splice.nix b/nixpkgs/pkgs/top-level/splice.nix index ec6ed357c688..a093442d3698 100644 --- a/nixpkgs/pkgs/top-level/splice.nix +++ b/nixpkgs/pkgs/top-level/splice.nix @@ -96,19 +96,20 @@ let } @ args: if actuallySplice then spliceReal args else pkgsHostTarget; - splicedPackages = splicePackages rec { - pkgsBuildBuild = pkgs.buildPackages.buildPackages; - pkgsBuildHost = pkgs.buildPackages; - pkgsBuildTarget = - if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform - then pkgsBuildHost - else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; pkgsHostTarget; - pkgsHostHost = {}; # unimplemented - pkgsHostTarget = pkgs; - pkgsTargetTarget = pkgs.targetPackages; + splicedPackages = splicePackages { + inherit (pkgs) + pkgsBuildBuild pkgsBuildHost pkgsBuildTarget + pkgsHostHost pkgsHostTarget + pkgsTargetTarget + ; } // { # These should never be spliced under any circumstances - inherit (pkgs) pkgs buildPackages targetPackages; + inherit (pkgs) + pkgsBuildBuild pkgsBuildHost pkgsBuildTarget + pkgsHostHost pkgsHostTarget + pkgsTargetTarget + buildPackages pkgs targetPackages + ; inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; diff --git a/nixpkgs/pkgs/top-level/stage.nix b/nixpkgs/pkgs/top-level/stage.nix index 0ee5c25b0101..9f4b63293ef6 100644 --- a/nixpkgs/pkgs/top-level/stage.nix +++ b/nixpkgs/pkgs/top-level/stage.nix @@ -21,18 +21,23 @@ ## Other parameters ## -, # The package set used at build-time. If null, `buildPackages` will - # be defined internally as the final produced package set itself. This allows - # us to avoid expensive splicing. - buildPackages - -, # The package set used in the next stage. If null, `targetPackages` will be - # defined internally as the final produced package set itself, just like with - # `buildPackages` and for the same reasons. +, # Either null or an object in the form: # - # THIS IS A HACK for compilers that don't think critically about cross- - # compilation. Please do *not* use unless you really know what you are doing. - targetPackages + # { + # pkgsBuildBuild = ...; + # pkgsBuildHost = ...; + # pkgsBuildTarget = ...; + # pkgsHostHost = ...; + # # pkgsHostTarget skipped on purpose. + # pkgsTargetTarget ...; + # } + # + # These are references to adjacent bootstrapping stages. The more familiar + # `buildPackages` and `targetPackages` are defined in terms of them. If null, + # they are instead defined internally as the current stage. This allows us to + # avoid expensive splicing. `pkgsHostTarget` is skipped because it is always + # defined as the current stage. + adjacentPackages , # The standard environment to use for building packages. stdenv @@ -70,11 +75,33 @@ let inherit (self) runtimeShell; }; - stdenvBootstappingAndPlatforms = self: super: { - buildPackages = (if buildPackages == null then self else buildPackages) - // { recurseForDerivations = false; }; - targetPackages = (if targetPackages == null then self else targetPackages) + stdenvBootstappingAndPlatforms = self: super: let + withFallback = thisPkgs: + (if adjacentPackages == null then self else thisPkgs) // { recurseForDerivations = false; }; + in { + # Here are package sets of from related stages. They are all in the form + # `pkgs{theirHost}{theirTarget}`. For example, `pkgsBuildHost` means their + # host platform is our build platform, and their target platform is our host + # platform. We only care about their host/target platforms, not their build + # platform, because the the former two alone affect the interface of the + # final package; the build platform is just an implementation detail that + # should not leak. + pkgsBuildBuild = withFallback adjacentPackages.pkgsBuildBuild; + pkgsBuildHost = withFallback adjacentPackages.pkgsBuildHost; + pkgsBuildTarget = withFallback adjacentPackages.pkgsBuildTarget; + pkgsHostHost = withFallback adjacentPackages.pkgsHostHost; + pkgsHostTarget = self // { recurseForDerivations = false; }; # always `self` + pkgsTargetTarget = withFallback adjacentPackages.pkgsTargetTarget; + + # Older names for package sets. Use these when only the host platform of the + # package set matter (i.e. use `buildPackages` where any of `pkgsBuild*` + # would do, and `targetPackages` when any of `pkgsTarget*` would do (if we + # had more than just `pkgsTargetTarget`).) + buildPackages = self.pkgsBuildHost; + pkgs = self.pkgsHostTarget; + targetPackages = self.pkgsTargetTarget; + inherit stdenv; }; @@ -87,7 +114,7 @@ let inherit (hostPlatform) system; }; - splice = self: super: import ./splice.nix lib self (buildPackages != null); + splice = self: super: import ./splice.nix lib self (adjacentPackages != null); allPackages = self: super: let res = import ./all-packages.nix @@ -135,6 +162,9 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + overlays = [ (self': super': { + pkgsMusl = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -151,6 +181,9 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { + overlays = [ (self': super': { + pkgsi686Linux = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -176,6 +209,9 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun ({ + overlays = [ (self': super': { + pkgsStatic = super'; + })] ++ overlays; crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { |