diff options
Diffstat (limited to 'pkgs')
2556 files changed, 51555 insertions, 24048 deletions
diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index 631e0c9cca5..bc626cbad11 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor +, fetchpatch , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: @@ -15,6 +16,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/jpcima/ADLplug/83636c55bec1b86cabf634b9a6d56d07f00ecc61/resources/patch/juce-gcc9.patch"; + sha256 = "15hkdb76n9lgjsrpczj27ld9b4804bzrgw89g95cj4sc8wwkplyy"; + extraPrefix = "thirdparty/JUCE/"; + stripLen = 1; + }) + ]; + cmakeFlags = [ adlplugChip ]; buildInputs = [ diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index 389052d30e1..ee9932a7aa3 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preBuild = "cd source"; - makeFlags = "DESTDIR= PREFIX=$(out)"; + makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; meta = { description = "Synthetized (not sampled) pipe organ emulator"; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 737e73421c9..1d91ad4d2be 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -22,6 +22,7 @@ let }; nativeBuildInputs = [ unzip ]; installPhase = "cp -r . $out"; + meta.license = stdenv.lib.licenses.unfree; }; wine-wow64 = wine.override { @@ -62,7 +63,7 @@ multiStdenv.mkDerivation { # Cf. https://github.com/phantom-code/airwave/issues/57 hardeningDisable = [ "format" ]; - cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK"; + cmakeFlags = [ "-DVSTSDK_PATH=${vst-sdk}/VST2_SDK" ]; postInstall = '' mv $out/bin $out/libexec diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 2fd3e5c27fe..57e0c52e640 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ # LAME "-lmp3lame" # ffmpeg diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index eeb0f67d193..d71718c32a8 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index dd59ac5080f..0cff19819c0 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,16 +1,25 @@ -{ fetchurl, bitwig-studio1, - pulseaudio }: +{ fetchurl, bitwig-studio1, pulseaudio, xorg }: bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "162l95imq2fb4blfkianlkymm690by9ri73xf9zigknqf0gacgsa"; + sha256 = "1mgyyl1mr8hmzn3qdmg77km6sk58hyd0gsqr9jksh0a8p6hj24pk"; }; + buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; + runtimeDependencies = [ pulseaudio ]; + + installPhase = '' + ${oldAttrs.installPhase} + + # recover commercial jre + rm -f $out/libexec/lib/jre + cp -r opt/bitwig-studio/lib/jre $out/libexec/lib + ''; }) diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index cd1d837e1dd..52f5a6540e8 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -1,6 +1,7 @@ { stdenv , mkDerivation , lib +, fetchpatch , fetchzip , pkgconfig , qtbase @@ -17,6 +18,14 @@ sha256 = "07z8grnnpkd0nf3y3r6qjlk1jlzrbhdrp9mnhrhhmws54p1bhl20"; }; + patches = [ + # Fix installation without DESTDIR + (fetchpatch { + url = "https://github.com/falkTX/Cadence/commit/1fd3275e7daf4b75f59ef1f85a9e2e93bd5c0731.patch"; + sha256 = "0q791jsh8vmjg678dzhbp1ykq8xrrlxl1mbgs3g8if1ccj210vd8"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; @@ -26,8 +35,8 @@ ]; makeFlags = [ - "PREFIX=''" - "DESTDIR=${placeholder "out"}" + "PREFIX=${placeholder "out"}" + "SYSCONFDIR=${placeholder "out"}/etc" ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 76f76c1e750..864e04d88f3 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz"; }; - installFlags = "PREFIX=$(out) INSTALL=install"; + installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 692485d0dcf..04b31ae2c0b 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./darwin-limits.patch ]; - NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-missing-sysroot"; - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework MultitouchSupport"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport"; postPatch = '' substituteInPlace src/core/makefile.x/makefile.osx \ diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 0a374c26142..3fdf98da325 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -77,7 +77,7 @@ let inherit src patches nativeBuildInputs postPatch; # gst_plugins needed for setup-hooks - buildInputs = buildInputs ++ [ makeWrapper gst_plugins ]; + buildInputs = buildInputs ++ [ makeWrapper ] ++ gst_plugins; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index b88951c0fc5..023e35bd787 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.cc.isClang clangGCC ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ] - ++ concatMap (a: a.deps) opts; + ++ flatten (concatMap (a: a.deps) opts); makeFlags = [ "LD=$(CC)" ]; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 054fc758d64..0d2858713eb 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { libXinerama libXrender ladspa-sdk ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://distrho.sourceforge.net; diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 37c95430627..fdfca08c0b0 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "elisa"; - version = "0.4.2"; + version = "19.12.0"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0q098zaajwbpkrarrsdzpjhpsq2nxkqaxwzhr2gjlg08j9vqkpfm"; + sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac"; }; buildInputs = [ vlc ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 0308fad831d..b4ad1505320 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { }) ]; - installFlags = '' - DESTDIR=$(out) - ''; + installFlags = [ "DESTDIR=$(out)" ]; fixupPhase = '' cp -r $out/var/empty/local/lib $out diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 9dd5da4c1a9..c1ccd6add78 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = https://flacon.github.io/; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ ndowens nico202 ]; + maintainers = with maintainers; [ nico202 ]; }; } diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index b17561e1567..e514032f44e 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 gtk2 lv2 faust ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; # remove lv2 until https://github.com/sampov2/foo-yc20/issues/6 is resolved postInstallFixup = "rm -rf $out/lib/lv2"; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index a2588093309..34494871f29 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; })) ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = toString + (makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ]); hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 26a717dbd6e..41b40223b87 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -7,11 +7,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; - NIX_LDFLAGS = [ - "-ldl" - "-lm" - "-lpthread" - ]; + NIX_LDFLAGS = "-ldl -lm -lpthread"; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 3511a08682c..818630585cf 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ] ++ (with perlPackages; [ perl XMLParser ]); - NIX_LDFLAGS = [ "-ldl" ]; + NIX_LDFLAGS = "-ldl"; postInstall = '' wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index e96972b0d1b..0dbe60b6a61 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -18,11 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper pkgconfig readline ]; propagatedBuildInputs = [ libuuid ]; - NIX_LDFLAGS = [ - "-lm" - "-lpthread" - "-luuid" - ]; + NIX_LDFLAGS = "-lm -lpthread -luuid"; postInstall = '' for i in lash_control lash_panel diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 47d8f165ad0..b146fcecc8e 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,39 +1,27 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo -, ladspaH, php, expat }: +, ladspaH, php }: stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.10"; + version = "1.1.13"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "09gmwzh1gq1q2lxn8fc1bpdh02h8vr7r0i040c1nx256wgfsarqb"; + sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al"; }; - nativeBuildInputs = [ pkgconfig php expat ]; - buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH makeWrapper ]; + nativeBuildInputs = [ pkgconfig php makeWrapper ]; + buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; makeFlags = [ - "BIN_PATH=$(out)/bin" - "LIB_PATH=$(out)/lib" - "DOC_PATH=$(out)/share/doc" + "PREFIX=${placeholder ''out''}" ]; - NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ]; - - patchPhase = '' - runHook prePatch - substituteInPlace Makefile --replace "/usr/lib" "$out/lib" - substituteInPlace ./include/container/jack/main.h --replace "/usr/lib" "$out/lib" - substituteInPlace ./include/container/vst/main.h --replace "/usr/lib" "$out/lib" - # for https://github.com/sadko4u/lsp-plugins/issues/7#issuecomment-426561549 : - sed -i '/X11__NET_WM_WINDOW_TYPE_DOCK;/d' ./src/ui/ws/x11/X11Window.cpp - runHook postPatch - ''; + NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; doCheck = true; @@ -45,7 +33,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - buildFlags = "release"; + buildFlags = [ "release" ]; meta = with stdenv.lib; { description = "Collection of open-source audio plugins"; @@ -154,6 +142,6 @@ stdenv.mkDerivation rec { homepage = https://lsp-plug.in; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 5cf9b1b8ab7..82db91dcb07 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg"; + sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; }; buildInputs = [ diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 89d062d584e..5615f4cace3 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { ++ opt midiSupport timidity ++ opt modplugSupport libmodplug ++ opt mp3Support libmad - ++ opt musepackSupport [ libmpc libmpcdec taglib ] + ++ stdenv.lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ opt vorbisSupport libvorbis ++ opt speexSupport speex ++ opt (ffmpegSupport && !withffmpeg4) ffmpeg diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 37e233b5e9e..88cdde2ceb2 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.42.2"; + version = "3.43.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1v1dy857kxxn1si0x7p3qz63l1af5pln1jji1f7fis6id8iy7wfm"; + sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index fdefcf7e77d..08fe9b4f9af 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [libao libid3tag libmad zlib] ++ stdenv.lib.optional stdenv.isLinux alsaLib; - installTargets = "install install-man"; + installTargets = [ "install" "install-man" ]; meta = with stdenv.lib; { description = "Command-line MP3 player"; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 08c5c1a5c36..24ac52e7e31 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.9"; + version = "0.4.11"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "02kjwwh9d9i4rnfzqzr18pvcklc46yrs9mvdmjqx7kxg3c28hkqm"; + sha256 = "1g96bpwh419s429wb387lkmhjsn3ldsjrzrb8h9p3wva5z6943i6"; }; enableParallelBuilding = true; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] ++ stdenv.lib.optional usePulseAudio libpulseaudio; - configureFlags = stdenv.lib.optional (!usePulseAudio) [ "--without-pulseaudio" ]; + configureFlags = stdenv.lib.optional (!usePulseAudio) "--without-pulseaudio"; meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 26b94f306bc..811952f845f 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libao json_c libgcrypt ffmpeg curl ]; - makeFlags="PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; CC = "gcc"; CFLAGS = "-std=c99"; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index fee456ae717..f2130fe5559 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preConfigure = "cd src"; buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ]; - NIX_LDFLAGS = [ "-lGL" "-lpthread" ]; + NIX_LDFLAGS = "-lGL -lpthread"; postInstall = '' wrapProgram $out/bin/pianobooster \ diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index e7aace763a1..347774010ae 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -37,15 +37,15 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig cmake ]; - cmakeFlags = '' - -DprojectM_FONT_MENU=${ttf_bitstream_vera}/share/fonts/truetype/VeraMono.ttf - -DprojectM_FONT_TITLE=${ttf_bitstream_vera}/share/fonts/truetype/Vera.ttf - -DINCLUDE-PROJECTM-TEST=OFF - -DINCLUDE-PROJECTM-QT=${if withQt then "ON" else "OFF"} - -DINCLUDE-PROJECTM-LIBVISUAL=${if withLibvisual then "ON" else "OFF"} - -DINCLUDE-PROJECTM-JACK=${if withJack then "ON" else "OFF"} - -DINCLUDE-PROJECTM-PULSEAUDIO=${if withPulseAudio then "ON" else "OFF"} - ''; + cmakeFlags = [ + "-DprojectM_FONT_MENU=${ttf_bitstream_vera}/share/fonts/truetype/VeraMono.ttf" + "-DprojectM_FONT_TITLE=${ttf_bitstream_vera}/share/fonts/truetype/Vera.ttf" + "-DINCLUDE-PROJECTM-TEST=OFF" + "-DINCLUDE-PROJECTM-QT=${if withQt then "ON" else "OFF"}" + "-DINCLUDE-PROJECTM-LIBVISUAL=${if withLibvisual then "ON" else "OFF"}" + "-DINCLUDE-PROJECTM-JACK=${if withJack then "ON" else "OFF"}" + "-DINCLUDE-PROJECTM-PULSEAUDIO=${if withPulseAudio then "ON" else "OFF"}" + ]; buildInputs = with stdenv.lib; [ glew ftgl ] diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 2d941f74c73..31e19154862 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.9"; + version = "4.7.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0ag19hvf50ip7z1s8jziy4pm8c72w7qq9zzgb4967l6v17rar4yh"; + sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 84cc11b8bf3..753f6fe8206 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "1kddvxxhwvw1ps1c1drr08hxqci7jw4jwr8h1d9isb8agydfxmcx"; + sha256 = "09y0s43ypcghnvzsz89mi1qs5bsvn4hpb98lqxmwwsy0ikcv3hny"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index aee373329ce..801d32189bf 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.4"; + name = "qmmp-1.3.5"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0j9vgm6216w7arwl919p9rps0a9r6s4415spl3qkpifhwlk90zg0"; + sha256 = "0h7kcqzhfvk610937pwrhizcdgd4n7ncl1vayv6sj3va1x7pv6xm"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 69cc5e6e89f..33411002c23 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "qsampler"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz"; - sha256 = "1krhjyd67hvnv6sgndwq81lfvnb4qkhc7da1119fn2lzl7hx9wh3"; + sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 7b2d92ad59d..2fb1943e0e5 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.0"; + version = "3.2.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0cfczzpk1ddz61nk4d72fydbm5nbgxqp95v81by2n87s1wffjjhi"; + sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; } else releasePath diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 9445bf3723c..7c4cefb6ba4 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools +{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2 , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: @@ -15,7 +15,8 @@ stdenv.mkDerivation (rec { substituteInPlace src/CMakeLists.txt --replace svnheader svnversion ''; - nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ]; + nativeBuildInputs = + [ cmake makedepend perl pkgconfig qttools wrapQtAppsHook ]; buildInputs = [ dssi diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 5a90ee65947..a7500f8c6a5 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "setbfree"; - version = "0.8.10"; + version = "0.8.11"; src = fetchzip { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "1hpj8qb5mhkqm4yy8mzzrrq0ljw22y807qly90vjkg61ascyina4"; + sha256 = "0c2wc8nkrzsy0yic4y7hjz320m3d20r8152j9dk8nsnmgjmyr2ir"; }; postPatch = '' diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index ecdafdaeadd..376aadc7385 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libXext libXi ]; - buildFlags = "linux-alsa"; + buildFlags = [ "linux-alsa" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index bd4aaf5a2d6..973062ecb75 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "10wrlfi50lsf6qjsi9qklw2mk2fbf0jib7f841v842l9k9zw0hrg"; + sha256 = "1pshwn486msn418dilk57rl9471aas0dif765nx1p9xgkrjpb7wa"; }; - cargoSha256 = "140m3pryvbc96xvl5ymz68msrx93rmvvy0y8skvc40yxwl401inc"; + cargoSha256 = "0020igycgikkbd649hv6xlpn13dij4g7yc43fic9z710p6nsxqaq"; - nativeBuildInputs = [ pkgconfig python3 ]; + nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isLinux libxcb ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index bc95ec625bb..b763e6e6122 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -159,7 +159,7 @@ stdenv.mkDerivation { homepage = https://www.spotify.com/; description = "Play music from the Spotify music service"; license = licenses.unfree; - maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ]; + maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 8acd8e0b88b..3e9fe4725af 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { cp lang/*.bin $out/share/pico/lang ''; - NIX_CFLAGS_COMPILE = [ "-include stdint.h" ]; + NIX_CFLAGS_COMPILE = "-include stdint.h"; meta = with stdenv.lib; { description = "Text-to-speech engine"; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 8c7ed20e748..3564f875c9b 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "timemachine"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "swh"; repo = "timemachine"; rev = "v${version}"; - sha256 = "1jsvd29wiqigxyqxl2xjklla11fwyjy68vqivcnlr9f2af4ylym8"; + sha256 = "16fgyw6jnscx9279dczv72092dddghwlp53rkfw469kcgvjhwx0z"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,9 +19,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = { description = "JACK audio recorder"; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index c0bbd6e71db..11daabbf810 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -79,7 +79,7 @@ with stdenv.lib; stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ]; - buildFlags = "Rack"; + buildFlags = [ "Rack" ]; installPhase = '' install -D -m755 -t $out/bin Rack diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index c26d8b6d360..c928962c983 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -58,6 +58,13 @@ stdenv.mkDerivation rec { webkitgtk ]; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "The podcast client for the modern free desktop"; longDescription = '' diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 967f3f4f92b..bae9cef7150 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20191013"; + version = "20191215"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24"; + sha256 = "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 24620d91ff5..0cd512e5093 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { pname = "yoshimi"; - version = "1.6.0.3"; + version = "1.6.1"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2"; - sha256 = "1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7"; + sha256 = "044k2pcdsb43znc8q63mc4niggpain7wl9s5c4sgsfmrjh0bjapj"; }; buildInputs = [ diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index d19314ce9ce..d283dc7107d 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation rec { pname = "deja-dup"; - version = "40.4"; + version = "40.6"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "0x9z8z1mh1sxi28ilml3pvbc0g6ghcbyiy002rziwwlarxnbwkky"; + sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1"; }; patches = [ diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index d65889be3ac..db9e68ae905 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.12.9.0"; + version = "0.13.0.0"; in stdenv.mkDerivation { pname = "aeon"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "194nxf8c8ihkmdsxyhkhrxc2xiinipifk0ng1rmxiiyr2gjgxzga"; + sha256 = "07d87n1j4dc9gfwj6xy5jdpryn45095xdh961g6xjnjzc5fivjch"; }; nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index b03acfbf78a..85d6dcbdbe6 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.20.7"; + version = "0.20.9"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1d17ry9906zmwj2n3mh77b6rqmdg0dgm7b7ybh8d7q2ml0196ilj"; + sha256 = "1dmk7vm4r9n0yia8dazlx4fmr8i1r8cz8p1pj11glpa3pwda3669"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 61c2acab563..f6c9fee7a1c 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.7.3"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "ef2193940146d1b8ff0cc03602842c4d81db9ca6a5e73927e4f8932715e931a4"; + sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d5e84a71d27..64562fc445a 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "1.18.2"; + version = "1.20.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1giy8xg1yfv7b7gh98dmfc05wh54xqpd53nanacwcc7lakzizqnn"; + sha256 = "09mgd5nsd65w4irgzgmfz1k0r1k4fgkq490pkil8nqy6akjrsw1z"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 7082794bba7..0311169deb2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { cppzmq hidapi randomx ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; + patches = [ ./move-log-file.patch ]; postPatch = '' diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 22fdc7f51c5..cda342290a2 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "pivx-${version}"; - version = "3.4.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "PIVX-Project"; repo= "PIVX"; rev = "v${version}"; - sha256 = "1fqccdqhbwyvix0ihhbgg2w048i6bhfmazr36h2cn4j65n1fgmi2"; + sha256 = "0m85nc7c8cppdysqz4m12rgmzacrcbwnvf7wy90wzfvfr3xkbapd"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ]; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 681268b4f32..b50b14258cc 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; }; - cargoSha256 = "19xcxpbkrbygghz9qi52vzviksxg28m7ibvl359vlhqv1cjxmpsq"; + cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq"; buildInputs = [ pkgconfig openssl openssl.dev ]; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 952aa285637..c251af74b21 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -85,6 +85,12 @@ stdenv.mkDerivation rec { sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn"; }) + # https://github.com/canonical/lightdm/pull/104 + (fetchpatch { + url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch"; + sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7"; + }) + # Hardcode plymouth to fix transitions. # For some reason it can't find `plymouth` # even when it's in PATH in environment.systemPackages. diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 91fe3e5b22f..be586bdac9b 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; installFlags = [ "localstatedir=\${TMPDIR}" diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 05a997c62ff..bd1685f7cdb 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -22,6 +22,7 @@ , freetype , libpulseaudio , libGL +, libuuid , libX11 , libxcb , libXcomposite @@ -115,6 +116,7 @@ let dbus expat libpulseaudio + libuuid libX11 libxcb libXcomposite diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index fcd15355a10..cee61641041 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0xpcihr5xxr9l1kv6aflywshs8fww3s7di0g98mz475whhxwzf3q"; }; latestVersion = { # canary & dev - version = "4.0.0.6"; # "Android Studio 4.0 Canary 6" - build = "193.6052267"; - sha256Hash = "1naxyfnrj7milqha7xbwbcvyi81a7fqb7jsm03hhq5xs2sw55m1c"; + version = "4.0.0.7"; # "Android Studio 4.0 Canary 7" + build = "193.6085562"; + sha256Hash = "0vk1vwh2yhsmadkb3v3m042ckzizc41ckqvj3jax8p86gl0b4whj"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 26deee3b859..0a7e362e75a 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,14 +3,14 @@ let versions = { atom = { - version = "1.36.1"; - sha256 = "1m7q2r3zx463k7kpqb364piqrr69wrhs033ibzxdx9y7r4204qp4"; + version = "1.42.0"; + sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy"; }; atom-beta = { - version = "1.37.0"; + version = "1.43.0"; beta = 0; - sha256 = "0aq8r5vfgq7r31qajjgcg4n5a57a2m8fvq6fzy9vq5gawkvmaxxx"; + sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95"; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 46dd4a22864..cf783053679 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,6 +1,6 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr -, gconf, nss, xorg, libcap, systemd, libnotify, libsecret +, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk }: let @@ -10,7 +10,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret + xorg.libxcb libsecret libuuid at-spi2-atk ]; libPathNative = lib.makeLibraryPath packages; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 2c6b153370e..7d70ad14b5d 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ncurses ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildFlags = [ "CFLAGS=-fgnu89-inline" ]; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 72642cfbe63..cbed08f317f 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] - ++ optional contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; + ++ optionals contribPlugins [ "--with-contrib-plugins" "--with-boost-libdir=${boost}/lib" ]; meta = { maintainers = [ maintainers.linquize ]; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 13db2d13567..4b3a7e11f3b 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -13,11 +13,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "13"; + platform_minor = "14"; year = "2019"; - month = "09"; - timestamp = "201909161045"; - + month = "12"; + timestamp = "201912100610"; in rec { buildEclipse = import ./build-eclipse.nix { @@ -30,11 +29,11 @@ in rec { eclipse-cpp = buildEclipse { name = "eclipse-cpp-${platform_major}.${platform_minor}"; - description = "Eclipse IDE for C/C++ Developers, Oxygen release"; + description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0s9wvxd1bahlcdw7l6cyfi59p78j6gym3a3mn1z6dm6swxgyb2wjjl7hx8bkg0zs8x31bwllpdq22y2vcm6j57h40v53l3xkhy73m8v"; + sha512 = "28h8z45j7zlcbvvabzsniwqls1lns21isx69y6l207a869rknp9vzg6506q6zalj9b49j8c7ynkn379xgbzp07i6zw3dzk3pqp2rgam"; }; }; @@ -46,7 +45,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "09nc7ipv67h0gr7lkxsbxrgj9gn48348asn03ylcvflyrcxghqs8n11a75rwvdj98igdzpw922saicx5lqq5g2flfqiga97lwwhfiz5"; + sha512 = "1g1zsz3c2kx4vs1mjpcisbk81lk4hsr1z2fw46lih825c53vwf59snp8d97c8yw2i25y0ml48nc1nskib6qnif8m2h6rpah7kgmi8ay"; }; }; @@ -58,7 +57,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2c40wwrc2ip32n0m5cs8ds0g7cs7018acw8gjkd23msa4pr9x9511c3dj6rbnn1hwzf9yjq6vnjmib5qarxd3vly76jwxhf867l1f7v"; + sha512 = "05nsldw937l1g9fj964njivgkf2ipk1rh1jg5w8svdhpp3v1pp3iinfm2mz9kk8namwfkx8krsvsxcgvqyzgrkhf42wqh53vqrjf70h"; }; }; @@ -88,7 +87,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2vm646d1crzzzysll3p5pjfljfjzxx4qd37dqcp6xjm91zg8iskli688h0lgla0rmbwz5kj509jp22m4rxkp3cbgd006dd0jr3icdls"; + sha512 = "0dcbxzjqc27v1faz16yxqcm6zrbna4kkd32xy7paadiwn125y6ijx8zvda4kc7bih6v5b9ch2i0z5ndra1lcjcc88z6cklh0vngjkh1"; }; }; @@ -100,7 +99,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3zyxqd8iwrfgjjg91dfi4bda61rd2717hy53swmbygi48zaaam70swx997yp5qzxwjp3macdslfk6sqhq2qlcdwcdl6dmkry018jh7b"; + sha512 = "21lhgv3z23mn8q0gffgxlfwhyxb348zjnzv716zsys7h7kj5vigl45q9mz0qrl11524rxx7jwi901jjd4l258w9kp7wzlq0d5n1r39m"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b2fdeafd37c..364d432f1e3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.9.0"; + version = "9.10.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.9/${name}/${name}.zip"; - sha256 = "1vgx7ggilfwmx0bjrhk7mwlwg1c8lb141ilj3vzwxivlffihy054"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.10/${name}/${name}.zip"; + sha256 = "0rjm91j0h1aq9lq4sdwgp9b2yp4w9lr13n82z32dw3gz3nby1mvi"; }; meta = with stdenv.lib; { @@ -474,12 +474,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.13"; + version = "4.14"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.jdt-4.13.zip; - sha256 = "0sfpxph0cszcx1cihzzjn60qid8sxgl2xyr9x46fld4ian5a7vbr"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.14-201912100610/org.eclipse.jdt-4.14.zip; + sha256 = "16c5v59mkb0cyfhf2475ds1ajma65bhqfxjr6v59hianqxq9h9la"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 1161fc8256c..c43640b6524 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { done ''; - makeFlags = [ - "-C src" + makeFlags = [ + "-C" "src" "prefix=${placeholder "out"}" ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a8d9a38729f..bfbddb6fc37 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -208,10 +208,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.2.tar"; - sha256 = "17fnvrj7jww29sav6a6jpizclg4w2962m6h37akpii71gf0vrffw"; + url = "https://elpa.gnu.org/packages/async-1.9.3.tar"; + sha256 = "1pmfjrlapvhkjqcal8x95w190hm9wsgxb3byc22rc1gf5z0p52c8"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.1.2"; + version = "12.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.1.2.tar"; - sha256 = "1yibg2anpmyr2a27wm4xqjsvsi9km2jzb56bf7cwyj8dnjfsd11n"; + url = "https://elpa.gnu.org/packages/auctex-12.2.0.tar"; + sha256 = "0j919l3q5sq6h1k1kmk4kyv0vkzl4f98fxcd64v34x5q1ahjhg48"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -324,6 +324,21 @@ license = lib.licenses.free; }; }) {}; + bluetooth = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bluetooth"; + ename = "bluetooth"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bluetooth-0.1.2.el"; + sha256 = "1vp2vpyq0ybjni35ics1mg1kiwgvc7x12dlmvygy78sqp52sfkcv"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bluetooth.html"; + license = lib.licenses.free; + }; + }) {}; bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "bnf-mode"; @@ -542,10 +557,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.10.tar"; - sha256 = "1w6a11rzsx5iyxn76xarzbghm460j0ampqxlh4j12bswvbn7swnd"; + url = "https://elpa.gnu.org/packages/company-0.9.11.tar"; + sha256 = "05fmkvsn5byaakl8i26nvnmiiz0766r17pni6x7bfrqby39ls233"; }; packageRequires = [ emacs ]; meta = { @@ -640,10 +655,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.9"; + version = "1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.9.el"; - sha256 = "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1"; + url = "https://elpa.gnu.org/packages/csv-mode-1.10.el"; + sha256 = "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -711,21 +726,16 @@ license = lib.licenses.free; }; }) {}; - debbugs = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , soap-client }: + debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.20.tar"; - sha256 = "03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm"; + url = "https://elpa.gnu.org/packages/debbugs-0.21.tar"; + sha256 = "1xx1wjfpsnwx2fpydqhwy9k1b5kjk8dqbkzf8lqaj9c4rvjbn50a"; }; - packageRequires = [ cl-lib emacs soap-client ]; + packageRequires = [ emacs soap-client ]; meta = { homepage = "https://elpa.gnu.org/packages/debbugs.html"; license = lib.licenses.free; @@ -810,10 +820,10 @@ elpaBuild { pname = "dired-git-info"; ename = "dired-git-info"; - version = "0.2"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-git-info-0.2.el"; - sha256 = "1pxn6kmgnynil13gp3m0y8hhkvciy3dcd55psj70pkrj50555dqx"; + url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.el"; + sha256 = "1kd0rpw7l32wvwi7q8s0inx4bc66xrl7hkllnlicyczsnzw2z52z"; }; packageRequires = [ emacs ]; meta = { @@ -915,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.11"; + version = "0.6.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.11.tar"; - sha256 = "1ljcp4vy8z5xbcrlf33xgi63a2px4fhx6928qhwr7sy7jwil2s6n"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.12.tar"; + sha256 = "1nmg2xxhfv53h13kb19xd4x5a7q9ln2rwzxc5v8zkf0g3vaxmhxw"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -975,10 +985,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20190902"; + version = "20191105"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20190902.tar"; - sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69"; + url = "https://elpa.gnu.org/packages/eev-20191105.tar"; + sha256 = "0w53wq8nhl4c5czda5imcv7y97pgbpfmvcvpi6kdwl3jbn9cx396"; }; packageRequires = [ emacs ]; meta = { @@ -995,10 +1005,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.4.tar"; - sha256 = "1f2p08ly17jcjyh8bif5zhmzhx3z5y9z20v6z24z939bqk8c1pdq"; + url = "https://elpa.gnu.org/packages/eglot-1.5.tar"; + sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i"; }; packageRequires = [ emacs flymake jsonrpc ]; meta = { @@ -1056,6 +1066,21 @@ license = lib.licenses.free; }; }) {}; + elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "elisp-benchmarks"; + ename = "elisp-benchmarks"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.1.tar"; + sha256 = "1blx3wsnz94va67437rmqa4i90gm9ig69bbmg9lp6jqyxrm9d7gc"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; + license = lib.licenses.free; + }; + }) {}; enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "enwc"; @@ -1327,10 +1352,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar"; - sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.4.tar"; + sha256 = "1zm4c48x9vjqyn1h60lphhnzzg005wcad5mzn0majk0h59qcr0ff"; }; packageRequires = [ cl-lib ]; meta = { @@ -1379,10 +1404,10 @@ elpaBuild { pname = "gnus-mock"; ename = "gnus-mock"; - version = "0.4.2"; + version = "0.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.4.2.tar"; - sha256 = "04ddmdm2hykgr2y9g2yzmjp3fszhaywwnxhiy608cpvqdjwlwhn7"; + url = "https://elpa.gnu.org/packages/gnus-mock-0.4.4.tar"; + sha256 = "0v94z800f1y3ylbgbrw4nslqm7j2jr592g402nxgj9rlldazzxg0"; }; packageRequires = []; meta = { @@ -1521,10 +1546,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "7.0.3"; + version = "7.0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-7.0.3.tar"; - sha256 = "1mvplaxfjji00gg8rkhidfsdl8knwi6c0ai149zm4djsfaww3ikh"; + url = "https://elpa.gnu.org/packages/hyperbole-7.0.6.tar"; + sha256 = "08gi4v76s53nfmn3s0qcxc3zii0pspjfd6ry7jq1kgm3z34x8hab"; }; packageRequires = [ emacs ]; meta = { @@ -1566,10 +1591,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.12.0.tar"; - sha256 = "14q9kh48iabrnhwcmhlvgk7sg4a0j5c3zjp0yzj1ijrz5zbdhxxz"; + url = "https://elpa.gnu.org/packages/ivy-0.13.0.tar"; + sha256 = "18r9vb9v7hvdkylchn436sgh7ji9avhry1whjip8zrn0c1bnqmk8"; }; packageRequires = [ emacs ]; meta = { @@ -1596,10 +1621,10 @@ elpaBuild { pname = "javaimp"; ename = "javaimp"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/javaimp-0.6.1.tar"; - sha256 = "1piaj3sgw6a05g9dhkbrn5n490w01z1rxa7axh3vg1xqbs6rv7lw"; + url = "https://elpa.gnu.org/packages/javaimp-0.7.1.tar"; + sha256 = "0i93akp9jhlpgbm454wkjhir8cbzhfjb97cxxlk8n4pgzbh481l3"; }; packageRequires = []; meta = { @@ -1656,10 +1681,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.7.el"; - sha256 = "19z35gjphl4mlgpznfhlccgipnmbb3c1dvax48f4hw8qwksfcac1"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.9.el"; + sha256 = "1ncsdv9pr2zsfa9mxm4n68fppnkpm410mh72r7h5f8yj17lz00ss"; }; packageRequires = [ emacs ]; meta = { @@ -1802,16 +1827,16 @@ license = lib.licenses.free; }; }) {}; - loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "loccur"; ename = "loccur"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/loccur-1.2.3.el"; - sha256 = "09pxp03g4pg95cpqiadyv9dz6qrwd9igrkwrhm4s38cscmqm7dzq"; + url = "https://elpa.gnu.org/packages/loccur-1.2.4.el"; + sha256 = "00f1ifa4z5ay90bd2002fmj83d7xqzrcr9018q8crlypmpxkyh7j"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/loccur.html"; license = lib.licenses.free; @@ -2070,10 +2095,10 @@ elpaBuild { pname = "nhexl-mode"; ename = "nhexl-mode"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.3.el"; - sha256 = "1fcy4ybr12dvswmzaqkv4798snb1x1y7ldxwrsgjv5sx7bb5j60z"; + url = "https://elpa.gnu.org/packages/nhexl-mode-1.4.el"; + sha256 = "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2160,10 +2185,10 @@ elpaBuild { pname = "objed"; ename = "objed"; - version = "0.8.1"; + version = "0.8.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/objed-0.8.1.tar"; - sha256 = "06jfvz7avh28p1ghyd1aik5lz8k9fnv1fcxh9npm1iyvh810y5zj"; + url = "https://elpa.gnu.org/packages/objed-0.8.3.tar"; + sha256 = "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2220,10 +2245,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2.6"; + version = "9.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.6.tar"; - sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4"; + url = "https://elpa.gnu.org/packages/org-9.3.1.tar"; + sha256 = "1n79h6ihhsaxxbnl9hw511aav0215m3pa51sa5fh3ddknjfplian"; }; packageRequires = []; meta = { @@ -2250,10 +2275,10 @@ elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.9.el"; - sha256 = "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6"; + url = "https://elpa.gnu.org/packages/orgalist-1.11.el"; + sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl"; }; packageRequires = [ emacs ]; meta = { @@ -2265,10 +2290,10 @@ elpaBuild { pname = "osc"; ename = "osc"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osc-0.1.el"; - sha256 = "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb"; + url = "https://elpa.gnu.org/packages/osc-0.2.el"; + sha256 = "1b1ck9kb9mkyd7nlj4cqahsshar6h8mpvqss6n3dp4cl3r6dk1sw"; }; packageRequires = []; meta = { @@ -2385,10 +2410,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.1"; + version = "0.3.27"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar"; - sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.27.tar"; + sha256 = "1p6s5dq0d1ysm993qax8mi2sv4956ggainfbhsn65gc2718kjd0h"; }; packageRequires = [ emacs ]; meta = { @@ -2505,10 +2530,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.1.el"; - sha256 = "0cpga4ax635rfpj7y2vmh7ank0yw00dcy20gjg1mj74r97by8csf"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el"; + sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339"; }; packageRequires = []; meta = { @@ -2725,10 +2750,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.10.el"; - sha256 = "1l0lh4pkksw7brmhhbaikwzs4zkgd2962ks1zy7m262dvkhxjfv8"; + url = "https://elpa.gnu.org/packages/relint-1.11.tar"; + sha256 = "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7"; }; packageRequires = [ xr ]; meta = { @@ -3046,10 +3071,10 @@ elpaBuild { pname = "svg-clock"; ename = "svg-clock"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-clock-1.0.el"; - sha256 = "0j6zk7fsv72af12phqdw8axbn2y8y4rfgxiab1p3pxq3y7k47jid"; + url = "https://elpa.gnu.org/packages/svg-clock-1.1.el"; + sha256 = "12wf4dd3vgbq1v3363cil4wr2skx60xy546jc69ycyk0jq7plcq3"; }; packageRequires = [ emacs svg ]; meta = { @@ -3151,10 +3176,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.2.2"; + version = "2.4.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.2.2.tar"; - sha256 = "0bjfnxxyn8xgw10ybnjrza2gfwqifa3q7rh0bp6pidlhg45718p8"; + url = "https://elpa.gnu.org/packages/tramp-2.4.3.tar"; + sha256 = "0m1w4myvd2z293xcdyj7yc75b108f67f98i0jrizhdaj9nlw8j5f"; }; packageRequires = [ emacs ]; meta = { @@ -3211,10 +3236,10 @@ elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.6.5"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.6.5.el"; - sha256 = "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37"; + url = "https://elpa.gnu.org/packages/undo-tree-0.7.el"; + sha256 = "0mc5spiqx20z8vh8b24dp9hqj27h5bm5wqk0ga7c6s6mp69r72h4"; }; packageRequires = []; meta = { @@ -3241,10 +3266,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.1.tar"; - sha256 = "0c4lf25503z71wz9f0v6ag5lmqfxz94lmq65xvzvhmqvkxvsgpm5"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar"; + sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h"; }; packageRequires = [ emacs ]; meta = { @@ -3327,10 +3352,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2019.9.23.4801067"; + version = "2019.12.17.268053413"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2019.9.23.4801067.el"; - sha256 = "0jaba2cqiiknjqc7qz6047hpjd87hznl6b154ai1900i52kjbs21"; + url = "https://elpa.gnu.org/packages/verilog-mode-2019.12.17.268053413.el"; + sha256 = "0g42sd5s5xrck077qx0p2sldnr2f9qm8dsr9d0fiaks294sk8li8"; }; packageRequires = []; meta = { @@ -3480,10 +3505,10 @@ elpaBuild { pname = "websocket"; ename = "websocket"; - version = "1.11.1"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.11.1.tar"; - sha256 = "09s8qyi012djmm3vrj1qg1zqqy0h0cbcfzfkhybvqi4amy4jgliw"; + url = "https://elpa.gnu.org/packages/websocket-1.12.tar"; + sha256 = "0ap4z80c6pzpb69wrx0hsvwzignxmd2b9xy974by9gf5xm2wpa8w"; }; packageRequires = [ cl-lib ]; meta = { @@ -3506,6 +3531,21 @@ license = lib.licenses.free; }; }) {}; + windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "windower"; + ename = "windower"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; + sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/windower.html"; + license = lib.licenses.free; + }; + }) {}; windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "windresize"; @@ -3635,10 +3675,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.13.0.tar"; - sha256 = "1klnvyy8az3h7i7yrpbhad4ka9p9vlgf918ha1vf7i3wbcbm0s5z"; + url = "https://elpa.gnu.org/packages/yasnippet-0.14.0.tar"; + sha256 = "1lbil3dyz43nmr2lvx9vhpybqynpb7shg7m1xl1f7j4vm4dh0r08"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 0529fce2b16..57bccc60818 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -77,7 +77,7 @@ in { url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}"; inherit sha256; }; - packageRequires = lib.optional (! isNull deps) + packageRequires = lib.optionals (! isNull deps) (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 76a1c27502b..c3c21b40a65 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -113,10 +113,14 @@ perl-completion = callPackage ./perl-completion { }; + pod-mode = callPackage ./pod-mode { }; + railgun = callPackage ./railgun { }; structured-haskell-mode = self.shm; + sv-kalender = callPackage ./sv-kalender { }; + thingatpt-plus = callPackage ./thingatpt-plus { }; tramp = callPackage ./tramp { }; diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix new file mode 100644 index 00000000000..198adefc016 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix @@ -0,0 +1,18 @@ +{ trivialBuild, lib, fetchurl }: + +trivialBuild rec { + pname = "pod-mode"; + version = "1.04"; + + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/pod-mode-${version}.tar.gz"; + sha256 = "1wr0khymkaa65blrc5nya607c1a3sjsww49bbf8f0a6176as71sv"; + }; + + meta = with lib; { + description = "Major mode for editing .pod-files"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platform = platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 7a29ea7cd1d..66d5f65953b 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -234,16 +234,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20191013, - 926 + 20191204, + 1751 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "5332dc875e0a285f64dd075b204fb6de5ba719ad", - "sha256": "1p2nsc4in8w407irsfihm8q0fh5am8vrd53gg5q78hhybazr53cf" + "commit": "30479e8341679711dc960b26d01d5908f8a05bb4", + "sha256": "1dbrz1wxwqjg25pzjhgfs9mnii8mna2ydqvrz6xahvqsvfplmlrf" }, "stable": { "version": [ @@ -961,8 +961,8 @@ "auto-complete", "yasnippet" ], - "commit": "84aa4f0c4ffafa2c2fdfbcb16662abac0a571013", - "sha256": "1miz6nwsdbc9n3jc7qcb0mvf2yp0k9a7pyl0ifbdjjr2160m2lql" + "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", + "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" }, "stable": { "version": [ @@ -987,8 +987,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20191023, - 1045 + 20200103, + 656 ], "deps": [ "dash", @@ -998,8 +998,8 @@ "s", "xcscope" ], - "commit": "84aa4f0c4ffafa2c2fdfbcb16662abac0a571013", - "sha256": "1miz6nwsdbc9n3jc7qcb0mvf2yp0k9a7pyl0ifbdjjr2160m2lql" + "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", + "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" }, "stable": { "version": [ @@ -1058,27 +1058,27 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20181117, - 1949 + 20191222, + 920 ], "deps": [ "auto-complete", "rtags" ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 ], "deps": [ "auto-complete", "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -1361,14 +1361,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20191017, - 941 + 20191219, + 1209 ], "deps": [ "avy" ], - "commit": "483d0ea9d1e13884f13e54093b41082884325878", - "sha256": "1m4zcw27m99jlbjy5dyxxp4069pgwswqhyrps3c3zsnzs8hf1j0z" + "commit": "1ae238e1a00c65e47cdd1bc1bd88015332b2b615", + "sha256": "0izdfx834dsgnxdh3gx6f38rmxg1dwwwjknl64f6il0b3dxbnbx9" }, "stable": { "version": [ @@ -1498,20 +1498,20 @@ }, { "ename": "achievements", - "commit": "83ec19a4ebac6b2d0fd84939b393848f82620978", - "sha256": "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr", - "fetcher": "bitbucket", + "commit": "2790c00a79df237cf853a00f094fdeca9e532a9a", + "sha256": "1cl2rlmfhs5mhh5rjdr66a0mszy9hb50z8fxn1c081cnqd6iw8a2", + "fetcher": "gitlab", "repo": "gvol/emacs-achievements", "unstable": { "version": [ - 20150530, - 1826 + 20150531, + 1317 ], "deps": [ "keyfreq" ], - "commit": "18a422131c12aff723dde17bae08989efd93232e", - "sha256": "0nk1zhqx0lvckjc98b36125148zgx1l2axln8gvkdwlhrd2cc6vj" + "commit": "c8275ee492d56255999d58f2988129ab29145182", + "sha256": "14p9lmnrpsnx94ycvsqmfxnk5kws0cman4a6fbnikl35ma8zc01x" } }, { @@ -1600,20 +1600,26 @@ "repo": "gonewest818/adafruit-wisdom.el", "unstable": { "version": [ - 20180225, - 52 + 20191217, + 511 + ], + "deps": [ + "request" ], - "commit": "aafc01726f1b3160321d40160298a0e1b054b382", - "sha256": "18p55zghycsx88dn0iw610fklkhi5chzycrpjb4xzs5x1l5l2v08" + "commit": "656e360c8121e8c2f5f11b32671a416e1c8e52f4", + "sha256": "09dry0i92m1hhh1xrm1bb28d8plr1ard6wgl90a3d8hnbdl5p0fg" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 + ], + "deps": [ + "request" ], - "commit": "2b353f9029f359eb4eb4f0364bd2fbbedf081e42", - "sha256": "0zyqnwmrj7yigk1z9baqxmzxnwhpxfjz9r1gl090harl69hdp67d" + "commit": "50414eaac3dbeb67a1329833b912d26b164873eb", + "sha256": "0s6xrg9g7f4cv745k4zmxhgqr68qajfr6hi6wpyab330y0hd1m0v" } }, { @@ -1844,11 +1850,11 @@ "repo": "vietor/agtags", "unstable": { "version": [ - 20190709, - 950 + 20191112, + 142 ], - "commit": "f81b70412216277f4a3a78a9ad9042279d624e6f", - "sha256": "0481zjrmg834d2ik0vpdan9l083q17ln13rcg4hnbhl1dmzz960p" + "commit": "8813eb055dfd3faf1021c7d02fed0dabd8e518c1", + "sha256": "0xj394fiqsyh32g21mcp64srs8dlf0ixaildyla1gm27v8cgiakb" } }, { @@ -1859,11 +1865,11 @@ "repo": "takaxp/ah", "unstable": { "version": [ - 20191004, - 250 + 20191212, + 652 ], - "commit": "218b9ffacb615e7a307ee30c18d072ce3e33aad6", - "sha256": "16ak8bbha079lkg7gxxngysry6bgilqi3dz4aa2yd5w9y25rv6va" + "commit": "938c78327aad94d5f8e8d86ffd9808a687f3e953", + "sha256": "1zzhy5ajr6ivmj4jbbmaznxfqgxl4xy21s2r4wip668w8kw02h4m" } }, { @@ -1889,11 +1895,11 @@ "repo": "ralesi/ahk-mode", "unstable": { "version": [ - 20190323, - 623 + 20191221, + 2202 ], - "commit": "66e02a3b44d672787b1f13a30008801a9efca65b", - "sha256": "15x1hwar0i89y2vbjrfp7d0b2fj48zqribfm4323k1fc18hbzrb7" + "commit": "377f79484cc43458f66c1ba5a61459b77e363591", + "sha256": "0vf9pg2yjldzm4nzvzw0w2cvrnxj4xpm3ymsnpzdd55mp7q3y1ag" }, "stable": { "version": [ @@ -2040,14 +2046,14 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20190212, - 507 + 20191204, + 716 ], "deps": [ "f" ], - "commit": "5fb19ed061d6ee92ac0df1f1ec766c155d50867d", - "sha256": "0w43s1rh7j2qnm32db6pzqr04z7jm2lfbdz0lzrx4j61hnwmsx9g" + "commit": "43bfd15f0b1b90e0e99345f7c6c6e994d048a05c", + "sha256": "02y51gbbb9j448zifxgw53hprq77wsk8v6waafgpdbn84wljxkig" }, "stable": { "version": [ @@ -2153,16 +2159,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20190816, - 2205 + 20191126, + 2032 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "b5ef49bbb871867ac03d2943a720576336cd7025", - "sha256": "00lhx0gd1myzjfp59hjk0z44xf0cr4njvzwjdacahim7gz3hhicd" + "commit": "a73ede85c9cdd7d1a7593d4674cde8eec66c098b", + "sha256": "02p049xrbccb6hf7pc51mwwqqiks25dvz42smb1s7q03a0svrq6d" }, "stable": { "version": [ @@ -2237,14 +2243,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20191025, - 43 + 20191127, + 1123 ], "deps": [ "memoize" ], - "commit": "605deef5560429ccf66063ee9337b24c68820397", - "sha256": "15ibvcqn678visphmaffy5yh6jaczzzhhlxj4vnsywg5bdzxch3m" + "commit": "1416f37984486a44c6c0cbe0a2c985e82f965b6b", + "sha256": "1nwqn1cwjrmlp8g87ciwpv1h0pd61nh05bdpvz2kqg8b5ssfc4gd" }, "stable": { "version": [ @@ -2378,6 +2384,15 @@ 20190701, 1246 ], + "commit": "ded8cbff05f4f2fc4d023c5ee08ebe8b1bdb9ca9", + "sha256": "1v8sir3c0akv5sb8yg01zh0n6qqd4hp95sahbx01z1200g0phcaw" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], "commit": "7dcd9cdcc41cfb991801ea1e2f5b3c925a5309ee", "sha256": "19xg4ng3p49zvn1y7vagrfiiwvc2fynwibr6cmj7qam1y64lw90c" } @@ -2431,11 +2446,11 @@ "repo": "crystal-ameba/ameba.el", "unstable": { "version": [ - 20190720, - 1845 + 20200103, + 1454 ], - "commit": "8383f07d760a31a0737be9b7bdaff2f1cff67bfd", - "sha256": "066ccpaszidjvwy18bvkrf37ws60363cnbvcl1sfd7k6nynbdar6" + "commit": "0c4925ae0e998818326adcb47ed27ddf9761c7dc", + "sha256": "0jh0pfyqdks9xk43765vgm4569a8ny01pk3gy2p3vr5gdgfdm4a3" }, "stable": { "version": [ @@ -2492,8 +2507,8 @@ 20180207, 1745 ], - "commit": "536966adf882446165a1f756830028faa792c7a9", - "sha256": "07bpv8dag40qjnm5000pgzpazj4whfxf93x2vprz26sg3mjfx0nf" + "commit": "f5a163626e04abda2d3c168f703c3f330f302a7c", + "sha256": "1z08mdl3i4nfs4ln64sks3b4vbir4r8czscrdqyvq4izr6j05j2f" } }, { @@ -2519,14 +2534,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20190419, - 330 + 20200101, + 1701 ], "deps": [ "s" ], - "commit": "b46e77d8ef9d1edf225e67055001f7e85048f842", - "sha256": "0hrgq6kmfqx21y0dpvhwd82rap75lnn2lzlhria893yvqc7phzn5" + "commit": "3af93ca066aa42dd1342f1ee0ab0d02360075613", + "sha256": "1jm5zr4xlz2ik80kmjsvlka8kzxxp6k9g5ymxhc1k726kw808lf8" }, "stable": { "version": [ @@ -2548,8 +2563,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20191001, - 2056 + 20191204, + 111 ], "deps": [ "dash", @@ -2557,8 +2572,8 @@ "pythonic", "s" ], - "commit": "1b31c03756b989b674969bb1eb45ac809e59313b", - "sha256": "0h6afysc7c5a379bd9scdb27g0r1ncqinz7gnspqlqri205dmj33" + "commit": "1bc301b2d2bc336988f4a16a891c275a90136ca5", + "sha256": "18albgjh7bcsyw7004pagldz510zwjswlyp9lk2lwqnrrw2wryr5" }, "stable": { "version": [ @@ -2710,6 +2725,21 @@ } }, { + "ename": "anki-connect", + "commit": "1f2c391b543a6b98b9f171f8638c003737424e52", + "sha256": "09mvw1qppn1nrjyn7gfq1bfxn9hyh5kpxz30m1rrfwjjgw4lw4x6", + "fetcher": "github", + "repo": "lujun9972/anki-connect.el", + "unstable": { + "version": [ + 20191123, + 1858 + ], + "commit": "1324f0c248aa2c6e73d6cf93fad6119d699f7dae", + "sha256": "055nzb0dki4fmgmfhq83x7gciyp74r36a233hnl9lyd8wmb2hvqf" + } + }, + { "ename": "anki-editor", "commit": "8155d649e4b129d0c72da6bb2b1aac66c8483491", "sha256": "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l", @@ -2764,6 +2794,26 @@ } }, { + "ename": "anki-vocabulary", + "commit": "2ee1509faf58c4ea1bddcfd6f103e63c5c466c69", + "sha256": "11rl81s268l605lwzni29w366h2csnj4snl0nq12m9mvywv2dx2n", + "fetcher": "github", + "repo": "lujun9972/anki-vocabulary.el", + "unstable": { + "version": [ + 20200103, + 325 + ], + "deps": [ + "anki-connect", + "s", + "youdao-dictionary" + ], + "commit": "863fe0219577f996ab126f1b7902db3c2cc59b2b", + "sha256": "0mfch10hvs5czgc3lj75s02bbf36gfdk3xvry717g8gqqa37j581" + } + }, + { "ename": "annalist", "commit": "2298cf2894029267c77a8aa06f4fa8d9d7c3e4f0", "sha256": "1102yd0vas3kyml8flf3mdswnc2kizbdq996740plzwnnnbw34vj", @@ -2801,11 +2851,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20191022, - 633 + 20191221, + 959 ], - "commit": "54aefdec8d7d366d0987aec9242f035a52c54aa2", - "sha256": "11iqz6kncnzcnmxk2m037pmyflv6svq32r52cjw254fc3dvm39i0" + "commit": "d10b9158573017a02194a6d594387bfa88f03edf", + "sha256": "0sv1flx7s03avirgmq91alg35yyc25l57vfvniyi4raa4ldnp6vp" }, "stable": { "version": [ @@ -2954,20 +3004,26 @@ "repo": "zellio/ansible-vault-mode", "unstable": { "version": [ - 20190126, - 1936 + 20191123, + 1919 ], - "commit": "4fe490f524b79748c9f23026bb88d8f516b4ef40", - "sha256": "17kbjlssxa9b2fcp8vf2xs2k5y6jgpw277mj2gbv173b0i7v1fjd" + "deps": [ + "seq" + ], + "commit": "fb56eb5e85fb5621ecd94b28d069504add010ea9", + "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4" }, "stable": { "version": [ 0, - 3, - 4 + 4, + 0 ], - "commit": "57cf7e6da30250587c28ebf592d7bca9a3bae1df", - "sha256": "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb" + "deps": [ + "seq" + ], + "commit": "898b0989f6054c813802e0ff0fb0c0094e3a71b5", + "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4" } }, { @@ -3151,25 +3207,25 @@ "repo": "w-vi/apib-mode", "unstable": { "version": [ - 20170520, - 1358 + 20200101, + 1017 ], "deps": [ "markdown-mode" ], - "commit": "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6", - "sha256": "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d" + "commit": "c6dd05201f6eb9295736d8668a79a7510d11159e", + "sha256": "0f5zph67h0pr445ykllz0pix2dg2kdxl0g5mhxaggdydizf24p45" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "markdown-mode" ], - "commit": "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6", - "sha256": "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d" + "commit": "c6dd05201f6eb9295736d8668a79a7510d11159e", + "sha256": "0f5zph67h0pr445ykllz0pix2dg2kdxl0g5mhxaggdydizf24p45" } }, { @@ -3183,8 +3239,8 @@ 20180602, 2231 ], - "commit": "e4c9c57d6620a788ec8a715ff1bb50542edea3a6", - "sha256": "0xpb8mmssajy42r2h1m9inhv1chx19wkp5p0p63nwpk7mhjj8bis" + "commit": "a4fb21d96027369307b22439a4a6c765ee272f44", + "sha256": "19v92dgbwrb66bj5zs4fh0knba286i32afi42mvjmgagf228x6ka" }, "stable": { "version": [ @@ -3242,11 +3298,11 @@ "repo": "vietor/aproject", "unstable": { "version": [ - 20190724, - 600 + 20190730, + 152 ], - "commit": "a044d8e612a8973f958b6a4e03cefca2194874de", - "sha256": "1gpwx704bvza8ccly1vph9b3c146pxry2rldln8g66hfp3v49fw0" + "commit": "b534e2a62738ad59a8a3cddd386466c145dad3b2", + "sha256": "08nhfa845cn20kx0q9rchs24imfmvpywi1b8mn40d1lw587yr519" }, "stable": { "version": [ @@ -3265,11 +3321,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20190724, - 1729 + 20191220, + 2017 ], - "commit": "c46432a5559630380abee9ead387eba2db28ad15", - "sha256": "102i0qq3p28rgc870j4nviw7ns5ldxxybq3lg4y723idrim71ypc" + "commit": "543341f0836b24e001375c530c4706e9345ec1e3", + "sha256": "03917db85x4c2a1ba94wmik21wwnwf9xpz6wc0d0ay0zkkvqsn5g" }, "stable": { "version": [ @@ -3571,8 +3627,8 @@ 20191024, 1100 ], - "commit": "5ca12cc51bb02b5926adf9a7976ba9ca08a1ea21", - "sha256": "16cwpzbi8xpmw25xnn9535djpgwwdjv4q4yh47mqfav3x5nqwgpk" + "commit": "ec4bf74de602b97df1f306d51acf4cda45184aac", + "sha256": "1j505ijrgd0rwh69jl7677sgf5ryjwp160nrp0w0bskisrf028d7" } }, { @@ -3583,20 +3639,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20191009, - 1018 + 20191226, + 1227 ], - "commit": "67c369555de998eaabd60056dead038c6c50b8fd", - "sha256": "0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7" + "commit": "036b475a29bbbee52f88c7d0332341c2643155fb", + "sha256": "01jpgxzfkj4zqnjh167598qk2pp59vpkd2gmgal27gwm4g3y2q11" }, "stable": { "version": [ 1, 9, - 3 + 4 ], - "commit": "caad15ce64c1aac5e17d480c59ee6c85ebcb6bb2", - "sha256": "1zsnb6dy8p6y68xgidv3dfxaga4biramfw8fq7wac0sc50vc98vq" + "commit": "67c369555de998eaabd60056dead038c6c50b8fd", + "sha256": "0hhpyxb3d531jb2f3wvzx25183f0anm8nxv6mh0p825q2gkm6ly7" } }, { @@ -3607,14 +3663,46 @@ "repo": "chuntaro/emacs-async-await", "unstable": { "version": [ - 20191006, - 422 + 20191108, + 539 ], "deps": [ "promise" ], - "commit": "c1348cc02ed54ccf49b7f39f1ebbf7df17e63c74", - "sha256": "18li54j0rnx64nnaw2wp2nl92msdryb7sjxmaip6b88q9qiwkdi5" + "commit": "2a2351d52af8f0141a1849bc36292f068196aa63", + "sha256": "15g862hpjdwja9ii30vps1vk6nxr8allmj890yrfycvalvhrkfm5" + } + }, + { + "ename": "atcoder-tools", + "commit": "314396ec5a51460ad679ee9fcf3aa3970cd44229", + "sha256": "1rlsqqc7p351yyzmad4dvxrp5aj2788sg04019ybk83kacy0y5hf", + "fetcher": "github", + "repo": "sei40kr/emacs-atcoder-tools", + "unstable": { + "version": [ + 20200104, + 624 + ], + "deps": [ + "f", + "s" + ], + "commit": "4c805a03a9b0ee331dfa409472e38b4085a1628e", + "sha256": "0fcamxvz8wvy9b8f03y7hllv88xc25v9dhdjmw58x400pycra19x" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "f", + "s" + ], + "commit": "780fabbe5b3c890b3ae764e26b188603be294daa", + "sha256": "1pvnwzp0i1s19cyyzrkcannhx1jizvylxsr7qcipfiy2kmf8sbhz" } }, { @@ -3696,8 +3784,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20190927, - 940 + 20191119, + 1515 ], "deps": [ "dash", @@ -3705,8 +3793,8 @@ "flycheck", "s" ], - "commit": "0e4a2848d0a0cb509a54dbee6dd7b04f96c17737", - "sha256": "0ds3ca3pw1aab4y0fzlv76imbnlccky5mphd10zdikmrnwdhsm2w" + "commit": "12e234aeb16e190435133b29e93c69c67ec1ee6b", + "sha256": "04gnqhg1bq02vk6s2p7v2vh4djl5m6bf3jfxhx6q3i9hmayk2ya2" }, "stable": { "version": [ @@ -3850,11 +3938,11 @@ "repo": "DamienCassou/auth-password-store", "unstable": { "version": [ - 20190813, - 1026 + 20191126, + 1242 ], - "commit": "847a1f54ed48856b4dfaaa184583ef2c84173edf", - "sha256": "0g48z5w6n3c54zqfpx65dfyl9jqbl15idvbb1hhw2pd9f9r8fykk" + "commit": "ff4940c647786914b3cbef69103d96a4ea334111", + "sha256": "1swrr8wjrfzjy3x11lfby2jckw5fgvpaywhg2pzmwwvf9mr9xzdg" }, "stable": { "version": [ @@ -3914,20 +4002,20 @@ "deps": [ "packed" ], - "commit": "c46fb16c919d1f821cd69a43cc6e396757c51b2f", - "sha256": "06xfvn9s7kh3c0md431css5hz5yd3b2x6x788hx75hy3r7azi73s" + "commit": "3e92c5b1a94b0cf43f2d624180a1cb01df92afd8", + "sha256": "1f270axx8cpl1fgrwaxjbwyhkacp1b9whmn9f3mjpwkr55ih7wgl" }, "stable": { "version": [ 1, 5, - 1 + 2 ], "deps": [ "packed" ], - "commit": "e6bbb1371324c8884af3b201e9adbc9296eb2ff4", - "sha256": "1jyn7yvbvk7cydy3pzwqlb0yxf5cxdiipa1gnigdk9wdbj68wjjk" + "commit": "3e92c5b1a94b0cf43f2d624180a1cb01df92afd8", + "sha256": "1f270axx8cpl1fgrwaxjbwyhkacp1b9whmn9f3mjpwkr55ih7wgl" } }, { @@ -4282,11 +4370,11 @@ "repo": "mattfidler/auto-indent-mode.el", "unstable": { "version": [ - 20190925, - 231 + 20191112, + 1418 ], - "commit": "8dffa08ab631bf9c388d076958f4da735eaa3e3a", - "sha256": "0y8k1mc7fk59j36khrrp9g65yaklp39s93gk9l1vmp33rclshqg8" + "commit": "ebb1ee5ca24f3040c34b9455502a0e94f19903d0", + "sha256": "19p73jws7iddgs14cnfz9lb5ggyicqk08pasf66fkcvyhzydnwkm" }, "stable": { "version": [ @@ -4400,15 +4488,24 @@ }, { "ename": "auto-rename-tag", - "commit": "ec27ae185c0308c445e461dc84f398483ca08c5a", - "sha256": "0ysm559b2p2v2v39cssx5cviy2qb78cjvhmy76hih09qimg2azrz", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "05ln7dj57f3rjhmvbwy6fpn71ln4fw94qiw120qby199da1an28f", "fetcher": "github", - "repo": "elpa-host/auto-rename-tag", + "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ 20190525, 628 ], + "commit": "27ca700cb2f61a1040013600c5744d68a27cbd8d", + "sha256": "1hydigzi82zana6ivcj4nxqvdnh3973594ag6zlgw9nijilih64r" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], "commit": "4bd41b3107d3971c9533f9d0c8718c299669cb78", "sha256": "1g6kllnl625h6vmnps15a7ivpxq3k6s4vdxj50dj2i76g19wi2cn" } @@ -4506,16 +4603,16 @@ "repo": "robert-zaremba/auto-virtualenvwrapper.el", "unstable": { "version": [ - 20181006, - 937 + 20191120, + 1159 ], "deps": [ "cl-lib", "s", "virtualenvwrapper" ], - "commit": "72cc9168db475e8328019f9592493560dab832a5", - "sha256": "1cvc2k5x0ircnpppwwmm813h7c59pyswz4dfgwqqrk325zcnp80f" + "commit": "6380e8986d593655021f7f884d0d21895d7e63ad", + "sha256": "18k7azy456l7qizn3xnpb2dkj58gfrxy5q77dwplgakyvkr13y8p" } }, { @@ -4669,8 +4766,8 @@ 20190331, 2230 ], - "commit": "e9dc7907eb8e9cf9a016bd73e6a96421534a70ae", - "sha256": "0ga1vbkaxjybxr3l5laakxvy9cbf82lrrsjqi67krh7s303az0bl" + "commit": "ce213afc026590871ca7d514e563720ef967c938", + "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k" } }, { @@ -4761,11 +4858,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20181128, - 745 + 20191220, + 625 ], - "commit": "cadbfb4c9cd6812d63b69076a9d90514bfd2db66", - "sha256": "07isy168fnvyy25z1wwyr6740bmwmff6c3yfcdy7dnypcj9whllr" + "commit": "e97ec20d07cc9093661f51853375063bcdc91993", + "sha256": "14011k7rafibjpfd7g903a81pml176m7hxvvgd8a65vgqx52q4d3" } }, { @@ -4776,14 +4873,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20190925, - 1054 + 20191106, + 1234 ], "deps": [ "cl-lib" ], - "commit": "87394c9a880104a08d0f0e2d4149ac2d70cc192f", - "sha256": "1n1ngl9w8h889apkgvnz4z9lwks66qkwfb20jw5jh8p8kxyz7m16" + "commit": "cf95ba9582121a1c2249e3c5efdc51acd566d190", + "sha256": "0d7v04xzr385ybq0ai88d4h8ywl53q1ig197cbkrna2jl2s466bh" }, "stable": { "version": [ @@ -4937,14 +5034,14 @@ "repo": "baron42bba/aws-snippets", "unstable": { "version": [ - 20190207, - 1047 + 20191203, + 1553 ], "deps": [ "yasnippet" ], - "commit": "9cb1edaaa86609b51a7fbf39ec643cc5ae80eaa1", - "sha256": "1rzfzb19h5d0ikysxi0xcbyvv733kdmcmydpc7wwq9qkb31wck56" + "commit": "557d19a0bc486e0fddb597b2be5087769d9bd47e", + "sha256": "1s71h8limqxql9qhkp7bmq9k9j1mkazvc0lh92a6wd7hk6xg1hi1" } }, { @@ -4970,11 +5067,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20190323, - 1924 + 20191027, + 1928 ], - "commit": "505d85ffc051a7725344c960b1255597dab17780", - "sha256": "1251xc58nc2h6n4dibfdp7z85y609dkpc499ga8j9s0nwif009fs" + "commit": "3e7885d694efef923e7b53827d277c28bfa09320", + "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" } }, { @@ -5077,26 +5174,26 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20181111, - 832 + 20200104, + 1851 ], "deps": [ "outline-minor-faces" ], - "commit": "cfaaaed812674d7e474a8800a7452b4a5ba6d637", - "sha256": "12n4401sbwxq08ifidmxmbpg5877n308lwhwz4f8xbx9yijd0sas" + "commit": "dc541a6daf82ab73774904ae9ccecd13e3c2af48", + "sha256": "0410p7144k2kh1bz050h45zrfd98j10sbx409la5x01l9xrmb03y" }, "stable": { "version": [ 0, 1, - 3 + 5 ], "deps": [ "outline-minor-faces" ], - "commit": "ac58abcf0fa818392f5810ffba1243416caf0ae6", - "sha256": "0pzz7dr46k0b0i7f3vi9y3jgx83kcx3shsvaizccg83wz1rhz505" + "commit": "cde271f5e01ed44de239f776c3d0bb27e30953de", + "sha256": "0j1w2ig3rick6lnq668jkzjhrfy8cg3xgra5sj1qpxygdspfjyp9" } }, { @@ -5220,11 +5317,11 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20190819, - 1339 + 20200102, + 1933 ], - "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", - "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" + "commit": "87589331a8f0850a46964dbdbdcc3f2191b03376", + "sha256": "0yzz090997jn3d1ah8a32q491bsgzan6zqp2szv7d8ga4ziv3gkp" }, "stable": { "version": [ @@ -5312,11 +5409,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20190924, - 1827 + 20191031, + 1607 ], - "commit": "4cee70262967efce31997443645f83b08aa33df1", - "sha256": "0q56qp1wrgcsabqi25npz0y3f7hw7w9zq8nkpvxhzgg105szgy17" + "commit": "9eba6874c80ab429bf5cbf6c76bb0399d3d2a2cb", + "sha256": "0ag5fsr3377rz6xfa0b9j54r90zh0yiz98kpa27xzhky4f5jpdah" }, "stable": { "version": [ @@ -5335,11 +5432,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20190820, - 1804 + 20191126, + 1824 ], - "commit": "504dd26b1de326ec03d2c45f2d2db1ad59481adf", - "sha256": "041zrjlc0n3l1r8gyd78i14jkl2mf3pfsk37malmsllf3067ambz" + "commit": "96ce14af9674f3e605bacca87abc0c23b8f13cd5", + "sha256": "1w3yvpcdjq9a6m2q2lz23dib2ijmfgn4w2z2g5y9wkpdmx48k655" }, "stable": { "version": [ @@ -5451,11 +5548,11 @@ "repo": "codesuki/bazel-mode", "unstable": { "version": [ - 20191002, - 333 + 20191110, + 2228 ], - "commit": "13a8efc7b388b3ac45dd981898953bd98dd1b3d3", - "sha256": "17b4q3crzaxmsrh98jrnnnlyyjlbqq3mzxdvw44cbzy4d4qqcaps" + "commit": "7798e33cba5db14eb2c06ddcbc4e8fa361eb679c", + "sha256": "0gjm8276qj3a5kmh2qg93yadjhc2gcny058zpxwr6sialq9p7iwz" }, "stable": { "version": [ @@ -5505,11 +5602,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20190927, - 1617 + 20200102, + 403 ], - "commit": "2bbe645ae71d84ad518e03dec698d4154af2f9f0", - "sha256": "1f18pzwm7p4k1ycnrx80la4wxlph59kv7zh18sk4iz3k6a3j3nnh" + "commit": "45529e315ba861f9df2914f9b88d2f7b991d5595", + "sha256": "0iim6394q02yw5rcyjs7ym16v9jbq5pwqsbpwc98ckg26063p3fi" }, "stable": { "version": [ @@ -5750,20 +5847,20 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20190708, - 1856 + 20191030, + 839 ], - "commit": "66e9fbf77fbe248e15a17bd095645a48d40560b4", - "sha256": "0d373cfc6wkb4b5aq42vwr12i47ravhhsyi5zdq90wlqm6c7fbvj" + "commit": "d2a0a7ba6f8f8eb400c0ee309307602922573630", + "sha256": "1dqdd4hgiyldsggzkrs719xplihnaq1q5n91k7v4bs7szbdbgccn" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "a06a479c2279da9e852cf42628b6dfa466fff0bd", - "sha256": "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl" + "commit": "0710e25138c1cec40ccf78d704741143c5bac735", + "sha256": "1ic5z3qb5sc3mjrjdlg0rqm2l59a43gwnakagns4cilln2a3xdg8" } }, { @@ -5829,6 +5926,53 @@ } }, { + "ename": "bento", + "commit": "aad104fd26adb419c5da1e3472807244794e8949", + "sha256": "0a7yaikvaxxk8wmr7f9darpwb4r17rkzxcxaagfypn8n5kswddj4", + "fetcher": "github", + "repo": "returntocorp/bento-emacs", + "unstable": { + "version": [ + 20191024, + 2123 + ], + "deps": [ + "f", + "flycheck" + ], + "commit": "31546a03475fc2b3ffd3159fe1beda55f7762224", + "sha256": "0ny0bably9h4ak2fr01z4a80mp9kjalzhw232a92n8dvmz4b7mq7" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "f", + "flycheck" + ], + "commit": "116839c7d50342e62a2832715ba850d8bf04362e", + "sha256": "0gxqy2l1a4pddh4pdci2nyflmv76rhl8wx3zmh5j0aqk5ahh1ln5" + } + }, + { + "ename": "berrys-theme", + "commit": "d7043d5fcdf995a6278c8a92aa451ce4b58694b3", + "sha256": "1fn2n7li6fs9zibjzp07y6wdn3a64nsib8d23l7sl7jyzib6vbqa", + "fetcher": "github", + "repo": "vbuzin/berrys-theme", + "unstable": { + "version": [ + 20191201, + 1609 + ], + "commit": "888a14206b2fb3dc45b5273aeb05075f3e0b5f60", + "sha256": "1a75pa7gckdqwrcm25a2ic4cq1la42z939qqzj6nnqyjsj3sbn00" + } + }, + { "ename": "bert", "commit": "89635cd11621b04a8575629ec1bf196fb3ea5d43", "sha256": "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7", @@ -5851,11 +5995,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20190917, - 1545 + 20200101, + 2257 ], - "commit": "01b8f00235c37bddf3e1a949e943dc0c9980863a", - "sha256": "0qniwfdip1ksxwx52xwsx9sgy7vfcsixsccmx877w4rlv893plah" + "commit": "e051c5278f71af8414f8c6101695197dd4365cca", + "sha256": "0m4cc9qwwm14drdars5a5hbiv5fapd245n3iry9x5ar76rb20hcb" }, "stable": { "version": [ @@ -5875,11 +6019,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20191021, - 1647 + 20200103, + 1413 ], - "commit": "3aa1a8a7662d4188633daf7d75a23e13ebdd902b", - "sha256": "1rn4mxh9anqk582x0x7v32dw6m5i96aapdpfpzsxs519wxs3j9q4" + "commit": "6d240032ca213ccb3347e25f26c29b6822bf03a7", + "sha256": "0vdrdd0q4rlpyxgwbc31zz8f6sr7sy0gdw84sb1dy9bpq6qvdbdw" } }, { @@ -5890,19 +6034,20 @@ "repo": "killdash9/better-shell", "unstable": { "version": [ - 20180625, - 1316 + 20191025, + 1737 ], - "commit": "cfcd9d57f87ad68cd72bf4935fd1aaa1d9f059a9", - "sha256": "1z2c2w7p9clijzsfjhcghl76ycy6s0lyymxglzzk7js5np8idmdr" + "commit": "70c787b981caeef8c5f8012b170eb7b9f167cd13", + "sha256": "0i87d1xrg4gvszm52wdrx81g49lh75ycdfxkxhlrckbw7nkrjchz" }, "stable": { "version": [ 1, - 2 + 2, + 1 ], - "commit": "f231404b6f8efce33b48e31e5b1566108d0ba000", - "sha256": "1g5bljvigga856ksyvgix9hk0pp9nzic088kp0bqx0zqvcl82v0b" + "commit": "70c787b981caeef8c5f8012b170eb7b9f167cd13", + "sha256": "0i87d1xrg4gvszm52wdrx81g49lh75ycdfxkxhlrckbw7nkrjchz" } }, { @@ -6063,8 +6208,8 @@ "a", "pdf-tools" ], - "commit": "5f3e67448cc98fe2875115163849acae4d9e8526", - "sha256": "1w0dhyr4i0nx0g70smgclcfsbv6cfilb7df330njzaqk8j2gdfws" + "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", + "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" } }, { @@ -6075,14 +6220,14 @@ "repo": "pzorin/bibretrieve", "unstable": { "version": [ - 20190725, - 1539 + 20191124, + 1855 ], "deps": [ "auctex" ], - "commit": "3a21f5b349b7c83fc9dcaf8773ee7b4749599f0d", - "sha256": "0ppaajc559lv9aqk3jlcjm2id2wj6qiby9hq9kmc1avfns25cp30" + "commit": "81dc8e0db3629cc180eafb2bc34b60dcd8980316", + "sha256": "00zya2h6f5fpfxyi893fz3kpbbdhd8yq6b8g42bvxc5bfbknfhwc" } }, { @@ -6100,8 +6245,8 @@ "dash", "s" ], - "commit": "aeba96368f2a06959e4fe945375ce2a54d34b189", - "sha256": "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823" + "commit": "0116bbb04840d20a6b087e6d9c921bb1c2489a8f", + "sha256": "0vcdi0q6rbs3qqlpccy9hdv82zrx61gdj3fn444qashk84s085vf" } }, { @@ -6127,20 +6272,20 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20180909, - 2126 + 20200103, + 1237 ], - "commit": "ab81d259a71827ff54872c64d13d56aedc9a212e", - "sha256": "1hjd7syqvg13yji2w5a6fjgg4gjka2rk7lc7m1d7w05dw1ad76jh" + "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", + "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], - "commit": "42a5db3514019d539500a67f913411f5533a1eb3", - "sha256": "1nanf0dp7kqzs2mc8gzr9qzn9v6q86sdr35pzysdl41xqydxpsrd" + "commit": "91d9f946690df0a1ed866f2cd1eab1b2e7c7480a", + "sha256": "0pkn99srwyvyibz5zxkh58csbf598x26f31mpizacx3bs4nys0qb" } }, { @@ -6211,8 +6356,8 @@ "bind-key", "key-chord" ], - "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", - "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" + "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", + "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" }, "stable": { "version": [ @@ -6235,11 +6380,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20180513, - 430 + 20191110, + 416 ], - "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", - "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" + "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", + "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" }, "stable": { "version": [ @@ -6440,11 +6585,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20191024, - 1230 + 20191123, + 1547 ], - "commit": "2d75594b8b016597f1c2ffa15f9974a0fa825d8d", - "sha256": "0l76km14qgj9vww8znl92dfqcbn6vlb1qngcwp35q8fwxi5biy9l" + "commit": "a09f8e2564739792a1b86bc8a6ce41039db3bbf8", + "sha256": "0cs9nmi30dknrw6p2xvx9np1zmzpsn3bs93lhfiqy2a4ylf96brl" } }, { @@ -6811,16 +6956,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20191001, - 1211 + 20191128, + 820 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "b17880bd39863b8f4acc7c8597fbf3f01b36e047", - "sha256": "0ad8vgn1sg1rmldh8nnavlgkjqb5ild5744wr4crmx6p9wyab298" + "commit": "ed8bc8bbc4ea13f68bd2aec6a59c4765b49fc610", + "sha256": "0rzv687yfv756pvvdjpjh0zgvqgqgg1hjl9h1lls1mc5vndny1rz" }, "stable": { "version": [ @@ -6844,30 +6989,30 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20190902, - 1510 + 20191205, + 2240 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "e4a53ec687a1e2f75276c2f2c2b568266887fe10", - "sha256": "1s01gwnpqrkr60r0xn27231854qpqqbqphiy200x7hmkq93wzlhv" + "commit": "7efd982e8e84b5761acbed9db98ec21eefca5048", + "sha256": "19ivl467n19ny4138vhzgzdbrsycclxmy34cck5z50nh42is3865" }, "stable": { "version": [ 3, 1, - 1 + 2 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "940af3d437b299ef81ce73da4e4ec8c2f52d7a79", - "sha256": "0lg2inxzfz6pcblynna4fyi5lxnmbrpl095d6574d0pnn22zdx5a" + "commit": "3f9fc2281e9ae873873998782c98c57c5ebb0555", + "sha256": "1k889m4095lm97lphcwcrsl53vhgas7iha594mmk8cs7sm5csjy1" } }, { @@ -7008,6 +7153,30 @@ } }, { + "ename": "brazilian-holidays", + "commit": "111f2736e864e7cc8be6beb00eebb62f4d614e8c", + "sha256": "1akqv0xd03vq46s8rzpk2hmjvy676dgnivaq8n5myagjkj9bmw3r", + "fetcher": "github", + "repo": "jadler/brazilian-holidays", + "unstable": { + "version": [ + 20191211, + 330 + ], + "commit": "13a480f03eb3729e6f203ce77dfd4de5e1203a3d", + "sha256": "1980267q70b7m16jsxc433cdqzr15q8dz5cwpkhla52wfdf1s184" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "13a480f03eb3729e6f203ce77dfd4de5e1203a3d", + "sha256": "1980267q70b7m16jsxc433cdqzr15q8dz5cwpkhla52wfdf1s184" + } + }, + { "ename": "broadcast", "commit": "6ed51896112e702a8b853059884aad50d37738c2", "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib", @@ -7238,11 +7407,11 @@ "repo": "joehakimrahme/buckwalter.el", "unstable": { "version": [ - 20190204, - 1451 + 20191119, + 1950 ], - "commit": "d4a7785eef05491ac4eb3150b75c473480bb51cb", - "sha256": "1i0kkn2qziakpy0ax8rc1pjdb6r881gybqhl5dwmwsd8gkfhddy5" + "commit": "1ef6f210f38c0686bc5b445b9704190f168f30ea", + "sha256": "054gbfdaqfj5psb3f06ba46x38gd9xak28h1la5b1szdzj61f23i" } }, { @@ -7291,15 +7460,15 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20190815, - 502 + 20191015, + 1730 ], "deps": [ "choice-program", "dash" ], - "commit": "47852b908a0d9a059e9f8cd7797229ecf6259b8c", - "sha256": "1zxlw2kkkfa0pgxzk7qcjxy77g0r3grnnv4sa6zjhmh9kh7jgf75" + "commit": "4fd0e6f9f3da31bc805be2000adf2c91088dd39b", + "sha256": "1an2w2s2xnmcj2knnax4mpv4wzcq31bvqcbhwasm39yzjlz7j5s9" }, "stable": { "version": [ @@ -7445,8 +7614,8 @@ 20180128, 1314 ], - "commit": "f570a0532bfb44f095b42cf68ab1f69799101137", - "sha256": "09rbxgrk7jp9xajya6nccj0ak7fc48wyxq4sfmjmy3q1qfszdsc3" + "commit": "83e028e1b2359f75c8bcd3159f7b56c3fcdf85b9", + "sha256": "0g9wwkjznc9vvzi2z0q7x0fzj0ixnxlgb7gggl1blqjzbswwy394" }, "stable": { "version": [ @@ -7711,19 +7880,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20191006, - 1305 + 20200106, + 2136 ], - "commit": "c2d75e9a48c93f96d1bc7f1bf151d69adb417abf", - "sha256": "1nzx39pf3lqbbc5h9r7qx30jm5r8g3k2zqc5hpmizv8d4l23fhcx" + "commit": "9b87afc57f5131259957a8bfd5d4bf53917e4beb", + "sha256": "0pncvp89axm6pv83j5lly9pyxcp3yr6v8llzi0ixy9jnf43679ry" }, "stable": { "version": [ 1, - 18 + 19 ], - "commit": "c2d75e9a48c93f96d1bc7f1bf151d69adb417abf", - "sha256": "1nzx39pf3lqbbc5h9r7qx30jm5r8g3k2zqc5hpmizv8d4l23fhcx" + "commit": "8a284895e9f9856e3b27a7aaff4ce7e9600e36e3", + "sha256": "1v2zjncn92p08fisds761yxrfa7k24wn0qmakgpn4ksyghmzdjlg" } }, { @@ -8256,7 +8425,7 @@ "error": [ "exited abnormally with code 1\n", "", - "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n" + "" ] } }, @@ -8335,15 +8504,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20190902, - 754 + 20191224, + 47 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "39a77e48a16d69b2e841084a3dbbbd083f166a21", - "sha256": "0wyqqc22my842ag999hnfijycfck888z1pbm6acaa6h6cczm1ya9" + "commit": "dc9ff35c2861d524ac4d65020c5320eec71acacf", + "sha256": "0nng284i5jygsnbda6ycrm2wv8rw47z8ilcs6r1z0w1gv3p012fd" }, "stable": { "version": [ @@ -8626,8 +8795,8 @@ 20151205, 1343 ], - "commit": "ad61579af269291b4446f4bab0a58522cc454f1c", - "sha256": "0aisilp9wl9w8l6nsiy963wvja38pp57g3skdf6qbm5ak8bb3244" + "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", + "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" } }, { @@ -8638,16 +8807,16 @@ "repo": "MaskRay/emacs-ccls", "unstable": { "version": [ - 20190927, - 246 + 20191219, + 913 ], "deps": [ "dash", "lsp-mode", "projectile" ], - "commit": "b1acc336f27d8a3bbc750c2dc3be915a4ac1afea", - "sha256": "1qgfxc5d1hb32ks1fxpx7agpw7dvnkz99wydlflc9fqq75g8v142" + "commit": "aab3e31fd716daf59f9794e62d473357263e8cc0", + "sha256": "1ykgw21ypyhwlyflppjcgqrj1xw4d9rld4z65qvwhk3f12cv113j" } }, { @@ -8676,8 +8845,8 @@ 20151205, 1343 ], - "commit": "ad61579af269291b4446f4bab0a58522cc454f1c", - "sha256": "0aisilp9wl9w8l6nsiy963wvja38pp57g3skdf6qbm5ak8bb3244" + "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", + "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" } }, { @@ -8688,11 +8857,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20191006, - 1030 + 20191203, + 646 ], - "commit": "fea53d325bdc32e9b299971f906101f41d24e77e", - "sha256": "0gn2h9p60dbz6xcz2fn0p7vpg1bwsh2kn4n76yd9z1p40j1fn93a" + "commit": "b7af5a9884189412b4699a8fbffcb8fc17bdf617", + "sha256": "1ra5m51b9r0irp30bg8qm9wziaz5r4bi84b14s8ss5q3w950sdd5" }, "stable": { "version": [ @@ -8811,15 +8980,27 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20191020, - 237 + 20200103, + 1548 + ], + "deps": [ + "cl-lib", + "powerline" + ], + "commit": "9b2ae1ace8c0d4ad1fa90047105793274baa1d48", + "sha256": "1rcf2jnpvkrmpsqcbrbqrn142dzgixzcv8fa095a2gzp9cdf64rj" + }, + "stable": { + "version": [ + 3, + 0 ], "deps": [ "cl-lib", "powerline" ], - "commit": "6a788ff518570d161674b4a7033f0a7a763b7417", - "sha256": "0a7nka9iha4c049gyb9qxdapgi33s5s5kav6r5p73wajx6iryzmz" + "commit": "7d0d4e939d8089fc18b20a51a49de11b70947649", + "sha256": "19xm43f3p5klyiyycy3bp46j2mpqcf4jl5d34hvv0jynx4hxlk1f" } }, { @@ -8934,17 +9115,17 @@ 20171115, 2108 ], - "commit": "510a0d3506cca601195d53d0ce885a25b4084e1b", - "sha256": "07mdkfzfr12mava0ms17g4z1k6lbbrbbchjnljilkjcgccv20gg6" + "commit": "c505dc774244e8cb10ec479940a04a0580d36f06", + "sha256": "0sn459dj9a0zr4bbbzlwx2hcmd82x535ap4czybjpsnyjn51lpac" }, "stable": { "version": [ 3, - 14, + 15, 0 ], - "commit": "44c447317b7ab87f973f21170a9c17a58b1c75c8", - "sha256": "0fk4x7qn7dsc7jqgbr3bpnphq7a1s4faqjci1j08cnigb3b5x585" + "commit": "76bc1fad91478de7064380c31d333e1975cf8126", + "sha256": "1amjzy3v7rhc6djl1ldqnhpd4m3prh7lfyd5hyb9fp0v8jhyg3w2" } }, { @@ -9067,11 +9248,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20181205, - 1834 + 20191114, + 1339 ], - "commit": "96b7b1e2a9a3f8ffcbc36a1f37251b1232539d89", - "sha256": "1wvxblnn9qp75r33w3mlbjgqlq8dbh6m38snwkc45071vdqfkyk0" + "commit": "b8427b5c87948a183e2dd2b8920a54fbaae2738b", + "sha256": "05vgax8arz6l0a4x0gsh7gs0qasjf09xj973nb7k3w8gyzmy1z95" } }, { @@ -9201,19 +9382,19 @@ "repo": "davep/cheat-sh.el", "unstable": { "version": [ - 20170802, - 1118 + 20191027, + 1038 ], - "commit": "e90445124f3f145a047779e42d070a3c5e150f70", - "sha256": "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn" + "commit": "bd970d7c576b8720d63a1e7fd88ea8a943f2160b", + "sha256": "027ws9hz84d4j00bfl5s0id8jcv2yqjkjmph1890w37miwj62cjf" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "6409bb66241255cc9a0362f2acdcb0b34344f9f2", - "sha256": "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m" + "commit": "bd970d7c576b8720d63a1e7fd88ea8a943f2160b", + "sha256": "027ws9hz84d4j00bfl5s0id8jcv2yqjkjmph1890w37miwj62cjf" } }, { @@ -9573,8 +9754,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20191019, - 1042 + 20200101, + 839 ], "deps": [ "clojure-mode", @@ -9585,8 +9766,8 @@ "sesman", "spinner" ], - "commit": "aba6567a12cdec01334f16f009e0c3c41b7aeb35", - "sha256": "1k3c4xrznyy3mya3n72y8c2brp0x3mr0pq6paw1wfdwzz9mn3764" + "commit": "6e00ad359f87e658d7fa2c533731b60d9ce26a35", + "sha256": "1xvzlvv20hmcssk6lijdknqwikf8yfsv4hjp6zbglq60545s1hx2" }, "stable": { "version": [ @@ -9777,14 +9958,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20191006, - 1434 + 20191202, + 1028 ], "deps": [ "cl-lib" ], - "commit": "e4af7143bd32907d0bf922bee53a96399f0376fa", - "sha256": "1ccxin0vp3z8lxcfm9bci06jkwy0nwasdwg95wp9hdnccpr63s38" + "commit": "0c79138fb2d37940654649787cb17cb619268748", + "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk" }, "stable": { "version": [ @@ -9869,6 +10050,21 @@ } }, { + "ename": "cl-font-lock", + "commit": "c4cc415c24fc1c404aa9e4d8fcc7bf70ed182633", + "sha256": "1igiclz5lshq9bz4sndf0qgsvnrfk39jnpld8g4a985gr2hislb4", + "fetcher": "github", + "repo": "equwal/cl-font-lock", + "unstable": { + "version": [ + 20191230, + 2341 + ], + "commit": "b3d28f3c7136be728caa6e57ce7eea16c7066bc9", + "sha256": "0ykz1gkaigb92ap491h8mlgp8vzw4yx67x1hizrrda9z65869avb" + } + }, + { "ename": "cl-format", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", @@ -9952,14 +10148,14 @@ "repo": "emacsmirror/clang-format", "unstable": { "version": [ - 20191019, - 1213 + 20191121, + 1708 ], "deps": [ "cl-lib" ], - "commit": "113b767848ec1568f538e547d7c456a07d66b598", - "sha256": "1p2zz810nam5ciljd6hvln0qv9f8j53niry47fgwgsvwg527savx" + "commit": "2d6a4526a2518b7c0059a8a0dfee156e90a49369", + "sha256": "1l64r9rr59g26mlph6r8pkn8vzadmh3mh8gvv398kz8skayfa55f" } }, { @@ -10068,6 +10264,29 @@ } }, { + "ename": "clipetty", + "commit": "3f6895244ad88e79d9e5d98dd0ba28be96c79595", + "sha256": "0471hrl5nw4v83fglgnsa5yh810idbsliwvrm2b5i6zwgn3mndci", + "fetcher": "github", + "repo": "spudlyo/clipetty", + "unstable": { + "version": [ + 20200105, + 15 + ], + "commit": "fda5a80cf4b24389b2f95eeec1d567df80a8fb11", + "sha256": "1nzlrd7vf4sqhb2a0bsg1gaj722id5i1s9f1wdi2bmx58rzhqnhp" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "8430e1c01ae701fb85bb12703fe59a0f04fd0a6f", + "sha256": "0k3srxvy5r7hbwbr8r65l9gc7nynqrqx5hc39s3xgx3ddq66wq4i" + } + }, + { "ename": "cliphist", "commit": "82d86dae4ad8efc8ef342883c164c56e43079171", "sha256": "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29", @@ -10161,8 +10380,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20190618, - 716 + 20191223, + 917 ], "deps": [ "cider", @@ -10175,8 +10394,8 @@ "seq", "yasnippet" ], - "commit": "50d2d8aad5e0bd8002173b300f8419d72ceab7af", - "sha256": "012mck2bqngx7s11d37q1h8ig5c167bn5b5rg40jn4vsybhyp2f5" + "commit": "e24ba6284317dbb3e678fcad325044c628da56da", + "sha256": "1ci08jkjvksy6wr3djij4wv3n8r4dar11z1sn1ap67sngx4q3z3f" }, "stable": { "version": [ @@ -10340,11 +10559,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20190914, - 1029 + 20191112, + 1948 ], - "commit": "147bf84189ef672161b2229ddc5c35713323ad59", - "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" + "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c", + "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg" }, "stable": { "version": [ @@ -10370,8 +10589,8 @@ "deps": [ "clojure-mode" ], - "commit": "147bf84189ef672161b2229ddc5c35713323ad59", - "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" + "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c", + "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg" }, "stable": { "version": [ @@ -10456,16 +10675,16 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20190925, - 1509 + 20191201, + 200 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "292c8f5370a2c74094da46ede990b5e7cc8b55b8", - "sha256": "1rv57wqr09vl0caz4wjr0kqvhgvl5y1x6818v8m55rm2z8rim11i" + "commit": "88b8fc6d1b7105adae009578ef24fedaf157f341", + "sha256": "13rhnncqj8666g2v7493i8xh79mczjrmg24p12knzhkslxdnv9hp" }, "stable": { "version": [ @@ -10490,26 +10709,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20190731, - 1450 + 20191229, + 1814 ], "deps": [ "emacsql-sqlite" ], - "commit": "70b98dbae53611d10a461d9b4a6f71086910dcef", - "sha256": "1wvhrihg663f61yzc7f0vha2abjdnlwbk0gjcwakdfk1bhwf5ikh" + "commit": "1e78f96dc976badb59067c986f7766cce89405cc", + "sha256": "03nknirj5jd3yf842amb274269fyiinr325g1x2snf1zgqfm3csn" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "emacsql-sqlite" ], - "commit": "012b94f8695e194455111fd54eff0b94dd0dd0db", - "sha256": "1xhpfjjkjqfc1k2rj77cscclz5r7gpvv3hi202x178vdcpipjwar" + "commit": "92f8f2dba684b7c9cc60821aa5668d336544ab99", + "sha256": "0q8val0v4hryr0miliqjf38y4aybrihzncr0p1mwba861jlpy86n" } }, { @@ -10535,11 +10754,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190901, - 1701 + 20191106, + 1836 ], - "commit": "08090f00738809306fa156aac60d85ad6be9e672", - "sha256": "17a5xdn2m7gdaw71b79xs1cprh4jqgwsfgmb52gz2yaxb20hg7xy" + "commit": "37e5246c90b747b634cbbc16871a156bb8477e91", + "sha256": "15pjvxgdamq69s344hasjc9gr8qczlcqz0y80la0c9xnbjgqdhns" } }, { @@ -10618,14 +10837,14 @@ "repo": "Lindydancer/cmake-font-lock", "unstable": { "version": [ - 20190728, - 1901 + 20200103, + 1702 ], "deps": [ "cmake-mode" ], - "commit": "e0ceaaae19c13b66f781512e3295bfc6707b56f4", - "sha256": "03gsyn95dlmsn15bl353bphi3qy7ccn5bss3f7n97kf38bllh0yf" + "commit": "9e0fcd1ee2cf316f661f2d652368b12f83a4ec9c", + "sha256": "0m1i5ijiwsxral544xd4nygcr1qbackaghjfgr8pfb5yfwgdxifh" } }, { @@ -10673,19 +10892,17 @@ 20190710, 1319 ], - "commit": "5a3f539cd50621298d15df639c29a9c09aace443", - "sha256": "07jv0xpszir2vz0i6ixdaq4ra32b5icj3sr4wdm3faf052xnv3my" + "commit": "75dfba223f0fbe9b599fe10662a5bc733f4f2623", + "sha256": "05gisydanpwq3mmdnvy6cf6969l42jf2ksanwlx6b5xh2mfpc1ni" }, "stable": { "version": [ 3, 16, - 0, - -1, 2 ], - "commit": "92780281c2e8a46223b262b152caa9c8329373b1", - "sha256": "1qia99zl24n56wlpxigs1hmma5b1sydifcwd4v542p2jiwciwmny" + "commit": "512ab500f06d6c645985cc8014c5e6291b9a059f", + "sha256": "0m0sd8ynrrhj8636jgixakpha814r1qpzcqdbnpddvjcvmijqjxv" } }, { @@ -10753,11 +10970,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20190314, - 1132 + 20191214, + 1006 ], - "commit": "c31d13cc3c320fd5bf24bf8309c6d982a25c49ee", - "sha256": "0c50xacgcbk3kbkxbg713bmaidpmkhnsb89pn9v8p8rk5nz06b89" + "commit": "4af009919ab8965afe8b0daacef1ad13606da5bc", + "sha256": "1sgy6dkwn22nxm0rgrxbkq1sfrdh55ry5sq96xsl9k52gzzh27zz" }, "stable": { "version": [ @@ -11145,10 +11362,10 @@ "version": [ 0, 0, - 2 + 3 ], - "commit": "7107540d22e8ff045e0707de84c8b179fd829302", - "sha256": "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9" + "commit": "4f7da6f955f7c584c5dfab2dc170f9a3debd80f8", + "sha256": "08wmllq3smg7cp7jspmvd67z5vzmxvi136c6j87r1gsgprhgmhw4" } }, { @@ -11185,11 +11402,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20191025, - 423 + 20191231, + 616 ], - "commit": "7f76f4c4e055bda2c2e633e6d913b5b9e205ed42", - "sha256": "12i0snv7nhf2annjb74nwk9m6bh1a812sgg44v87kcj5p4mq87hf" + "commit": "09067a0744dd5c0e37d5bd03fc528b0fdfab95a2", + "sha256": "1gv8qq1ngw4s4xm9rbwx94sk2w7l64l0315f797dsc7sgjki0yma" }, "stable": { "version": [ @@ -11287,6 +11504,19 @@ "cl-lib", "s" ], + "commit": "b0491d5340c5f5c516b44aa7bfef6f6cf2998484", + "sha256": "0d6pxwi5mbb98zzx3j55w221541674d69pxmf55yji6hly8yqavv" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], + "deps": [ + "cl-lib", + "s" + ], "commit": "e3c6a3a88c8f7e3ce7a5c6756b47a7aba7ffe149", "sha256": "0c3pcgr95nhf2yx66hxiwwl6k2fqz8cpmr0y0fxzahkmvc4c9zi6" } @@ -11323,20 +11553,20 @@ "repo": "matthewbauer/comint-hyperlink", "unstable": { "version": [ - 20191022, - 1451 + 20191104, + 2224 ], - "commit": "bd5a5e95f0e451a774fc5b197456f47f9eb4c50b", - "sha256": "0wri4ygdkyq54107hg0ij2nxzbpk8irfd2x2c94qkx97yql4yj54" + "commit": "a7878825788ff6b9d6b8a5adf0214a028bad895e", + "sha256": "19fww5aciqx4h67hpmzf564n0ygzg69v1sk1qjyhbs27pq5zrjmq" }, "stable": { "version": [ 0, 1, - 5 + 6 ], - "commit": "bd5a5e95f0e451a774fc5b197456f47f9eb4c50b", - "sha256": "0wri4ygdkyq54107hg0ij2nxzbpk8irfd2x2c94qkx97yql4yj54" + "commit": "a7878825788ff6b9d6b8a5adf0214a028bad895e", + "sha256": "19fww5aciqx4h67hpmzf564n0ygzg69v1sk1qjyhbs27pq5zrjmq" } }, { @@ -11347,11 +11577,11 @@ "repo": "hying-caritas/comint-intercept", "unstable": { "version": [ - 20170317, - 1228 + 20200106, + 454 ], - "commit": "a329abf01fa8e0c6b02b46b29bcb421a21120dc5", - "sha256": "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb" + "commit": "3c9a6125e450435b79ab5e6466f830e57c5e0a30", + "sha256": "06cvphbnhb89h4ss3y87lladb0dcsrkij8pfv65ky06brc1jl0hx" } }, { @@ -11496,8 +11726,8 @@ 20181213, 1045 ], - "commit": "9a825ae98166c9dbbf106e7be62ee69dd9f0342f", - "sha256": "1x30iyvvxggbh7xvp8lwpirvpqijchqf2fdaw4xrlbw5vajlaxcx" + "commit": "dede0f8ecb72156fa6ae81198ea570ead02997ff", + "sha256": "1ykicd6yp495s7795mlfwd54lp0427j8mw6ajbqsw2c2w0f7jcjr" }, "stable": { "version": [ @@ -11595,20 +11825,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20190907, - 1149 + 20200102, + 2354 ], - "commit": "f6974e3103497afe01da2ad4d2ea3668ad68bc27", - "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp" + "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d", + "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i" }, "stable": { "version": [ 0, 9, - 10 + 11 ], - "commit": "3eda0ba23921d43b733f7975e56d490a34b9f30b", - "sha256": "0shmv48bq9l5xm60dwx9lqyq6b39y3d7qjxdlah7dpipv5vhra42" + "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d", + "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i" } }, { @@ -11657,26 +11887,26 @@ "repo": "krzysztof-magosa/company-ansible", "unstable": { "version": [ - 20190301, - 2111 + 20191029, + 2127 ], "deps": [ "company" ], - "commit": "c31efced8a9b461de5982ed94c234fda3df96f10", - "sha256": "0d2c3ckmwn36fwhvwfvqg86hfd2jwkg2n301chhxzs03v0mc03mx" + "commit": "8d1ffbc357ccb0c307815d0c7f2cbb699f92537b", + "sha256": "0rsdj502mqw9w1g5ylyi4szi789z9k7n8ay9ms4h6f1wi7fjd974" }, "stable": { "version": [ 0, - 7, - 1 + 8, + 0 ], "deps": [ "company" ], - "commit": "c6dc714e3a15f89671ae5e8fe668858b20ef63e8", - "sha256": "01nly13i2bs77lrvkm26i96vrrigbxpb9cakski9fv3xrvfxq9bv" + "commit": "2ea0be24f003dc64a30412df76298152be29103c", + "sha256": "1h3cl975k7lbk8x0r0f2yjw8nc5w455npc3nn4jx5nynirvz3i7n" } }, { @@ -11730,15 +11960,15 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20171024, - 2010 + 20191027, + 1928 ], "deps": [ "axiom-environment", "company" ], - "commit": "505d85ffc051a7725344c960b1255597dab17780", - "sha256": "1251xc58nc2h6n4dibfdp7z85y609dkpc499ga8j9s0nwif009fs" + "commit": "3e7885d694efef923e7b53827d277c28bfa09320", + "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" } }, { @@ -11839,8 +12069,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20191004, - 1358 + 20191025, + 2219 ], "deps": [ "cl-lib", @@ -11849,8 +12079,8 @@ "dash", "yasnippet" ], - "commit": "109f86ddbb87313b8ef763ae97d9445230b6d051", - "sha256": "1y2dl262g2l6zsjmlmmi6fk3p83wv2j8qh83x5j09dj1j1vyx4hy" + "commit": "6e8bc2e367e8184079b7f4b4ab359b64ab884d7c", + "sha256": "192vvz77yik0lx2g4yfjwx2himzzq4zhrc9mlyhdpwsmzwx7bf4r" }, "stable": { "version": [ @@ -11870,6 +12100,36 @@ } }, { + "ename": "company-ctags", + "commit": "b548dbf4a388d2f69205786351a1d4336e0c0e88", + "sha256": "17j7cl5b6vd7ymbci83s0nfs8zn4h8zvir57cp9wl2z5wcjyxzcn", + "fetcher": "github", + "repo": "redguardtoo/company-ctags", + "unstable": { + "version": [ + 20191108, + 1018 + ], + "deps": [ + "company" + ], + "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39", + "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "company" + ], + "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39", + "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i" + } + }, + { "ename": "company-dcd", "commit": "ad5be8c53911271fba03a88da7e9d518c6508ffe", "sha256": "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd", @@ -12018,28 +12278,28 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20180925, - 2008 + 20191226, + 1915 ], "deps": [ "cl-lib", "company" ], - "commit": "f0d91d5be0077b20b418a3ba37d36f431fae322f", - "sha256": "0aqqi1ksyglx7w347a99flpfa9pm1jakdvsgk4jr2ahv6j13nawg" + "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06", + "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2" }, "stable": { "version": [ 2, 5, - 1 + 2 ], "deps": [ "cl-lib", "company" ], - "commit": "271909be44f86bcc294739ca45992cdc3caee39f", - "sha256": "1rihgld1wxwfdpqv7d9gcgd8xpnms5kpw61z30y18fmkxhhmid3c" + "commit": "fc45b56f3e2081d794f243bce705e77d4e29fc06", + "sha256": "0r9zcbm3nb3zw5cwrkl098v5b49jbga5404bj7j55g6k4rwkjar2" } }, { @@ -12127,6 +12387,19 @@ "company", "s" ], + "commit": "2af24f053465ab370566a49c231d541ca9509850", + "sha256": "0ki049jpd4xymagaxd4zvnj3bm7d7d797xa1bm8lfi701m2jjlgg" + }, + "stable": { + "version": [ + 0, + 5, + 3 + ], + "deps": [ + "company", + "s" + ], "commit": "a97f55b60f427e536e637898d12792154d134aab", "sha256": "1iw1vk1pgdacvfh17n45kk98rxml3f6kxnijmpp7fzz4q07yiv7w" } @@ -12167,10 +12440,10 @@ }, { "ename": "company-ghci", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "11sygcn8jb4rcc1hfiadhsyanbhsmnalpz2qvh5iaba0l165bsgg", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "1qps4bgnmwbaml3dhx3lkcznngl8w5j58pacw35kbk4q8r69s4kx", "fetcher": "github", - "repo": "orimh/company-ghci", + "repo": "horellana/company-ghci", "unstable": { "version": [ 20190707, @@ -12218,8 +12491,8 @@ "company", "go-mode" ], - "commit": "7fb65232883f19a8305706b4b4ff32916ffbcaf5", - "sha256": "09yqziccv9mg5jlmhw8gslpcwwiiah0hs05nq0qnsbdnvc8bs4lr" + "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", + "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" }, "stable": { "version": [ @@ -12371,8 +12644,8 @@ "lean-mode", "s" ], - "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", - "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" + "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", + "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" } }, { @@ -12546,8 +12819,8 @@ "company", "nixos-options" ], - "commit": "45c8d90748304c90e1503c9fa8db0443f3d4bd89", - "sha256": "0hsr8acsvfb42drb8f2wkpgqyh3csny7l82qv4k2l83xf022cs1d" + "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", + "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" }, "stable": { "version": [ @@ -12580,8 +12853,8 @@ "cl-lib", "company" ], - "commit": "84aa4f0c4ffafa2c2fdfbcb16662abac0a571013", - "sha256": "1miz6nwsdbc9n3jc7qcb0mvf2yp0k9a7pyl0ifbdjjr2160m2lql" + "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", + "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" }, "stable": { "version": [ @@ -12613,8 +12886,8 @@ "company", "phpactor" ], - "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", - "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" + "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3", + "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn" }, "stable": { "version": [ @@ -12666,8 +12939,8 @@ "company", "pollen-mode" ], - "commit": "819edf830e9519f8ca57e9cef31211e3f444d11a", - "sha256": "0c06kfbyk2g0kxwlh6g3r7ij06ip6x9ni0bin24drwr0qj2vis2d" + "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be", + "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5" } }, { @@ -12678,15 +12951,28 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20190626, - 759 + 20200108, + 450 + ], + "deps": [ + "company", + "posframe" + ], + "commit": "23da6d89f018517181afb4a82a711387bf102c48", + "sha256": "0wl2y304crkc5ylgbwqp8zply1r76758mm407rw1mlzijpljzldy" + }, + "stable": { + "version": [ + 0, + 1, + 0 ], "deps": [ "company", "posframe" ], - "commit": "849867a05efdc1a93ef989e3a0f8944522bf16b3", - "sha256": "1q1iflh9sx90g53hl5hkgv5g09jm3am87mg3nysq1rjkm40d1nc1" + "commit": "361de25739e866843b770638669f5bdf7ed95610", + "sha256": "0azmln9mssc52563vs5g3z3ajv4p6908c94v3fij1q0bdvlmcv6g" } }, { @@ -12697,27 +12983,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190921, - 3 + 20191224, + 220 ], "deps": [ "company", "prescient" ], - "commit": "82a90c4142c369f4090a42536179c6029d3fdafd", - "sha256": "0n919w068j73dnlxfzsvzh7j385phi4z718pi6xq6cygkjkq9zq8" + "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", + "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" }, "stable": { "version": [ - 3, - 3 + 4, + 0 ], "deps": [ "company", "prescient" ], - "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", - "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" + "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", + "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" } }, { @@ -12741,10 +13027,10 @@ }, { "ename": "company-quickhelp", - "commit": "022cc4fee54bb0194822947c70058145e2980b94", - "sha256": "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g", + "commit": "651679c2430c69294d1a1870fd206b7ea69ab017", + "sha256": "0g4l12j85g129p9li4p7rsji263qy05hgkb7qi7k1ik5s2bm7jdw", "fetcher": "github", - "repo": "expez/company-quickhelp", + "repo": "company-mode/company-quickhelp", "unstable": { "version": [ 20180525, @@ -12854,27 +13140,27 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190821, - 449 + 20191222, + 920 ], "deps": [ "company", "rtags" ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 ], "deps": [ "company", "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -12927,8 +13213,8 @@ "company", "solidity-mode" ], - "commit": "47f15b2663a6cf92ae6ebf655841a9509ad79017", - "sha256": "0zhr5fcv8vlkcnya36y9smpgw7ylb0fkx0px8zr0zhr2f9xgjmph" + "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", + "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" }, "stable": { "version": [ @@ -12981,6 +13267,38 @@ } }, { + "ename": "company-stan", + "commit": "33fd0382da97c7397b1e4435860e7344d70399b8", + "sha256": "064476s2gccjmwhrc406460k3aqc80giqqyjbii8243964rdx4p0", + "fetcher": "github", + "repo": "stan-dev/stan-mode", + "unstable": { + "version": [ + 20191106, + 131 + ], + "deps": [ + "company", + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + }, + "stable": { + "version": [ + 10, + 0, + 0 + ], + "deps": [ + "company", + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + } + }, + { "ename": "company-statistics", "commit": "89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2", "sha256": "1fl4ldj17m3xhi6xbw3bp9c2jir34xv3jh9daiw8g912fv2l5dcj", @@ -13036,8 +13354,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20190829, - 1801 + 20200102, + 2025 ], "deps": [ "cl-lib", @@ -13046,8 +13364,8 @@ "s", "unicode-escape" ], - "commit": "81b7440a7253e1753cf41932237fd64c1c1e44b6", - "sha256": "15nmli9drrb25d5xn31v1ja2hmc9kgpn2hjj6b2azj391yw0q4a3" + "commit": "a207f493eaf1cc766eb25ae84d0eca4c9d3e433b", + "sha256": "1qk0l4zcsd9jjivbaw7zbhx2dsdnb30slqc66qd3w69aq4r1xyv7" } }, { @@ -13129,15 +13447,15 @@ "repo": "Wilfred/company-try-hard", "unstable": { "version": [ - 20150902, - 2206 + 20191106, + 2105 ], "deps": [ "company", "dash" ], - "commit": "70b94cfc40c576af404e743133979048e1bd2610", - "sha256": "1isnk2i64kppsr23nr6qm5kwxxwcp4xazjwvm2chyzl4vbvp03p2" + "commit": "8a417255b4da9f2e3889f6024755290dcc5884d1", + "sha256": "14b3sad9a7dr8j7xhnspk905ybidqz8h4hx2rw4bgl25imhmlysz" } }, { @@ -13213,8 +13531,8 @@ "s", "ycmd" ], - "commit": "6f4f7384b82203cccf208e3ec09252eb079439f9", - "sha256": "1bl86x8nqw4jqzb8pfm6hm316hmk1bx8v3qz7wq9z92hb67ck2kn" + "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477", + "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv" }, "stable": { "version": [ @@ -13242,11 +13560,11 @@ "repo": "jjzmajic/compdef", "unstable": { "version": [ - 20190929, - 655 + 20191211, + 249 ], - "commit": "67104a38763cc819644f711248b170a43bce151b", - "sha256": "1f6y6cr67gps9jp5hd20xszfd3k26v70g6z4g5db6wdkvlnc2wkg" + "commit": "bb210101f2673cb9ff368027b8d272ad5b268648", + "sha256": "18iqhgpcvikk352x5g8m05lxmigpbc079rzwycg25w8n1hi2bvqi" } }, { @@ -13291,8 +13609,8 @@ "s", "seq" ], - "commit": "6c1578b2352c81cc9a22616a70db2a14b7d2b67f", - "sha256": "0fijw3kcl4vyc5x7a1syqslsj13mwkq1k3bs4p60v2jg1fxqarrb" + "commit": "269270e13b2be00a9cc7d08bd2a96d6bca64cae2", + "sha256": "1bwrmgkkyq35zm5vb9krhdgirsz5hilif6i1k7nsm4bl1msf0h6m" }, "stable": { "version": [ @@ -13319,14 +13637,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20190923, - 542 + 20200106, + 2011 ], "deps": [ "dash" ], - "commit": "17d8bf8bcf2d7551480cd9a4785c3a6e832e6d8a", - "sha256": "0dm5gvaxgbn2flj0k6y6w0nw4ia02lhwpkh3iawv00lqndxqjrv6" + "commit": "bcda169785d02285226cab06cdb3fec4407b7eb3", + "sha256": "14jx6k70595jhb86l2h48k6j2j5m2sc7v8ldyycdiba8i3dj510i" } }, { @@ -13367,8 +13685,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20191001, - 1753 + 20191121, + 1521 ], "deps": [ "dash", @@ -13376,8 +13694,8 @@ "pythonic", "s" ], - "commit": "ffafcc47ddc58b53b5dac19f6f0f745b316d4522", - "sha256": "02pvi03blbfkyzy46ma7zg1xfgikxnxrs3silraaym25bn633rn5" + "commit": "41e9593cf230a50183a36fa9c0a4853acb2e7505", + "sha256": "07ckq7zvn00izk39wqrl2hgg8pa5p2nra0xdi9p5ra481iiinq47" }, "stable": { "version": [ @@ -13511,19 +13829,19 @@ "repo": "myrkr/dictionary-el", "unstable": { "version": [ - 20140718, - 329 + 20191111, + 446 ], - "commit": "6edc1d0a4156d33c3da0c1649c308b809fda46e1", - "sha256": "0g95q3yggzxr8d2gjxamfwx8xbzf182naxpb265r7v9awd35bqk5" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" }, "stable": { "version": [ 1, - 10 + 11 ], - "commit": "9ef1672ecd367827381bbbc9af93685980083c5c", - "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" } }, { @@ -13823,14 +14141,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191024, - 1621 + 20200105, + 1947 ], "deps": [ "swiper" ], - "commit": "c8120fb614425bf76bee687183f70b4b4c2ffc9d", - "sha256": "1m62yv9fxw1456v92li3acrwchqs9n56g150nwdppsic5vwlzgnz" + "commit": "baac6e1c32ee895ea543f341a62204946237fe9c", + "sha256": "0z9mgvvs8dqkbzp3gqpvfwrdh88arvxiqmrgvl3xxcix5w06gqnb" }, "stable": { "version": [ @@ -13903,15 +14221,28 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20180302, - 1036 + 20191031, + 345 ], "deps": [ "cl-lib", "counsel" ], - "commit": "0536af00236cdce1ed08b40dd46c917e8b4b8869", - "sha256": "04qm5dqxnl4s0axbrin7a7dpj3h8rx096q01bwzfs10qsdx3l7c0" + "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524", + "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w" + }, + "stable": { + "version": [ + 1, + 0, + 7 + ], + "deps": [ + "cl-lib", + "counsel" + ], + "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524", + "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w" } }, { @@ -13922,16 +14253,16 @@ "repo": "nathankot/counsel-dash", "unstable": { "version": [ - 20191021, - 1648 + 20200103, + 1411 ], "deps": [ "cl-lib", "counsel", "dash-docs" ], - "commit": "7027868d483b51d949b9f20fb8f34b122ca61520", - "sha256": "0h3f5pxnmb21pq4hh7k4w8jzflz1k2ap7nwpjc222w0q6x6jrbjp" + "commit": "370d5f6f14b5294d0eb717f7b2a6a8e93df1ed24", + "sha256": "1fn38vbz46ijarjvhgw7iy7dj9s2a2miy95fyy9f8b5sj8nrdfvz" }, "stable": { "version": [ @@ -13957,28 +14288,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20191014, - 50 + 20191211, + 1129 ], "deps": [ - "counsel", - "ivy" + "counsel" ], - "commit": "b08ed51b763e29fc5deb2952eb7e5ba7c3677b4a", - "sha256": "055iwjwkdbwirgm707xgar5afx2nr2kvrsdg5bnw96yvwvby6x4r" + "commit": "9d7f0c4aea8f36710fa7957c306a39f7abf49202", + "sha256": "02gygn77x9rm51bqa9mykykjwflmz7cdz3qp1b8kd8qkd2zl3q1q" }, "stable": { "version": [ 1, - 8, - 9 + 9, + 6 ], "deps": [ - "counsel", - "ivy" + "counsel" ], - "commit": "fda1f77eb8548c4451894886ef5e99815dfc1bf8", - "sha256": "0rmdl93kgyydwa96yclds9vwly41bpk8v18cbqc1x266w6v77dr9" + "commit": "9fae8adc833919ffe33ca51d8e3db67e5be13666", + "sha256": "0831ylsl6d1ldrvvg5cs0yl33mh8s5hgxjp38kcy912mc7b1x0q1" } }, { @@ -14008,15 +14337,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20190923, - 1842 + 20200101, + 1701 ], "deps": [ "counsel", "seq" ], - "commit": "baac1a718aaa3ad6c439ab48903b12013de2cec0", - "sha256": "18bwis4j6j4plcdwxml3jdqzd9l8wi0k9kwmyqf9nbqx9f54klqr" + "commit": "5d2a8c2c2d358e374a576cf8a3a67f7997a8839b", + "sha256": "0qx7gdxgd28grz8pn57kb9qrsvdiysci6hya1fif3iqb1hbyg2mn" }, "stable": { "version": [ @@ -14031,6 +14360,37 @@ } }, { + "ename": "counsel-jq", + "commit": "556a010fac8da34a655e5bb2bee331c8af24b283", + "sha256": "07lmpzrz03kqa0xklrz0vxpgiadsnvy96vlwwp14nswr6i3r5hia", + "fetcher": "github", + "repo": "200ok-ch/counsel-jq", + "unstable": { + "version": [ + 20191207, + 1334 + ], + "deps": [ + "ivy", + "swiper" + ], + "commit": "b14dfc5c18d991c3b3051c3cbb244d5923b3a327", + "sha256": "0f5h7nnqrkzbyxi4mgzahqzylszrqb25l3i24ml8yra2a23nl2w8" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "swiper" + ], + "commit": "33d709f5b73a68093ec9414c774844d5f4983aee", + "sha256": "120i4j4bw3v1ybcwrfpn0v7jphhk7hhlp738m60fck97p9lwfyy0" + } + }, + { "ename": "counsel-notmuch", "commit": "54fe0be4e8e8b90cd2dc3cc8b9c573694c8f773b", "sha256": "1n4jp9fa5fbv55am0w1b832ncdih8gi6xflwabpwqqj4k5mj94p1", @@ -14113,28 +14473,28 @@ "repo": "ericdanan/counsel-projectile", "unstable": { "version": [ - 20191010, - 1427 + 20191204, + 1759 ], "deps": [ "counsel", "projectile" ], - "commit": "ace17b9a3243e934314860f161f0ed71e4922730", - "sha256": "06l8rr11ki31a35vmvfdhvvvsgm8nbx8v2wsn4d12y42i86sdfv5" + "commit": "cadc6de7070458781a373b052adddf102bbed302", + "sha256": "04fn3rg68ssa5kj2yv5gr62jlhpsvmspiqssgmaqfnx6rhkd3vpx" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "counsel", "projectile" ], - "commit": "d64e5275c578a494102852c466a3696bde466739", - "sha256": "1inc4ndl0ysfwvxk4avbgpj4qi9rc93da6476a5c81xmwpsv8wmq" + "commit": "d71a3274cfa9d7425f1bcee3eb2dfed9714ac16d", + "sha256": "1k4n5lw6wwbgpwv0dg9dw0bjzi0hvbgkzrs1zmq36yhfz6y8gwnh" } }, { @@ -14163,14 +14523,14 @@ "repo": "Lautaro-Garcia/counsel-spotify", "unstable": { "version": [ - 20190406, - 2025 + 20200104, + 2216 ], "deps": [ "ivy" ], - "commit": "f484e6efd3994704cfd16c87c298fbfa12d442cc", - "sha256": "0b5hykw3n96f0m50176hk639sbzdykhnp52xlp8g6l7p807x27w9" + "commit": "e673b7adbaff423f14613f90ec2ed00b0f242792", + "sha256": "0mx8b7x81i6rr5hzym66qhaz65bgbayf2q9rvqgd2rh6l51icbm9" } }, { @@ -14287,15 +14647,15 @@ "repo": "trezona-lecomte/coverage", "unstable": { "version": [ - 20191008, - 2203 + 20191113, + 1958 ], "deps": [ "cl-lib", "ov" ], - "commit": "2d9b662673a0f165c6929d8b7fb264f5ffb2ebcd", - "sha256": "0pdn309kcyrvb8bgzgjmy26mcgbfkr6p1d37ww6qjk9hps0jy92r" + "commit": "6e3c6f2dcb759a76086adeeb1fdfe83e4f082482", + "sha256": "1l2vpyv22f77r2nd1bxf4mggmarb621dl7fnskp5hizhc5sfxi4f" }, "stable": { "version": [ @@ -14372,20 +14732,20 @@ }, { "ename": "cpp-auto-include", - "commit": "5323c0ab6d3e471951738a00ce7036e6ff2665d2", - "sha256": "1a1zv7zbd1l2vbgi42zd60mqnsv7a35is4drf2dmp5dw1nh08z73", + "commit": "e745bff580b3fa8a982f2bdfafbc9e238de47b7f", + "sha256": "0nzq7k656iy5x4hp7646rxqd0wyf0aspbjdsr8xfkgdp8m3yvaz5", "fetcher": "github", - "repo": "syohex/emacs-cpp-auto-include", + "repo": "emacsorphanage/cpp-auto-include", "unstable": { "version": [ - 20160426, - 412 + 20191221, + 2319 ], "deps": [ "cl-lib" ], - "commit": "f3b9bfa668fcd38da8a9dbef0e33a536be239468", - "sha256": "1qnmmk97963j92d4h7vjf27dmiwnjk6q2ls0xy0xx5rg0y7firjf" + "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391", + "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" } }, { @@ -14723,11 +15083,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20190604, - 1254 + 20191121, + 1447 ], - "commit": "34124f546ff5c1136aed95bf0059015f9f6a1d60", - "sha256": "09cmbw190w6aiwwc2bg349xx6vcv9b9ajw8m70ajb3653qnq3mw4" + "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", + "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" }, "stable": { "version": [ @@ -14780,11 +15140,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20190717, - 1024 + 20191126, + 1928 ], - "commit": "30ae13607c9d8174ab488ff58cd0dfe4e5cbd0c2", - "sha256": "0wzrlda3nvrpzghb2nkh4apdbx9fbdq5sdbasz0ym0h9m0cbyc24" + "commit": "57bd21bda4edc16671a85c7d6d51484e40a6e640", + "sha256": "0chl9lzxn1mq59vy5lsim2iiy2hl20rg3d7ri41ljksjcfz9ki6v" }, "stable": { "version": [ @@ -14804,16 +15164,17 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20191005, - 807 + 20191113, + 158 ], "deps": [ + "dash", "highlight", "multi", "shut-up" ], - "commit": "7d3f78477c725719be9c4a98b403a5aa409e4202", - "sha256": "154xnfspbx2fsk32h34ljw7mzsbsdymscmi0rqdc6r9bbbwapwqw" + "commit": "623127836352b1b83afed71fd542d87e5d3be352", + "sha256": "0nnsh6f02glrjrzs2f2blm0j397c8zkbwvwb61l7y9dx15a3rdrx" }, "stable": { "version": [ @@ -15323,17 +15684,17 @@ 20190111, 2150 ], - "commit": "a32a29e8aaa688e0507d374ab47e641eb1a427c4", - "sha256": "1ry1jcdkl0mcjlpa1lp2mdrp03mcrvkvx5p3y4f4d6h4bjk5zk65" + "commit": "3dc2b9dfc23638fbef2558d619709b5235d5df08", + "sha256": "0nh552256vh47l6zzjlf2r9wdndhpw0pkhm4mf1yfmkcxmyywyz4" }, "stable": { "version": [ 0, 29, - 13 + 14 ], - "commit": "d4610f39a43a658cee1862c899a9696d8a9c9f5f", - "sha256": "0ljf2rhyhzih28x2rp95xyajvvjsmk6lirfshf6h6nlcwbh5i9c7" + "commit": "bfcaf163e3dcf472ef2af5dec6ac3fffd0d34e66", + "sha256": "0rzdx15z6y97cr1g1a3pqiiy2vx3jps3zgzz25bd9043nhhnmjcf" } }, { @@ -15475,11 +15836,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20190731, - 917 + 20200107, + 819 ], - "commit": "f88bf1d8c3d26ad03b3faf0d91c1ad8521c7feef", - "sha256": "0biv8aglzj2g77dq1y6pad7k1nihgzb54am4wslvh2b3d6r25rnd" + "commit": "79be83dac9f10a1487ed9a8b75ea2e606ffec639", + "sha256": "0is3jqr0fxd1winqjf6k23fxiflji4r9vgh493fhxzqn4r08yp8q" } }, { @@ -15490,8 +15851,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20191004, - 1233 + 20191229, + 1922 ], "deps": [ "company", @@ -15502,13 +15863,13 @@ "lcr", "s" ], - "commit": "38b589417294c7ea44bf65b73b8046d950f9531b", - "sha256": "1mnmn635552zlwd4zr68jbvdjipl6gi4mi6wiyck28fsmq8kw96h" + "commit": "9289b6f053f343cb841ea7ca74758fe41bf6b74c", + "sha256": "1x36ck1wy19rlqfzcdy2xs888iqs1r1vkllnx8ld4z4aak1sg2mj" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "company", @@ -15519,8 +15880,8 @@ "lcr", "s" ], - "commit": "3bd1bfdd775a309565a850e37dfbd42f1b33068e", - "sha256": "0f76snwsy735r7pl3gdzvajsmpd12qkj03lyjxq1x44a79a1gfwk" + "commit": "38b589417294c7ea44bf65b73b8046d950f9531b", + "sha256": "1mnmn635552zlwd4zr68jbvdjipl6gi4mi6wiyck28fsmq8kw96h" } }, { @@ -15531,8 +15892,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20191019, - 1707 + 20200104, + 946 ], "deps": [ "bui", @@ -15541,15 +15902,16 @@ "f", "lsp-mode", "s", - "tree-mode" + "tree-mode", + "treemacs" ], - "commit": "dd71e3fefb40f84d13d7630c6233c6c768d1134b", - "sha256": "0s0a9n30bzf70p512r0hgipx5b7jrphnj3r2r6b6xva4ndbp7laj" + "commit": "68f9c19bcc4c8f76c2d7258ec15d7b80cf2ade9a", + "sha256": "0zch80h1a151wpwcpj9s3v77p4qma6ah38k7r9cki79phlhz0ca1" }, "stable": { "version": [ 0, - 2 + 3 ], "deps": [ "bui", @@ -15558,10 +15920,11 @@ "f", "lsp-mode", "s", - "tree-mode" + "tree-mode", + "treemacs" ], - "commit": "240da34149e2d8893b647f15ff30f217aba4ac89", - "sha256": "1y3s28xb66w8yynwlavn6d7ysjv0d5ziyga5fjyj0jk1037mjg6y" + "commit": "4e25c8334f2ace87275f86b11f0ed969c2f20def", + "sha256": "0zajvq6p1d0lzha58yzaacbc060krhlj6m4v4lg9w1c9vdyshin3" } }, { @@ -15790,17 +16153,17 @@ }, { "ename": "dash", - "commit": "57eed8767c3e98614259c408dc0b5c54d3473883", - "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz", + "commit": "2853d2fcf46eda788e5a3ea08815d0a2bf9d9d32", + "sha256": "1z55hwp6xzbn44xbz6fzpcgbp1b1sf37amryl8p54likj3i21i8n", "fetcher": "github", "repo": "magnars/dash.el", "unstable": { "version": [ - 20191024, - 1908 + 20191109, + 1327 ], - "commit": "9631947f2fbeed58b1d07a3ebc1340a3626b2823", - "sha256": "0mbhi7rzahsl0i8i8ifga39f7s4z4ppagr52cs28xldkc3344ahf" + "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb", + "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d" }, "stable": { "version": [ @@ -15869,14 +16232,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20180107, - 1618 + 20191109, + 1327 ], "deps": [ "dash" ], - "commit": "9631947f2fbeed58b1d07a3ebc1340a3626b2823", - "sha256": "0mbhi7rzahsl0i8i8ifga39f7s4z4ppagr52cs28xldkc3344ahf" + "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb", + "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d" }, "stable": { "version": [ @@ -15899,14 +16262,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20191009, - 1129 + 20191210, + 1041 ], "deps": [ "page-break-lines" ], - "commit": "224fb2cb067d0f1f95fbbe8aa4073154cd255410", - "sha256": "1ndffcfhavb1pa8f2g8mbbi8w2386r1av5dfns1gz9fdzi6pqlz4" + "commit": "87779af059b33559c88596793cc55504c418fd32", + "sha256": "15jpw52kjcl0zpzx3yancw6kyz3ddyzl9lah8qya2914sv5w01c7" }, "stable": { "version": [ @@ -16040,8 +16403,8 @@ 20190630, 933 ], - "commit": "ca8e3bd421ac59adf5bdd279ccf007f04dd61c1e", - "sha256": "1mx295zh3mf5arj63bswkm8ypjrdiwfxm27746nr2kblwjliy9px" + "commit": "386dbe73678705d6107cd5c9bdeb4f7c97632360", + "sha256": "0mdsvrwn6g33arcby02v6m9kfyymq7svgnvpvkvkvfdswcrns4mn" } }, { @@ -16174,15 +16537,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20190423, - 1234 + 20191210, + 1919 ], "deps": [ "ccc", "cdb" ], - "commit": "ad61579af269291b4446f4bab0a58522cc454f1c", - "sha256": "0aisilp9wl9w8l6nsiy963wvja38pp57g3skdf6qbm5ak8bb3244" + "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249", + "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c" } }, { @@ -16193,15 +16556,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20190816, - 1855 + 20191123, + 1632 ], "deps": [ "ddskk", "posframe" ], - "commit": "f062a2a2a0fb3746ba01a7f56d051adf4cf4c7d8", - "sha256": "1lkvbix25p5jlhz5164vnyfldq1fk7m10w6q7q4rm2plnmxfbv1y" + "commit": "8a37953b37d397ba406bc308eb908bd966d34af6", + "sha256": "0qm2hb2m3gqzqblgy3d5krxkjbwyhiivzbjfiq9yygh5v729d3as" }, "stable": { "version": [ @@ -16224,16 +16587,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20191002, - 2 + 20191031, + 2214 ], "deps": [ "dash", "s", "spinner" ], - "commit": "e1ea4a358cfdac7551d0c6bf6ae70a4e191c1528", - "sha256": "161mb7kyr70k24kl25lms8v8b87fi5q66zj9hlbhzwksdxpa9z30" + "commit": "6ea9ad874827e7ba6c8f5e62a89a5a479cd20735", + "sha256": "0ngq8ysyfyrrb7mkh02i7wwqig29njad9ndam3bbsbqh07ihdywa" }, "stable": { "version": [ @@ -16406,11 +16769,11 @@ "repo": "purcell/default-text-scale", "unstable": { "version": [ - 20190615, - 247 + 20191226, + 2234 ], - "commit": "dc7e2004be736544149643de2673a5506c83dbaf", - "sha256": "15y3yxv6r8480cir4i97f6j5z2yxx002w9h73xng37w24s105l5w" + "commit": "bfc0987c37e93742255d3b23d86c17096fda8e7e", + "sha256": "1kbmq9ssp1i58bcmnk0g0ijhwsa80qm5xwwzhzcskrmxb6dg88j2" }, "stable": { "version": [ @@ -16446,6 +16809,46 @@ } }, { + "ename": "define-it", + "commit": "c3b4c0c6a715b4302cc6cb6171b185883f2a87e2", + "sha256": "0y9l0dy4l1k9j5fis652rypxm5r6qmdxgb5msihbyl8acbwdhhr2", + "fetcher": "github", + "repo": "jcs-elpa/define-it", + "unstable": { + "version": [ + 20191230, + 1409 + ], + "deps": [ + "google-translate", + "popup", + "pos-tip", + "request", + "s", + "wiki-summary" + ], + "commit": "4e769b94c4ec81d9c1eac9dda0e22c869a07aa7c", + "sha256": "0amwslk4hawjzjbdakx7ggclw3y9ackl2vnmrr0pw17m5ccsr10b" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "google-translate", + "popup", + "pos-tip", + "request", + "s", + "wiki-summary" + ], + "commit": "ec13795cd1185706fcc81ea627d3680f65283891", + "sha256": "05wq0apnljclpjn3ifwl31vx3rlwv9kns5yva26sd8ks7kjyqizj" + } + }, + { "ename": "define-word", "commit": "e318b30d8b2b89981f4b89d78e5a46e77d3de412", "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a", @@ -16453,11 +16856,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20190506, - 1525 + 20191031, + 1736 ], - "commit": "11bfee628aee082a9a3a2fd5f083cbdb05d5d00a", - "sha256": "1yrhrvqiyp4cv6bpvdrkc5zfwflb1jx8kmivjkpv6765pnr11zp8" + "commit": "d8c76d503be3d561221631067ec5274e7c147248", + "sha256": "18yy7gw8x3y9sk3v7xpd59p425qc36dymj0wgk6mzarfq5rhv79h" }, "stable": { "version": [ @@ -16653,20 +17056,20 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20190701, - 1306 + 20191114, + 441 ], - "commit": "d2706dd2d83cf9f3672a74b0b3fc490cc84b0f78", - "sha256": "1ymxxa1jpcg6c0wwxz8qi453bgik07yh297fsf4a03hh07rpx8a0" + "commit": "57de5e018baa1c7667230cae657c80ca765ae912", + "sha256": "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], - "commit": "284c38fcb5b10746255ee4123eaa549e028df0c8", - "sha256": "14ija2rrz3zjhjbzxg84j5fq6xph4ah7w9bkqnq37by040cydvhw" + "commit": "57de5e018baa1c7667230cae657c80ca765ae912", + "sha256": "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2" } }, { @@ -16764,11 +17167,11 @@ "repo": "redguardtoo/dianyou", "unstable": { "version": [ - 20190604, - 1215 + 20191120, + 39 ], - "commit": "46d3328998ed20b37c4b52722d52d4d579e4f5d3", - "sha256": "1n437mjk9j4jdn0jzrra1m5q6x3wmk1r54rcafhbfnl6b8ji81jl" + "commit": "da7443a680bd8db75884355314e9352cd8c68d05", + "sha256": "099iiwp52rfnxgwhiaxdaridhcjdp3qchmskxmb1j5dz757c6w1c" }, "stable": { "version": [ @@ -16791,8 +17194,8 @@ 20190702, 2148 ], - "commit": "97f37cfb27ca85eec2f30c630ed356f2fd1f65e3", - "sha256": "0xqag57bmgwxvkz1k458xlrxnp3vg1kvaaapxpr3zb1dwqvvcyn8" + "commit": "964dd7bf60a8e8abc880ef5b73319bc65d5ea5e3", + "sha256": "1w1hffypsx41n63yrpz0lcyzia4x4lis0sja8gksik7dvwwkyhwb" }, "stable": { "version": [ @@ -16863,23 +17266,27 @@ "repo": "myrkr/dictionary-el", "unstable": { "version": [ - 20190403, - 1918 + 20191111, + 446 ], "deps": [ "connection", "link" ], - "commit": "6edc1d0a4156d33c3da0c1649c308b809fda46e1", - "sha256": "0g95q3yggzxr8d2gjxamfwx8xbzf182naxpb265r7v9awd35bqk5" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" }, "stable": { "version": [ 1, - 10 + 11 + ], + "deps": [ + "connection", + "link" ], - "commit": "9ef1672ecd367827381bbbc9af93685980083c5c", - "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" } }, { @@ -16907,6 +17314,21 @@ } }, { + "ename": "diff-at-point", + "commit": "d342698c94e145ecfebf204c1099dbe765b39c71", + "sha256": "1gjjnxafsxrhpxz3zs5kbdmy5wmhcqqfkgryzzc0mmm9iqbskd3j", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-diff-at-point", + "unstable": { + "version": [ + 20200106, + 441 + ], + "commit": "c26027d701f2a1512e0a2b18e4b34f02e9140ee0", + "sha256": "1c5pibjmpkw7fi26vnsvv5yjg4y851jccwymzwa06gbxb3jf5ggc" + } + }, + { "ename": "diff-hl", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "135jgjfaiq6kj72ji5k22v4pqc8gjjmcv80r5rkjbjigzlvcvvj2", @@ -16914,14 +17336,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20190707, - 2243 + 20191223, + 26 ], "deps": [ "cl-lib" ], - "commit": "374b1d4b34876219218da7a539e7301259b56958", - "sha256": "0i7x6qgr3nydcwhw72sbc8z9x9dfhgkf0dqj9nakvx36vn1bblbq" + "commit": "fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74", + "sha256": "0ksp86izjw7vgh21jn4rwl5vnfn1jvgs05lv216mnwia8p14ihjz" }, "stable": { "version": [ @@ -17117,20 +17539,20 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20180318, - 2027 + 20200103, + 1239 ], - "commit": "2d879932741ac8e3afd4dd03071b61170eae353d", - "sha256": "0nw9q569771z6y8zkpmcg5flr71732s6kckywjvpixqnxxa579iy" + "commit": "c8dc02259d6c1aa25fb58742ae8b181f83b39a13", + "sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd" }, "stable": { "version": [ 2, 0, - 1 + 3 ], - "commit": "788320fe089fafbdf1cb09d2ab4d29d64a804e21", - "sha256": "0iyhjww7p274x418n1iw1xj2fkmn5k9icav0jyzbwmy83a2nmr52" + "commit": "c8dc02259d6c1aa25fb58742ae8b181f83b39a13", + "sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd" } }, { @@ -17141,11 +17563,11 @@ "repo": "myrjola/diminish.el", "unstable": { "version": [ - 20170419, - 1736 + 20191127, + 1326 ], - "commit": "565a983a39d2e2cffab5df13b34f3b6116723208", - "sha256": "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0" + "commit": "96b47cf90360e4bd19138fe82dc59bfa86c7bf7d", + "sha256": "1ar2bl1w4s3gx8slryf5qzq4qzprdyhm1fngvlnfhxg83k2g3969" }, "stable": { "version": [ @@ -17167,6 +17589,15 @@ 20190921, 1647 ], + "commit": "0b1262f947b3ce03dca17879caec808a7d091bf4", + "sha256": "0yrzp7jdw04hj3ag3379l6kb9vpd1vcvqqf4z5yb3i28b5d7s136" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], "commit": "e137baa5e258a7938c713253fc9cc63f8674f841", "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i" } @@ -17179,20 +17610,20 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20191024, - 1711 + 20191213, + 2008 ], - "commit": "52652c54f2714ec931f3fc3709c66b109b1b81e2", - "sha256": "14s7pc2sac50vai7clxcxws3hyrcskimd8byp43q4a3fhqsjys93" + "commit": "f42411f8678e5745b6610ec24ab62bcb389a83ec", + "sha256": "00lq0zaslnhm51yymbprd9s93waszq6skjy6y6a6yr1pfsa6ibhv" }, "stable": { "version": [ 0, - 3, - 0 + 4, + 1 ], - "commit": "12fc52a6570ec25020281735f5a0ca780a9105af", - "sha256": "1jv9rrv15nb5hpwcaqlpjj932gyisrkwbv11czkg3v0bn7qn6yif" + "commit": "5c0d50439afb43362b06a249a40e1ee00ce837a8", + "sha256": "1ykzr7h96a55hnj0bwq9fds4fdwinzx48p3i3k2g6fy8qcn7ydlb" } }, { @@ -17289,8 +17720,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17309,8 +17740,8 @@ "dired-hacks-utils", "f" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17427,8 +17858,8 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20190211, - 2020 + 20191105, + 1404 ], "deps": [ "cl-lib", @@ -17436,8 +17867,8 @@ "dired-hacks-utils", "f" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17454,8 +17885,8 @@ "deps": [ "dash" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17581,8 +18012,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17600,8 +18031,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17648,8 +18079,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17667,8 +18098,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17732,27 +18163,27 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20190508, - 1605 + 20200101, + 1207 ], "deps": [ "dash", "s" ], - "commit": "d7eb558c4efa73d9e1f50709dbd2374041c0f1a9", - "sha256": "074xy2wipdn2lvm7kxyf7rpsgp7hc62f7h1n77am7p4i7j5alw1f" + "commit": "698294cbd4b731abcb617f29aa133bc9c60b2651", + "sha256": "0q4w99cjp7ibbhjcgyzbwchk8k7qljp7w9p5dvszsfxiwfxgyg4w" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "s" ], - "commit": "9233e7c2afe0ff654a63ce6a0546a06c3e921494", - "sha256": "0jzbn0izxqgz719gb6fpr60zbcb6w1ama13ngpvrig82nlhs37fv" + "commit": "707f527a5448f8fd881321f1d60e49821d3efe60", + "sha256": "1nq3d8py2zsji835wilg514z5j180k371pwqsqrmnnhq1cj4fkia" } }, { @@ -17802,11 +18233,11 @@ "stable": { "version": [ 0, - 1, - 3 + 2, + 0 ], - "commit": "5b002927fd8c7f954eec187227ac59dcaa8edfa3", - "sha256": "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j" + "commit": "c66c9969428d1cf3544a164d7e5347e8efb5dd5a", + "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn" } }, { @@ -17824,8 +18255,8 @@ "dash", "dired-hacks-utils" ], - "commit": "ae39981d7cc58206cfeb377d6621bdd9000fd472", - "sha256": "0q4fk5cg04pj83kpn1mvfqsjsr99ffqxayfnb7vcgdc33g19afjv" + "commit": "f49a8bbf95f70671a74a24f7f4de453b2686be46", + "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs" } }, { @@ -17883,11 +18314,11 @@ "repo": "purcell/diredfl", "unstable": { "version": [ - 20190629, - 231 + 20191227, + 2028 ], - "commit": "d5aa50a5269d7374bc8ea981d3871729424d165d", - "sha256": "0jwzlf0nhn5699l5xjhszix0y1539zdxyy6434srf31cgr7q84cw" + "commit": "83567d00affce66a4e501563eddd0bd436ac48d0", + "sha256": "11xkvywcfv27gr0dpgprmmnjqfxmxdmcpa2kq0vqnxrblg6ijwbr" }, "stable": { "version": [ @@ -18262,11 +18693,11 @@ "repo": "mnp/dispwatch", "unstable": { "version": [ - 20190903, - 356 + 20191130, + 52 ], - "commit": "04e7ecb52636e27a8e2e670c6e8977c12ed989e6", - "sha256": "0yv4gl86z9wx81n1hadha01iqcinp2c3414hg5iypv2j7n129kri" + "commit": "93aac853215d0902e7a30a6dd2b99d796da77df4", + "sha256": "186294rkmhwbh8x054w1hnqykp1iydxd490irl542j5alinv43qk" } }, { @@ -18341,14 +18772,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20191023, - 1357 + 20191115, + 824 ], "deps": [ "cl-lib" ], - "commit": "466df0a7f5ab6ab19150bef92f7d1aac0dec2467", - "sha256": "1gb21rsczwcwhqc9bpw77zikwr2ycqmvks6n0y8mdrj3kc6qvzgc" + "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc", + "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql" }, "stable": { "version": [ @@ -18378,8 +18809,8 @@ "dix", "evil" ], - "commit": "466df0a7f5ab6ab19150bef92f7d1aac0dec2467", - "sha256": "1gb21rsczwcwhqc9bpw77zikwr2ycqmvks6n0y8mdrj3kc6qvzgc" + "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc", + "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql" }, "stable": { "version": [ @@ -18418,20 +18849,20 @@ "repo": "muffinmad/emacs-django-commands", "unstable": { "version": [ - 20190320, - 722 + 20191107, + 1830 ], - "commit": "1b19436a1160d1552207d4356d5e78793dabe100", - "sha256": "1zb8mf0dgdr83n61a54m5grhdr6nz75zrgwczpzfl3f66xkvfci9" + "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", + "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" }, "stable": { "version": [ 1, 3, - 2 + 3 ], - "commit": "1b19436a1160d1552207d4356d5e78793dabe100", - "sha256": "1zb8mf0dgdr83n61a54m5grhdr6nz75zrgwczpzfl3f66xkvfci9" + "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", + "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" } }, { @@ -18686,19 +19117,19 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20191005, - 650 + 20191222, + 939 ], "deps": [ "dash", "docker-tramp", "json-mode", - "magit-popup", "s", - "tablist" + "tablist", + "transient" ], - "commit": "5027a3d541b1dcbb2f7ec0bac04a30dceeca7ce8", - "sha256": "1n4k5ar9h2a11f68nqdgmqnwpnlym5862vls89wkjqxl02ss34zn" + "commit": "baba7f72ea9e642536ca3664c2082722062b046e", + "sha256": "0vcmlw8v9rgpfyahfjx8fbdh524m2dkil23gp4gf5n4l696chk6z" }, "stable": { "version": [ @@ -18831,14 +19262,14 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20190505, - 1807 + 20200106, + 2126 ], "deps": [ "s" ], - "commit": "ed73e82dcc636dad00d1a8c3b32a49136d25ee60", - "sha256": "0lri2rnx4lr23vqfphkpq39cd4xfgzkvz1xsz7ccdvl4qj0k7fdl" + "commit": "d31f7685ebc5832d957e25070a930aa42984327d", + "sha256": "1br73dsls42fn4rwagljkpa3l4wwj6f7jxfn3gmgl6c54z81av3v" }, "stable": { "version": [ @@ -18920,8 +19351,8 @@ 20181110, 1857 ], - "commit": "6421d9e28d57cb73212c61ab7304abfe6f950ec9", - "sha256": "1j9ibjg6fx5iqlhxjqjcr9j9jy1n75cwcqslddzlp80p4qz9ms1k" + "commit": "925845844035998a941faed57baea9142cb61a44", + "sha256": "0nbr9ncc73w6b138ccgnknlynn0lja2ap2h7131krz9p0n07hkll" } }, { @@ -18961,21 +19392,21 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20191025, - 624 + 20200106, + 622 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "59b1f7fe24fef9027d60942c44bfaa93df149a3d", - "sha256": "0jc65qxnjnid30y2ilp0a7yqa41qz9jzflp9cmky49hgwjaph33n" + "commit": "4afe41ef3de2407f52c4954829240a3714256107", + "sha256": "041hdfp8ykiqm6apajriipbc6wgbysxak6ffaiwzw9zv909qywyh" }, "stable": { "version": [ 2, - 6, + 8, 2 ], "deps": [ @@ -18983,8 +19414,8 @@ "dash", "shrink-path" ], - "commit": "c7eb0fb93e11c2252dc9f1a928e26627f3f4b3a3", - "sha256": "1swbjrmfyq496rg03xm6vz5w00bsz06nly7mffvxy74jc3f6d5fc" + "commit": "a6f6f25877343a5fcf04eaffa410175411a4c1dd", + "sha256": "11srz1mr821axggs2jcmdhihxx09a2dniqv3n039wbdfaimfaidz" } }, { @@ -18995,14 +19426,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20191024, - 1803 + 20200106, + 100 ], "deps": [ "cl-lib" ], - "commit": "bb587d06f883cf4362fbfb3df2f989367fccb0fe", - "sha256": "0k8i6xg6dg5i0kgyj73qiy5kn4aa8c2g7caijg76914dmxvm3ikc" + "commit": "2ec6df8905e22586f349290b6f39b320fc2e21be", + "sha256": "0wbxn41j2i6ca7y7gvdr3qmwhsw2bbazg9ckkbl9ycjmchjpxb20" }, "stable": { "version": [ @@ -19041,20 +19472,20 @@ "repo": "preetpalS/emacs-dotenv-mode", "unstable": { "version": [ - 20180207, - 1914 + 20191027, + 2129 ], - "commit": "f4c52bcd5313379b9f2460db7f7a33119dfa96ea", - "sha256": "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc" + "commit": "e3701bf739bde44f6484eb7753deadaf691b73fb", + "sha256": "0ys1czramj3c8zbnxxc599bqc0nqp3nnn3n45ac9cjglx5iaydq3" }, "stable": { "version": [ 0, 2, - 4 + 5 ], - "commit": "f4c52bcd5313379b9f2460db7f7a33119dfa96ea", - "sha256": "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc" + "commit": "e3701bf739bde44f6484eb7753deadaf691b73fb", + "sha256": "0ys1czramj3c8zbnxxc599bqc0nqp3nnn3n45ac9cjglx5iaydq3" } }, { @@ -19083,8 +19514,8 @@ 20190325, 1917 ], - "commit": "215ab684a204965497c4f841b110f0621ff1f09f", - "sha256": "0ns51z9fmqkypnm8s0lzkglds073rlbq8n0v78s84l82bir0kwzv" + "commit": "b61df3561ea9bed1848cf69b6bb53f7fdf6916dc", + "sha256": "063jw3b94l43j31piygjcjzqp2gf828xr3da1hd3qimp25c9fsv6" }, "stable": { "version": [ @@ -19231,11 +19662,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20191022, - 2033 + 20191227, + 1527 ], - "commit": "320cc8cfc67e33c86045ef3e79b7627b91b9b517", - "sha256": "0pzlwxsa823sbcf2nq2lw303cld2jc2siaaiafld0qc4xasg9zyn" + "commit": "a492387de86096bd274834bfc9e8f35ef708b958", + "sha256": "03wsj02mqb6czcx5205fzfg3bzxazy2hmkhjac4dr2qma09w59j5" }, "stable": { "version": [ @@ -19297,10 +19728,10 @@ }, { "ename": "drawille", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0nkhy00jx06a7899dgyajidah29p9536mvjr7cyqm99ari70m7y9", + "commit": "e45ddc0c886fd2bd89ef24c99110c9faf0a05776", + "sha256": "1rsnp3zfp4y6bjdwr2adys91gc4jph3cgwkbj9r1d07xvh5fpfwm", "fetcher": "github", - "repo": "josuah/drawille-el", + "repo": "emacsattic/drawille", "unstable": { "version": [ 20160418, @@ -19380,8 +19811,8 @@ "deps": [ "php-mode" ], - "commit": "47fda0a38a5b197f4606137d9c3b7d44aaeaa886", - "sha256": "1rg46prsymxc9lyhk7cbr53089p970mmmybiir2qsyx2s4m6mnfl" + "commit": "ee53f9e12bb3a80d65876a005b3a5a8ae6c7ab59", + "sha256": "1nrgx70gb1v84zn11a30ix24453g34v2zxw20d9w2xs9fv7vx55x" }, "stable": { "version": [ @@ -19407,8 +19838,8 @@ 20130520, 1655 ], - "commit": "cddf1dbc71fb4c5c4c50317db6830467fa97cff0", - "sha256": "0fr275b7k66widp0mmbm7mjmk76hgxk89h3rcfva4wwkflhymhhl" + "commit": "4087c28c89a884ee050961c57166e6b09085f59d", + "sha256": "1hjs8jbbflj56dm87mkzray75dlczy6p58lpkr8lvh7wnim4pd6a" }, "stable": { "version": [ @@ -19443,8 +19874,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20191016, - 103 + 20191215, + 2352 ], "deps": [ "cl-lib", @@ -19452,8 +19883,8 @@ "s", "seq" ], - "commit": "abf5f50fd2bd2697f0c07991ab05e0132ae7f50d", - "sha256": "0zdmsqlb4ph9cdpl0gvvyizjdgygwdmww5vnsz3h84chzpza9x5q" + "commit": "be7a8e148c022f73794e168dbba2ae821f400bf7", + "sha256": "1n6idkkmpbjrasacbyxdbfmxcy1v2kwxfwnbndmwn0pl9zqk4kbc" } }, { @@ -19561,8 +19992,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20190928, - 1758 + 20191128, + 1910 ], "deps": [ "dash", @@ -19570,8 +20001,8 @@ "popup", "s" ], - "commit": "34fb76982dafc62f8105c520aece4c3ceccb7307", - "sha256": "1f6hgrklnbadr15qnsb4icn3xa589cs3ms2jvn1fndbhv4ms2hv3" + "commit": "738d40ceb7e2d6a3a26f7f27a31ba93924baaa2d", + "sha256": "0fpvzxvn6vhqsxqjhsxdf92x8vsiwyapgahbzl8c5bvq9rqdmlfi" }, "stable": { "version": [ @@ -19615,17 +20046,17 @@ 20191016, 1241 ], - "commit": "72ed306bc42175675c0cf227c7073d3522c683da", - "sha256": "0m8xy6fgv33j7r414959fy4i0d0lq8pl6qfnwrzln21a5j99dvah" + "commit": "78495a08c9b271b324d0b2485dda539599c0fbc9", + "sha256": "1765z4v30crrsivvhr3qqspj3n0rhpb72isxpvbabswyawh4900m" }, "stable": { "version": [ + 2, 1, - 11, - 4 + 1 ], - "commit": "f7ac8f5c8fed67d31c2a63669006829263c2fe6d", - "sha256": "1bbicrfsrcc67v4q5qfi2vbzpqhzj5v55z9vkp6sljwnwfvm8jzr" + "commit": "4cba00ad7b228c46166404412dac92436c1f86de", + "sha256": "1lgpzf2mca3rh1mg46vn0d5jb7afm26p8n83iv5ngjarwd5064gk" } }, { @@ -19813,10 +20244,10 @@ }, { "ename": "e2wm-R", - "commit": "9a3ba9843bdf275815b149e4c4b0a947bbc5e614", - "sha256": "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "195qgcdkz1913bvr8pk0yakp83phfn8i7gjv9s0zi8alwwpm3cw9", "fetcher": "github", - "repo": "myuhe/e2wm-R.el", + "repo": "emacsattic/e2wm-R", "unstable": { "version": [ 20151230, @@ -20015,26 +20446,26 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20190801, - 213 + 20191230, + 1057 ], "deps": [ "ivy" ], - "commit": "8b54294af9c0ad8d6e40932b2b384fe760e56209", - "sha256": "1iyw3gs0ab6vi5x2r6m0caf984yg0fqbn3mmsqmnap2pk1cr259w" + "commit": "a25c28f4ee1126d1ee51dae22843f3440520f1a3", + "sha256": "0pz894saz6ncira9ag9aqmfw394v56sfxldv25phh3z44y1ij01z" }, "stable": { "version": [ 2, 0, - 1 + 2 ], "deps": [ "ivy" ], - "commit": "ba6a95838422ec33191beaa12b3e43b67c105abc", - "sha256": "0ksn11sm3g1ja5lpjz3hrzzw8b480mfcb3q589m52qjgvvn5iyfv" + "commit": "e074682aa18bed4fd68068a48ccaa970ae6d4e33", + "sha256": "1kb14p8004kaqxq765nv5rn8xniw53g4zafcy9wkv9b88bixb7q9" } }, { @@ -20075,28 +20506,28 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20191013, - 1814 + 20191215, + 318 ], "deps": [ "popup", "request" ], - "commit": "0ff8033adc13ada55259e6c2fad27de143325917", - "sha256": "0hk7kcl598d43fi9k6c278syz7f11szpmi6x6v0vjaah805a07jb" + "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2", + "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl" }, "stable": { "version": [ 3, 8, - 43 + 45 ], "deps": [ "popup", "request" ], - "commit": "02f7f06d9d1e66cef6df9768dc2400217f488a6f", - "sha256": "17l7zpc7vcn4g19q78fj1pxmh63x5xf081x4f79d1v23fnakqrdb" + "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2", + "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl" } }, { @@ -20107,26 +20538,26 @@ "repo": "masasam/emacs-easy-jekyll", "unstable": { "version": [ - 20191013, - 750 + 20191215, + 1016 ], "deps": [ "request" ], - "commit": "c6f6640848df1b73fa04cba10a7a22dc9cc49db3", - "sha256": "1m1xn4b6dny1h7vq99c18s8lmxps2xzh5zy8bzms241p2d5zbbvk" + "commit": "063f69505f4559b77fa4a5418df1a53849b29f19", + "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz" }, "stable": { "version": [ 2, - 2, - 23 + 3, + 24 ], "deps": [ "request" ], - "commit": "23d95261dce28a73e4ab11b10f447bde829b8a1f", - "sha256": "08y6v7rz33pw2crq3lq06sp7lvg2ww9afdwa41bp5i2xrlz069x7" + "commit": "063f69505f4559b77fa4a5418df1a53849b29f19", + "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz" } }, { @@ -20284,26 +20715,41 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20191015, - 1716 + 20191207, + 844 ], "deps": [ "parsebib" ], - "commit": "622faff85836383d8cc1a40ca65904338247785c", - "sha256": "0y75jdcd10l77ggxk7fd9ppkygm77iw35vscnj0yfms72qajava9" + "commit": "99bd909f47f71e024ce324981109b73a50e82fba", + "sha256": "131vgl4d1j9s4055x88409w19q52x2m0x08b961hylp7yb5ljzgh" }, "stable": { "version": [ 2, - 17, + 19, 3 ], "deps": [ "parsebib" ], - "commit": "7a1e570e3d540e4c8d30bf1d23b62a30c1ae65a6", - "sha256": "1ifqa0scvq872yhvb6p6x2y8yilbnf754rdbqa69s0rvv9qzhvw9" + "commit": "d69f59ae83ea92c17cc2f92040b76d9e47e12b81", + "sha256": "19hnrrvb0iwkmj095mqvm9qdpm0crr6f3268h5mh6l3qbm4zpj4l" + } + }, + { + "ename": "ebuku", + "commit": "2f38ff73025a8645e9a93d27dc2c19446920737b", + "sha256": "0f9gm24cw81hfczas7w5k7dcr5n255ffskp926ks4wwvl4bpvdpq", + "fetcher": "github", + "repo": "flexibeast/ebuku", + "unstable": { + "version": [ + 20200105, + 201 + ], + "commit": "9ca9dbd65112157b265dc040db2e8fa9504d5d21", + "sha256": "1frk27lba5g195a03mf0wyyhbghi614zkzkbmm2avkvqzq7649mv" } }, { @@ -20368,11 +20814,11 @@ "repo": "abo-abo/eclipse-theme", "unstable": { "version": [ - 20191007, - 1354 + 20191113, + 1518 ], - "commit": "0381586948f4b0d56f43c4587afd618063834986", - "sha256": "0rzq6qfy7ssy4mmaysjw1l78xs2pgnhfl8wzad7yaig3hs71p81k" + "commit": "dcf97865512ed450f9d5137c1a05e12edb5b7f80", + "sha256": "0nv0cwn9pjvy54b2pv9ncr6xmh6nnrdcdyqmcahrzmlvgy4ks8ra" } }, { @@ -20662,17 +21108,17 @@ }, { "ename": "edit-at-point", - "commit": "a63b22f357b2d08b12fb86c27261ab4d687c5f7f", - "sha256": "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df", + "commit": "2c01af1911a0c8856e3dee09b6d233f821d67814", + "sha256": "0ris81wld73h70arvc7zpzvk2wqqmzbpa090vak71w9xgw1jfr36", "fetcher": "github", - "repo": "enoson/edit-at-point.el", + "repo": "emacsattic/edit-at-point", "unstable": { "version": [ - 20150716, - 1324 + 20191013, + 1218 ], - "commit": "3b800c11685102e1eab62ec71c5fc1589ebb81a7", - "sha256": "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w" + "commit": "28c85a65c9c61f2aff50bc5e93f61cde26a5d9c0", + "sha256": "1wciwx9zk28r21v9ampjd8wn19g19ia7hiq1x0hami479dxwinfc" } }, { @@ -20702,11 +21148,11 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20180422, - 1807 + 20191103, + 1013 ], - "commit": "de645d8144e8a08f039a9c88185121ec81d957ef", - "sha256": "0xg6p3ccch9k920xhhpyhn5mkgc0sfyxsn8l1wsc6vbbp5h7wlad" + "commit": "935ded353b9ed3da67bc61abf245c21b58d88864", + "sha256": "0yghm0l4wickhqc29ykjjg98xb91djr1f6n6ihc7ymsv0yhw5wc4" }, "stable": { "version": [ @@ -20809,14 +21255,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20191025, - 806 + 20191127, + 529 ], "deps": [ "cl-lib" ], - "commit": "59c734af576b6ea505718a2294eae9f3facac477", - "sha256": "0v3ymgbh4ap5sw71aa7ycxd0yj4qga5ngsshd80i2cg9pn5qz0aj" + "commit": "65f8244ffbeb9bf2720d922d4b5fc74849b9af82", + "sha256": "0ifz26mnv53mlk2vvyb2vrrid58y4dbw7wk1pfxxv0xbam9rihh4" }, "stable": { "version": [ @@ -20955,8 +21401,8 @@ "repo": "tjarvstrand/edts", "unstable": { "version": [ - 20171030, - 709 + 20191217, + 630 ], "deps": [ "auto-complete", @@ -20967,8 +21413,8 @@ "popup", "s" ], - "commit": "6ef4bdf571235ee1b078db321402270cabff7fda", - "sha256": "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi" + "commit": "6e08bc97ce8a923a6ec4e0af442e861ad5010298", + "sha256": "085rrmcwpy0jdj84jiiz8wpscsnicp6flj96pc45g2f3arqccgj0" }, "stable": { "version": [ @@ -21065,8 +21511,8 @@ "deps": [ "dash" ], - "commit": "d98524799f95c6c6bd972e52790e7e6b9003725c", - "sha256": "1zyni0z4bnns37f7ylxm99pdgggd8942lkwjkl8x4qglpb9ibiri" + "commit": "64511754e123687930afdb5b05cfcc24a30fbbcb", + "sha256": "1bxf5wssmpgnidf228frzw347fx8fvcqsj8rpg83fz315i16nydb" }, "stable": { "version": [ @@ -21113,20 +21559,20 @@ "repo": "egison/egison", "unstable": { "version": [ - 20190714, - 236 + 20200107, + 2333 ], - "commit": "65dff2c90834dda505ccd1d8401f3e86689aadef", - "sha256": "1mw2cjflh1r5irj0362rvg90gklrxj1b5kwcdjq9brj26g3fzpc9" + "commit": "84b42d0532561c902ed6dba40b134fa7f3cc1dcd", + "sha256": "132aj070k7yqzq01bwyipnvg6m5v9rggrlhc5rx0zzn9qy49x5fy" }, "stable": { "version": [ 3, - 9, - 1 + 10, + 2 ], - "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", - "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" + "commit": "fa7adfd9abf5f7cf61fbbdac6a2add4f46d0c659", + "sha256": "15rf1mhzgaadp2kf5vrvnylc08fmq4ilpgsk55if8y337aafvy7i" } }, { @@ -21137,15 +21583,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20191024, - 1132 + 20200105, + 1332 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "32ba9d09ec40c68b086e6ff0a2d7c3bdd8393df0", - "sha256": "059bm1chzxvfs46izshc2q1fgg1c0gpffasjg5lgh49vk66jmyxf" + "commit": "a4c83a65cf0054de1cfa0d74d7261a5177ebfb63", + "sha256": "0zwyc8mvxpdg661mkm2kv5b3sf4nixq0c3lg7liz1r2vdjm5pjqv" }, "stable": { "version": [ @@ -21161,6 +21607,38 @@ } }, { + "ename": "eglot-jl", + "commit": "5f04bf5d68dc12aa3f3fd66591d45cc894e59df6", + "sha256": "0ffbxzhx1fqgqlfk8gqdgyfsc98rqw7mbrdd99qx9gds1pzzx4r8", + "fetcher": "github", + "repo": "non-Jedi/eglot-jl", + "unstable": { + "version": [ + 20200102, + 1615 + ], + "deps": [ + "eglot", + "julia-mode" + ], + "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a", + "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "eglot", + "julia-mode" + ], + "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a", + "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm" + } + }, + { "ename": "ego", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09k33ggc6n7wgykaawbmh6hyrl9dqp0azaq9zcjhjbc88nszj7fj", @@ -21191,11 +21669,11 @@ "url": "https://framagit.org/eide/eide.git", "unstable": { "version": [ - 20191001, - 2003 + 20191213, + 2119 ], - "commit": "eafa97e61383ef943bd6c3f8c7d50953257d4ae1", - "sha256": "1gdiblh6c7wsdrsrlh933xdx74nwrda7gq860lv05lc0a5j860mj" + "commit": "2153a68b58910e7892b16cc32414e2be99e33f36", + "sha256": "17fbxijpiachsb16ngbv7wpy9f4m0456bc5q9g7z8qi28dgzlz9p" }, "stable": { "version": [ @@ -21230,8 +21708,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20191020, - 1934 + 20200104, + 1609 ], "deps": [ "auto-complete", @@ -21244,8 +21722,8 @@ "skewer-mode", "websocket" ], - "commit": "876cba2049751b39f9f12929afb75aacc034ea64", - "sha256": "0jy9rhh7arbg9y1yng2gk48dvk2cifmdn9wnzf0sifn8m8cld8fv" + "commit": "41d8e61df6f18f5accc341e7ae42e03069501870", + "sha256": "0qws01ba15rmc1bv3qzwzzcxl764iyr1xdzs7zsfay7s91px9cr0" }, "stable": { "version": [ @@ -21319,8 +21797,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190924, - 1423 + 20191201, + 1636 ], "deps": [ "auto-complete", @@ -21329,8 +21807,8 @@ "direx", "spinner" ], - "commit": "99f2928624e19efc4eb7736e0e722161d9781fc5", - "sha256": "0xqhma6l1zmmkxsb1b3pzdwjz95237r2ibkhqrqfys30wi5xkk1z" + "commit": "c151fdfceaa9cb9009878c30134cc45dd6386441", + "sha256": "1rvbnpxzg0qd47rw1w431mdjw3qf8lf6d5a2152ii6aa46jg9a3l" }, "stable": { "version": [ @@ -21413,8 +21891,8 @@ 20181006, 225 ], - "commit": "29b43a17559bbf38d7a1db1edd5b524cacc4401f", - "sha256": "011i33igq9df0bcmk938yibgj4b417ri2pz16j6klwnnbl8dqkq3" + "commit": "8f60d6249a2f7a5518d1a95a6d6a06f1f45cc6ad", + "sha256": "1rnvs3xrcl9fk5ryp0zdx6gcp4y8nnq34wy38zbhf1h87zd40px2" }, "stable": { "version": [ @@ -21527,11 +22005,11 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20190702, - 2147 + 20191114, + 1639 ], - "commit": "1ea0645280f8e3d9a6858ec9050f4e260b52f6ce", - "sha256": "025yglv0wkm2gx4yncyqwgvl9h5zcnap3508qb824jncla5jnb92" + "commit": "4744d6b1a5405001cb75f2c362a681964367319c", + "sha256": "1l4rjvdrdzvgq5zq6njg6gv0b7p6j545h4v27mpyxfh3z5jc8c49" }, "stable": { "version": [ @@ -21756,11 +22234,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20190713, - 2309 + 20191218, + 1744 ], - "commit": "1e1cf35cd9f0a5d6f4a3757860e066d7ac482c39", - "sha256": "0mfsd4f7494k9p9wm6wn7abcacxv8lxsfjnj6cbin7b8992rgq01" + "commit": "88bc8f6f6b92a9d3095d55e4ddc3601ea13d4447", + "sha256": "0vsfnlrp3s64iv34mdzjp3shm63sasfmiddi7ig70d0a9ylcnvly" } }, { @@ -21804,11 +22282,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20191008, - 1427 + 20191102, + 1433 ], - "commit": "033df7175d454708460818c66ad9a8c589540ca9", - "sha256": "16shcbq8hl2xmbzyfk727sbbxflrkpms48y715hw4iy2a2qxnbwq" + "commit": "913786070769fac83e7b8ef790b57c8d8cbf8853", + "sha256": "0lgwixznvrmgzkridbsmhxqdsgchs5k56vb8nmpmchgf08qvaiz2" }, "stable": { "version": [ @@ -21878,6 +22356,36 @@ } }, { + "ename": "eldoc-stan", + "commit": "e4ae4feacc7d83ad2acc8db83cf6339b6c63ec3e", + "sha256": "0ah6fbz039lyb9xf4q379h7y0df18r1vyri6nq3lmhj3zw3042n1", + "fetcher": "github", + "repo": "stan-dev/stan-mode", + "unstable": { + "version": [ + 20191106, + 131 + ], + "deps": [ + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + }, + "stable": { + "version": [ + 10, + 0, + 0 + ], + "deps": [ + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + } + }, + { "ename": "electric-case", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1ch108ljzg5xkk4pkfpfxm8v2yzqk79q3h2zhzzqhsydq7r07bdn", @@ -21985,20 +22493,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190903, - 1137 + 20191227, + 426 ], - "commit": "69b0320156cbf7e395efa670464d4651f708332f", - "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" + "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd", + "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq" }, "stable": { "version": [ 3, - 2, + 3, 0 ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "9b5a0ce648cdaa59f7c96414ee868038e08ea29d", + "sha256": "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5" } }, { @@ -22054,28 +22562,58 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20190616, - 301 + 20200106, + 1038 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "92961499adfdef3c038af3dff24b435e9fb4bc1a", - "sha256": "0sybvs9wwf8bvf9615pvhgswz3g6d34hic22smcy7byrlq8hrba5" + "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500", + "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl" }, "stable": { "version": [ 0, - 5, - 9 + 6, + 1 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "c5faca15ccfe7e03dc4ee1372a07671c20015737", - "sha256": "1cdg111dgpphlpv2csv9nr5p2zjk3qss7bf0y8485nnzcin4ip9f" + "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500", + "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl" + } + }, + { + "ename": "elfeed-score", + "commit": "e981f8adeb5015d966e733496280d5cea457228d", + "sha256": "0jag1ksmnql61303a51i2lizd2yk4cjlsm2hksqqjk46cwv2cvl7", + "fetcher": "github", + "repo": "sp1ff/elfeed-score", + "unstable": { + "version": [ + 20200104, + 2247 + ], + "deps": [ + "elfeed" + ], + "commit": "7c76684ceccb0623f3320c16ea22c04b5ca4433a", + "sha256": "1qzmgryk9dg3jmz2v6mrrjbmkzik4isxlh02zmh1ajmcr93hkn3v" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "elfeed" + ], + "commit": "b1419ac54e5dfaa4b88352a3919e7fdedc61bb17", + "sha256": "0pkvq0f7linwxm9vv389wjhw60v3jcgw71q5ic4nrvayizx6ld5h" } }, { @@ -22086,28 +22624,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190906, - 2012 + 20191123, + 1738 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "69b0320156cbf7e395efa670464d4651f708332f", - "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" + "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd", + "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq" }, "stable": { "version": [ 3, - 2, + 3, 0 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "9b5a0ce648cdaa59f7c96414ee868038e08ea29d", + "sha256": "0j8a94val4ml7g1vcjgzk1w89h55sxfdrwnncmz6qbh1y2xsz8c5" } }, { @@ -22118,14 +22656,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20191022, - 1746 + 20191203, + 1227 ], "deps": [ "async" ], - "commit": "13cfea5df14a24fe71afe6efd167caf107497698", - "sha256": "1g4rnc3y5ivz5ix0xvcai9wiq4kzqnv8skggq9vx1691p3s847nl" + "commit": "4a139c820c9dfe00dcd403818051fc78fca87782", + "sha256": "0g70d1a2677ga3f8lp0f4k8vr7j4fjdxn790fah9zcmc23nl8g6m" }, "stable": { "version": [ @@ -22196,20 +22734,20 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20191025, - 1021 + 20200101, + 1259 ], - "commit": "0c4948c08b8616f3e24fa8b6deb758f199e12fda", - "sha256": "1nqkzicika1ndw0m62xjaa0szfpz7ls15m2fbhk91sqk1lwf213x" + "commit": "d61fd603f115214c582436fc7f4798a711b69de4", + "sha256": "148mqad8mk50zbjaacdjngb44i7maqxx8i71kwbaw27pgbcbfpbl" }, "stable": { "version": [ - 2019, - 10, - 25 + 2020, + 1, + 1 ], - "commit": "0c4948c08b8616f3e24fa8b6deb758f199e12fda", - "sha256": "1nqkzicika1ndw0m62xjaa0szfpz7ls15m2fbhk91sqk1lwf213x" + "commit": "966517c818c8fa0440c10a66008a2c209af8cf26", + "sha256": "02axxz3xin5n6kr8cmn19qqv96agcy8ml2apwwgrmbxrvqdhm1ia" } }, { @@ -22265,20 +22803,20 @@ "repo": "gonewest818/elisp-lint", "unstable": { "version": [ - 20180224, - 2042 + 20200102, + 1550 ], - "commit": "04b0d36ec0e4dc1bb54c2bf4c2d16b2af8cf6a39", - "sha256": "04hxpfgvkh4ivaxqbhnp3j68i1kqzg1v19bssnvcagll2mm4r3xg" + "commit": "f8316b84513261b17817006f5fcc25599d8e12b2", + "sha256": "0xv5n2qlk5i1jx441m5nhp1w7smyx5szv0jy7iayz4a3kn8lkvis" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "9d894e99377859171ee54cb7d2b2e7f2cc7c267c", - "sha256": "11pvqskjhxxsyxmy8wllqwa0qg0j9280h0m5rzjghgsdcnlisyvq" + "commit": "d4dc13addde8cacd7660efcb369af5e54a547114", + "sha256": "1zyy8dj11sn74wq86hibp17a1zbps2pv26ncn8fh8wvsfy1vdfif" } }, { @@ -22366,14 +22904,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20190831, - 2225 + 20191203, + 408 ], "deps": [ "pkg-info" ], - "commit": "5c50dcedd890f14e0ede33b74ddf86607b037239", - "sha256": "0hi8ly4jplhlh4mrmwlhz44w50ccjbc4w12jkacjc82gay8m8yfa" + "commit": "5920edcf19f0526bbee97b01435c4b8bf3b59c36", + "sha256": "0ymxrc0qy4p1ryffj8a57f6jn3i4ll5z0ay56m5fh9l46xz6b3am" }, "stable": { "version": [ @@ -22445,19 +22983,17 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20190815, - 555 + 20191228, + 2356 ], "deps": [ "dash", "f", - "let-alist", "reformatter", - "s", - "seq" + "s" ], - "commit": "834fb5037424c47155518ed27537ef7ad6addcc5", - "sha256": "1jqp9n28xgxbp1xfqw1vpv9h5q41xirxcfj9257p2gvk1lg1w7jr" + "commit": "de2521ec8f47e7ef1a5120d7ba0e0d7cba94498f", + "sha256": "0rzrizzbrmsyd6703fqkabx7k7fh5n2f4skrisgcwph2sqzn89wy" }, "stable": { "version": [ @@ -22515,15 +23051,15 @@ "repo": "Silex/elmacro", "unstable": { "version": [ - 20190823, - 1308 + 20191208, + 1057 ], "deps": [ "dash", "s" ], - "commit": "5bf9ba6009226b95e5ba0f50489ccced475753e3", - "sha256": "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a" + "commit": "ba4086ef241dadfc2b1ce1bcfa56e12dbb89ef58", + "sha256": "0q29h3y6q1xkz2jx9bvrk8nvmisv1di2l79yc3zrw5k4hirq8j2a" }, "stable": { "version": [ @@ -22739,26 +23275,26 @@ }, { "ename": "elpher", - "commit": "df2162816fed4d5da7ee5adafbf547eed8815418", - "sha256": "1csy26ra6kgm2rnf1s6bj254r18zkaf6y7kb3rrjm1msw3vjvvr2", - "fetcher": "github", - "repo": "tgvaughan/elpher", + "commit": "d87a0f3142e0a59842608576961707c98374f954", + "sha256": "1i52q6xsyabl8gg8cd29d24gnw6aac69pjif2yh0rijxvbcl2a86", + "fetcher": "git", + "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20191014, - 1459 + 20191212, + 1858 ], - "commit": "798c375e25d988da94915f2949c51cb8669faf86", - "sha256": "1sp322h4m2n35q65hp9myfgh9nc53pddr5bg133n9gyp7sywq7w8" + "commit": "3f56dde4342dcfecc2b8b4d1c6e07436d2ab9991", + "sha256": "0872dis1zin58fljbyzvvyd5z6c27cw8ikxgd8s57addbi4s6ffh" }, "stable": { "version": [ 2, - 3, - 6 + 5, + 2 ], - "commit": "798c375e25d988da94915f2949c51cb8669faf86", - "sha256": "1sp322h4m2n35q65hp9myfgh9nc53pddr5bg133n9gyp7sywq7w8" + "commit": "12629c283e0e3e62561d1456a2f8842b3524df57", + "sha256": "023ih6bgqf98jgzqy03nplwxhabaj9x9dqk3c8bmd50ndgrspc7q" } }, { @@ -22769,11 +23305,11 @@ "repo": "twlz0ne/elpl", "unstable": { "version": [ - 20190704, - 1130 + 20191229, + 1929 ], - "commit": "341dd89aa2a0315ec63d476d79057be8b5f5386f", - "sha256": "04m9dinhgwgqry7yblc9wryv8sikprqflijjfdk8319c7kiddl3h" + "commit": "48ecee2aa7b3d085a3deff809fb3ae31ae4ef9dd", + "sha256": "06xqww1r3i2hlr4hyg4n2l9zbpiki3g90b51jylaiabj4gqfswzv" } }, { @@ -22784,8 +23320,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20191024, - 2007 + 20191229, + 2252 ], "deps": [ "company", @@ -22794,25 +23330,24 @@ "s", "yasnippet" ], - "commit": "ddc1689f9bc6719568feb522e54054f2b2cb64e8", - "sha256": "16m96l1krpg3d2xnbr7jc65pqvczlkdpydp9gyh1b2qmhg0hqhf3" + "commit": "a698cfd03e35a7b821fa343e4e13d1c5a22902da", + "sha256": "0wxjwgrac2r3y9q83gjb95253r440db39npqpisj4r9zxkn5ss3m" }, "stable": { "version": [ 1, - 31, + 32, 0 ], "deps": [ "company", - "find-file-in-project", "highlight-indentation", "pyvenv", "s", "yasnippet" ], - "commit": "54ed6fe219689e187286c8808041b6f61718b025", - "sha256": "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk" + "commit": "d54e78edad91660caaabd19e4a6e416889ccfe31", + "sha256": "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj" } }, { @@ -23098,20 +23633,20 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20191021, - 1312 + 20191226, + 1614 ], - "commit": "a37c328eac07936ccb3e3e225a764c10e81fd3db", - "sha256": "02dy68df31fgdw0isxckg3nysnagxfxy65kgvcndbpb8prvpm0md" + "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", + "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" }, "stable": { "version": [ 1, - 2, - 8 + 3, + 0 ], - "commit": "457fca9d4bb0429b08c8f4e675f8b1f3e48297e3", - "sha256": "0vpvdnmg95nk9bmrjysbpfwbyzxhipdqh9xfphxi2n63sd0vzk7z" + "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", + "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" } }, { @@ -23275,14 +23810,14 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20190926, - 1542 + 20191211, + 1229 ], "deps": [ "emacsql" ], - "commit": "e3c434ac212d77f112d4dc9e70784ed2ac48c649", - "sha256": "08szs2v7cz4155d2hv7ja40n81r3ph395gr5himi496a6q9kdggr" + "commit": "998ba547bd14c7406ab5d59820ef140c1819784e", + "sha256": "026hkbf90sp3q71g2pds63dvnfpw2q1i66vglfy42502c08l8285" } }, { @@ -23293,19 +23828,20 @@ "repo": "marcowahl/emacsshot", "unstable": { "version": [ - 20190715, - 1808 + 20191206, + 944 ], - "commit": "1b5c080135b963c9a7f2d34230b3134a9fb3d345", - "sha256": "0bklypf31y374xqhq3b24srfbr95bi3km9nrxy2wwcak8ia20pg5" + "commit": "fe958b11056f3c671ebdd604d5aa574323284ca5", + "sha256": "0zg52b3hl0rp9hjz04546kngssxs0l64dm01bwp9hapy7pichbci" }, "stable": { "version": [ 0, - 4 + 5, + 0 ], - "commit": "f2f8996d877ece5469c459c9bb7f33fe43c95822", - "sha256": "00q344vgihl2s0snibfwsjvxqkbvy2jlqnnid7qw5gcni673b2hl" + "commit": "f0add6820d250875f7d7c21aa5d813dc73dbcf96", + "sha256": "18bnw6yb41ki1xvkhi07v7fqx3var928majgd6613ra9nirnyqnj" } }, { @@ -23382,14 +23918,14 @@ "repo": "madnificent/ember-mode", "unstable": { "version": [ - 20190928, - 1451 + 20191123, + 958 ], "deps": [ "cl-lib" ], - "commit": "f0324b20b6f4e6154a7ea787a2f4d6be464a90e1", - "sha256": "0mlj9q1k49wjx1n7dghmpk3pbbqyl4ljgdk7j23lmrq6hbmc4vf4" + "commit": "34373dd9413986288b2709365b2725e9390ecf9e", + "sha256": "005c679f9gpjixdcidsb50vzkg4gsy5qcz4rdjr84nspxz6nvjjw" } }, { @@ -23526,25 +24062,25 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20190905, - 2111 + 20191205, + 2229 ], "deps": [ "cl-lib" ], - "commit": "2bad5e6cf7442cff492cafe896c47719ae77b8fb", - "sha256": "1bxaa1mzx5l1pp16j14y66cywpr174y6q7rhk5qr60lfjjfgj3h6" + "commit": "eedd61d9639de043933293b662a148d57d2f8a2f", + "sha256": "1nx0xvl03g2626xszqv9mw6v6xa83xxsjm11522g0srfvibj2iwn" }, "stable": { "version": [ 5, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "2253146e5607e12f62b0c1c474fded1219da2d5d", - "sha256": "0r0ai788mn5f3kf5wrp6jywncl2z3gpjif41pm5m0892y7l0vh9i" + "commit": "a8075b52fa75c5b53892214e6ca89fe0b42a04bf", + "sha256": "0jp96s0pglmrcgcyn9cp4rn2qlk9rf0dq6avrr5wiigjjkl33fip" } }, { @@ -23887,8 +24423,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20190810, - 2133 + 20191122, + 1911 ], "deps": [ "cl-lib", @@ -23901,8 +24437,8 @@ "projectile", "s" ], - "commit": "ed430d55bd7504cb51d9f2b9e1b3c4b4ca93dafc", - "sha256": "154vzwxw3mlxxjmvi8aqxmpww6b4gvrcq6aw7w1gi3yb048pgkyy" + "commit": "8038ab88a000a835ca73af2068b1ef536bc7e33c", + "sha256": "1d27y6chxjf4k9cgsk93xjf1wq9lrv0516lpnqqlp2rdd7m3nv7y" }, "stable": { "version": [ @@ -23962,23 +24498,26 @@ "repo": "hrs/engine-mode", "unstable": { "version": [ - 20181222, - 2027 + 20191105, + 750 ], "deps": [ "cl-lib" ], - "commit": "117a9c0cbc1ff8ade7f17cd40d1d2f5eb24f51a3", - "sha256": "1pm6xi0bcab3mpmvy8g449d5iv8s3cjqqvm2rcnlz1d6223pszh0" + "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", + "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" }, "stable": { "version": [ 2, - 0, - 0 + 1, + 1 ], - "commit": "243d04691475b47a4453ad7106d8268ca14d9f28", - "sha256": "02xas46nl28mascqsyr1zcd4hn15bh0fjv2xlxv1kmrj0pis94ml" + "deps": [ + "cl-lib" + ], + "commit": "96b3488a6de2f50b8ba3a101e04ebcbe9821a989", + "sha256": "1xka8i4cdvp5r2v2mkli1zz17x1sdsnmszbhqav2rf94v656d91i" } }, { @@ -23989,18 +24528,18 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20191005, - 2306 + 20191111, + 2243 ], - "commit": "3b97c6f7c4e0e462b74d57d3a0164f6b6f9b498e", - "sha256": "07qk8pbwp8bk5dmcsnmyw08b6nzy7dh4asdraw8ml0rpdcqvvlxf" + "commit": "732331b99a0884dd7fc0149658d4090886857656", + "sha256": "12wip0l6xyqgvxvjvid1rh61yizk1r9y7xl1jz2sjds7kv6aw0kf" }, "stable": { "version": [ - 20190408 + 20191111 ], - "commit": "5c5ea7532bfff3c12c2a554d68c5def1dd984a40", - "sha256": "1asr52rg3230avq2bwl06nnrgkym98i7gas0xrs2vqyyaxbcpb1h" + "commit": "4e058f36a455c90816fd9615a4a7a63a8c8b8cc8", + "sha256": "1jpiyjb5291jk6pd649d6i8nxaazqjznb3zpksp7ykrqqgw4wgjm" } }, { @@ -24029,21 +24568,21 @@ }, { "ename": "eno", - "commit": "a63b22f357b2d08b12fb86c27261ab4d687c5f7f", - "sha256": "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q", + "commit": "2c01af1911a0c8856e3dee09b6d233f821d67814", + "sha256": "1agnkykmq8d6mw4cwdw772zzsrwdd28v8m37894w2c80cxmjjrbq", "fetcher": "github", - "repo": "enoson/eno.el", + "repo": "emacsattic/eno", "unstable": { "version": [ - 20160110, - 1034 + 20191013, + 1239 ], "deps": [ "dash", "edit-at-point" ], - "commit": "40075bb1ed9e62f42c5799f3d3721734742ed417", - "sha256": "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in" + "commit": "c5c6193687c0bede1ddf507c430cf8b0a6d272d9", + "sha256": "1khi2x0v2f7kn74s5mszp4f5qsdp6v91b98y8gyzhrxic7n083q4" } }, { @@ -24183,28 +24722,28 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20190807, - 846 + 20191228, + 2011 ], "deps": [ "closql", "dash" ], - "commit": "80098a45909d50aa089d344c6e24cbbae1481513", - "sha256": "0r5h8wdw58maqmda2ldg5j3fmjsih95ikzg34gxfk18sw7r50rpv" + "commit": "075f6afa81f7a83a35088b699ed44d6029192198", + "sha256": "0g1ggna56w3c1qdqi3g1aq4gz6hdpacwc4hd31bqa03gydr8ghlg" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "closql", "dash" ], - "commit": "1aaa64402bf91575ee81bf240c4c52320f68088d", - "sha256": "0ij44yp72y1flcjp2q6yfbrnr4bnzjflgcsksl3djr9nhb73cd5a" + "commit": "ca211c5225aa550374d77629dd9b87e2b0b0d992", + "sha256": "1pxz611qb3m33r6343h0xhwqvvhjl131zyc2klplzgb23rkm8lk0" } }, { @@ -24325,15 +24864,15 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20191013, - 1847 + 20200101, + 630 ], "deps": [ "dash", "tco" ], - "commit": "e8561fe7fc69be9d230437cd164c8be3a7bfb911", - "sha256": "0ivrpgbavjdfn0451d3sl0v9vxpigpqkkjxl80kip7xwdxnlg7mw" + "commit": "4568d865e3524a284808e2a79c7ac9703bd228dc", + "sha256": "1ng1d0nrj0nzp4w209jr0gcnfl7chrlx7m6bapbq11lkf9qwgg35" } }, { @@ -24359,45 +24898,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20191002, - 2159 + 20200103, + 1329 ], "deps": [ "cl-lib" ], - "commit": "8844d418fe249daf425eb0b0e3a41abe6c0ee805", - "sha256": "0v2bgiw08xkscyy0rskmhwk4h9zf8jxmmv3znr65qxhzaf0l4cxb" + "commit": "26e16e0fc3af78e70b095f47995d2a368f8de61d", + "sha256": "197sj97j7mc9jwhamra4narnypdg3xpxy5rb95an5gqqzhy9bccm" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "85706aba3ea03ea15fcf53c611c4257b9ae9c7b0", - "sha256": "1akxy2mh11bjjhhr9vfc09dj3dy2zrz8p1jynnyc7d5iiy0ai3bc" - } - }, - { - "ename": "erc-hipchatify", - "commit": "b60e01e7064ce486fdac3d1b39fd4a1296b0dac5", - "sha256": "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x", - "fetcher": "bitbucket", - "repo": "seanfarley/erc-hipchatify", - "unstable": { - "version": [ - 20170314, - 1637 - ], - "deps": [ - "alert", - "request", - "s" - ], - "commit": "a532275136920aa1a66a1817cfc5880a01974dab", - "sha256": "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc" + "commit": "2a597b39a929f6dff2b7da6439fcee6d2b25d3e6", + "sha256": "0jgkhwfgvy8lw6mws1m44vzh16514xxv34fivghc8kzn5w5ghwv7" } }, { @@ -24798,20 +25317,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20191023, - 843 + 20191219, + 1238 ], - "commit": "8342a099cf94cef4de1c845841bbffd15ecac4a6", - "sha256": "09c25njcaivglr3k955d8difsq447vpzjplnsfj4ikl37jfi78rs" + "commit": "52412c598ad67786032d17762e8655ad3d6771b5", + "sha256": "19d3whdfi21a0mlvgls549s8j3ygcmrw2sk7m36vpqf17k6059fw" }, "stable": { "version": [ 22, - 1, - 4 + 2, + 1 ], - "commit": "6611181ae71422a1c66798718b37474641a090a9", - "sha256": "1n9pf1zxnl5dmv4xihgw7x8a1a4s1wfygr54rzsqw0bjjc86r7ym" + "commit": "4583b137e585e59a3fc7020b781911a6927187a2", + "sha256": "070l0c40jwaq2s19mklq7459a0gd9v81q29xga39rbkv6diqcdq0" } }, { @@ -24864,11 +25383,11 @@ "repo": "rejeep/ert-async.el", "unstable": { "version": [ - 20151011, - 1359 + 20200105, + 1031 ], - "commit": "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526", - "sha256": "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9" + "commit": "948cf2faa10e085bda3739034ca5ea1912893433", + "sha256": "1ixkh6bghrg1criczhdvr9igjcdsijadaqvywyjj6bfwd8ql5x39" }, "stable": { "version": [ @@ -25022,8 +25541,8 @@ "repo": "dakrone/es-mode", "unstable": { "version": [ - 20191024, - 1952 + 20191119, + 2018 ], "deps": [ "cl-lib", @@ -25032,8 +25551,8 @@ "s", "spark" ], - "commit": "6170a2e0976aaa66df364b949c7e109f1202a60f", - "sha256": "1bg6v34cid0kxqlm1qmr934nxqn5bnnd3jmll2i0gfk4w13igm69" + "commit": "9e5bcb290b38d5bd143e0ee480ed49147cfd3504", + "sha256": "13f7s8hk5d3psxp4qzzsqnwawsjj59cmjhmg1zi2c90qhvna78vn" }, "stable": { "version": [ @@ -25301,15 +25820,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20170909, - 1452 + 20200103, + 1444 ], "deps": [ "cl-lib", "dash" ], - "commit": "b6bb2d7bd4e393b4170b29891cfefb72ae020aab", - "sha256": "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y" + "commit": "5a73993f351e89255538f60ae546511362a49c91", + "sha256": "1ja2nfq266mnr1iqyl8g7180xmpi563fjh17xc4fhizhfvp650ai" }, "stable": { "version": [ @@ -25327,25 +25846,25 @@ }, { "ename": "eshell-prompt-extras", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0zkdb9a8dibk832b5hzb6wjich3l0lah5p64805rgd4qskzj10gx", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "1k0cig7chdm349bp6rz9z105njs9bxicnpkcm4v0nrnk59ynj2h6", "fetcher": "github", - "repo": "kaihaosw/eshell-prompt-extras", + "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20181229, - 1418 + 20191104, + 1230 ], - "commit": "5a328e1b9112c7f31ce2da7cde340f96626546b6", - "sha256": "0fwlvrzjygs12dcp89wy3rb3wa03mrvbzpmpvmz4x6dfpr7csznk" + "commit": "356a540f9365b2f37f8a8cfb9c0e0e1994d12f4a", + "sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g" }, "stable": { "version": [ - 0, - 96 + 1, + 0 ], - "commit": "7581c109673c40aceff278cd524273f50ffe170d", - "sha256": "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h" + "commit": "356a540f9365b2f37f8a8cfb9c0e0e1994d12f4a", + "sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g" } }, { @@ -25356,14 +25875,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20190526, - 1452 + 20200107, + 2230 ], "deps": [ "dash" ], - "commit": "2eb91974047f5caf8df3bf3af5014be2cc95ddac", - "sha256": "1iblhp0jvki2lm1jg1g93r3zvxvpjv3pi0xssivypq3bpy22v6cr" + "commit": "ddfbe0a693497c4d4bc5494a19970ba4f6ab9033", + "sha256": "0xqrp8pwbmfxjdqipgpw5nw633mvhjjjm3k3j9sh9xdpmw05hhws" } }, { @@ -25398,26 +25917,25 @@ "repo": "xuchunyang/eshell-z", "unstable": { "version": [ - 20190823, - 2341 + 20191116, + 333 ], "deps": [ "cl-lib" ], - "commit": "ee30761bd368df5f2e55c744ccc44089c7a46b6d", - "sha256": "0ywwvm1xx0p2iqzqmbb908147l8zlyf7gqsz0mgrzj0amqx1rhg2" + "commit": "337cb241e17bd472bd3677ff166a0800f684213c", + "sha256": "13dwaq8q23rwmrkpy3gvf7aswrkk6b9ak5221xl7n0bld4wdhq3j" }, "stable": { "version": [ 0, - 3, - 2 + 4 ], "deps": [ "cl-lib" ], - "commit": "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5", - "sha256": "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc" + "commit": "337cb241e17bd472bd3677ff166a0800f684213c", + "sha256": "13dwaq8q23rwmrkpy3gvf7aswrkk6b9ak5221xl7n0bld4wdhq3j" } }, { @@ -25602,14 +26120,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20191014, - 1343 + 20200103, + 915 ], "deps": [ "julia-mode" ], - "commit": "d31b96e02cb4c5d71effab893da9cd81f30d0470", - "sha256": "0rbasf6kfyyd6r72cqm6sr791f70q95447c240dvx2kjqp1jhckm" + "commit": "2812b85880807e5da35dbf2e69fc1b577f2ad7f4", + "sha256": "055chn6vln1hg9r5fkzddk92c7y2ha42symzkkn0smpwjr12niry" }, "stable": { "version": [ @@ -25925,16 +26443,16 @@ "repo": "kaz-yos/eval-in-repl", "unstable": { "version": [ - 20171122, - 1343 + 20191116, + 1107 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "fea05a5b81d74ac53cb2a83aa83a73d9526bcc42", - "sha256": "0xm1ggdaihy1cyg4b3b9x1n93bp4qiv30p1mfzmmqm6w89z1agf0" + "commit": "0fe2d3fa0fd1739ec096f149dc067b586e05c75c", + "sha256": "0gswgn99pqikw44mp4v6b4bxvh6bj132gq5x3swvkmi3f56l0bry" }, "stable": { "version": [ @@ -25959,26 +26477,26 @@ "repo": "hchbaw/eval-sexp-fu.el", "unstable": { "version": [ - 20190109, - 809 + 20191128, + 825 ], "deps": [ "cl-lib" ], - "commit": "e1d7165383c941b3f11c2715707adc3d91d129a0", - "sha256": "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij" + "commit": "36d2fe3bcf602e15ca10a7f487da103515ef391a", + "sha256": "19rv0kwajq0j8inglp84sml23ci74wdcvp5bl6zxbw5skqpf6phr" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "cl-lib" ], - "commit": "e1d7165383c941b3f11c2715707adc3d91d129a0", - "sha256": "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij" + "commit": "36d2fe3bcf602e15ca10a7f487da103515ef391a", + "sha256": "19rv0kwajq0j8inglp84sml23ci74wdcvp5bl6zxbw5skqpf6phr" } }, { @@ -26051,36 +26569,36 @@ }, { "ename": "evil", - "commit": "440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad", - "sha256": "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39", + "commit": "69567536a89f0294726ae58f748386a8d336c55e", + "sha256": "0nbfhynlv213rjl6jh4lji1q94s99q4iv18mnd3x23r91sx7ssm3", "fetcher": "github", "repo": "emacs-evil/evil", "unstable": { "version": [ - 20190729, - 704 + 20200103, + 1756 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "874beba2cb243c325eca08fb7badff567f3c9494", - "sha256": "1h7s3bapv7g1z87ygmrsisbjjzpwhbsds5ywj2srpifd4llrxa4m" + "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7", + "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i" }, "stable": { "version": [ 1, - 2, - 14 + 12, + 16 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "3766a521a60e6fb0073220199425de478de759ad", - "sha256": "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q" + "commit": "210316cbf9615ade96834e30352366985752f11e", + "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi" } }, { @@ -26260,16 +26778,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20191025, - 41 + 20200105, + 1846 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "61bb63e8f9849980913a0b616b1f53e535724af4", - "sha256": "0cr5r7r4ns1jy9bcf7bq5xiq6kap3knj2in6k226ykklqn5r6zk9" + "commit": "815c127d020f8c45a17fe7b23dbd82240aaee390", + "sha256": "0djrhqvj3x75hj278qfz9pa2ikl4752yc8h0aslhkdvdfvs2nazv" }, "stable": { "version": [ @@ -26475,15 +26993,15 @@ "repo": "Dewdrops/evil-exchange", "unstable": { "version": [ - 20170511, - 259 + 20191105, + 255 ], "deps": [ "cl-lib", "evil" ], - "commit": "47691537815150715e64e6f6ec79be7746c96120", - "sha256": "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa" + "commit": "35dd0f0662789f043bd89a9f9801ffaf4318123f", + "sha256": "1wx8wpdgwhfgf5vykkjw2skbf6xhxmzj40vsq8dj5vhmiq4njw5k" } }, { @@ -26588,14 +27106,14 @@ "repo": "edkolev/evil-goggles", "unstable": { "version": [ - 20181123, - 1946 + 20200101, + 1935 ], "deps": [ "evil" ], - "commit": "78454a7e8bd609edf0d93cb0a7f9ed576dd33546", - "sha256": "1yn72wmrda670h0bz3gdqh6k44ja60wkk9f4hijh9w1hw0vazk20" + "commit": "08a22058fd6a167f9f1b684c649008caef571459", + "sha256": "1p3vjrij63v9nrcyj3b5jsqzv9y7dgv9i1inx1q7x3s90vndavac" } }, { @@ -26794,15 +27312,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20191007, - 1744 + 20200102, + 1856 ], "deps": [ "evil", "magit" ], - "commit": "1decef941f252bfd862be50d99bfbc0660dfa18c", - "sha256": "0n1c9cll6j05kj56vkdp0xnph8dha98780s0bl8ligx90abapbsl" + "commit": "7223dca89c0b4bca9871c453a30a4d4edfdb444e", + "sha256": "1sp1l6p88dj6qpgcmh0caprq0vv6ps6kmqrakrm2kgdnirvzqign" }, "stable": { "version": [ @@ -26886,15 +27404,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20190916, - 348 + 20191202, + 806 ], "deps": [ "cl-lib", "evil" ], - "commit": "1cabb869fe70cef49f7dc06f015c3ade1a969c8c", - "sha256": "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb" + "commit": "007d471e26b44e692250804f82f06ebbd27b6ec4", + "sha256": "1hkynxs42sh24dd842lskysrn0s37c22w2p6422miykczq6dgffi" }, "stable": { "version": [ @@ -26957,16 +27475,16 @@ "repo": "hlissner/evil-multiedit", "unstable": { "version": [ - 20190103, - 715 + 20200103, + 1006 ], "deps": [ "cl-lib", "evil", "iedit" ], - "commit": "cb35914ffabb4f65d22ab2f812ff6e7622cc5c26", - "sha256": "19h3kqylqzbjv4297wkzzxdmn9yxbg6z4ga4ssrqri90xs7m3rw3" + "commit": "c3d43b1a65c193755dae2c41ce5c072c4c01b35d", + "sha256": "0nk5cg3ammn3mlymb093la8wab4jdzh3qhc15s1235vw3s47g6ag" }, "stable": { "version": [ @@ -26991,20 +27509,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20190801, - 148 + 20191231, + 938 ], - "commit": "7132693a4cc684dff232839fed45a8a54d832646", - "sha256": "0kw9ikdax8b55g19c61n8aznavzms61rqr6lwiw37dsc1589nr3k" + "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304", + "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi" }, "stable": { "version": [ 3, - 3, - 8 + 4, + 0 ], - "commit": "f510a491c17192ce235bb7ce7589cacf99db8482", - "sha256": "0qd5a89mzvdyhd8lm13iwp220vzpd6dajwx54frlc5bzsxdmg6vc" + "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304", + "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi" } }, { @@ -27085,27 +27603,26 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20180323, - 2306 + 20200101, + 2017 ], "deps": [ "evil" ], - "commit": "b6d652a9163d3430a9e0933a554bdbee5244bbf6", - "sha256": "176hrw7y7nczffbyhsa167b8rvfacsmcafm2gpkrdjqlrikbmrhl" + "commit": "9d4be14118bf27094a30dbff349b815f098aacbf", + "sha256": "1fxxfkinb0gq4p5b686r7z4jrkv98zfgh5z889zkjacncv8ibswn" }, "stable": { "version": [ - 0, 1, - 1 + 0, + 2 ], "deps": [ - "evil", - "org" + "evil" ], - "commit": "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9", - "sha256": "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7" + "commit": "9d4be14118bf27094a30dbff349b815f098aacbf", + "sha256": "1fxxfkinb0gq4p5b686r7z4jrkv98zfgh5z889zkjacncv8ibswn" } }, { @@ -27122,6 +27639,18 @@ "deps": [ "evil" ], + "commit": "93913d4e9b3a34973756d0c18803dde0ae52cb64", + "sha256": "1qn10lhy05ib9g8yc7cx18ca1hka94ni36fd98ixln6zqlwl6n78" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "evil" + ], "commit": "24c5f43df375194386344e69bc720ea3986c9510", "sha256": "0bqzch14whlmrcasakah3psrzswvkzd7mmi8hx5s64kfp29wbdhi" } @@ -27392,15 +27921,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20180731, - 1731 + 20200103, + 923 ], "deps": [ "cl-lib", "evil" ], - "commit": "8dd076cc56eb9b04494e4e303b86a959b048350b", - "sha256": "05zlmkyl1gms7pk2izh67j7xk4mb5y94jpyx63lg59yc391p5p07" + "commit": "3ec8adfd4990f95fa0fab2b7019ead3596857673", + "sha256": "0q689f52saky3rfap351n4bkjn0kpg7xkjias926affqpghywb1r" }, "stable": { "version": [ @@ -27486,26 +28015,26 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20191013, - 1656 + 20191217, + 1131 ], "deps": [ "evil" ], - "commit": "d210e1fc2cf1c2d095471cefa700a0d1703f4ab6", - "sha256": "1dh716rnyirr580r5y0zvqqx7dbxh459y7r0pcvz8jck5ipiryx7" + "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", + "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" }, "stable": { "version": [ 1, - 0, - 4 + 1, + 0 ], "deps": [ "evil" ], - "commit": "5ad01dfa86424c4b22cd1dfa375f13bd8c656f43", - "sha256": "1ajsi6xn8mliwzl24h6pp9rd91z7f20yvkphr9q7k6zpjrd7fb9q" + "commit": "9b0b17f06cef9bac81ee4800d121265e54718a17", + "sha256": "15v2spg5rhddr97pxjfvxj36sh7knp753a9qpw8v5zjnp65kf2kn" } }, { @@ -27516,11 +28045,11 @@ "repo": "wbolster/evil-swap-keys", "unstable": { "version": [ - 20170726, - 1820 + 20191105, + 1426 ], - "commit": "56bc201e265a6bd482a7c41a7c81d2238341ef3a", - "sha256": "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs" + "commit": "b5ef105499f998b5667da40da30c073229a213ea", + "sha256": "1kawq9c64cmkdjy03sfppjn7g9anxnmds3ip7cgj1j0yym0glyfq" }, "stable": { "version": [ @@ -27577,26 +28106,26 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20190104, - 1026 + 20191218, + 852 ], "deps": [ "evil" ], - "commit": "874beba2cb243c325eca08fb7badff567f3c9494", - "sha256": "1h7s3bapv7g1z87ygmrsisbjjzpwhbsds5ywj2srpifd4llrxa4m" + "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7", + "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i" }, "stable": { "version": [ 1, - 2, - 14 + 12, + 16 ], "deps": [ "evil" ], - "commit": "3766a521a60e6fb0073220199425de478de759ad", - "sha256": "1833w397xhac5g3pp25szr2gyvclxy91aw27azvbmsx94pyk2a3q" + "commit": "210316cbf9615ade96834e30352366985752f11e", + "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi" } }, { @@ -27743,14 +28272,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190906, - 538 + 20191214, + 558 ], "deps": [ "evil" ], - "commit": "1931e3ea2c64b4aec393a9c25063c330deff55e3", - "sha256": "12p9lfxscs182vbd4dy0m5gacs3d4kyprbz5yndpwvl8g2qsqplz" + "commit": "257c66bd7a9162caef3b04137af0dc9360fe3d53", + "sha256": "1saf7kpmz09j1q8nzriqmllxg4l3chqgy9x0j8qz91wflf15xbbs" } }, { @@ -28112,11 +28641,11 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20190426, - 2227 + 20191229, + 112 ], - "commit": "3cfedb8791397ed50ee66bc0a7cbee5b9d78245c", - "sha256": "1mrwsc12j44q9cv9sjz3hhr7pd4z4vj30ha320zlh7pcacs973js" + "commit": "76fbdf5d01bace97dbabf5a4b56b6d9414a7aea3", + "sha256": "0vmdwdn60cq12bh2pinqzpdvd0yqizjrq77zbqszzscblb31cg0d" }, "stable": { "version": [ @@ -28218,11 +28747,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20190416, - 538 + 20200106, + 2058 ], - "commit": "1c31447730443d98f90f65dfcb752f347d46ad1b", - "sha256": "07jm8hm3zsm556l10gw83dw0mpm2d9d8x5blqbdmmp5zsf0y5kqb" + "commit": "0fa7c2d349e40c0e1de0965acf0f0b77b7070451", + "sha256": "1rqkrf021lmm761caskn0npp9aph7xjkr6v8973cgj9v09yk5mn1" }, "stable": { "version": [ @@ -28593,20 +29122,19 @@ "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20190720, - 1720 + 20200102, + 2210 ], - "commit": "a0cafce1c49f3830fe96dacd49f4732b53166603", - "sha256": "0vhmv47i07zrnvy5b6gd3ws2gnnviifv04b6dafa96xr3063n2cp" + "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044", + "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch" }, "stable": { "version": [ 1, - 1, - 1 + 3 ], - "commit": "a0cafce1c49f3830fe96dacd49f4732b53166603", - "sha256": "0vhmv47i07zrnvy5b6gd3ws2gnnviifv04b6dafa96xr3063n2cp" + "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044", + "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch" } }, { @@ -28617,15 +29145,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20190109, - 906 + 20191110, + 1357 ], "deps": [ "dash", "s" ], - "commit": "8191672377816a1975414cc1f116fd3b94b30bd0", - "sha256": "1b9wq6r6v44y11ldcj8czmah4ciibkm2261q4z9awd7v7iqlzf07" + "commit": "1814209e2ff43cf2e6d38c4cd476218915f550fb", + "sha256": "1l9lff15vbji9phpx4jrg8bmw2bkspzmhcgawchf5ylg2sb6yymm" }, "stable": { "version": [ @@ -28791,19 +29319,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20191018, - 2049 + 20191028, + 1846 ], - "commit": "1c9729d18642f45f867c46744796f831c8d85042", - "sha256": "004llls46rvdw0ig75bwpgh758xwcwnqxxx3bgc3xi59mbwmpk5n" + "commit": "a16c4b36ef50731a83a57c1c6341a49e9897d225", + "sha256": "10850175c6jll4grsdjl180hs3rd72yajq55x6fz3a8mm8v5fqk9" }, "stable": { "version": [ 2, - 8 + 9 ], - "commit": "1c9729d18642f45f867c46744796f831c8d85042", - "sha256": "004llls46rvdw0ig75bwpgh758xwcwnqxxx3bgc3xi59mbwmpk5n" + "commit": "0aaa15181eab4088a57ad69ba2c93b2663453c31", + "sha256": "0xg20g9qqmi1x94d8f0gqwxgxpyzirs61nj86507bqn2c4n00r7v" } }, { @@ -29192,10 +29720,10 @@ }, { "ename": "fetch", - "commit": "7e808952551936dd8eaf0158d6ca929d10712dc5", - "sha256": "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "0mph6kri9p0g38ll1cakpgfaz1krkyhi1382kybg1xyfy17jisg3", "fetcher": "github", - "repo": "crshd/fetch.el", + "repo": "cbrst/fetch.el", "unstable": { "version": [ 20131201, @@ -29280,8 +29808,8 @@ 20190706, 804 ], - "commit": "504cb41eabded459de6990da6cddb3cb24474b39", - "sha256": "191ahvir06xv9ql3ynsx0nc884rlnxzdk1rvr2lp7vhxv7x0vgqw" + "commit": "01e6a919507a832ee001a2a0fc257657f8b04b72", + "sha256": "15557rkbi3d40q2zs5vkgkpbya4c4ksnh2a07d8l7x457zah4fbn" } }, { @@ -29292,11 +29820,11 @@ "repo": "alpaker/Fill-Column-Indicator", "unstable": { "version": [ - 20171209, - 1924 + 20191109, + 10 ], - "commit": "a284bb50789c97d7ef9021214260b3ce7cc220e3", - "sha256": "0cjnqw22vq760nzzq4pn9vf89s5w0kl877c5f9ks03c617q656nn" + "commit": "3d88b8a4a3eeabb8d1c9ef27d3c6f5d98517be77", + "sha256": "1rklnjsqz8krqjll35xd5xwg79xqwh0sldwbcnymkjwywbky8yhh" }, "stable": { "version": [ @@ -29417,26 +29945,26 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20190914, - 524 + 20191223, + 2328 ], "deps": [ "ivy" ], - "commit": "79baa7026803b3d877857493da3041ddf6eed050", - "sha256": "0q5lcfg7bpid8rl04c9qml062pyi6sqgdcvhrqxm9mcfyjq5zg72" + "commit": "9aff62217a16c6261b25237eef1ce41130692b29", + "sha256": "1ygmr2scbaawi7gzsay6rrapvxc2rb2260xf3riikb4w43dbzi79" }, "stable": { "version": [ 5, 7, - 7 + 8 ], "deps": [ "ivy" ], - "commit": "85f0fc4ab29e4339732c19be314a4920888803b2", - "sha256": "1skjbh7m0cck2rwmgzrrds51gipqf1jqghyfx15drc1n6kwivx3h" + "commit": "4540416d5aaf7f6adcdcea3ac5b80a08bb695e44", + "sha256": "0ak7i76m3b6gi5favcd6rvmh2flr11995jlx5d52as5lrbx01x7m" } }, { @@ -29636,8 +30164,8 @@ 20161219, 1323 ], - "commit": "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864", - "sha256": "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0" + "commit": "f2fd47d9be0c53d63bae5c248d23874fab7e2d6d", + "sha256": "14cb46jsvp5s7g6dmhadm9dmi2sqrk215bsq8bwsh6f81fnkvy87" }, "stable": { "version": [ @@ -29672,19 +30200,19 @@ "repo": "Ambrevar/emacs-fish-completion", "unstable": { "version": [ - 20190904, - 254 + 20191103, + 1210 ], - "commit": "0a9a63e2cac24bfdf7dbedb5c6ab7faca23d3bfe", - "sha256": "1rp5y1hpdr08v374cvkqjb2i47lni0yl866wssm73ch9ql30y22n" + "commit": "10384881817b5ae38cf6197a077a663420090d2c", + "sha256": "17lqip1i1rrsvxzz4bx9rqf1fvwd3hriwg3sj6qxmfc8pylnp37q" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "e5b9b65a077319dfdb2faca9ef847db3ef55d0db", - "sha256": "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021" + "commit": "10384881817b5ae38cf6197a077a663420090d2c", + "sha256": "17lqip1i1rrsvxzz4bx9rqf1fvwd3hriwg3sj6qxmfc8pylnp37q" } }, { @@ -29844,6 +30372,21 @@ } }, { + "ename": "flames-of-freedom", + "commit": "71883f7c1e28695701244bab6368aa528ff339f3", + "sha256": "1xj4kznx94xxzvxgx74dqd4flljzacygfvp6xr1lsvvm9wvb4m9h", + "fetcher": "github", + "repo": "wiz21b/FlamesOfFreedom", + "unstable": { + "version": [ + 20191202, + 1637 + ], + "commit": "5e47ff27cfa2f7c06081be2ffefe91a731efd012", + "sha256": "1xgrd2ybf8g488fq698xv30bqzcv1swxqnds61slj99w6k2gm29i" + } + }, + { "ename": "flappymacs", "commit": "a63b22f357b2d08b12fb86c27261ab4d687c5f7f", "sha256": "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404", @@ -29965,15 +30508,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20190707, - 2000 + 20191019, + 18 ], "deps": [ "buffer-manage", "dash" ], - "commit": "21f992b502309cb047d91a64de48958d565f751f", - "sha256": "1fqnaclmvv46ij5q8nmj571cjynsbgyp40idg8lcv1fvx56hj44c" + "commit": "df113f0b25ef73c5a246330ef9fa69ab936df174", + "sha256": "11hdabn2ayg2nrp7mg8vp9ywb1yl6nw4z7y7rxv70n0h4blnwn9n" }, "stable": { "version": [ @@ -30094,15 +30637,15 @@ "repo": "Fuco1/flow-js2-mode", "unstable": { "version": [ - 20190814, - 1402 + 20191213, + 1004 ], "deps": [ "flow-minor-mode", "js2-mode" ], - "commit": "bfb23b73d47ea9902bcdc13b48511b23d704fd22", - "sha256": "1pz2mhavs0jbfq8qswzvz3fz7nw7glcysybjyng9i0463vr8cwc9" + "commit": "7520bdda70287e8d57b3f41033b1e0ca59a3be95", + "sha256": "1d0g5v3nwy2wyjgh1f1s27bb8nxcfhq6yq3d7scgbnd6v6anyxxv" } }, { @@ -30113,11 +30656,11 @@ "repo": "an-sh/flow-minor-mode", "unstable": { "version": [ - 20180315, - 1824 + 20191214, + 1309 ], - "commit": "d1b32a7dd0d33c6a00a106da5f4b2323602cbd3e", - "sha256": "169r4ib9qg9q6fm3p0p23qs1qx4pa9pg1qvyq4ysr85i7kwygppl" + "commit": "5db3936d9eba8ccb2beca476afc84675b7b161ca", + "sha256": "1rnihrhkr1xpwsl6c4cgg75slsqs31bckrlkgw1252ihpl9laa6p" }, "stable": { "version": [ @@ -30181,11 +30724,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20190924, - 118 + 20191210, + 550 ], - "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d", - "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v" + "commit": "01473aeec61a19e9638a6c032228c054a578aba5", + "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86" } }, { @@ -30203,8 +30746,8 @@ "flutter", "flycheck" ], - "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d", - "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v" + "commit": "01473aeec61a19e9638a6c032228c054a578aba5", + "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86" } }, { @@ -30233,14 +30776,14 @@ "repo": "lewang/flx", "unstable": { "version": [ - 20151030, - 1812 + 20191115, + 659 ], "deps": [ "cl-lib" ], - "commit": "46040d0b096a0340d91235561f27a959a61d0fef", - "sha256": "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy" + "commit": "17f5c9cb2af18aa6f52910ff4a5a63591261ced5", + "sha256": "1zny29byq08vic9pzxfkchdary7dsk9ygc1lcb8drai4kd9g5jk8" }, "stable": { "version": [ @@ -30270,8 +30813,8 @@ "cl-lib", "flx" ], - "commit": "46040d0b096a0340d91235561f27a959a61d0fef", - "sha256": "0zysqnxa6kgnyfgknsin7pk25a8dy8208qw2yzan93cabplgqszy" + "commit": "17f5c9cb2af18aa6f52910ff4a5a63591261ced5", + "sha256": "1zny29byq08vic9pzxfkchdary7dsk9ygc1lcb8drai4kd9g5jk8" }, "stable": { "version": [ @@ -30295,15 +30838,15 @@ "repo": "PythonNut/flx-isearch", "unstable": { "version": [ - 20180103, - 514 + 20191119, + 515 ], "deps": [ "cl-lib", "flx" ], - "commit": "f132fd6367e369885ab3a865fbfe20eee989bc0b", - "sha256": "1dcvfl4fyhgw0rhfhixzlzjfr99fisa83f7lmlwzz2zs96myhhkz" + "commit": "a44097fb8f539a193c2f09a37ea52a68f2c51839", + "sha256": "051cpdggssmbz2zhr26q2831a8g2n66r5f1aqbvczg3kfw1axpkq" } }, { @@ -30314,8 +30857,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20191022, - 1117 + 20191126, + 2142 ], "deps": [ "dash", @@ -30323,8 +30866,8 @@ "pkg-info", "seq" ], - "commit": "0eaf67211b83c062e598694d2ba4efb444dc1dc6", - "sha256": "1pb8clscs5gwfldnpy6bvczzpnj7j01hzr9c3p2xi1driszs35md" + "commit": "269237f6529a4ad7db5bbbc5a40c1f038accf3cd", + "sha256": "11gjfnrk5s6pr3ggalcxxv9x0grhyliyyz3px2pf5jgc1n115pmk" }, "stable": { "version": [ @@ -30348,14 +30891,14 @@ "repo": "crystal-ameba/ameba.el", "unstable": { "version": [ - 20190720, - 1845 + 20191226, + 1011 ], "deps": [ "flycheck" ], - "commit": "8383f07d760a31a0737be9b7bdaff2f1cff67bfd", - "sha256": "066ccpaszidjvwy18bvkrf37ws60363cnbvcl1sfd7k6nynbdar6" + "commit": "0c4925ae0e998818326adcb47ed27ddf9761c7dc", + "sha256": "0jh0pfyqdks9xk43765vgm4569a8ny01pk3gy2p3vr5gdgfdm4a3" }, "stable": { "version": [ @@ -30444,15 +30987,15 @@ "repo": "flycheck/flycheck-cask", "unstable": { "version": [ - 20160928, - 926 + 20191030, + 2253 ], "deps": [ "dash", "flycheck" ], - "commit": "c3a51147eddeb7347de81f6a498fc96538bac499", - "sha256": "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m" + "commit": "3457ae553c4feaf8168008f063d78fdde8fb5f94", + "sha256": "0fw5ikifp0n8jjkcg328hg1sklsgd7b8bsd538dvymk6qhx223zc" }, "stable": { "version": [ @@ -30469,10 +31012,10 @@ }, { "ename": "flycheck-checkbashisms", - "commit": "f5678ea5aef4dc8a517d6d9381a64f182645d344", - "sha256": "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "1gjfv3zkgc07wgrxia509pdl2z23a29m5x1p0w8bdjrp5zc4j7pw", "fetcher": "github", - "repo": "Gnouc/flycheck-checkbashisms", + "repo": "cuonglm/flycheck-checkbashisms", "unstable": { "version": [ 20190403, @@ -30551,26 +31094,26 @@ "repo": "ch1bo/flycheck-clang-tidy", "unstable": { "version": [ - 20191004, - 801 + 20191030, + 814 ], "deps": [ "flycheck" ], - "commit": "eb82f734529380217c0cd2a53c0d74102eedc301", - "sha256": "14hclnacnawmcqf0s3cd84an222blfh8vhan9yyyd0wgzg8llxhh" + "commit": "2f89698ab0d78818875d5ef08d0b470a9ffc402f", + "sha256": "1l4jla3vlyx37nz9hjaihy9pi3ywbrg3512k2zp9cdis7130mvrb" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "flycheck" ], - "commit": "130e933a7089f4523648b5f45d08a658d540d5f3", - "sha256": "0cqw2kfi5lcwpzvv6c39ygzhaswjmcwx55z8nmfh87syqh54wj2y" + "commit": "2f89698ab0d78818875d5ef08d0b470a9ffc402f", + "sha256": "1l4jla3vlyx37nz9hjaihy9pi3ywbrg3512k2zp9cdis7130mvrb" } }, { @@ -30607,8 +31150,8 @@ "deps": [ "flycheck" ], - "commit": "353e3481a20fbd577ad79db8bbc6113ce179c195", - "sha256": "1xgvz2mdacyr7jszrpxs9lm30y0p72ahin98lr385gvsa8gknmhm" + "commit": "f652a8dc4cff01e78bba50b555bae7ba6115b552", + "sha256": "09k87wfz4m16r32g6ry4jl2zagh1gpgfd9sik54wvyky24s605y4" }, "stable": { "version": [ @@ -30631,16 +31174,16 @@ "repo": "clojure-emacs/squiggly-clojure", "unstable": { "version": [ - 20190611, - 2351 + 20191215, + 2227 ], "deps": [ "cider", "flycheck", "let-alist" ], - "commit": "4c5d0c723bd564d632a4b93046679ed19d0e49d9", - "sha256": "17g5z02gjpyb5nwgwwcc0lxzd4l2jg0q2bndbxscsf5iw41p0irq" + "commit": "592c4f89efb5112784cbf94c9ea6fdd045771b62", + "sha256": "0yyy1c385jn0m6ql7vf9za4waqznr4mvv7fd234ygcbvhqn4pfdz" }, "stable": { "version": [ @@ -30757,8 +31300,8 @@ "deps": [ "flycheck" ], - "commit": "34124f546ff5c1136aed95bf0059015f9f6a1d60", - "sha256": "09cmbw190w6aiwwc2bg349xx6vcv9b9ajw8m70ajb3653qnq3mw4" + "commit": "2428b016243e78a0312cf6b3ba6939e7169a1405", + "sha256": "0al65ldsbmm15h4y79i8avk63qq1y7fqzzad8p327z6d42zfm1qj" }, "stable": { "version": [ @@ -31032,15 +31575,14 @@ "repo": "emacs-elsa/flycheck-elsa", "unstable": { "version": [ - 20190211, - 1921 + 20200104, + 1523 ], "deps": [ - "cask", "seq" ], - "commit": "c0a226d2520681bb0c16cd31504b620e43ee743c", - "sha256": "07605v5insay9jgj274ysdksk4cck49y5gsqzjz7js8f6p526k75" + "commit": "4796cdae375f51e8364660518c2948b8a90bcd40", + "sha256": "1nmf51jrw0xixrb0nawl6shfw68nw4zs1w12plhghaiwr4430rjp" } }, { @@ -31131,8 +31673,8 @@ "deps": [ "flycheck" ], - "commit": "422f6e4b77b27fd7370f0c88437ac5072c9d3413", - "sha256": "16117njpia9046snp1y2yapqmnzgbsan5dvaw3ih5pqmnqjjqdkd" + "commit": "1e3eede14da405b914a7d8b00300846e4393cb83", + "sha256": "10gskp8ch904s3lw7g4sixfhwyx74grdivdl2wnsvd44im9zlw6c" }, "stable": { "version": [ @@ -31262,6 +31804,25 @@ } }, { + "ename": "flycheck-indent", + "commit": "b1c1163d5acc402716c4a6cf877f13665138b74b", + "sha256": "0d6wa3w377s22psbficabyqi03z8kp32662yxcly1dlv5zyyh6nd", + "fetcher": "github", + "repo": "conao3/indent-lint.el", + "unstable": { + "version": [ + 20191228, + 235 + ], + "deps": [ + "flycheck", + "indent-lint" + ], + "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92", + "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1" + } + }, + { "ename": "flycheck-indicator", "commit": "25d59829ca2f4fbedfee500885b45bc358faf47b", "sha256": "1h2d7dw94agrdrks41npjdmf5m628n1jg060pv1mrjysj4xm2n45", @@ -31473,14 +32034,14 @@ "repo": "purcell/flycheck-ledger", "unstable": { "version": [ - 20180819, - 321 + 20191128, + 203 ], "deps": [ "flycheck" ], - "commit": "0fdb067ebbcc8bc1a3f9d2109e341049516b71da", - "sha256": "1p7sns041iqsnmmhkcx2651plz3wrb2nr3s78w2pd7kagx5hwksb" + "commit": "2065beab564c23e6ab380547d19bdb5a9b3b25fc", + "sha256": "16wq9l8q15iw7mdicrx2c28qrhndmd0fmg8f3yiyk2frmb8ack9h" }, "stable": { "version": [ @@ -31688,26 +32249,26 @@ "repo": "GyazSquare/flycheck-objc-clang", "unstable": { "version": [ - 20190421, - 1049 + 20191116, + 1015 ], "deps": [ "flycheck" ], - "commit": "b46ad43637cebf8467cf596d3e7b5f5d371789e9", - "sha256": "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z" + "commit": "683d52e7bc3aeabd966c546a1d835d4c7191509b", + "sha256": "0aymv9y06gzkh1m0jl693wsqvbh3cc5fp5z2yprmqzc98w1lh8bs" }, "stable": { "version": [ - 3, + 4, 0, 0 ], "deps": [ "flycheck" ], - "commit": "b46ad43637cebf8467cf596d3e7b5f5d371789e9", - "sha256": "0qiva3sfxy0ilf062yd5kyirmimlc5nnl6954ijmf7r31z57n64z" + "commit": "683d52e7bc3aeabd966c546a1d835d4c7191509b", + "sha256": "0aymv9y06gzkh1m0jl693wsqvbh3cc5fp5z2yprmqzc98w1lh8bs" } }, { @@ -31983,15 +32544,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20190712, - 515 + 20191214, + 1109 ], "deps": [ "flycheck", "posframe" ], - "commit": "13f8c7c7b3b51c9e7e518ae47500755642315a0e", - "sha256": "0q66shznczxvbzhq4n88lyl9lsw5dlqxfbl5k4pf7li23q8qsn9v" + "commit": "2b3e94c2e427ec9831c513007460c5ea9e2225a3", + "sha256": "1hmplb61xvz6p2b2pv6pg5bv7q7mirmgr0n1by1hj1w479g8rps3" } }, { @@ -32020,14 +32581,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20191003, - 1712 + 20191025, + 2137 ], "deps": [ "flycheck" ], - "commit": "c6a404cb6325ce17d682bbe24cf7f226b342860b", - "sha256": "0pj422carpmzsl87z272i76z35sjpjngwr5hps3jzpc1ln50rym2" + "commit": "da328975c5554a879d6cd198e3ebb4f8427f0c36", + "sha256": "16n41bjmx6nk6gz70d1xv6rvhfw7sxmjs9y14ikp9fyg5j2kdy39" }, "stable": { "version": [ @@ -32086,27 +32647,27 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20180619, - 824 + 20191222, + 920 ], "deps": [ "flycheck", "rtags" ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 ], "deps": [ "flycheck", "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -32164,6 +32725,38 @@ } }, { + "ename": "flycheck-stan", + "commit": "e1d19cd6b80080aad5eff159c1bc7f7585bcd655", + "sha256": "15dxj6lklnavs3lfs8l7wq0wmqfmsss919cjw6jy8hgfbnf27wyx", + "fetcher": "github", + "repo": "stan-dev/stan-mode", + "unstable": { + "version": [ + 20191107, + 320 + ], + "deps": [ + "flycheck", + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + }, + "stable": { + "version": [ + 10, + 0, + 0 + ], + "deps": [ + "flycheck", + "stan-mode" + ], + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" + } + }, + { "ename": "flycheck-status-emoji", "commit": "5abd6aaa8d2bf55ae75cd217820763531f91958b", "sha256": "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p", @@ -32233,26 +32826,26 @@ "repo": "GyazSquare/flycheck-swift3", "unstable": { "version": [ - 20190421, - 110 + 20191116, + 1113 ], "deps": [ "flycheck" ], - "commit": "811a765a0106bbdc8d6a721b22a2a97f3527df7c", - "sha256": "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz" + "commit": "62c93add8ff65d335f6ef8a3123d2d4f53339df5", + "sha256": "0jh8mb9zscj7bzvis6fplc142s7iqy6hhhwfy2lz34yp4n6ap1p0" }, "stable": { "version": [ 3, - 0, + 1, 0 ], "deps": [ "flycheck" ], - "commit": "811a765a0106bbdc8d6a721b22a2a97f3527df7c", - "sha256": "0gsiisshqml1s56p9k8lw5fd3mlnk2i9j886ybc7ahkkpq8sfdwz" + "commit": "62c93add8ff65d335f6ef8a3123d2d4f53339df5", + "sha256": "0jh8mb9zscj7bzvis6fplc142s7iqy6hhhwfy2lz34yp4n6ap1p0" } }, { @@ -32274,6 +32867,25 @@ } }, { + "ename": "flycheck-swiftx", + "commit": "fe5b92702eb8bc9af8f344a4d34c91b69d1e38e2", + "sha256": "0f00iir9xxlckn51xs7k72j26jw404nnyyb3kc8wpmy55dhzshw3", + "fetcher": "github", + "repo": "nhojb/flycheck-swiftx", + "unstable": { + "version": [ + 20191129, + 2207 + ], + "deps": [ + "flycheck", + "xcode-project" + ], + "commit": "94ead32e879c055902e3edb78af1193f21339e5f", + "sha256": "1r49cyhpqw469j832nqdywjh1zc37q9innxwj2hnvvw9hz69g2wm" + } + }, + { "ename": "flycheck-tcl", "commit": "fafc86df6c15348711f16302bb86c0ee08c08454", "sha256": "0rmc7rk0n4mgk11jgza1dn1nkjyi7rqs79d3p0cj1081znyj56f3", @@ -32435,8 +33047,8 @@ "deps": [ "flycheck" ], - "commit": "c2b273d84f15bd03464d6722391e595d7c179a5c", - "sha256": "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97" + "commit": "1e9fe3b2d3e42d551b94473816a8eeee637b446c", + "sha256": "1w7b6v1zlq8c95pddx6a2rffmgghv90dpnzz6vczg37hyad3a2np" }, "stable": { "version": [ @@ -32487,8 +33099,8 @@ "let-alist", "ycmd" ], - "commit": "6f4f7384b82203cccf208e3ec09252eb079439f9", - "sha256": "1bl86x8nqw4jqzb8pfm6hm316hmk1bx8v3qz7wq9z92hb67ck2kn" + "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477", + "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv" }, "stable": { "version": [ @@ -32687,20 +33299,20 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20190828, - 128 + 20191129, + 1558 ], - "commit": "86268e1faf904bc8844dea313fe1bdaf02398ae9", - "sha256": "1xsj29z0qmijdb97cpy11dmqw8536amdz76664yzzn5gzin12fw7" + "commit": "6e2d376f84ddf9af593072954c97e9c82ab85331", + "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" }, "stable": { "version": [ 1, - 3, - 4 + 5, + 0 ], - "commit": "d4be92ea779ea333b599fd125817f943a676a63a", - "sha256": "1x0ipsg0gd5lflx7kyyaz7zv6xnjzmhh1k32f01qr69zarf31nw0" + "commit": "6e2d376f84ddf9af593072954c97e9c82ab85331", + "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" } }, { @@ -32758,6 +33370,24 @@ } }, { + "ename": "flymake-golangci", + "commit": "76c98b2e204eb2a733295037cbf13b60d1cad97b", + "sha256": "13p29d7b3pchyiw1rbdaif7h6jhzfg635ix8z2kzkqg9bvkxxr7y", + "fetcher": "gitlab", + "repo": "shackra/flymake-golangci", + "unstable": { + "version": [ + 20191028, + 1927 + ], + "deps": [ + "flymake-easy" + ], + "commit": "dfc31a1a6ae3f087b49fe6f5f21b3866780aa91c", + "sha256": "1py7ssjz4q5r28c8lzga5qi8x4gmdg3z0ga0cyskiba6krvv45ry" + } + }, + { "ename": "flymake-google-cpplint", "commit": "01f8e5c2b63e80f0411860fde38bf694df3bfc8f", "sha256": "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3", @@ -33403,19 +34033,52 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20190408, - 1010 + 20191230, + 630 ], - "commit": "a0852074bab130a711ba6b4696a7cb8059dac8db", - "sha256": "088cnxz4gnm0ps5myns861cjdnskvbxj70p5bimwbb4cvlp3v322" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" }, "stable": { "version": [ 0, - 5 + 6, + 1 + ], + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + } + }, + { + "ename": "flyspell-correct-avy-menu", + "commit": "be7986f018c7029a8e581059bec31ed23a464e0a", + "sha256": "1mwdg1q7818kl5r9rnsqd11p9b2clcm0bxph4i1rll9rvggfgjp6", + "fetcher": "github", + "repo": "d12frosted/flyspell-correct", + "unstable": { + "version": [ + 20191230, + 630 + ], + "deps": [ + "avy-menu", + "flyspell-correct" ], - "commit": "a9b53c52ab350aead0851e140d813cfd7b1bd680", - "sha256": "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" + }, + "stable": { + "version": [ + 0, + 6, + 1 + ], + "deps": [ + "avy-menu", + "flyspell-correct" + ], + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" } }, { @@ -33426,27 +34089,28 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20181205, - 1932 + 20191230, + 630 ], "deps": [ "flyspell-correct", "helm" ], - "commit": "a0852074bab130a711ba6b4696a7cb8059dac8db", - "sha256": "088cnxz4gnm0ps5myns861cjdnskvbxj70p5bimwbb4cvlp3v322" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" }, "stable": { "version": [ 0, - 5 + 6, + 1 ], "deps": [ "flyspell-correct", "helm" ], - "commit": "a9b53c52ab350aead0851e140d813cfd7b1bd680", - "sha256": "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" } }, { @@ -33457,27 +34121,28 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20181205, - 1932 + 20191230, + 630 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "a0852074bab130a711ba6b4696a7cb8059dac8db", - "sha256": "088cnxz4gnm0ps5myns861cjdnskvbxj70p5bimwbb4cvlp3v322" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" }, "stable": { "version": [ 0, - 5 + 6, + 1 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "a9b53c52ab350aead0851e140d813cfd7b1bd680", - "sha256": "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" } }, { @@ -33488,27 +34153,28 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20181205, - 1932 + 20191230, + 630 ], "deps": [ "flyspell-correct", "popup" ], - "commit": "a0852074bab130a711ba6b4696a7cb8059dac8db", - "sha256": "088cnxz4gnm0ps5myns861cjdnskvbxj70p5bimwbb4cvlp3v322" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" }, "stable": { "version": [ 0, - 5 + 6, + 1 ], "deps": [ "flyspell-correct", "popup" ], - "commit": "a9b53c52ab350aead0851e140d813cfd7b1bd680", - "sha256": "1r9hmz7sihhy7npv6nxp04sy57glzmfax5d67mwn96fdnc0yhlnd" + "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6", + "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1" } }, { @@ -33624,26 +34290,26 @@ "repo": "larstvei/Focus", "unstable": { "version": [ - 20190318, - 242 + 20191209, + 2210 ], "deps": [ "cl-lib" ], - "commit": "ab42b8779929beeb7878c7fb3d3ccd80d9327c7f", - "sha256": "079v1syid7h2vr2ya6hs6hl0pgj60qdsw60mqw4cj2zllmkrkwj4" + "commit": "5f3f20e7f22fb9fd7c48abce8bd38061d97e4bc0", + "sha256": "0a55i4bychfnnzjg67a9h4j130hchcg44446dwwx1l1h48i692dw" }, "stable": { "version": [ - 0, 1, - 1 + 0, + 0 ], "deps": [ "cl-lib" ], - "commit": "75202c9445f52eab6fb82f00006f37cd20dae6b2", - "sha256": "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg" + "commit": "5f3f20e7f22fb9fd7c48abce8bd38061d97e4bc0", + "sha256": "0a55i4bychfnnzjg67a9h4j130hchcg44446dwwx1l1h48i692dw" } }, { @@ -33736,11 +34402,11 @@ "repo": "magnars/fold-this.el", "unstable": { "version": [ - 20190723, - 811 + 20191107, + 1816 ], - "commit": "74752dc6b6c0e73826b33198a552bb440b04f275", - "sha256": "01lv0ibkcimlyg3g7ffzw0fqfmvbshj30gg8j7niq6m3rkphxk4a" + "commit": "c3912c738cf0515f65162479c55999e2992afce5", + "sha256": "0cnfkz2bjyk0fkbxa80h500f7pig7q0rdifmj56d4whzhg2jsicg" }, "stable": { "version": [ @@ -33890,8 +34556,8 @@ 20191004, 1850 ], - "commit": "5f3e67448cc98fe2875115163849acae4d9e8526", - "sha256": "1w0dhyr4i0nx0g70smgclcfsbv6cfilb7df330njzaqk8j2gdfws" + "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", + "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" } }, { @@ -33968,8 +34634,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20191017, - 1801 + 20200102, + 2204 ], "deps": [ "closql", @@ -33981,8 +34647,8 @@ "markdown-mode", "transient" ], - "commit": "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb", - "sha256": "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83" + "commit": "269effb4954071f590954c0e5b4faba3f27d03d0", + "sha256": "0d6l1rllzznc9qvim1zn5w3plqcdpk9lwc7m4jsx8jkhxzyajw68" }, "stable": { "version": [ @@ -34037,14 +34703,26 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20191024, - 2151 + 20200107, + 1608 ], "deps": [ "cl-lib" ], - "commit": "a1d3ad48f21086788cd1effaf30227308a18d98f", - "sha256": "0xa3ajx6izb086r4gwxfsqwrlnyil6yrqgl8mhv14zfs93k7w8p6" + "commit": "f0ff413f09b5982b39df6ebe0d566aa221da7327", + "sha256": "0bzss41dg25sn7cgf21v5v8hl0qb47l5cr5ngqc9yzd8lgg3x56y" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "09119a61855efe084e77f14544d5432b94cfa82c", + "sha256": "1890i4h18rciyl0vngxchdc01hw3wciq7s8qzgnikdz2pcqfwf2m" } }, { @@ -34168,20 +34846,20 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20191004, - 351 + 20191217, + 914 ], - "commit": "05db0789ceb658fbbed74381ba59c4583a004673", - "sha256": "0yibcya5v7ddkrn8dwan0bk6mmb7js8gr0h419nx4rrsgjzwd4sq" + "commit": "4805d4149366e69cdce2e4206540fcf064eac91b", + "sha256": "1xavb8yp24y2pvvmh68m0mfdslfifgni22dv7p20lnqz7dp3x3n6" }, "stable": { "version": [ 2, 8, - 0 + 1 ], - "commit": "05db0789ceb658fbbed74381ba59c4583a004673", - "sha256": "0yibcya5v7ddkrn8dwan0bk6mmb7js8gr0h419nx4rrsgjzwd4sq" + "commit": "cd58c7e8d8fde05ef521fbcd066a290b005e6d40", + "sha256": "063bdfr0rnnr4k1js9vjcwhdliw374iw433a5hwj3cqj1jwz133q" } }, { @@ -34323,20 +35001,20 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20181219, - 2100 + 20200103, + 1238 ], - "commit": "d0b76e4a5d9d112690bf27155f7c34a1ae5548b4", - "sha256": "149v1lxxl6kz0pwb68x65vj0fghrsfyir00qrcsl90vc5yp76ra3" + "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf", + "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6" }, "stable": { "version": [ 0, 2, - 2 + 4 ], - "commit": "3830aae976603ff4e41e09fdca7554594075694c", - "sha256": "1sbxr78gl822gl0ky7iz1wb558ch9gp7igg4aq63gjlq6wfx2v93" + "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf", + "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6" } }, { @@ -34372,8 +35050,8 @@ "a", "dash" ], - "commit": "31ef9ff4af1a4fed3dcc24ea74037feea8795c87", - "sha256": "051aihjdg3x22svaxhwylpi8i6s2x9j8syvsj1jgilgjjdy15l6j" + "commit": "6d57aee131d96315aedf6cb7d6e5d6d09bf71503", + "sha256": "1hxjvfys5kqwvl21jj5sfb6bpqxdgdhsrniq821y324glc8s38xc" } }, { @@ -34384,15 +35062,15 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20191024, - 1342 + 20191204, + 312 ], "deps": [ "frecency", "persist" ], - "commit": "80ca5bca1dcdc99876f28758ba4fbd3c41ad2458", - "sha256": "06cmpd3628hvlaqcnp8p75mk0ss2rhgk517xqfng95gn8wqmy4ah" + "commit": "1d5d641fdd93480db2374276e85ec652af0565c5", + "sha256": "01l92rz4hll2v5k0xppmszcpy0r6lxgm4cql0zxkcj5yhgzjmrln" } }, { @@ -34524,44 +35202,35 @@ }, { "ename": "fsharp-mode", - "commit": "dc45611e2b629d8bc5f74555368f964420b79541", - "sha256": "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z", + "commit": "7a41e8a101b1b76870402eb8f60130be9e9f189d", + "sha256": "1bcgy40z5d1663rafh4vhbm8d24yxnbw23sagki4427sywinl11x", "fetcher": "github", - "repo": "rneatherway/emacs-fsharp-mode-bin", + "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20190609, - 1317 + 20191130, + 1857 ], "deps": [ - "company", - "company-quickhelp", "dash", - "flycheck", - "popup", - "pos-tip", + "eglot", "s" ], - "commit": "e2a63296681d65969d9c21144a22c6fd2f9dd57d", - "sha256": "0llv82jhfmxnblhihnc07z343780dsd2167xjm4vrpcqvlpp50g8" + "commit": "0415c45489fa7d83e9a7c94530aa1943682aabf9", + "sha256": "1cwyj9xw9d2hyvibvyr046bhgmxpf55nmgb33la7564wfgkmr37f" }, "stable": { "version": [ 1, - 9, - 14 + 10 ], "deps": [ - "company", - "company-quickhelp", "dash", - "flycheck", - "popup", - "pos-tip", + "eglot", "s" ], - "commit": "e2a63296681d65969d9c21144a22c6fd2f9dd57d", - "sha256": "0llv82jhfmxnblhihnc07z343780dsd2167xjm4vrpcqvlpp50g8" + "commit": "4a1df3342931f09edc933cb481da70cc5a5ef268", + "sha256": "0dkfd4nlc0hxikvby1271y6zppsvcc0jr12m2w1zrng1pqx666di" } }, { @@ -34614,8 +35283,8 @@ "deps": [ "cl-lib" ], - "commit": "522d176762a24c8b1ed453800e21be0e5130e078", - "sha256": "1cnjinms4i6axmjxw26s2pnkbf9n47vx2s1c8c3b4qyjlb623cl6" + "commit": "ca1612cc57239c37c7646544d40a6a10adb80476", + "sha256": "1nnim6q1ab2din657qdnlzn5fy1a9wdvkw7gjlb2n9xd27ln00gy" }, "stable": { "version": [ @@ -34684,8 +35353,8 @@ "deps": [ "cl-lib" ], - "commit": "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd", - "sha256": "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi" + "commit": "2c4497f5d66898f5f4cbde3abe97402880e46c2c", + "sha256": "0jnkri7d23hh392lfc3gwjlis4a0pgn0jpbhm4md94ap263yyylc" }, "stable": { "version": [ @@ -34768,29 +35437,29 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20191020, - 1746 + 20200107, + 2336 ], "deps": [ "cl-lib" ], - "commit": "da6aa3895b5ccfad297446e9547c0604cd3c6e09", - "sha256": "02v508shs94w145m7j9ic04ybr26h8md9jhhcd0l2bcggpgqyvxa" + "commit": "c0899e431e5819575231a7e637d6c77f51e384f5", + "sha256": "0xayw1jwxfln67k8fwkdvc784zrv5sf0jajngxhcx0ljwaqj97q3" } }, { "ename": "fuz", - "commit": "aed40e85cf9a9906ca7a9fe34469083d21254e42", - "sha256": "0bpm2p5i8zyjsbn4d7i7rghwbap9mw4f5a5q47r6nxnr0fciarz5", + "commit": "2d3139563902bb1cb8aa48a517747f12a1ca1746", + "sha256": "0xmi3r7mhxc38rjmx2p0lhsn0gch21hhbr2s0gxy1h29mhgvy3sb", "fetcher": "github", - "repo": "cireu/fuz.el", + "repo": "rustify-emacs/fuz.el", "unstable": { "version": [ - 20190810, - 507 + 20200104, + 524 ], - "commit": "56f08351c2ae91e010f6a5e810f11ae74d76deb0", - "sha256": "15fymhj82phj407bcnc64p16kv3nc860xbsnlnj7i8qvcnl3jpdl" + "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", + "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" }, "stable": { "version": [ @@ -34999,17 +35668,17 @@ }, { "ename": "gap-mode", - "commit": "83ec19a4ebac6b2d0fd84939b393848f82620978", - "sha256": "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2", - "fetcher": "bitbucket", + "commit": "2790c00a79df237cf853a00f094fdeca9e532a9a", + "sha256": "1xq50vkw4sgfjv2sfc3ddybjzbaxq97xwgjxjkd8k6v5f755qn29", + "fetcher": "gitlab", "repo": "gvol/gap-mode", "unstable": { "version": [ - 20180809, - 445 + 20191110, + 2237 ], - "commit": "00f251070b10ba72d0548955ca125498fcaaf40c", - "sha256": "0rk5smpzpdqzpmb5cp2l40042i51z3f40fkd3hma40id0ql2gy2w" + "commit": "62adb8935033eead7fbf2c107c2dfb79afa53c67", + "sha256": "1rhhls2ylc2jg3mman3zq0mknmmwhll09d9dxrqmk5262d2f7vw4" } }, { @@ -35151,11 +35820,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20191023, - 424 + 20200103, + 1329 ], - "commit": "526d5ed4c2437d5d9a87dce67551451448bd853e", - "sha256": "04lw0kqyk5v3iicqajqbvnim8nc3a3539xwyd4hyg2w835pkvakr" + "commit": "645e4775420c59bb10ef0693ed2631a8df8c0e29", + "sha256": "035rf5i37zwl4glnpvvgn25sp1lf3c212ycsah5xpyh0ddzw5v4v" }, "stable": { "version": [ @@ -35174,14 +35843,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20191001, - 450 + 20191031, + 2024 ], "deps": [ "cl-lib" ], - "commit": "f38fb2294bd29261374b772f765730f2fa168b3e", - "sha256": "1aqi5axkwfng6rm52sblf738c7rffp10sqs69dvkh2fv3ps8q28i" + "commit": "f6e928622d78d927c7043da904782ed7160ea803", + "sha256": "1l541isnwhcg3y8h709zw6nskhkgwnkbdbl1zv702mgfsbl5am62" } }, { @@ -35245,6 +35914,27 @@ } }, { + "ename": "gerrit", + "commit": "3b966a2476cf10234686e49d808bcbabe0686891", + "sha256": "1ikkd2xjr1n8p43pwycfrsfy9fkib83mf8l0p4bjrjszfcb9ln4v", + "fetcher": "github", + "repo": "thisch/gerrit.el", + "unstable": { + "version": [ + 20200107, + 2305 + ], + "deps": [ + "dash", + "hydra", + "magit", + "s" + ], + "commit": "a88e2ca8a6b3ccab44ed8f4f7653e6235c96353b", + "sha256": "0mm7naq50wwjljky1yzcxh1mzi5x74dc4yzqaxl5wrqkc80calhz" + } + }, + { "ename": "gerrit-download", "commit": "18725e799efd1694ff2397b6c877f926ac5f4ce8", "sha256": "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp", @@ -35529,16 +36219,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20191007, - 1420 + 20200102, + 2204 ], "deps": [ - "dash", "let-alist", "treepy" ], - "commit": "e19cd86ca4768a6d89285123933baa3f1460d696", - "sha256": "1d6f8sxlsl0fpkzwbpnaw77d1a5pkg63zfvf6a2fxir357lbdizx" + "commit": "a9c5ac44bc7691752e6bfea87ac75c7459ce88f3", + "sha256": "07wanc8l1k9dk1r7ykgpiq1yfp5dwhvwlfaay1y86xblpd9jaagi" }, "stable": { "version": [ @@ -35564,15 +36253,15 @@ "repo": "vermiculus/ghub-plus", "unstable": { "version": [ - 20181113, - 32 + 20191229, + 1748 ], "deps": [ "apiwrap", "ghub" ], - "commit": "51ebffe549286b3c0b0565a373f44f4d64fc57af", - "sha256": "11fr6ri95a9wkc0mqrkhjxz1fm2cb52151fc88k73l93mggib3ak" + "commit": "b1adef2402d7599911d4dd447a987a0cea04e6fe", + "sha256": "0bzri6s5mwvgir9smkz68d5cgcf4glpdmcj8dz8rjxziwrg6k5bz" }, "stable": { "version": [ @@ -35595,11 +36284,11 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20190326, - 849 + 20191212, + 147 ], - "commit": "248d1e158405e6cba2c65ecaed40e2c59b089cd8", - "sha256": "19xqi5mgalnnhb4hw0fh7py2s2dllldx1xxbhwhknkdpifai8hl8" + "commit": "2ed2ebe710690f041c074cc59816ecd3e0f8e980", + "sha256": "1nyysz7bcx4lm2jp08c50xqrz14piwpvr83yk77rrdjg837iasg4" } }, { @@ -35733,8 +36422,8 @@ 20180925, 2003 ], - "commit": "8f6290c76e7827d5a198e7dc04516bcfb2128c06", - "sha256": "0ns6m856i9j18fsg96mm66k0xwdxrnnmnzgr296f4f6gqvx7kia8" + "commit": "50df0630eba2a931146f676d349b29bde6b6b37b", + "sha256": "181yd1nwg5mvk8i5y49fmqzk6jp0rzx3zl50qq59d48jlj4l5f9f" }, "stable": { "version": [ @@ -35754,11 +36443,11 @@ "repo": "ryuslash/git-auto-commit-mode", "unstable": { "version": [ - 20191008, - 429 + 20191214, + 1021 ], - "commit": "2f05046731330c8643fc21c40a6840d40d70fc26", - "sha256": "156zfq2dwm5liffjhc1yhbwwh6vvfc2m4m9shj11glbzy9ggfqsf" + "commit": "6f7b58f866a72709c213f4c1f7c957beb474bd6c", + "sha256": "0lfyksjl4wlb0vlw99ng4wi0q6q9dh6skia2ji836h0hbqnfyp3l" }, "stable": { "version": [ @@ -35771,6 +36460,55 @@ } }, { + "ename": "git-backup", + "commit": "07d8ba2d036abeeb585f9dfd0399ae97fd1e2415", + "sha256": "094sh80zyidzavf0b4nfpryi164x24mi4bs8jqcwvlyg91vn9b96", + "fetcher": "github", + "repo": "antham/git-backup", + "unstable": { + "version": [ + 20191209, + 2144 + ], + "deps": [ + "s" + ], + "commit": "643c8c292c128ac3d0c4d80f2d4a2e19db711e6c", + "sha256": "0k7blj6s31llvznwsj94kwpnahb6ga58vkx6542ibdmcgdb59n1d" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "s" + ], + "commit": "e28d7af2d1c58fa5b8068223eb83a73f044e6a6c", + "sha256": "1kx5pmm7hrcppryb39z289dab5h0w6hwk0jk1bmvbg9lzf9hqz3q" + } + }, + { + "ename": "git-backup-ivy", + "commit": "51d979059ab570a0e43264dfa081e7241dc3a2b5", + "sha256": "1yfyq6i2cfm0kdjkzrc5pql2k5hsk9wwhz220blcizldw142p236", + "fetcher": "github", + "repo": "walseb/git-backup-ivy", + "unstable": { + "version": [ + 20191224, + 1254 + ], + "deps": [ + "git-backup", + "ivy" + ], + "commit": "0a6226c37b63660e6b246bc9bbcf919e44270a99", + "sha256": "081dfbxs417zv2dds4i16ak6dri41cfn012sbfmalp8qslpclb6z" + } + }, + { "ename": "git-blamed", "commit": "87bc01218964a01cfd471ee068ed75976793a568", "sha256": "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p", @@ -35793,15 +36531,15 @@ "repo": "10sr/git-command-el", "unstable": { "version": [ - 20191025, - 627 + 20191028, + 333 ], "deps": [ "term-run", "with-editor" ], - "commit": "af9dfa8c88837839d0fc67f71a7a78f1e14aa826", - "sha256": "1pfy7qclr6v5q7ibxwish82xp515qyi05az16a6zbm9g1cm9sav4" + "commit": "a773d40da39dfb1c6ecf2b0758aa370ddea8f06d", + "sha256": "01b2h88a6fxy23p9ggwlj5vv30aw16m8fnqxx9yr9c6yv8p9f5cl" }, "stable": { "version": [ @@ -35826,15 +36564,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190928, - 1746 + 20200102, + 2204 ], "deps": [ "dash", + "transient", "with-editor" ], - "commit": "8b3172fc495d83830573461f877ed390e6408e0b", - "sha256": "09wcf1s7xnw4ssmg8bha94zw9ax9mz3prl5krl1l634740ajy6h4" + "commit": "2191261223078077bf35eb12187e35ff0228174a", + "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" }, "stable": { "version": [ @@ -36104,11 +36843,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20190829, - 145 + 20191119, + 1420 ], - "commit": "267bd81c228bdab434172dbef896f3f3b82713fa", - "sha256": "04xa6lp8wkjb6zs096bf4sz124grcjj15xv1h009bmn2j95rggj6" + "commit": "2fb0e4be8801e7d53e02fc7f14ec0f9a14586ba2", + "sha256": "1y5qw5iyblj14zjvw4is51qyvmy2z0f0iba7cqr628zn9q1fqll6" }, "stable": { "version": [ @@ -36157,15 +36896,15 @@ "repo": "kidd/git-msg-prefix.el", "unstable": { "version": [ - 20180118, - 1446 + 20191031, + 1304 ], "deps": [ "dash", "s" ], - "commit": "848f2c7475f5e4937b09f55e85ea89a3be5f8588", - "sha256": "0ab6qjq5nky15vj88j5s8sh7gp9lbwgxrfqsc08bg6gdf2rx2dvx" + "commit": "43f6b31c1090371260a2f15b2117a7666920bee7", + "sha256": "01fcf0qqy24ji0ka9gh91gdrp81ilq2xjwah3rv2b90yjk8wib60" } }, { @@ -36237,6 +36976,38 @@ } }, { + "ename": "git-walktree", + "commit": "10bccf74f0bfd3788a7a07956b9f46fe40ff81e8", + "sha256": "1iyxncq8bgh4hlsll7agsxnw5038g712aglh4qczg202kdq1qcnz", + "fetcher": "github", + "repo": "10sr/git-walktree-el", + "unstable": { + "version": [ + 20191101, + 302 + ], + "deps": [ + "cl-lib", + "git" + ], + "commit": "162d9073286c256502df4baa9845790b9f4c2f05", + "sha256": "17z0csy00i56l7mmz2xhc1pmq044m17r4xy1azp775h9k9y2n6m9" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib", + "git" + ], + "commit": "a1a5490b89d193724ec637818baf2d8edf97c638", + "sha256": "13ksz3syz96n3qzk4spwyq8g8xl8riqdlh9glp92v3hg2h3d5nbs" + } + }, + { "ename": "git-wip-timemachine", "commit": "81b5dd5765f52efdb88fdc14f48af641a18b3dcb", "sha256": "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw", @@ -36276,8 +37047,8 @@ 20180318, 1956 ], - "commit": "33c6a116a5b298e20eb39ebb154a51c4dd37c06d", - "sha256": "1l129z6hdqyzpmk6wcjlp9nxrlhfdgrq9ql8rqq57z28sa88abld" + "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", + "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" }, "stable": { "version": [ @@ -36324,8 +37095,8 @@ 20180318, 1956 ], - "commit": "33c6a116a5b298e20eb39ebb154a51c4dd37c06d", - "sha256": "1l129z6hdqyzpmk6wcjlp9nxrlhfdgrq9ql8rqq57z28sa88abld" + "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", + "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" }, "stable": { "version": [ @@ -36536,8 +37307,8 @@ "ghub", "s" ], - "commit": "a13a3b4f1b6114a32af843971a145ab880f51232", - "sha256": "0injfpxzgfhmqalba845j5l5cdcxxqz43knhxwinf36g52nfabl0" + "commit": "4f7f927f57d39beac231cadcd1fea42c77103073", + "sha256": "1wcmkz47ylid9p5fvy9a6yzylv457vrcpc64msmfsnai6qbqx8k3" } }, { @@ -36616,8 +37387,8 @@ 20180318, 1956 ], - "commit": "33c6a116a5b298e20eb39ebb154a51c4dd37c06d", - "sha256": "1l129z6hdqyzpmk6wcjlp9nxrlhfdgrq9ql8rqq57z28sa88abld" + "commit": "55468314a5f6b77d2c96be62c7005ac94545e217", + "sha256": "08hy7rbfazs6grkpk54i82bz0i0c74zcjk96cip8970h6jn3mj72" }, "stable": { "version": [ @@ -36837,6 +37608,21 @@ } }, { + "ename": "global-tags", + "commit": "2bf3f3de312becb948000a21b280c990a03c8aa0", + "sha256": "0zfjfn92dnz7x5k67fphch6a5n7nyigapcg20gsz34xshdnnsz3z", + "fetcher": "git", + "url": "https://git.launchpad.net/global-tags.el", + "unstable": { + "version": [ + 20191104, + 1328 + ], + "commit": "8ac8790790d833e2979103f7f5a14b37382ff323", + "sha256": "05swwpslvy3c7yv7v5g6q4s82ff623lpbdkasmq3q8jhmbjsx92k" + } + }, + { "ename": "glsl-mode", "commit": "c416822d54df436f29dcf9a5f26398685fdc17a2", "sha256": "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5", @@ -36974,6 +37760,29 @@ } }, { + "ename": "gnome-screencast", + "commit": "628db4fa9d74c60290bf0e81cbb7ffdd08bd4a68", + "sha256": "0h16zj0lyg76g6561q8xbazyidwbr8bd146lw8s68vdgmn6k9qn3", + "fetcher": "github", + "repo": "juergenhoetzel/emacs-gnome-screencast", + "unstable": { + "version": [ + 20191217, + 2007 + ], + "commit": "cff1c312224b4943df6fb6559492fd94caa82f86", + "sha256": "0cwdmlq3aibai1g4jbxvwms9wvqxscak7bvlxv52i9qxyr7gjlnv" + }, + "stable": { + "version": [ + 1, + 4 + ], + "commit": "261844a88c75f10d98b60577ac8121fcd6721564", + "sha256": "0qc5dj14fj3wa36kf3d6n0ijd49lpxmgnn1qw5qqbz29k12w5sqf" + } + }, + { "ename": "gnomenm", "commit": "dd98221d3498528efb0f2d943102d32ebd7b34b3", "sha256": "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm", @@ -37033,17 +37842,17 @@ }, { "ename": "gnuplot", - "commit": "78be03893e4b0502ce999375e5630d32bda56ac1", - "sha256": "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds", + "commit": "be594de074dc3513c773d78c38e823be53061612", + "sha256": "1cz3db40r72cfqazg0w85fx5249d98wkxvjjjcn8dhwnmqymqigi", "fetcher": "github", - "repo": "bruceravel/gnuplot-mode", + "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20141231, - 2137 + 20191212, + 1801 ], - "commit": "21f9046e3f5caad41b750b5c9cee02fa4fd20fb9", - "sha256": "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c" + "commit": "a406143d52618638d908b6b0b1c1c90c045b83ee", + "sha256": "0vq7ha6z07x46pf7qig1f6p1rr8vyhj8vafrmq40h3gw5422vv8y" }, "stable": { "version": [ @@ -37273,8 +38082,8 @@ "deps": [ "auto-complete" ], - "commit": "7fb65232883f19a8305706b4b4ff32916ffbcaf5", - "sha256": "09yqziccv9mg5jlmhw8gslpcwwiiah0hs05nq0qnsbdnvc8bs4lr" + "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", + "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" }, "stable": { "version": [ @@ -37295,11 +38104,11 @@ "url": "https://git.sr.ht/~zge/go-capf", "unstable": { "version": [ - 20190629, - 727 + 20200102, + 1957 ], - "commit": "728e290b182239260937efcf816d904122c423ca", - "sha256": "0s8hwpd882gpxnmlz3y6987gc5c2kawsdkqic5d4kfd8v9yc0psx" + "commit": "d391dd08cc33be958d9ff21daeb88b79e5ab68e4", + "sha256": "0snwaj702xjy3qrknjjywqsgr8553rk6kr1qdcbpln9nj9hyksb4" }, "stable": { "version": [ @@ -37518,8 +38327,8 @@ "cl-lib", "go-mode" ], - "commit": "a414da86a48e490baeb24386fad495b47ec56fd9", - "sha256": "0q1m18g9n77x7znmmqmpqj3lmkw7g4jp7fp9cj2psi04bmvcsnr6" + "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", + "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" }, "stable": { "version": [ @@ -37611,11 +38420,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20191022, - 2037 + 20200107, + 546 ], - "commit": "a414da86a48e490baeb24386fad495b47ec56fd9", - "sha256": "0q1m18g9n77x7znmmqmpqj3lmkw7g4jp7fp9cj2psi04bmvcsnr6" + "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", + "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" }, "stable": { "version": [ @@ -37719,8 +38528,8 @@ "deps": [ "go-mode" ], - "commit": "a414da86a48e490baeb24386fad495b47ec56fd9", - "sha256": "0q1m18g9n77x7znmmqmpqj3lmkw7g4jp7fp9cj2psi04bmvcsnr6" + "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45", + "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im" }, "stable": { "version": [ @@ -37908,11 +38717,11 @@ "repo": "roman/golden-ratio.el", "unstable": { "version": [ - 20150819, - 1120 + 20191028, + 1732 ], - "commit": "72b028808b41d23fa3f7e8c0d23d2c475e7b46ae", - "sha256": "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92" + "commit": "007911d8a431b72670f5fe5f0e5b4380c2777a31", + "sha256": "1dkc25yj47jlrji0v9xjxj3d3hhgnxxb5ia91zlby1mil7r9cwv1" }, "stable": { "version": [ @@ -37967,8 +38776,8 @@ 20180221, 2015 ], - "commit": "16217165b5de779cb6a5e4fc81fa9c1166fda457", - "sha256": "0jhwmwc0vykcmf164na0pnadl8gv7184b6pf3xayknwmzdw6vd7h" + "commit": "fdd1cda4f05fd1fd86124f0ef9ce31a0b72c8448", + "sha256": "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2" } }, { @@ -38012,8 +38821,8 @@ 20180130, 1736 ], - "commit": "83a9e8d7ca3d47239cb0a7bf532de791e6df3ba6", - "sha256": "01m0wxy5a7g82dc04kfjhh1hx7g5d04974b2jhbgsab38hdgggpd" + "commit": "f704c352f4f0597d2bd8b85d089b093946ff75d7", + "sha256": "0kki38izdw7wl6x8cvcwidmrrw1cgx18a64gffwl05ka59yw375g" } }, { @@ -38173,8 +38982,8 @@ "hydra", "s" ], - "commit": "bbd27f6a0a77f484e2a3f082d70dc69da63ae52a", - "sha256": "01lqirxgw7svxy1fdv49mvcbhpslf64in6c4dk36b8xhngyqbilf" + "commit": "6a73bf352e8d893f89cad36c958c4db2b5e35e07", + "sha256": "0ydiq55ylm8ph2r5nlv9p7a5bnnxk3c9731l7mbzdhd43f734dld" }, "stable": { "version": [ @@ -38194,16 +39003,16 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20180617, - 1333 + 20191128, + 1111 ], "deps": [ "f", "go-mode", "s" ], - "commit": "36e09a6bf1face4c56d4a7707935c992786e0076", - "sha256": "1aqjyhp7qdss3iqfxamp45006fgfxdgvhf7lqjnjs2xqzvmvsq80" + "commit": "70f63eafda1f6a2f0a01a9320cc4d2edee9a17b2", + "sha256": "090xf2w5zgffndpjvg4qfdm77cpsc8vpr00h6j0skjpr3bni79cx" }, "stable": { "version": [ @@ -38255,6 +39064,15 @@ 20190418, 829 ], + "commit": "c0209143fbeafcc9ba93bc2333dd08e72211fa20", + "sha256": "15plzc33vyhmfm7bxhvnfr25yvjj6fdr1zp2dvsj8jryj4gb6gkz" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], "commit": "366cf84c30fc8e675e9cbab1091ead6f3cd0d399", "sha256": "1y2ay0r0rqayvw8wlbf8advjbhvzz7sa16k272mxszxzp7xmnr71" } @@ -38365,6 +39183,15 @@ 20190308, 736 ], + "commit": "1f0afb261a4e4a1b0a2fae3959b0ce5d30bce2a1", + "sha256": "03csbs9mh9jjw21sncvnlmm97waazy0c57jp1jynwhzzsbp0k0rs" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], "commit": "772fb942777a321b4698add1b94cff157f23a93b", "sha256": "16zil8kjv7lfmy11g88p1cm24j9db319fgkwzsgf2vzp1m15l0pc" } @@ -38377,8 +39204,8 @@ "repo": "vmware/govmomi", "unstable": { "version": [ - 20180524, - 2023 + 20191213, + 2131 ], "deps": [ "dash", @@ -38386,8 +39213,8 @@ "magit-popup", "s" ], - "commit": "f01505d273e85c71261f91457191e65fcb971be3", - "sha256": "1yirkw804z53xl0i3znyj4dxkqspwibkim80mp9901ncn10k21y6" + "commit": "deff37c279fe783a0ea565cd572565d37bbedafd", + "sha256": "0zamng9677kj13wp6gmadmrb4r9bngf74pmd6xvvnwdwn5s0gvrz" }, "stable": { "version": [ @@ -38475,14 +39302,14 @@ "repo": "xuchunyang/grab-x-link", "unstable": { "version": [ - 20180205, - 1146 + 20191113, + 848 ], "deps": [ "cl-lib" ], - "commit": "d19f0c0da0ddc55005a4c1cdc2b8c5de8bea1e8c", - "sha256": "1l9jg2w8ym169b5dhg3k5vksbmicg4n1a55x7ddjysf8n887cpid" + "commit": "d898db46e4864118359fdedfe915e180de3fe290", + "sha256": "0npz0da2rcckv0zcf2f8vpjcdnii3z99x6c5c4z7jd4xgkp004xs" }, "stable": { "version": [ @@ -38561,8 +39388,8 @@ 20160504, 911 ], - "commit": "09226f852cb3167f23012df8f77318037f5fe9c5", - "sha256": "1gq8zwnyqxdf2i9agwky9nhc0nz6g7y0jfi8vjvxgak8dyilrfma" + "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", + "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" }, "stable": { "version": [ @@ -38606,6 +39433,42 @@ } }, { + "ename": "grammarly", + "commit": "1bbf7e3434cea3d0f6f72747ea653188ce25f68f", + "sha256": "0h0gikvbyraflm921jmf2jkj1nfgxsdq1ybih449zbhxkvb494d4", + "fetcher": "github", + "repo": "jcs-elpa/grammarly", + "unstable": { + "version": [ + 20200105, + 125 + ], + "deps": [ + "cl-lib", + "request", + "s", + "websocket" + ], + "commit": "87b46bb1c906e86fe9ea16b54d3699deb33d7221", + "sha256": "1jkb2g1xiwgwdyhgk1v9lr8s2h1hw1drq3d1kiba0djiicchy46y" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "cl-lib", + "request", + "s", + "websocket" + ], + "commit": "cd2e75f21989a586c9cc71540fc6e3b5df8a5ce0", + "sha256": "1v7lwwx9iyksh5aaav97vd5pm07k93fkv5v4h96s8i3hyrbcgd74" + } + }, + { "ename": "grandshell-theme", "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b", "sha256": "1r0r0r0g116f4jp3rip8mjqqgdam4h5dr5qvdglr9xpirfcw6wq3", @@ -38749,11 +39612,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20191012, - 849 + 20191126, + 2016 ], - "commit": "096ca0130f0bcbbacc0107a86e3cdfecdb88a087", - "sha256": "1y8szyj3g96vb8ybc7ynkbpm98wpflrx1q5cbbxygx3y21lv8dpw" + "commit": "158644714e8f35d8d2b9e5e4fbd00dbd8075a7bb", + "sha256": "0ymz88244dccbrysaq1yik6nzrqmaw37jh6h1sqqla0nbbidgvr1" }, "stable": { "version": [ @@ -38957,8 +39820,8 @@ "cl-lib", "dash" ], - "commit": "5a4e3efdf775755c1bbefcfe4b461c1166d81d7d", - "sha256": "00q7l4a3c0ay6g5ff9bfa2qgkiswsyh4s6pqnpg0zpzhvv5710f5" + "commit": "58f6edc18510d871e4f5ef63ef60665cbc204e96", + "sha256": "04mk5wi2i4mx58mfzl4zk10lm58yliczsw5vpxqmikz8gbripqqx" }, "stable": { "version": [ @@ -39012,20 +39875,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20191022, - 808 + 20191114, + 1754 ], - "commit": "8fd4102a25c2dd9ccbbee082bc61d8f44eb5ed74", - "sha256": "0ylmn54znwhqv9m88zizgzi08ks0vxf1vxqsk4mk2a94ycw1xfkc" + "commit": "d1ee2d170b50ccd6f32d875db527581e6ee959fd", + "sha256": "15892kak2ag4hc3vi01yp5qsn9yzjqqhfxyfxf4lv0xh02gnbh5j" }, "stable": { "version": [ 2, 1, - 2 + 3 ], - "commit": "8fd4102a25c2dd9ccbbee082bc61d8f44eb5ed74", - "sha256": "0ylmn54znwhqv9m88zizgzi08ks0vxf1vxqsk4mk2a94ycw1xfkc" + "commit": "923ebc91e37e6489e02c11c5cd6c490f7aa5efb5", + "sha256": "0jhk8agn0y56gf6hcd15yn1lbfzdc7522j9xqly90pd3jjcllpbp" } }, { @@ -39094,15 +39957,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20190930, - 2356 + 20191031, + 2256 ], "deps": [ "dash", "s" ], - "commit": "09226f852cb3167f23012df8f77318037f5fe9c5", - "sha256": "1gq8zwnyqxdf2i9agwky9nhc0nz6g7y0jfi8vjvxgak8dyilrfma" + "commit": "cafdd98e06a3bbff213f3ccb163de2c42d412b66", + "sha256": "07809alyxind4n0rb1h3x19hgq7ihpn128xljlz38d9xvp0r48z3" }, "stable": { "version": [ @@ -39285,8 +40148,8 @@ 20191007, 1500 ], - "commit": "cb026a595de8a9244b16e06876f10c60dce18676", - "sha256": "12az34hx714y0wqhxllpc8nk1rwh8s4lhhnvkzbqwki94qyqm87c" + "commit": "338e6dca6d749cfc85195907bba593f9f6855715", + "sha256": "1nl2ji5wvmfzchxpnmsgxn4v2lybyymyyh99lw3riqg6gb0phl9l" } }, { @@ -39379,8 +40242,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20190913, - 1624 + 20191121, + 1620 ], "deps": [ "bui", @@ -39389,15 +40252,14 @@ "geiser", "magit-popup" ], - "commit": "24918011d2f1a78d63f39bf0c462b7dab190629a", - "sha256": "1maag50nbgwygc6w7lbna1ml20f3k4dvxzjm3fgdqmfypi5ag891" + "commit": "c2796e68868c91253b6aca422a9ae07363aa03a9", + "sha256": "0i0bvv3wd3fd22mffa62076mi1cnzwyphibqiimll23kngg507b2" }, "stable": { "version": [ 0, 5, - 1, - 1 + 2 ], "deps": [ "bui", @@ -39406,8 +40268,8 @@ "geiser", "magit-popup" ], - "commit": "c4c96663fefe7e007c372e7d24d6e7016b70e4ee", - "sha256": "1730q2dm84f15ycjdf3dgl2j8770mhr6qnyzxgac3zzkjr8pyvq7" + "commit": "c2796e68868c91253b6aca422a9ae07363aa03a9", + "sha256": "0i0bvv3wd3fd22mffa62076mi1cnzwyphibqiimll23kngg507b2" } }, { @@ -39557,14 +40419,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20190809, - 1810 + 20191218, + 1628 ], "deps": [ "s" ], - "commit": "6ccad0581775eb5a777382b37175c1ec230ae5cb", - "sha256": "0yixpz25bi7cbji7jk2azkpbnxvc56fymsg2zxvwjrb8dh6gwapk" + "commit": "fd6a661b091490920804d043303596f9e60a5dd7", + "sha256": "1x4nymp53rdm1d0jjkz0mha4d8y8wzmakf65d56fn5mnziqh2l5d" }, "stable": { "version": [ @@ -39790,6 +40652,24 @@ } }, { + "ename": "handle", + "commit": "da5debb55f7b34dcbcea81675bddd872bdb7fd69", + "sha256": "032rfk3hiv0ps0p332gkf67vqs5nif8hhraiv3zlybxblzhcxaw1", + "fetcher": "gitlab", + "repo": "jjzmajic/handle", + "unstable": { + "version": [ + 20191029, + 856 + ], + "deps": [ + "parent-mode" + ], + "commit": "e27b2d0b229923f81a2c8afa3e9c65ae9e84a0da", + "sha256": "1w77p85ww1fjqgybi75s9bayqxyfvy040nr0gvsv3lmkri2mhglm" + } + }, + { "ename": "handlebars-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0wizasjihnabnqzn1226vh4gb571rs7s86bffhvkfvbk95zkiafq", @@ -40014,19 +40894,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20190926, - 313 + 20191229, + 2357 ], - "commit": "1bee161d3cea973d4ee3ff7acf980bf2cdeb83e2", - "sha256": "1vjxqqa08cxhsk69rcf0kn7bsfp6c5a9jax777h7ljc39fzcpf8q" + "commit": "c69ced59b6e2b452858a9469ce2c343a09aee871", + "sha256": "0lbbn5kh3c2yvh5xn8b2a2s5364yms3iga6x0ks442yzkfrbf78g" }, "stable": { "version": [ - 16, + 17, 1 ], - "commit": "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359", - "sha256": "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq" + "commit": "17357211a16394884a981fe0c062f94250b40300", + "sha256": "0izcasi2v02zh08c863h43m8mmsldzy8pck43cllrfn0zf24v2qn" } }, { @@ -40348,21 +41228,21 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20191023, - 1610 + 20200107, + 1518 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "1341b84aedd972e01396036ce4d496e70282dcac", - "sha256": "0nimmkvlvh811swzhynwddd2y06jx27a1s0cl5zmc9y5r4ycpxns" + "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da", + "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98" }, "stable": { "version": [ 3, - 5, + 6, 0 ], "deps": [ @@ -40370,8 +41250,8 @@ "helm-core", "popup" ], - "commit": "610d06e4c170b76ba5a687fe479842cd18420b0a", - "sha256": "07bijcnfkv60l3swasxv53x32l6glds05mxnbb3xbnmkgm1pm9if" + "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", + "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" } }, { @@ -40615,8 +41495,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190918, - 1116 + 20191028, + 1313 ], "deps": [ "biblio", @@ -40627,8 +41507,8 @@ "parsebib", "s" ], - "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", - "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" + "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", + "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" }, "stable": { "version": [ @@ -40947,14 +41827,14 @@ "repo": "xuchunyang/helm-chrome-history", "unstable": { "version": [ - 20190714, - 324 + 20191031, + 1233 ], "deps": [ "helm-core" ], - "commit": "5c37ac3f1abdb02af80fc57878b22d872dfecc80", - "sha256": "0sjxjizcj4znhx64pvah6cdg5wy9v4zgrvj691y3fqw2ydb3467d" + "commit": "f9002d4c12df65a99830376b126dbbeae3ef2148", + "sha256": "18vgy5kaj0cmrar7ahcxiy9jva006zd7yfcgyi5h99yv62g76j72" } }, { @@ -41203,26 +42083,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20191013, - 626 + 20200108, + 724 ], "deps": [ "async" ], - "commit": "1341b84aedd972e01396036ce4d496e70282dcac", - "sha256": "0nimmkvlvh811swzhynwddd2y06jx27a1s0cl5zmc9y5r4ycpxns" + "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da", + "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98" }, "stable": { "version": [ 3, - 5, + 6, 0 ], "deps": [ "async" ], - "commit": "610d06e4c170b76ba5a687fe479842cd18420b0a", - "sha256": "07bijcnfkv60l3swasxv53x32l6glds05mxnbb3xbnmkgm1pm9if" + "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", + "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" } }, { @@ -41267,14 +42147,14 @@ "repo": "emacsorphanage/helm-css-scss", "unstable": { "version": [ - 20140627, - 25 + 20191230, + 1549 ], "deps": [ "helm" ], - "commit": "ab8348aa98e0daa2f1b771e35bdb06bfacbe5016", - "sha256": "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph" + "commit": "48b996f73af1fef8d6e88a1c545d98f8c50b0cf3", + "sha256": "1xadlsg4c52anbk3dqz6blkrid8lzsd28rw402gy17vnk7lwg9i7" } }, { @@ -41285,16 +42165,16 @@ "repo": "danlamanna/helm-ctest", "unstable": { "version": [ - 20180821, - 1005 + 20191031, + 1435 ], "deps": [ "dash", "helm-core", "s" ], - "commit": "0c73689692a290f56080e95325c15362e90d529b", - "sha256": "143vyd64w3gycc68jcsji474nz2ggda58hgwq6hyiwb7s0gm1gd3" + "commit": "2a29cfb4ec583da247fa2ae7bac88790b1223e40", + "sha256": "11am95crkf409w3ph17x55v0xx2gy4spb4qc6z5f7vbxgwyaa4a6" } }, { @@ -41386,14 +42266,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20160817, - 2033 + 20191110, + 2202 ], "deps": [ "helm" ], - "commit": "805ce850d4cbe811227d9c9b16cc51f652198f3f", - "sha256": "0ambb6i8ipz5y0mnc8jd07j3iiwb7ah87pw8x8pi3phv1r80l0k1" + "commit": "6a21ac1ba424ffa87b3b3e1b53d0fdd529844a28", + "sha256": "1qpcly4v7yf6ncp951gl1c18riln86xgyasf66n56qj26mfq8bhq" } }, { @@ -41543,16 +42423,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20191001, - 1414 + 20191111, + 1954 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "77f5dab62f9962e376dad99452f29edd0b5dc75a", - "sha256": "108ksri1a5hmfjbflqmm486zv3j0sy89xsdjs39q3xrr1s4gbc4q" + "commit": "f0bf6b307f9747ba16b3f582e8364a5012e41465", + "sha256": "0wldy81xyb96kg1pz6l2i463pi83qz84m1rmiff7866w9rl1fifd" }, "stable": { "version": [ @@ -41840,6 +42720,37 @@ } }, { + "ename": "helm-fish-completion", + "commit": "0e73cbca73b5be3fa107c045083c765b5dc5d9e8", + "sha256": "1farkigcif15yb8nz6kb99hc9qf7kpf39z2vmsjp62c936rrsxls", + "fetcher": "github", + "repo": "emacs-helm/helm-fish-completion", + "unstable": { + "version": [ + 20191230, + 1717 + ], + "deps": [ + "fish-completion", + "helm" + ], + "commit": "b579193c9eca37e45ac54b66114032e9fb78aa69", + "sha256": "1aydd2f0xmyrkl9hhxcrgzgrpl2qna1krzgaprw0y7gcvg0p09b4" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "fish-completion", + "helm" + ], + "commit": "dff0fdfdbf70ad41fa2da031197836a84384e635", + "sha256": "089gp2k22xwn33z8brpyb7r18vpyralq2cwxj1xsc8b2sj9s4896" + } + }, + { "ename": "helm-flx", "commit": "f1418d260f34d698cec611978001c7fd1d1a8a89", "sha256": "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq", @@ -41944,21 +42855,21 @@ }, { "ename": "helm-fuz", - "commit": "7b411e46e9246beb36acb3e468980e84c77c6015", - "sha256": "1j3fpmqn526pkrrms578fm470svqd2yran4mpxjx0xps45nsklsc", + "commit": "2d3139563902bb1cb8aa48a517747f12a1ca1746", + "sha256": "1c6mm698kzk0armpla4i5xn5fh8pwhim6gj4cblk0wwf2av2r58b", "fetcher": "github", - "repo": "cireu/fuz.el", + "repo": "rustify-emacs/fuz.el", "unstable": { "version": [ - 20191024, - 1133 + 20200104, + 524 ], "deps": [ "fuz", "helm" ], - "commit": "56f08351c2ae91e010f6a5e810f11ae74d76deb0", - "sha256": "15fymhj82phj407bcnc64p16kv3nc860xbsnlnj7i8qvcnl3jpdl" + "commit": "0b6b64cebde5675be3a28520ee16234db48d3b8b", + "sha256": "1bddjr3rpmvkrljq5ipjm42d59m2897cpfhmiah3rcb4c6ra40m1" }, "stable": { "version": [ @@ -42729,8 +43640,8 @@ "helm", "lean-mode" ], - "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", - "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" + "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", + "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" } }, { @@ -42797,14 +43708,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20190630, - 737 + 20191127, + 510 ], "deps": [ "helm" ], - "commit": "ab825ea050f88babf6f8d340424f9359f3c6036f", - "sha256": "1i71q2d7bv7hc6793is7c1qcykadad5ggpabspac8wg9db360g2b" + "commit": "18c53b62bc758b9d8ad4e94a94f58d143ccb29db", + "sha256": "0r4dj6422g2zsbm2kig369j39lw4d68zpcr2xr02p02sfyhg1c0f" }, "stable": { "version": [ @@ -42876,16 +43787,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20190423, - 548 + 20200103, + 1659 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b", - "sha256": "0wh5zai3s17ss2q8wcdd6d87hv1h3nbyrxxs4js9cas8m6y2ssjv" + "commit": "6f62659cc528b7e37ffcc8fb356633acd7031be8", + "sha256": "1gf3pzrcxrymlj677mghxf4yrqiqa90y3ip1g1f1h186wnwa2vcg" } }, { @@ -43085,8 +43996,8 @@ "helm", "nixos-options" ], - "commit": "45c8d90748304c90e1503c9fa8db0443f3d4bd89", - "sha256": "0hsr8acsvfb42drb8f2wkpgqyh3csny7l82qv4k2l83xf022cs1d" + "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", + "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" }, "stable": { "version": [ @@ -43172,14 +44083,14 @@ "repo": "emacs-helm/helm-org", "unstable": { "version": [ - 20190819, - 617 + 20191229, + 635 ], "deps": [ "helm" ], - "commit": "542dda7bc9a3b9dfb439e4f8a1e5f60cfb6cc256", - "sha256": "1xa32w80icrykpyfb89fhb0s4l7ysi0sc7f7lfwqz5najwbgqipl" + "commit": "8457e1e46227bf87726e05c42cec5a4b51c2ef7b", + "sha256": "0kcjhwwi492n9m2w894hvdavfvhj45zygy7bwvx103wvpay5h6h6" }, "stable": { "version": [ @@ -43210,8 +44121,8 @@ "helm", "s" ], - "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", - "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" + "commit": "abc14bb85427a6585aa354894eaef6926881d585", + "sha256": "1ggj84b8wgd8xj6a442wfccvyaqg605zpikx19vqzwymaqbay85f" }, "stable": { "version": [ @@ -43432,15 +44343,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20191013, - 1027 + 20200103, + 644 ], "deps": [ "helm", "posframe" ], - "commit": "86d6e6e4c32839dec96ef51ae3917d45259165a4", - "sha256": "0byb477lxxyys9q1kwyh37y46jlyk7j1q3xq6cllq47k2gnaix72" + "commit": "f9b41d6ef3471506528fc7edfeb784c050d87db0", + "sha256": "1j65nabxin0czr0vq9wh9fvgc3fswqgbls3l6bncw64y1wzpfbng" } }, { @@ -43905,27 +44816,27 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20170813, - 411 + 20191222, + 920 ], "deps": [ "helm", "rtags" ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 ], "deps": [ "helm", "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -44102,6 +45013,40 @@ } }, { + "ename": "helm-sly", + "commit": "4dbeeaca23d938116bf23177a71f38b16276d2c6", + "sha256": "1ikrn07b2glyix6n08v6yydiisi17acfmv1cpbq6is5f3zwqcgmx", + "fetcher": "github", + "repo": "emacs-helm/helm-sly", + "unstable": { + "version": [ + 20191104, + 1054 + ], + "deps": [ + "cl-lib", + "helm", + "sly" + ], + "commit": "b1567c27c0b421b9e25e350f0c83b9c7fe0fee6b", + "sha256": "0ihcqysz5cvn94rrvjz5l4whzmxcjrfrinas180x8iycpyvzkwk6" + }, + "stable": { + "version": [ + 0, + 4, + 1 + ], + "deps": [ + "cl-lib", + "helm", + "sly" + ], + "commit": "9a4d91ba738ca06ceab2dea3c1e09fd45a67d488", + "sha256": "0b2dx9nzh5233lkix3lz81c9cv626lk2hjpcjiikwvyp6y0q92ys" + } + }, + { "ename": "helm-smex", "commit": "85568bd732da952053148e07b95e53f7caf5f62c", "sha256": "02jvq2hyq4wwc9v8gaxr9vkjldc60khdbjf71p8w2iny5w3k0jbj", @@ -44220,6 +45165,26 @@ } }, { + "ename": "helm-switch-shell", + "commit": "d585f1f9d6eaccf5150b0e7db530b61beb4ebcf4", + "sha256": "1x1qp9l9ahx85m6yqnf00ids1xlm75l6v8rdig77kzzmazpvc707", + "fetcher": "github", + "repo": "jamesnvc/helm-switch-shell", + "unstable": { + "version": [ + 20191223, + 1418 + ], + "deps": [ + "dash", + "helm", + "s" + ], + "commit": "690e20f0d95f81151b34cb424a201f39d93eb430", + "sha256": "08p9dfjkf1ssnzd8n69a10mkvdvm8w229fy32z95dh9vbxsp7aqv" + } + }, + { "ename": "helm-swoop", "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", "sha256": "0dbn0mzzsjhpxh0dpxrrzqam9hl2sjsp1izq2qv3z11iv2hylzx4", @@ -44227,14 +45192,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20191008, - 401 + 20191225, + 959 ], "deps": [ "helm" ], - "commit": "884d2f5840108f0171d38fa19ae2334560f5c2d9", - "sha256": "0x6pspamns2hb2a7x01pwzs1zbzi1p0vq6rwrczjh978n2plrqjq" + "commit": "eab47a9991ec3e6d332b091af3cbc5ee7761b121", + "sha256": "1h749s3vx5p8lgpavpvj49a3zipq6ajdrjh8bxv0qxn6k3lc1nly" }, "stable": { "version": [ @@ -44547,14 +45512,14 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20190930, - 1646 + 20191108, + 859 ], "deps": [ "helm" ], - "commit": "bbd9a858c9eaceb6d3efab0a25d9caff32b3750c", - "sha256": "0hvgcpc47ki5arln473qq3qpcg5j83qjk6cmm9k1xqvjkyv19prl" + "commit": "6b4a8bd91f5eaf82f51bd31b03f6587387fe6983", + "sha256": "03b57sm98v25bqyy9d2pccfnlfxkvaxmvismhxmai4kfv8d84azj" } }, { @@ -44658,8 +45623,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20191001, - 9 + 20200101, + 1346 ], "deps": [ "dash", @@ -44668,8 +45633,8 @@ "f", "s" ], - "commit": "e2609e4ae9e058bd8be6239681b2f22195628f28", - "sha256": "00id29w31mq6ikaa95dp0m6l9hcmvm4m0z3mfgyj4713vnm162s0" + "commit": "982dd49c9c7e63fa94b56824f50dea4186081f8e", + "sha256": "03fkk0dybzj6ckkvih7fxsw7kf3a26h7mlly44acxcpkyjxq0k1k" }, "stable": { "version": [ @@ -44959,8 +45924,8 @@ 20190425, 842 ], - "commit": "a1d13c40102e833192c3bd6acf930013bdcbc819", - "sha256": "1hg3hvz11ncsh7xhsgv0id4szypj7cv2cffqnk3hphyl073dyic6" + "commit": "be2634dc1f08a5e781d02ef301c727246863756f", + "sha256": "05v3p2n92xjz035m5p0m5wd85ygngbvjd8y09r5sx1mi5ya2k0v2" }, "stable": { "version": [ @@ -45567,17 +46532,17 @@ }, { "ename": "hl-block-mode", - "commit": "d2fbba8cc73a5d567b525ce2c0a15f35379f29e8", - "sha256": "16z49k1rn8n1f64fidff0jyhn3h4pmklys9plr96nbd4lvm80msj", - "fetcher": "github", + "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", + "sha256": "17ghc2hbvckp68blk8izwmx6far9ampalik2f9idz27982h49ia8", + "fetcher": "gitlab", "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20190520, - 30 + 20200106, + 448 ], - "commit": "fcefe78a1df2dccb85821d23e6c6ea2a60eedcbc", - "sha256": "1r9p7lz0bidr499f7l3w5c9q2ypzhqxn7n1k95wmdmbg8l5jnxxd" + "commit": "646c8cb8938b22b34f7c75a8644680a3f75f6bf5", + "sha256": "1ydnf53fk6gbcmqijwpi5yqwbz4b86y2xjbmf264a7yavb7gqpjh" } }, { @@ -45646,20 +46611,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20191024, - 1036 + 20200103, + 1239 ], - "commit": "823ca3751e4cac6e936800ddf2f19d6f96eeb422", - "sha256": "16isym4dp6vbc9f1pa1q1x1hwhm7nd61rr5y4inf58wllgflnb7f" + "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543", + "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn" }, "stable": { "version": [ 3, - 0, - 0 + 1, + 1 ], - "commit": "487d349b7b8d6738223d5dd10957dd10b45eb9f3", - "sha256": "07xcc04ivpl5sbgb55qz84mz6wa500h0awzw1zq1ba5mfjjq8hls" + "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543", + "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn" } }, { @@ -45983,16 +46948,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20190921, - 259 + 20191118, + 2222 ], "deps": [ "org", "promise", "request" ], - "commit": "8ebfcb2b8f708110040c5a3e6f4f0d46f33b025c", - "sha256": "1rsmz7av9ij11j307ncly78dhncyb7lxdcgpy0plfsyja3kw3m5q" + "commit": "8bfaffeff945bcfbc1e2b2cfb65e8452a7a34717", + "sha256": "05k7ar832bbzvjicri4v5dyivdrypgkqgninf72izykl89v8yzgx" } }, { @@ -46009,8 +46974,8 @@ "deps": [ "cl-lib" ], - "commit": "e011a70f5955b8eb2e30f7baf2f3833fc6d3216f", - "sha256": "0p8gphaqkyl9cmbs85vi31jgbc56j6ghwf5zhn523sy22vcw5j0j" + "commit": "4f550d35935abc943e37e1f2da78c52218ac7c8d", + "sha256": "1rcyqyb48lsqpsa65ggd7ks88rk53frjhgrwr357b057kcqjic4n" } }, { @@ -46159,19 +47124,19 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20180923, - 1829 + 20191111, + 2130 ], - "commit": "8db0aa6aab77475a732b7363f0d57bd3933c18fd", - "sha256": "19hwcqla1mnp5k8mll4in1pimqpa8zmqd8yfmxkikldmwwsilaq0" + "commit": "86f22f211e9230857197c42a9823d3f05381deed", + "sha256": "0n117rb4d9dydl01b65d09rp8bmkir3m09zs02dhlmqmljpy25w8" }, "stable": { "version": [ 1, - 54 + 55 ], - "commit": "a8b73f1393b2d73541ba4a8fd716c0d07ce50276", - "sha256": "1d5hj8wibp1lxs697y7i4yrpv9gqq821gxmpqqkn2jwrb70nsngl" + "commit": "682edbf751f5c255bfd4af0eb714a8bce0737cec", + "sha256": "0gi3xshscpa53qrj8yplfsqahcilc2ybcc2p7gnh5nbnf2n1n97x" } }, { @@ -46185,6 +47150,15 @@ 20190517, 511 ], + "commit": "35c62dd95c580fad49f84c5270cd69810455fedd", + "sha256": "1gh6acc21lfnng4hlgf6wv5pv4zcs9j44i25grrac0714sa2lm81" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], "commit": "3260d9267b51019328c30a6317f28e4a2dd7d522", "sha256": "15rfg4z8lhwadgnr58r3skmzmkxs5phnqr1ap4bjd9pq618amdbn" } @@ -46484,15 +47458,15 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20190821, - 939 + 20191125, + 955 ], "deps": [ "cl-lib", "lv" ], - "commit": "74b32f3ff004cd2ad7707722ffa7f85e8233a845", - "sha256": "0gp1j8n65v3r849c3h3xmn7c133wyh68szksqjwn1lzd2mpdnfny" + "commit": "9db28034d7d61bfeff89899633b958f22befc53d", + "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp" }, "stable": { "version": [ @@ -46630,19 +47604,20 @@ "repo": "muffinmad/emacs-ibuffer-project", "unstable": { "version": [ - 20190925, - 1105 + 20191128, + 1938 ], - "commit": "7de4f54a959de3254a98662777269ec7a08adbc9", - "sha256": "06p12hxnrbcjdwr8b1rmbm7b4hwkhp7lsrw4j6fnnf1hi27hngsq" + "commit": "38d0d528f7ec008d2953fc9c6217b327c50088ec", + "sha256": "08ahkjs2rwdn93mmwsp2snvvparq76y3k788q5nj90xl396j5l4r" }, "stable": { "version": [ 1, + 2, 1 ], - "commit": "a29ed1f415902f21b5b17bf36ce1a0e46e29400c", - "sha256": "0b5d5gdqinnqfll82i994jmg6y4va2fallvh0d8g0978y3xx8vnp" + "commit": "a83e74952244f46a759a8ccd5e55176c763c7309", + "sha256": "09pcd0xlijxmz2lh69m3rs53agzq4zr7i2wg652v25s4rhipl55r" } }, { @@ -46997,16 +47972,16 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20190719, - 4 + 20191105, + 532 ], "deps": [ "cl-lib", "memoize", "s" ], - "commit": "fcb6fa0c2f5989b2e79f2dc1ef57d03e455cce44", - "sha256": "1wq5gbr87f6c3bbsndkg50ndf6s21pzz49dmxaa4sckjs2ax9mzx" + "commit": "74861eabd0a2619be9efc4c91fe0c5e69db5f263", + "sha256": "04rykll588dkvmanskqnfvkb9pgsj4ymlzx1msahj1g144laijnc" }, "stable": { "version": [ @@ -47082,8 +48057,8 @@ "flx-ido", "migemo" ], - "commit": "aa93aa05947eb6c106bb9523ff3163b8574c4eac", - "sha256": "0k6zidi0ch4z9fg74k968pz7r0hzj56kccbf48k0is0fnzl4isxq" + "commit": "da64f2fe3849492d35e155d81a817308a4853473", + "sha256": "0r8z8ingq83nkab9khpl9gspihv28gy721hcs0yh1d74wyjc71cr" } }, { @@ -47177,20 +48152,20 @@ }, { "ename": "ido-migemo", - "commit": "8550601b8989f9838dfa7848977b2509b8e16175", - "sha256": "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "0dpgr9lxj7g7kciw4w7y1qmah91z2b2vwj9xyn8m6f6grihg7p2l", "fetcher": "github", - "repo": "myuhe/ido-migemo.el", + "repo": "emacsattic/ido-migemo", "unstable": { "version": [ - 20150921, - 2244 + 20191017, + 1919 ], "deps": [ "migemo" ], - "commit": "e71114a92dd69cb46abf3fb71a09ce27506fcf77", - "sha256": "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38" + "commit": "09a2cc175b500cab7655a25ffc982e78d46ca669", + "sha256": "0my4bvi2b4c5q8wdsdhypyk6w6n63pw0240kx3r6kb85l9rg95r3" } }, { @@ -47639,20 +48614,20 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20180318, - 2259 + 20200103, + 1238 ], - "commit": "a61f409c517ec274e1ec81f3f00c178108c226fb", - "sha256": "0l75z8i0zpl7jwbmv3jqh896dikdvjh1l8qgwn7xh2hi1zjwybwh" + "commit": "100d62c7095743fadddfad5b9e0740ee386ba4cf", + "sha256": "0wpfl74v7xnvsk3ribxkfyy4p5p9j2wskrcf0naavqpgm6fc6jvr" }, "stable": { "version": [ 1, 0, - 1 + 3 ], - "commit": "7df5fb9684a0288313ef5f64594078d477105959", - "sha256": "0xc19ir5ak1bfq0ag48ql5rj58zd565csgxhpa30s9lvvkc8kvr5" + "commit": "100d62c7095743fadddfad5b9e0740ee386ba4cf", + "sha256": "0wpfl74v7xnvsk3ribxkfyy4p5p9j2wskrcf0naavqpgm6fc6jvr" } }, { @@ -47793,20 +48768,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20190412, - 1115 + 20200104, + 1433 ], - "commit": "176178a57c5b342b04bebd3107c29c6d12086cf5", - "sha256": "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6" + "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b", + "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq" }, "stable": { "version": [ 0, - 1, + 3, 3 ], - "commit": "176178a57c5b342b04bebd3107c29c6d12086cf5", - "sha256": "0bsx0dh802x58vza9whgkkj6j16c6pcz7gdpvan50dmzs0h0pfz6" + "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b", + "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq" } }, { @@ -47955,8 +48930,8 @@ "epc", "f" ], - "commit": "bbc131278f8cd62f3e71b6f4a86b0c91792a3524", - "sha256": "19p4nrpk4g8lxh2rhkgsjrf4xaqi9yp4p2pxrf69lygb54rzbdly" + "commit": "86f17856db194c5f18b30f35df40fb029d5544b5", + "sha256": "0cak79lnlbfigl6lh3c5wzphxssq78vyd9xxj3zi7ln5q9ijl6pp" }, "stable": { "version": [ @@ -47979,11 +48954,11 @@ "repo": "zk-phi/indent-guide", "unstable": { "version": [ - 20170221, - 1127 + 20191106, + 240 ], - "commit": "d64f43011c72068e008621e620009ec592b35913", - "sha256": "1zjxfwbbmg95llpkvgbwdgk6cx7g9x48y3i4v75r8d4iy2xndgq8" + "commit": "7fc710748f9e5a086acfe77970f117df89ee9749", + "sha256": "055cpcj57k14v2vdpc1an6dww5ncvfpxghpgw1spv53wzgv8vzkq" }, "stable": { "version": [ @@ -48009,6 +48984,21 @@ } }, { + "ename": "indent-lint", + "commit": "2cd74b5fe81e9b2dcdd9f40e8d5693335629f6ec", + "sha256": "1wy8cpyiljjg3315pwivpzlz5cjnxpcigx3pv7rrx5lvdzapz5v8", + "fetcher": "github", + "repo": "conao3/indent-lint.el", + "unstable": { + "version": [ + 20191229, + 846 + ], + "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92", + "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1" + } + }, + { "ename": "indent-tools", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "12rawl9qaihgyascy53yxpkknp95wh8fiqygb5cgl7d761qizvp6", @@ -48039,8 +49029,8 @@ 20190424, 1547 ], - "commit": "a5450fe467393194bc2458c0d5e0a06c91bf117a", - "sha256": "0phbs9cx73vg9k9gp60vhlrn065skpva6gx0abp0g6rbzys2qx0b" + "commit": "c941cde1205642c6b933ae6abbc47d199f609df0", + "sha256": "0523x5am383j1msaiflffa98mm05y38v4jvj144hbrhrdk3vykrs" } }, { @@ -48070,8 +49060,8 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20191022, - 2128 + 20191128, + 1600 ], "deps": [ "company", @@ -48080,8 +49070,8 @@ "json-process-client", "seq" ], - "commit": "9614d63fa5a5126bd5b68d62410894371da081bf", - "sha256": "1cvc9nk1cbym0ah6z0zmgv9bywj3lxvcaflywmavnn4gvxg67m9n" + "commit": "036f237840dd47e2dc5d368ce4ee3ec18fd4839d", + "sha256": "1gxd6ka99j10nlwkv2bmql5yf4lgpa0gh5ys0snci7d5565rxbr9" }, "stable": { "version": [ @@ -48129,8 +49119,8 @@ "deps": [ "clojure-mode" ], - "commit": "173d0e7f118b0009bf210be115485160abf554b1", - "sha256": "1514vrdpl467bj4k1qg48fk3526x7cx66px49jy8ynayfs0dhgjc" + "commit": "575538e27bf0109693c30afd1a0b5b5bd3eeba0c", + "sha256": "13rq2x9y5nadi6qplg56dmr8d0d4gy8zl4dw3vskj1hnj0yi9bv6" }, "stable": { "version": [ @@ -48448,17 +49438,17 @@ }, { "ename": "inkpot-theme", - "commit": "dd3e02aaf8865d8038b9c590c8545e7a1b21d620", - "sha256": "1m3iygb8vbqcnsxsnwr7g2mq1n2a9r7qxp3pgm1fpwz1lngvaagf", - "fetcher": "github", + "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", + "sha256": "1avgzjwppmmhdmljwpy75acylm3f74d3x0q94ld2n1yhi8xx40i9", + "fetcher": "gitlab", "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20190907, - 1024 + 20191218, + 2038 ], - "commit": "f6f148eebef72939b90a1822c1c3a257e22f802e", - "sha256": "0jxh9plw699b7w6vi6km4154ixgn5w8a1hx9v99s0icf8rpvrcnw" + "commit": "ed488fcbc8c015121a4b1acd8d08db229fd6735a", + "sha256": "14y87fvav10wjc88bbi1pwy8lxnqcdk4cahwhd9cg5bhsqwhm32m" } }, { @@ -48502,17 +49492,17 @@ }, { "ename": "inlineR", - "commit": "3a7228e5f23a4e66f4510b2f6fc41c36aa791991", - "sha256": "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "0f6bh46ljz01bysm96dzd9iygfh6zgd4w6g8h3kb8lk07brm7227", "fetcher": "github", - "repo": "myuhe/inlineR.el", + "repo": "emacsattic/inlineR", "unstable": { "version": [ - 20120520, - 1432 + 20191017, + 1920 ], - "commit": "29357186beca825e3d0451b700ec09b9ed65e37b", - "sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q" + "commit": "bf6450a3540aa3538546d312324c41befd0a4e54", + "sha256": "05by3mzz8gw13c42m2z3cr13zng62mbany0hvixx3jmn1q4hj9r0" }, "stable": { "version": [ @@ -48531,11 +49521,11 @@ "url": "https://git.sr.ht/~zge/kaomoji", "unstable": { "version": [ - 20190701, - 1823 + 20200102, + 1942 ], - "commit": "b144e48f02f29bb25651a63d9691e9de10f0171b", - "sha256": "0i5wx60hvkriyas6g0599x35xnln77v0136z2k1rp332m9450299" + "commit": "0c52e1266e61131ca0c8bd0f2092aad7b6d44ed9", + "sha256": "01sqc1cg89flxzhav9bgr733840xgqxy1i4sphfhd96c05yj287z" }, "stable": { "version": [ @@ -48683,11 +49673,11 @@ "repo": "rudolfochrist/interleave", "unstable": { "version": [ - 20171004, - 624 + 20191129, + 958 ], - "commit": "87549df30cbc681baf86b238bd14c7cf7ec11fc4", - "sha256": "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b" + "commit": "383eb955bf0084a6e6ec03c9bd34511e20e0407d", + "sha256": "11bm00pw0bg8z6b5gyfmb2iss5libp6m4x0mc8agazabxzhmzyx9" }, "stable": { "version": [ @@ -48707,16 +49697,16 @@ "repo": "commercialhaskell/intero", "unstable": { "version": [ - 20190919, - 216 + 20191103, + 1239 ], "deps": [ "company", "flycheck", "haskell-mode" ], - "commit": "3848723cbeeaf61ca13e2a44c5b87a7fcd66b7c5", - "sha256": "14cg856gsla77qfxv4sivg7mw7mpv3pqk7l4nrh4vna9ziy78z3m" + "commit": "30d8e7330c9b20c2905035bc417fa8645e7b4b85", + "sha256": "054ml379drc1gqykv2wlzaw8d8y2qmsk3rbxgry5nz9w7j66j5jp" }, "stable": { "version": [ @@ -48998,8 +49988,8 @@ "cl-lib", "json" ], - "commit": "e630c497f973fa4d1f0fd0e0fd87fb9d18666986", - "sha256": "0n2nfcq58md1p2xdhq1smh8v7lsyj0ci7ma5xyd6bkg5rvhsh10i" + "commit": "8387098286132abd6472a8f49750e38ddb8096b6", + "sha256": "0vbv0h75vxwhjk0wxmdvnyb20ymjp4jyyify6ycaq9i2byl84b1v" }, "stable": { "version": [ @@ -49066,6 +50056,18 @@ "deps": [ "cl-lib" ], + "commit": "4d660afa365c82c3ed00f685b53f0d2358972d36", + "sha256": "0klngpw69kdh3l9jrvjq63xlgpqd86j8rrvivrzipddmplppz9gy" + }, + "stable": { + "version": [ + 0, + 0, + 7 + ], + "deps": [ + "cl-lib" + ], "commit": "462b8100451b947367aed2970c2669ea6d15edbd", "sha256": "0b8ncpi6kps7fx3fmgfwd2czaal52laf2k6pn46yh110sz6dl30m" } @@ -49296,11 +50298,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191021, - 1017 + 20200105, + 1946 ], - "commit": "d2052bab4eecebab84e75b8a10b66f66a8574425", - "sha256": "0kxv03mb00ia48vk05xb6bqhkphjjh2pry6r2f5pyag0wgh5vyma" + "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", + "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" }, "stable": { "version": [ @@ -49320,8 +50322,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190918, - 1116 + 20191028, + 1313 ], "deps": [ "biblio", @@ -49332,8 +50334,8 @@ "s", "swiper" ], - "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", - "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" + "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", + "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" }, "stable": { "version": [ @@ -49414,8 +50416,8 @@ "repo": "s-kostyaev/ivy-erlang-complete", "unstable": { "version": [ - 20190910, - 426 + 20191112, + 1137 ], "deps": [ "async", @@ -49423,8 +50425,8 @@ "erlang", "ivy" ], - "commit": "95bb7da0f7d0e89b6732d1d14d4bc49007b8b794", - "sha256": "0jnpfxzzcgyrk7zdfnprchl6b15558zhn12a1pf3h3z6d3zyirql" + "commit": "7d60ed111dbfd34ab6ec1b07c06e2d16a5380b9a", + "sha256": "0z34ljmwr0hmkaq5z85p87vljywpv3nnsvhp1zc8cw4hvqarcjqg" }, "stable": { "version": [ @@ -49497,6 +50499,38 @@ } }, { + "ename": "ivy-fuz", + "commit": "578c150cb8f61058f8003554d372944a990d7a7d", + "sha256": "1z7r4fw1kl4vnfd5n6d628xwqhlr1768yfpj55gg28bq5lfx725h", + "fetcher": "github", + "repo": "Silex/ivy-fuz.el", + "unstable": { + "version": [ + 20191222, + 946 + ], + "deps": [ + "fuz", + "ivy" + ], + "commit": "f171ac73422a4bae1503d63d804e691482ed35b2", + "sha256": "0ir1ighdlkh7ff1n607rwqyw2m9x9gr1ss4abdx6walajs7q3dki" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "fuz", + "ivy" + ], + "commit": "f171ac73422a4bae1503d63d804e691482ed35b2", + "sha256": "0ir1ighdlkh7ff1n607rwqyw2m9x9gr1ss4abdx6walajs7q3dki" + } + }, + { "ename": "ivy-gitlab", "commit": "35d4d4f22e4c567954287b2a1cabcb595497095a", "sha256": "0gbwsmb6my0327f9j96s20mybnjaw9yaiwhs3sy3vav0qww91z1y", @@ -49567,8 +50601,8 @@ "hydra", "ivy" ], - "commit": "d2052bab4eecebab84e75b8a10b66f66a8574425", - "sha256": "0kxv03mb00ia48vk05xb6bqhkphjjh2pry6r2f5pyag0wgh5vyma" + "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", + "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" }, "stable": { "version": [ @@ -49645,15 +50679,15 @@ "repo": "akirak/ivy-omni-org", "unstable": { "version": [ - 20191013, - 423 + 20191207, + 528 ], "deps": [ "dash", "ivy" ], - "commit": "8d856238a5d93abec3b896f643a69960b50e821d", - "sha256": "026cz4pdcpnqcavsh1wgh2xpwp7n6wrd4d62bk8rc1caf49y0i26" + "commit": "5460a9fc061a4a5ae8372dc8df966ced94abab58", + "sha256": "1np1f51hc3phkl5w02a9a79gl38ra2d535i784fn4pqaasvm0rq8" } }, { @@ -49732,15 +50766,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20190928, - 554 + 20191226, + 637 ], "deps": [ "ivy", "posframe" ], - "commit": "81f2ea14ddbdd4b840f18dd13ad3e30a6b791b4a", - "sha256": "0b5sip1lc61hxi6bpvkv96vy83xb7cjblssjnzm9yxlniqc778b9" + "commit": "6d697ff00ac406b919eba8665b1bc18a2b423cda", + "sha256": "05zhfhml8bd1zi1msy6zjkimirwq59i9fwa0mxy9l88si3dmb2hb" } }, { @@ -49751,27 +50785,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191025, - 354 + 20191224, + 220 ], "deps": [ "ivy", "prescient" ], - "commit": "82a90c4142c369f4090a42536179c6029d3fdafd", - "sha256": "0n919w068j73dnlxfzsvzh7j385phi4z718pi6xq6cygkjkq9zq8" + "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", + "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" }, "stable": { "version": [ - 3, - 3 + 4, + 0 ], "deps": [ "ivy", "prescient" ], - "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", - "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" + "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", + "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" } }, { @@ -49813,14 +50847,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20191025, - 432 + 20191209, + 1200 ], "deps": [ "ivy" ], - "commit": "3f571704fa50e47174c92938d19c945a3bdf09b5", - "sha256": "00fcawjrfqzgnzcij1yrvnzbfqdghvgg94fihf97qs4qd79zzxb6" + "commit": "efcacd869ab8f214d95e4c0445da771ba21d62a6", + "sha256": "01whwckj0zlnck7b281r1z4c0kvjdmksjjajb6g2f62vdpjpd48r" }, "stable": { "version": [ @@ -49843,27 +50877,27 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190821, - 1946 + 20191222, + 920 ], "deps": [ "ivy", "rtags" ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 ], "deps": [ "ivy", "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -49910,14 +50944,14 @@ "repo": "alexmurray/ivy-xref", "unstable": { "version": [ - 20190611, - 1305 + 20191126, + 401 ], "deps": [ "ivy" ], - "commit": "1a35fc0f070388701b05b0a455cbe262e924d547", - "sha256": "0d71nm9d9ajp5i6dnl8h1hw9jqp8gd1ajgninb1h13i80rplzl9k" + "commit": "3d4c35fe2b243d948d8fe02a1f0d76a249d63de9", + "sha256": "1c0k1in2hpfwfd7m5r8623d58kxsrfl6pwpgdrkk3077vdgbwiip" } }, { @@ -49937,8 +50971,8 @@ "ivy", "yasnippet" ], - "commit": "32580b4fd23ebf9ca7dde96704f7d53df6e253cd", - "sha256": "1wfg6mmd5gl1qgvayyzpxlkh9s7jgn20y8l1vh1zbj1czvv51xp8" + "commit": "ebf05761cd890bccd8072051f988dae7ab11c9ce", + "sha256": "01dc8hv464r3q3d6whix76sqwfkjcvhdg55jmw0ck9jwmhwsvc7x" } }, { @@ -50074,10 +51108,10 @@ }, { "ename": "jabber", - "commit": "ef7dbf3c2ffee5a4d71466ce037c618e0434a346", - "sha256": "04d2jdzs3c790ms70px8xvyip1liqvd3jy2mbs8qqbwyiccb74xx", - "fetcher": "git", - "url": "https://github.com/legoscia/emacs-jabber.git", + "commit": "d29cc2a26829e678467664d6b2f5c171dc9dbd25", + "sha256": "0vsmj33qh07amkdlp5i0ldspxsw8pp16lwcq97i1xk59glif0n2f", + "fetcher": "github", + "repo": "legoscia/emacs-jabber", "unstable": { "version": [ 20180927, @@ -50117,11 +51151,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20190311, - 1920 + 20191125, + 1321 ], - "commit": "3be5f03ba39ffab65e974cf1624cf38588639dcb", - "sha256": "1lb7z060jrbr0ijzif5p3qg70lg21h1a6jyzyfqfhwf2iwa3mkcj" + "commit": "e951217ee3ea0ac6b9ed9a209305ef9a72ec019a", + "sha256": "03dklv7daxlqzmv8dq9whc07ia0fihy988gfgdr006pfy2x6mnq7" } }, { @@ -50180,11 +51214,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20190917, - 124 + 20191201, + 2353 ], - "commit": "349eba576455f1c8f40acaa77ef222bf6432c4e7", - "sha256": "0c0idb1rfp7n99jq1jmjvgmv77f38jrvxjy95lx27j743i8zkb7d" + "commit": "62a1ca33ac443e23869bc83dd2149cc014bb5132", + "sha256": "02chr2dcyf3946pg2wysybca559n2vm9lyb65zx6h6pvqhmg4kwp" } }, { @@ -50467,8 +51501,8 @@ "repo": "jdee-emacs/jdee", "unstable": { "version": [ - 20190418, - 1626 + 20191102, + 1426 ], "deps": [ "dash", @@ -50476,8 +51510,8 @@ "memoize", "s" ], - "commit": "b9ce633d68ece00dac03d3eeddc4477de53e5e38", - "sha256": "0gwcl9c0y2s9xyrajwrwiaklfd8as9hmmq0lbrd7fy4q0l0vpr98" + "commit": "b510a29f1fc1bea218a6230fb219922775687c78", + "sha256": "0c0jfi3gg85ccid7h9ll0a160lsjb11wxqncs4qnz75d3npmgsw9" } }, { @@ -50980,8 +52014,8 @@ 20180807, 1352 ], - "commit": "b4fec1497c76d36f7d8a2aad44983f8b6f501180", - "sha256": "0s80f6sq3ly9wiz5az1imrn5lyqhn0cdlq0vvfadk2ycvb370989" + "commit": "0ea56bf620105af71d2575f62f9527773b6e3d68", + "sha256": "1zdp9r97bd85ylb9km27129pxxf5mvmhr4fqvphzb57j7yml3z0h" }, "stable": { "version": [ @@ -51231,10 +52265,10 @@ }, { "ename": "js3-mode", - "commit": "805a7c7fee2bafd8785813963bf91ac1ca417fd1", - "sha256": "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "0iqhqq9wkhpgw1n83x6f8qib0agc626cv0qah73v6497ra9ri8ni", "fetcher": "github", - "repo": "thomblake/js3-mode", + "repo": "tamzinblake/js3-mode", "unstable": { "version": [ 20160515, @@ -51335,14 +52369,14 @@ "repo": "DamienCassou/json-navigator", "unstable": { "version": [ - 20190131, - 1031 + 20191213, + 755 ], "deps": [ "hierarchy" ], - "commit": "f4cde60c4203fc70cc7ff22ed1d6579159ce2598", - "sha256": "0xrjbx6rkm8a6pmzhdph0r6l468hj827dvvq2hxhcm8v5gk6m690" + "commit": "afd902e0b5cde37fad4786515a695d17f1625286", + "sha256": "0gn19qn11n86rn9b6knp9fb5jx9m2q1khhm4vnh0vjck7jxi9sqr" }, "stable": { "version": [ @@ -51551,30 +52585,6 @@ } }, { - "ename": "jsx-mode", - "commit": "7dea24e922f18c1f7e1b97da07ba2e4f33170557", - "sha256": "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b", - "fetcher": "github", - "repo": "jsx/jsx-mode.el", - "unstable": { - "version": [ - 20130908, - 1724 - ], - "commit": "47213429c09259126cddb5742482cfc444c70d50", - "sha256": "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh" - }, - "stable": { - "version": [ - 0, - 1, - 10 - ], - "commit": "1ca260b76f6e6251c528ed89501597a5b456c179", - "sha256": "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx" - } - }, - { "ename": "jtags", "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", "sha256": "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7", @@ -51597,11 +52607,19 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20191002, - 1352 + 20191225, + 858 ], - "commit": "ad6a4944feb61f5c7238cfaf6c99ae63544315c2", - "sha256": "1m4w0ha5zkclmdfr6wrpbwz1xqvjclbl63vxfsiq6qwmdajrq97g" + "commit": "5238f9adb7dd1c161fd6130435ebf0ac3755f33c", + "sha256": "1482wx9vhxvs1msdqmcv7hv31q57r2pkwij39rvscc3s046x61vr" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "d21b83db56ae74d232dc2be2cd87810c5b8a6451", + "sha256": "0h4v227qdd7w0caigzbgjmjh6ddjlwgcd0g7s30ac45vdwr877lc" } }, { @@ -51612,11 +52630,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20190908, - 1717 + 20191209, + 1051 ], - "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", - "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" + "deps": [ + "s" + ], + "commit": "b11a5729709c5ca541db2b6472b6579166723060", + "sha256": "0vb464y21jvqdkswz8hm8lm345fs811i6ns1zbwx7rz7bav4zlw5" }, "stable": { "version": [ @@ -52105,28 +53126,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20190921, - 751 + 20200107, + 1719 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "97c8d71977f12e4b791bdd0646c3e128bbe9fc1b", - "sha256": "0jv817fpbvadqvl44xf9ai8iw2w6jhlc3gsvb9by6cr6rbqyz9js" + "commit": "f5fcb5b375ff559214be0fce2a0930cfbe6be3e4", + "sha256": "0r73k6lgkar4sdigczpiw2i1f4l3f9dlvmdl5jsx0pd8kb4nyzxp" }, "stable": { "version": [ 1, 5, - 2 + 4 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "6b335f4cb203e40c7ee331ecc91f7d95feb23acb", - "sha256": "052lyf5dc6p70dla6ggb24941aaz7lsdzgmkyc7rqxvm0xhm8d2d" + "commit": "db1c43915fe68f31fffa00159b4198c32e87c8ed", + "sha256": "038bqg66m5cpg1w70la3jr57rq9fngmb1g67z27lpqcf3xf416xc" } }, { @@ -52367,20 +53388,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20191023, - 2135 + 20200103, + 1239 ], - "commit": "ab41be43b6d9efd5eff5ad7f22a997cc41e8daf0", - "sha256": "17hpyfkmr8ij3pr2cpl189svar2w5m01glmzvr95br6qmcifvvqa" + "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", + "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" }, "stable": { "version": [ - 0, 1, - 4 + 0, + 1 ], - "commit": "fe416461b15543138ad4fef8ef5e2c364a6b5b2c", - "sha256": "15q2kc7mlmr856ldh6bkba26zq8fwia26cv1gsqwj3jmhml6mlq1" + "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", + "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" } }, { @@ -52464,26 +53485,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20180318, - 2237 + 20191222, + 2258 ], "deps": [ "cl-lib" ], - "commit": "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7", - "sha256": "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8" + "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", + "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" }, "stable": { "version": [ 3, 0, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "1ad766dbc111ec78b1a292da97b9bd4856cd2ff7", - "sha256": "0imx8zp21bm066bzdynvasylrlhw0gr8mpk2bwkz8j1y5lsp54v8" + "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", + "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" } }, { @@ -52602,6 +53623,36 @@ } }, { + "ename": "khardel", + "commit": "d0dafe07d355f705b268b19460cf071ab878961f", + "sha256": "0h9dhlzjrci4q5p18fwwizs31f4gyz8d5jq011bvzcvz9q1q75sp", + "fetcher": "github", + "repo": "DamienCassou/khardel", + "unstable": { + "version": [ + 20191124, + 1257 + ], + "deps": [ + "yaml-mode" + ], + "commit": "5ee835a4429c58dec3900e4fa3d7cc1e778c969b", + "sha256": "0k2q0m7g9bj4k5xc4cldhi7cfbb114g016abyzq3q3jaymja195z" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "yaml-mode" + ], + "commit": "5ee835a4429c58dec3900e4fa3d7cc1e778c969b", + "sha256": "0k2q0m7g9bj4k5xc4cldhi7cfbb114g016abyzq3q3jaymja195z" + } + }, + { "ename": "kibit-helper", "commit": "f7fee551ca9ed226f1285dffe87027e1e1047f65", "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s", @@ -52757,17 +53808,19 @@ 20180702, 2029 ], - "commit": "7947abfbb77cb50c6d7cce7c8739ab630e028034", - "sha256": "0qcwnq5wmc9yd253yi4x6b3v2p5d9vwb3skq9qv9igc0nhmq9gvb" + "commit": "52d12ebf33e410c9f4798674a93cbd0db8038bf1", + "sha256": "0hgfqy5yysfg3z04bj6xw53icixadigf3yxnskrnrs76sj4pd1qi" }, "stable": { "version": [ - 1, - 11, + 2, + 0, + 0, + -1, 1 ], - "commit": "39c17457bae91baf8fe710dc989791e45879f136", - "sha256": "1rl56b7j3d6d57hx4c155brfv988ngcvc342ma09i630lh7gxpf5" + "commit": "ae0fa0cab3025e517452f44b91dd7d95182f39b2", + "sha256": "1ca9ggkbhfbr9d938nmg5klgmf5ayji0i201hcragjqj7hak18ia" } }, { @@ -52945,11 +53998,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20191021, - 1834 + 20191102, + 1510 ], - "commit": "6aa6d56c0a04e655e3cbfd1ab7904a45b73ae21c", - "sha256": "1kdka9yqbh3m8nb3rpvax1fpjij7r3r2j2whys5cyvvrjfmp8hlh" + "commit": "ab610996820b5cbdb032edbf8747661131603ab8", + "sha256": "1dcaiwxymrch1vfzssjizv6l9isc68xcf8987c0l71zmzmrq1s7s" } }, { @@ -53019,14 +54072,33 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20191014, - 2010 + 20191219, + 1646 ], "deps": [ "transient" ], - "commit": "9ed130c6e5d35b5fa41156f9ec62aa50365c23e0", - "sha256": "0xqjsng9fdf96h0sa01d0sza5qpkl14r2ccf0mmcg3l7c2xw8ibl" + "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f", + "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc" + } + }, + { + "ename": "kubel-evil", + "commit": "659b07e3acaa7f1738632b614098c0bdb7850969", + "sha256": "1rvzgkrw88m2im1gadpxz9galjzcnpfmqlim5020vy8lxi558zcj", + "fetcher": "github", + "repo": "abrochard/kubel", + "unstable": { + "version": [ + 20191231, + 1429 + ], + "deps": [ + "evil", + "kubel" + ], + "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f", + "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc" } }, { @@ -53037,29 +54109,30 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20190822, - 913 + 20200106, + 848 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", - "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" + "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64", + "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v" }, "stable": { "version": [ 0, - 12, + 13, 0 ], "deps": [ "dash", - "magit" + "magit", + "magit-popup" ], - "commit": "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c", - "sha256": "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi" + "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", + "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" } }, { @@ -53070,28 +54143,28 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20171123, - 219 + 20191108, + 615 ], "deps": [ "evil", "kubernetes" ], - "commit": "7ef0e4be3a788bf45914308d6e2158384e3f605b", - "sha256": "0zmjv1wndhy4j0mamz6phadp37zc6kgn4byln2p7pbwc7r9mzmlj" + "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64", + "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v" }, "stable": { "version": [ 0, - 12, + 13, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "d4ce5eb5da1ea0879b7d3266d97aecc8aee2807c", - "sha256": "1asjmxw24bvaapjaljj37pv9cbvqqw7577q1mds4lnicvnbdsxzi" + "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", + "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" } }, { @@ -53138,14 +54211,14 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20180401, - 1221 + 20191218, + 148 ], "deps": [ "s" ], - "commit": "a27153f6a01f38226920772dc4917b73166da5e6", - "sha256": "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955" + "commit": "f8a51febc4cd2576887d477c88d881a865a62d07", + "sha256": "141r35z6sq0ainvja83plypf2bnn6hbwn8xfi5bsqpk27mpd2709" }, "stable": { "version": [ @@ -53201,8 +54274,8 @@ 20190320, 1827 ], - "commit": "17a21954725eae3bf7b77f724d7783936eb33742", - "sha256": "0q1j5h4nxpckfd5apwl4iqhgdnjpy2fjf9kqfknyiz7c7h7424d0" + "commit": "a4d1806793ab7a651c5380ebb2d1b53c8fbf7944", + "sha256": "06mw3x40wl4hfqwps41z2sps3vamgj89b7ks0ri7z9f90x645v4q" } }, { @@ -53237,11 +54310,11 @@ "repo": "HenryNewcomer/laguna-theme", "unstable": { "version": [ - 20190714, - 1830 + 20191229, + 19 ], - "commit": "66c613692b9f0c71050a236e98dbc54cb410946b", - "sha256": "0kms0m65mpmk9j5i1f4ag8a8hja1msn73z2f2gby440l07c8hcjy" + "commit": "0da19f68ba22a39c02d83063f5b4936401ce4d97", + "sha256": "1r8di1cmhcx2vfk3fsydx24spib1fi4wihnxa41favnkjzklz9jv" } }, { @@ -53300,26 +54373,26 @@ "repo": "mhayashi1120/Emacs-langtool", "unstable": { "version": [ - 20190303, - 2227 + 20200104, + 18 ], "deps": [ "cl-lib" ], - "commit": "81f2b8a07b29bbdd558db4b68dd904f4c0eb10a4", - "sha256": "01w765n5bib060f0hci34f0vchf90b4r8gr1ng2c4yx20dvdjnqh" + "commit": "37e1e007e80fc01b040b7da21be5a628fbddfb1a", + "sha256": "0zlinwq5hzwws8frwdaw22q43xba3a4764qk6rhlpg6p6imf6s6m" }, "stable": { "version": [ 2, 0, - 0 + 4 ], "deps": [ "cl-lib" ], - "commit": "d93286722cff3fecf8641a4a6c3b0691f30362fe", - "sha256": "17xa055705n4jb7nafqvqgl0a6fdaxp3b3q8q0gsv5vzycsc74ga" + "commit": "adb80f55665db65a46fc552d364386d3cc703d94", + "sha256": "15bbyc0fqdn7d0k8zrn71jljkq9cc8a5rcllywvph46lnfnqy3p6" } }, { @@ -53348,25 +54421,62 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20190207, - 1057 + 20191208, + 1933 ], "deps": [ "cl-lib" ], - "commit": "9145c75eaa41a7a9deda928f704b99db056d3e9d", - "sha256": "10dwrb610jdal6ifpj34mmy8qqbca2sgfmvn4p4qpcc967sv4f1r" + "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa", + "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi" }, "stable": { "version": [ 0, - 1 + 3 ], "deps": [ "cl-lib" ], - "commit": "9145c75eaa41a7a9deda928f704b99db056d3e9d", - "sha256": "10dwrb610jdal6ifpj34mmy8qqbca2sgfmvn4p4qpcc967sv4f1r" + "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa", + "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi" + } + }, + { + "ename": "lastfm", + "commit": "0b87a3465eece39cb2f73a90dedf97dd0dd970c2", + "sha256": "06gy4br99r8l9ak2ac7js9nyw4v5b94a8ja4pkik49l90qgss93m", + "fetcher": "github", + "repo": "mihaiolteanu/lastfm.el", + "unstable": { + "version": [ + 20191117, + 1908 + ], + "deps": [ + "anaphora", + "elquery", + "memoize", + "request", + "s" + ], + "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c", + "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "anaphora", + "elquery", + "memoize", + "request", + "s" + ], + "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c", + "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b" } }, { @@ -53377,15 +54487,15 @@ "repo": "storvik/emacs-lastpass", "unstable": { "version": [ - 20171208, - 1016 + 20191102, + 611 ], "deps": [ "cl-lib", "seq" ], - "commit": "a4529ce70b8187ed9ac4972997df152af58ef2eb", - "sha256": "1h4h7swww2is7qblqi5r1vh26a9lfl52c0yq7rgwd1pqclffgc8m" + "commit": "e07b1a062153b9d56d0112ac45caf76d6bce67c5", + "sha256": "0pz5svbs7jp7zcjl7p5pbfxqh6xzh48dzz3swkywms9hfh2ynqzp" } }, { @@ -53445,16 +54555,16 @@ }, { "ename": "latex-pretty-symbols", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl", - "fetcher": "bitbucket", - "repo": "mortiferus/latex-pretty-symbols.el", + "commit": "f96a50861bdb87133690d64af85e132cc504f13c", + "sha256": "1idxv83vvx29xavyzzm5vh5f3bb0yb1p6688csxaaikaj9fsa5gs", + "fetcher": "github", + "repo": "epa095/latex-pretty-symbols.el", "unstable": { "version": [ 20151112, 1044 ], - "commit": "ef4ea64c09ea182f38ecb88dfb31d58ed5e6063e", + "commit": "83d5888147bb734a94dfd4847a11e975a7d86ba8", "sha256": "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b" } }, @@ -53633,11 +54743,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20191023, - 1053 + 20191117, + 339 ], - "commit": "d2e3367ca53718275a02c205ad68925c4c878d2a", - "sha256": "1785ydsjnbg1ldfjgwny2jv2xp1jq52bkbvxczc03zlfzi8vdp5k" + "commit": "57b99052f949f34471265f8b010549ee4725c320", + "sha256": "1vxcwdp7kgmv4pxjr33yfy2ba3x3zs6qacblyrah57f92xg85jg7" }, "stable": { "version": [ @@ -53657,14 +54767,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20190911, - 1658 + 20191123, + 1814 ], "deps": [ "leaf" ], - "commit": "29cae76ea7817fe3719f4ebf6751cf434567e4d0", - "sha256": "0qsmixhn7jjlzxnxjs77nmyzqh6q0q9ssgjj7gnp3i4llv2jlj3y" + "commit": "c3223e54eddf82a9b264ef81d958a017049141da", + "sha256": "1qwcir8d16gqr1xbl5bi9k51qfc5yvzaqvp03sji55bfqnx7zjwv" }, "stable": { "version": [ @@ -53684,8 +54794,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20190914, - 958 + 20191229, + 1613 ], "deps": [ "dash", @@ -53694,8 +54804,8 @@ "flycheck", "s" ], - "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", - "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" + "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613", + "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9" } }, { @@ -53746,14 +54856,14 @@ "repo": "DamienCassou/ledger-import", "unstable": { "version": [ - 20190502, - 456 + 20191126, + 2035 ], "deps": [ "ledger-mode" ], - "commit": "6911708e373e2cbdb3868df7711ef07925ed36bf", - "sha256": "15vz5fy5yr4m3b77nikqln3y5bihjdmrzgxbp56hz83dqkkcnc4l" + "commit": "e32c4dd5952e3e5daa65eda5a22d508e97683409", + "sha256": "1p6n5vgpjmm1z6xq8f4yxf9w0r8wczlf0pa8qdfv7jmc50l58a2y" }, "stable": { "version": [ @@ -53776,20 +54886,20 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20191008, - 1420 + 20191226, + 2018 ], - "commit": "214fad3ff8096bbd53cc079f71cfb845d12bfaa8", - "sha256": "05yjq15c7jj70vc5xp4k4h56nzybgibp48srkzjx8220q1w9656m" + "commit": "6b78e483dde4276a11d6946d081e41c7e3b894e8", + "sha256": "0xi5pwyzv81iqxj10sr1fl9csa6k5z1nisxwnpg9i3i1nj7ad3p6" }, "stable": { "version": [ - 3, - 1, - 1 + 4, + 0, + 0 ], - "commit": "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a", - "sha256": "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989" + "commit": "964630f80e0e80dad83134a3660f56948390173a", + "sha256": "1r5rcyxd6d1rqwamzpvqdbkbdf1zbj75aaciqijrklnm59ps244y" } }, { @@ -53815,8 +54925,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20191011, - 800 + 20200101, + 1111 ], "deps": [ "aio", @@ -53824,8 +54934,8 @@ "graphql", "spinner" ], - "commit": "86e9e167c10eed487cf6715a764527d84ccb35fa", - "sha256": "0mq4a2jv5lpy4wcfhp2cg63gdyqjv10ffb2702yjyd24nqmh3q76" + "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04", + "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5" } }, { @@ -53999,11 +55109,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20190831, - 1008 + 20200102, + 2003 ], - "commit": "026da5d614864a60bb151f0e75240a938e41923b", - "sha256": "008ynbzcszsbyj3pi9cm6ig1ks059xprkyhd74dnw8grlddwfimd" + "commit": "ee89b5d8b08c94eb78c0398720381c44342e2f44", + "sha256": "1g6bhfd39jbz8awxh2d4syvqblw3yniind76fzsvsapis1za8yfg" } }, { @@ -54067,26 +55177,26 @@ "repo": "DamienCassou/libbcel", "unstable": { "version": [ - 20190919, - 1948 + 20191203, + 654 ], "deps": [ "request" ], - "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", - "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + "commit": "df466d31544c53d8550f9c08e58b70adc559c48c", + "sha256": "1l8m47aklx98m89i9d3kj9dd521xkicipgbfnpiyjzqmaw1bh6zm" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "request" ], - "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", - "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + "commit": "d02a38898016bba314802b1f6a07317e52ea6c63", + "sha256": "1z5ydhv9qyk0g9b25n4m0xbvdy0j4y009iq8v2vy1m8c09lzp1v9" } }, { @@ -54127,11 +55237,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20190810, - 1757 + 20191217, + 1254 ], - "commit": "60e1e7d360b376534c4b6258ddf7d5b5f0a68133", - "sha256": "18y3wdfy6pnyv0slggagdyy41mjwsprnr57ab1qmyz5dd8ryfwwn" + "commit": "65fde63a0bde9b4cef74204db5d9ac0a740d6b4d", + "sha256": "0q7jyrgq67449i524dskiqfvf3znb048ksb9v6ja1x9xhpfw27d2" } }, { @@ -54157,20 +55267,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20191015, - 803 + 20200105, + 1537 ], - "commit": "983c27d11becf0078bc5b416746f171e7e238d6d", - "sha256": "0m8kb480v2cx3jniy73bim1g7kjsrvhh02li9d0qv7smala59nl3" + "commit": "95cb45ecea933e7befb2a5a6a6e7d15651c8746a", + "sha256": "0g0gsah4y12d2hrk2rsraxqjnd52fkikr0pgcrbrv2mcnqhs8c5m" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], - "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc", - "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik" + "commit": "a9d67cea595bfeff73cf6281fa735df98dee9a45", + "sha256": "1nzs6g2mg3jhfhhfcxjhd9sbvwzhmr6j6mc80ln2nr4gzjqgaa4k" } }, { @@ -54225,6 +55335,18 @@ "deps": [ "cl-lib" ], + "commit": "f50f8474db7c9b26ab3cf56d08e5184209f25cec", + "sha256": "1frf77ilyadrzil8sjp3rpr6v7j1nmmk1dz84d0kf8yr2cl48d9h" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "deps": [ + "cl-lib" + ], "commit": "ea7fc43210b5293beac4ac453b1bdde415f5183e", "sha256": "13vspm2c53ph25li4xd77q2v7rqwsszsy8a842ivcgn0k3qn6w0r" } @@ -54240,8 +55362,8 @@ 20180219, 1024 ], - "commit": "fefdee6fb6f7467b5afee6a591f677d7981b60bf", - "sha256": "0l176qgqvm9ia0z17y0wag38drhjz748qc4241g5y7ia2n20y3mb" + "commit": "5136c339864ca961629e6eb48c3ff9d0228aaf52", + "sha256": "14mzwnnsqjmzp8jb9jac43ga7vxzmrl2mch7kqdm244d605k0xlz" }, "stable": { "version": [ @@ -54322,19 +55444,19 @@ "repo": "myrkr/dictionary-el", "unstable": { "version": [ - 20140718, - 329 + 20191111, + 446 ], - "commit": "6edc1d0a4156d33c3da0c1649c308b809fda46e1", - "sha256": "0g95q3yggzxr8d2gjxamfwx8xbzf182naxpb265r7v9awd35bqk5" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" }, "stable": { "version": [ 1, - 10 + 11 ], - "commit": "9ef1672ecd367827381bbbc9af93685980083c5c", - "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s" + "commit": "c9cad101100975e88873636bfd426b7a19304ebd", + "sha256": "0zsjbpq0s0xdxd9r541f04bj1khhgzhdlzr0m4p17zjh1zardbpi" } }, { @@ -54345,15 +55467,15 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20190721, - 1844 + 20200101, + 1633 ], "deps": [ "avy", "cl-lib" ], - "commit": "4db4e6fb82bfffd00f540e3a489013f6a8173871", - "sha256": "0rphww249vqk7lassihapw836h6f9w7qnz45qhb07j7d82bxy7pr" + "commit": "8d8f9505f87dc8a3b3baee7cb516f091072893a7", + "sha256": "1bmb3x8i2ak72k2m3niczjqv2xg9lhvflxxfjj67j9ki7994vzx4" } }, { @@ -54455,11 +55577,11 @@ "repo": "marcowahl/lisp-butt-mode", "unstable": { "version": [ - 20191024, - 1229 + 20191128, + 835 ], - "commit": "47007084d0893373731fabd828c4d4f28058f8e1", - "sha256": "10hc9021q9paxcr0n1pcl6pfyz73an53mvfz8aa1bym931v0fdvb" + "commit": "9eca319bdbb96dac4d44d19cd21937ed82a67268", + "sha256": "1biyvcwrqgyy7dmrv6i972lrcr5xhsyjq5nwc035c341jcxkp0g5" }, "stable": { "version": [ @@ -54509,8 +55631,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20191016, - 1250 + 20200105, + 1844 ], "deps": [ "ace-window", @@ -54519,8 +55641,8 @@ "iedit", "zoutline" ], - "commit": "9f48176fe9a170848be0a07506d50e29b5f0dba3", - "sha256": "1410nghcficskk44jh1afgxwapmkhahc22bm7584rxrwbw7rl26s" + "commit": "ba59a11e122170620e7d151df4b609490ee416f6", + "sha256": "0qynzadzklb7wnldcs7sj9v003v6xffvq0y85x8knj04cbl09bwy" }, "stable": { "version": [ @@ -54725,6 +55847,37 @@ } }, { + "ename": "litanize", + "commit": "772ac9f0328ce5d184c2e126f6dd79a161a6d6c4", + "sha256": "1z4l0sk8gbramq900qf14vay0n5v2wd88yswawqrnhkhmqwl3qxm", + "fetcher": "github", + "repo": "zzkt/litanizer", + "unstable": { + "version": [ + 20200108, + 607 + ], + "deps": [ + "enlive", + "s" + ], + "commit": "ce74f10540d6b335c4d0966cbabcf5099531280e", + "sha256": "1gzpvl7pgawikkhprja6p94ymsjbsbklqjgdvhzca835mx1g4aw4" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "enlive", + "s" + ], + "commit": "ce74f10540d6b335c4d0966cbabcf5099531280e", + "sha256": "1gzpvl7pgawikkhprja6p94ymsjbsbklqjgdvhzca835mx1g4aw4" + } + }, + { "ename": "litecoin-ticker", "commit": "4976446a8ae40980d502186615902fc05c15ec7c", "sha256": "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5", @@ -54814,8 +55967,8 @@ "deps": [ "cl-lib" ], - "commit": "fb3b376de483d6923bb067caa01ebdb65a0161c2", - "sha256": "07difczbj38xzgxi0cig5zb05c9pn0fsbk00mmvfhk5rgxyfc71s" + "commit": "3bd795288db8dcd3edf5b33ca8fc213fe16c62d5", + "sha256": "0in5cryj1abcg6850lxx8qqhxvdij54jmm4ip9ra2kwz55smq4ky" }, "stable": { "version": [ @@ -54899,20 +56052,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20191021, - 102 + 20200108, + 546 ], - "commit": "4890a53082b4cacd8c64484dfae2037153453c8c", - "sha256": "015hh2mzm3b9kijl0dsxs3y2m6dxdwvblszy6ckp5j2qv32bmydn" + "commit": "96a72eb3d2d03ea9910f1712ab55990705275343", + "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8" }, "stable": { "version": [ - 2, - 25, - 1 + 3, + 0, + 3 ], - "commit": "b0e4f264c464ece407be9b8ccaf2f82c026f7c47", - "sha256": "1fpkfplpgvacwl7jiziqlh46dasnh8j7d2aihrghac7kkqnrhk2c" + "commit": "96a72eb3d2d03ea9910f1712ab55990705275343", + "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8" } }, { @@ -54992,17 +56145,17 @@ }, { "ename": "lms", - "commit": "b8be8497494b8543a8257c9ea92444baf7674951", - "sha256": "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1", - "fetcher": "bitbucket", - "repo": "inigoserna/lms.el", + "commit": "7d6c24152f88dad15ef9f304c0016a97ede71dab", + "sha256": "1nksla9i7b4nmnzppyw6fq5kzh8jyqjfxn45g60c4mi2mn3p95a1", + "fetcher": "hg", + "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20181216, - 2246 + 20191102, + 3 ], - "commit": "38302acf2aa3718ce62cc4c5f1fde96feb25a2ed", - "sha256": "0da14qr7lgkfxksnhf37ss5w6wxkw9qv5hvxk7z76jyzwqdc6w4x" + "commit": "0967d3bada2ab70784a944d56c81691b8e87dbd8", + "sha256": "15ksvdf2cfa8hwvazdza56iln244xlv1l65gydhjw8388hr7gbr0" } }, { @@ -55013,14 +56166,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20181220, - 1755 + 20200106, + 2015 ], "deps": [ "seq" ], - "commit": "50df445bace7896318f10c58d26b673635704215", - "sha256": "0m84ylx4j4bp898xc43yrkrk3csr2ppv3c51nirx5gdc5hnhykxj" + "commit": "999c613898085b37b9e16b60be1cbeaa9986d368", + "sha256": "1qhcx7c954q1liw3glhvbg5bph96j9bwf808g6l066n04xj5347i" } }, { @@ -55244,17 +56397,17 @@ }, { "ename": "lognav-mode", - "commit": "ad86b93f4982a0c6291c771e12c8f42ace3b88f9", - "sha256": "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb", - "fetcher": "bitbucket", - "repo": "ellisvelo/lognav-mode", + "commit": "a5b0dadc609d13737d56657c17a945f10e840222", + "sha256": "1fg2j63f6yaf4011vla36p1p0pjixzisff4wj80vh634yqvwp4ys", + "fetcher": "hg", + "url": "https://hg.osdn.net/view/lognav-mode/lognav-mode", "unstable": { "version": [ - 20190217, - 1632 + 20191124, + 1011 ], - "commit": "bec9f3eba66e1b58153f3d74ea21e6022d735791", - "sha256": "19axhlcny5i4hfrhxivalxrhpghy2czj92cflq0gb5b6ar6zgkyg" + "commit": "7eb9cd2af5b47116fe475870b41dded55052c14c", + "sha256": "10f3im4x55ag6mhrrsjkylmaxm5s7dj7mwmppzm2yvs1nq0fxa79" } }, { @@ -55302,8 +56455,8 @@ "datetime", "extmap" ], - "commit": "bd662d467dbd7c93cfe1e3058e4f11c49314fd6a", - "sha256": "03s4q5xdz84cjn4qkfhsc3l9y3v5avrl2i5dby4bgsg2zj7n7f73" + "commit": "72566479cbd8d90dfe2fec5984ebb4484994525c", + "sha256": "1ldqkbdl4vyqg6kibp1z8d5cam4r8za1pb851k886bqwag0zaj3b" }, "stable": { "version": [ @@ -55474,15 +56627,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20190602, - 825 + 20191230, + 1847 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "64106be79350f9ce6903d22c66b29761dadb5001", - "sha256": "1d2jvcsx0x7w7f9q93gdi4x2fc6ymyr7d213m9ca5jj52rxjfsm2" + "commit": "6d481f97e62b0fd2455e8f7a36429981277445b1", + "sha256": "0ljflzdjzsafgqqq9fdajrcm0rk4xaki2h5gbsbkgn8z65a2xh6h" } }, { @@ -55504,6 +56657,26 @@ } }, { + "ename": "lsp-ivy", + "commit": "51af5cfe26bdf1482fb707fbcc5e9ea49b99eb14", + "sha256": "0yw72n0gyzv60nx4ycn979yzqwxv4hqrbi39g5finxmwjjf4rha9", + "fetcher": "github", + "repo": "emacs-lsp/lsp-ivy", + "unstable": { + "version": [ + 20191028, + 902 + ], + "deps": [ + "dash", + "ivy", + "lsp-mode" + ], + "commit": "78c1429c62c19006058b89d462657e1448d1e595", + "sha256": "1bry1vsv6p2h4qrzx8aq7bsqfw12w3v5gz548dwkdk2cwmhsmi3d" + } + }, + { "ename": "lsp-java", "commit": "c03cb07862c5f35487fb4fb3cc44623774724717", "sha256": "0rrl9mh25w1avvyww840d3yh8nw0shirspxl2nxqwwdaymbkg2wr", @@ -55511,8 +56684,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20191016, - 1709 + 20200105, + 1046 ], "deps": [ "dash", @@ -55524,8 +56697,8 @@ "request", "treemacs" ], - "commit": "52f61a539b9627122b39d9aff3885a1d94247d9a", - "sha256": "1hhkssgbv4s1q9ypav6k4siwnhmqhjhsdag3d6vs9jhsswysds0f" + "commit": "a3ebf619a2b12b8dbbb24c39c4f78b1ba9c29e6a", + "sha256": "1x6il7pnyc7ylayiw35kn6jk8dphzwsas7dk129p6q0wjfdvif9d" }, "stable": { "version": [ @@ -55579,8 +56752,8 @@ "julia-mode", "lsp-mode" ], - "commit": "6b0d1a3f32c5e6c5b4c0993f30303569a9e9e9bd", - "sha256": "11jisy6161j4mpqyi06slfr3l7cmmnp7xc6701hszmvl935znn3l" + "commit": "da66e78eb601b1652c3a9096e0ceea6b852aa6a0", + "sha256": "1xn7470lm322lqkkbg95qmzaadk85z3f2f3cx34iq00cmkkppcng" }, "stable": { "version": [ @@ -55604,23 +56777,25 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20191024, - 2132 + 20200107, + 1910 ], "deps": [ "dash", "dash-functional", "f", "ht", + "lv", "markdown-mode", "spinner" ], - "commit": "287cedc45a4ae1bf947f9341446cee0d15992d97", - "sha256": "1adwqkd0fi6zfwyk0nwkl6dcf4c8qsxl6bxwfg423b3v4r0av7mm" + "commit": "752674a9efba4860ec85ea159fc4f9679a44819c", + "sha256": "0wi05v6a536y54kk9dc1a1id1arv8v6r5jpy49g9q2kglkhkaji8" }, "stable": { "version": [ 6, + 2, 1 ], "deps": [ @@ -55628,11 +56803,34 @@ "dash-functional", "f", "ht", + "lv", "markdown-mode", "spinner" ], - "commit": "50ddaf439cd62033d3bc0d12cca341fb0d4e1382", - "sha256": "0jn5slhv9zfs446a5966bfg9dq144g22v79wnkx9hxq7if78p652" + "commit": "5c8addac9d57dff268d2f6e825522fd5353e5e3e", + "sha256": "0f9d0zhblcjzrpggqclww2g7fyjky5rzpp7zj424005ahv0zd3xf" + } + }, + { + "ename": "lsp-mssql", + "commit": "abe823ce7ab99c2c45a74a36713064d441ee8165", + "sha256": "0imhby806kyp0nb5fk04kxy6w90n8s5j5ckf8pky8wvasl9anf4i", + "fetcher": "github", + "repo": "emacs-lsp/lsp-mssql", + "unstable": { + "version": [ + 20191204, + 1150 + ], + "deps": [ + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs" + ], + "commit": "e16e91d6a2a6cdb406ee9b98cfb47f7a32e41d61", + "sha256": "1fyghfl1acrghf8lisg760cgxw4rnz29ym4mzlznc0lb80d43cg3" } }, { @@ -55709,17 +56907,28 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20191024, - 2219 + 20200106, + 1738 ], "deps": [ "cl-lib", - "json", - "lsp-mode", - "python" + "lsp-mode" + ], + "commit": "9780be701545064847456eff8ae30fadcdf63b0d", + "sha256": "021nmpabad3vgq10bs3qsgg3m5vd4vzlsbyi2jgk1si9kgw898j1" + }, + "stable": { + "version": [ + 0, + 5, + 0 ], - "commit": "2760d4f7c87af4af9f9917e51de0263f6ed574ac", - "sha256": "133jqzmqyhl3wi9zs38cpfli5ybz598hbjw22j393rkbl210x6jl" + "deps": [ + "cl-lib", + "lsp-mode" + ], + "commit": "d8fa9d9eea03a457eaf9944c6188107ff2ed342c", + "sha256": "09v5i2sdayxa69csmfyr8x8lkqmz9578vw9vrm7ayys0sc1g2zh2" } }, { @@ -55767,8 +56976,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20190924, - 1757 + 20191229, + 1039 ], "deps": [ "dash", @@ -55778,8 +56987,8 @@ "lsp-mode", "treemacs" ], - "commit": "76c304df80256bb3314b177af3db27cf2f527b87", - "sha256": "0dai66jmpisf0h2qaiq32mzdzmnlzh5k2fi00wzg3l25vj13vvdr" + "commit": "4faf0e3fa14fff712d9cd325a2bf17ba452fa2c1", + "sha256": "1bqmv64skm6w0m3wxg914jzqs34cd5axwj2c6wjli4sja162h8ab" } }, { @@ -55790,8 +56999,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20191023, - 1558 + 20200106, + 1152 ], "deps": [ "dash", @@ -55799,8 +57008,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "f25367c8b56921d2af42dd6b1dc1a8cd82ce6021", - "sha256": "0v1wi8nkikc35jxwnm6znwzw7xabw3kg3nn90zc03ysr3kn2gc61" + "commit": "01f89e40f473032376f70a90e33831356832f084", + "sha256": "0avi8hfyh61gjrv0c8aj28y8nx8qw1vvsb3l15v9xzblvdrx7v5x" }, "stable": { "version": [ @@ -55825,11 +57034,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20191015, - 733 + 20191204, + 1434 ], - "commit": "52cc3e465a2d35dbcbad8a87fd5fe548840f5822", - "sha256": "1iw0z6dxd1nwjmlgy800xd2pgv40f798j831ca1hh3pbai5f84zm" + "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", + "sha256": "0fdnkv37m7nf8yjjf01c856g2wrzyzqicv67fnbrnx7abrrfb1nd" }, "stable": { "version": [ @@ -55880,19 +57089,20 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20180628, - 1346 + 20191203, + 1635 ], - "commit": "fc4b2f0f8a07db107234490fdfbf72f8b76a6643", - "sha256": "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp" + "commit": "1fbd5cfbdbb8ed744b5a141648febf620bbf5a84", + "sha256": "140af29angfnf9kakx65bpl233bn0xgr1lsb2na9qmbsarhva1kw" }, "stable": { "version": [ 3, - 0 + 0, + 1 ], - "commit": "fc4b2f0f8a07db107234490fdfbf72f8b76a6643", - "sha256": "014fivh9shi7p3x31bl22x48agrgygp0pf2lgzzflrxcynmprbnp" + "commit": "8ece9b1379a73e7dc0b6e682dd5a573f88a5cb32", + "sha256": "09zvn5fgjy27rmxziylvl83zdqmwa1jjndxmxhgsyh9mklisz32p" } }, { @@ -55903,11 +57113,11 @@ "repo": "abo-abo/hydra", "unstable": { "version": [ - 20191025, - 1326 + 20191214, + 1357 ], - "commit": "74b32f3ff004cd2ad7707722ffa7f85e8233a845", - "sha256": "0gp1j8n65v3r849c3h3xmn7c133wyh68szksqjwn1lzd2mpdnfny" + "commit": "9db28034d7d61bfeff89899633b958f22befc53d", + "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp" }, "stable": { "version": [ @@ -56200,14 +57410,14 @@ "repo": "zk-phi/magic-latex-buffer", "unstable": { "version": [ - 20170531, - 5 + 20191106, + 241 ], "deps": [ "cl-lib" ], - "commit": "c03277d5619d9adcd871f3e6480a1a27985810cb", - "sha256": "065xfj6asw7px4xmh5isbfs0y6m6818lrds1ca45rhkyfw98d2sb" + "commit": "8597f4db70732d6e479396e2f2a7e78742387253", + "sha256": "16zv10rir99wl16d79479204h5fbdx78wpgahlg6kf74001fr3sv" } }, { @@ -56218,11 +57428,20 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20190922, - 1727 + 20191227, + 929 ], - "commit": "e66f288844bbd4035a18da9444b2dc163faa8ed8", - "sha256": "1dpxihdq6ssqkgj2i6v1zcnk7hkpmk5fjvlwki7jamqlizzvy9is" + "commit": "f42fd8080781983ba593c9df39f2f5efc45bcf1f", + "sha256": "11vm25wkil9n2m9s330xy9c111qa85dffkig8x7m1qc9xka25wi7" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "11ea02254f2bdfaecc12a75545c558fd37b98954", + "sha256": "0msgpi4g8k6zyjshfaf5jb00idc5j5mrzl2kc5p2k1kg19bh3178" } }, { @@ -56233,8 +57452,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20191022, - 1848 + 20200108, + 532 ], "deps": [ "async", @@ -56243,8 +57462,8 @@ "transient", "with-editor" ], - "commit": "8b3172fc495d83830573461f877ed390e6408e0b", - "sha256": "09wcf1s7xnw4ssmg8bha94zw9ax9mz3prl5krl1l634740ajy6h4" + "commit": "2191261223078077bf35eb12187e35ff0228174a", + "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" }, "stable": { "version": [ @@ -56304,16 +57523,16 @@ "repo": "abrochard/magit-circleci", "unstable": { "version": [ - 20190814, - 1723 + 20191209, + 2113 ], "deps": [ "dash", "magit", "transient" ], - "commit": "03101bd9cdbdfd779471a4c6d3d00ebadc8ca4a2", - "sha256": "10jr06257g3wx45rrx8jp1lxrlf5xx9w07832p2jpwfvqwi9w0xh" + "commit": "3425ad5b16cb48d6802b7e9ed044b4cd7a99c785", + "sha256": "10iinizl99aivrf9zihykabb5lyg62kxbmydwaf7swzxf4dgxn2k" } }, { @@ -56434,8 +57653,8 @@ "repo": "sigma/magit-gh-pulls", "unstable": { "version": [ - 20180716, - 1636 + 20191230, + 1944 ], "deps": [ "gh", @@ -56443,8 +57662,8 @@ "pcache", "s" ], - "commit": "6949e973f3e951cb0bfe75d889e0fcccc33ba733", - "sha256": "0djr5lkv2wjs2c4dvb41xjkpjk9w6q888r4dlgw9w35z7h30b5vi" + "commit": "57f3a5158bbc7bfd169ee136fde351cce999e0ca", + "sha256": "1halhivvfklxscg1xxk461wgjlh3vl8g991ydj93450b6mw3azaq" }, "stable": { "version": [ @@ -56502,14 +57721,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20190219, - 553 + 20191105, + 2245 ], "deps": [ "magit" ], - "commit": "54f2e25eb5f9e9763a60808ecfc1edef7f276ce0", - "sha256": "0i16s3kc5k1sr2fgq72n0nmrwqphrg5zppmvri653120nga7b5lx" + "commit": "a7357ab87c89187234fe333bb869727c417638d1", + "sha256": "1s5ysmzyvlhnb9yzxwsrs0rj50ib0wzb2wrmisghxi10pk3j9sk9" }, "stable": { "version": [ @@ -56564,15 +57783,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190419, - 1545 + 20200102, + 2204 ], "deps": [ "libgit", "magit" ], - "commit": "8b3172fc495d83830573461f877ed390e6408e0b", - "sha256": "09wcf1s7xnw4ssmg8bha94zw9ax9mz3prl5krl1l634740ajy6h4" + "commit": "2191261223078077bf35eb12187e35ff0228174a", + "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g" } }, { @@ -56634,28 +57853,26 @@ "repo": "magit/magit-popup", "unstable": { "version": [ - 20190223, - 2234 + 20200102, + 1811 ], "deps": [ - "async", "dash" ], - "commit": "4250c3a606011e3ff2477e3b5bbde2b493f3c85c", - "sha256": "073x1yf96b623yphylnf0ysannr91vawzgjdv1smkcrgd4451hr3" + "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69", + "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw" }, "stable": { "version": [ 2, 13, - 0 + 2 ], "deps": [ - "async", "dash" ], - "commit": "4250c3a606011e3ff2477e3b5bbde2b493f3c85c", - "sha256": "073x1yf96b623yphylnf0ysannr91vawzgjdv1smkcrgd4451hr3" + "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69", + "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw" } }, { @@ -56788,8 +58005,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20190907, - 1321 + 20200102, + 7 ], "deps": [ "async", @@ -56800,8 +58017,8 @@ "pcre2el", "s" ], - "commit": "a80dace2bf8bf3e697e3e8421189996adcecc900", - "sha256": "0qwzag9js6qy98m7c8gmaskg4qc82sf0aihcs5vcxdf8rgia2j9q" + "commit": "40d268f9b487ad7e3b7aff2da2bc44e596bc8052", + "sha256": "1xgwz13nmk2apbgq00ac9qrcf2hip558x0qcn8rg9n9shnbixsqq" }, "stable": { "version": [ @@ -57259,11 +58476,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20180915, - 1940 + 20191112, + 1832 ], - "commit": "b560aa0129c55a2f4fcc5e67a7d6c66ee4dc3124", - "sha256": "17af3bs55c6bxf1izvfgg0kag5az64ncbabgbh6ry14nv3r9lwy6" + "commit": "4e6ce4f222c1fa175d56e926628f37caa5f398ce", + "sha256": "05lb7izcwivjlyx6442hkskppr2158wg0b8g9k435xl083vxmpfw" } }, { @@ -57463,6 +58680,36 @@ } }, { + "ename": "markdown-changelog", + "commit": "1ca43b6cf089d7c75b1fb483d8356a3ca7fec5bd", + "sha256": "0cnp6yfhsixl9nl7l6aa9vrnz71ylf6z25hmk7f6w64f7nxsdmr8", + "fetcher": "github", + "repo": "plandes/markdown-changelog", + "unstable": { + "version": [ + 20191231, + 1825 + ], + "deps": [ + "dash" + ], + "commit": "251c675d38aadb314184a7477f8a2f53399843be", + "sha256": "17nb57q9dmrrrn68zvm6bmrkp5yz18aivgmcz46y4a269srdsc28" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "dash" + ], + "commit": "83feaf9635a244bd26cb1959196be7efa143267b", + "sha256": "157imgdpwzmi5k02kqnpj2spyxkq663bka5gwxcf194h781icb61" + } + }, + { "ename": "markdown-mode", "commit": "74610ec93d4478e835f8b3b446279efc0c71d644", "sha256": "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14", @@ -57470,14 +58717,14 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20190802, - 2215 + 20191230, + 1055 ], "deps": [ "cl-lib" ], - "commit": "f3c54e34cc5228001af36a5301883325319f21d4", - "sha256": "1zvpryra1sr63192j6v62kc9mvhc9wsvm7haj2maxmv2v3akhlil" + "commit": "e9dff50d572caa96b68a7466c18c97a8d6ed651c", + "sha256": "0v7a56fqwaqzqkpip7lpbsf9jnnwfjwd3jf61xnziv6j9sa46p1d" }, "stable": { "version": [ @@ -57720,6 +58967,15 @@ 20191017, 1017 ], + "commit": "cb694a9eee79ea807dbc1587c47e209dd7e250fc", + "sha256": "0h191mip2yjvj1ha6cqvghd45g5ccd3p0qsvh9l2g0gg9d2salxk" + }, + "stable": { + "version": [ + 0, + 0, + 8 + ], "commit": "77e4becd8a812377eb219c77641a22a77b4fdfef", "sha256": "0a51aw567gkdxz58v7h2vdfs2rmnvyllqhq4a1yy4gslr0xsqk9c" } @@ -57870,11 +59126,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20191010, - 653 + 20200106, + 2217 ], - "commit": "e8d02b83ee22e976c32de211b4a0f6513470c462", - "sha256": "081qracq0rkwq3dxgmamzjcjbqavskd6smiq5lzxnh5jm89i92xs" + "commit": "b3057e8ca6a8703bf59ba365521cf37ad25c700b", + "sha256": "1ydls6g9fnsapvd5cnxba2b6g936q3ym4mlms7rvlazj3g1lma1n" } }, { @@ -58072,11 +59328,11 @@ "repo": "thomas11/md-readme", "unstable": { "version": [ - 20160811, - 1646 + 20191112, + 1943 ], - "commit": "bf818dd847c8b06b3b5100c5d3cf24cf96662528", - "sha256": "0gyjadkv572v3zilxivbiz28pvqh0jmi5bh5la1hyim0qnxymli8" + "commit": "ca99f44de11fab18d1f50d4b1722f2ceee3c814d", + "sha256": "1llwvcbwfj5mw100rx2hp8vcr7kawpl18nvy6vxl6brqw7ka0d2s" } }, { @@ -58087,8 +59343,8 @@ "repo": "ahungry/md4rd", "unstable": { "version": [ - 20190313, - 240 + 20191113, + 2108 ], "deps": [ "cl-lib", @@ -58098,8 +59354,8 @@ "s", "tree-mode" ], - "commit": "443c8059af4925d11c93a1293663165c52472f08", - "sha256": "1n6g6k4adzkkn1g7z4j27s35xy12c1fg2r08gv345ddr3wplq4ri" + "commit": "ff7d95fc0fdf46a3cb6b3bbe52396dc4e474b8fd", + "sha256": "1p8g5pbczg1n1pfibxwpbg1qsyrqi131awxkvl98w8ynb9zi1fqs" }, "stable": { "version": [ @@ -58151,30 +59407,30 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20190526, - 548 + 20191215, + 1353 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "24813cf364f1c857c2ee412d0a088f0ceff53842", - "sha256": "1ripap7is2amk3i2mavwiiv5mfsx9k3gxpy9nyaz58pzgvyjqplc" + "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", + "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "64518b54148092ceff58d45f062558a7dbfd3a03", - "sha256": "1ripap7is2amk3i2mavwiiv5mfsx9k3gxpy9nyaz58pzgvyjqplc" + "commit": "70bfbf553c7b7fb1928672e9a95b7137e02c2d4b", + "sha256": "07rl9lr4dyb9ld2cgvkxkfirls03jznggaa1j776nppk00fhz3bg" } }, { @@ -58263,11 +59519,11 @@ "repo": "skeeto/emacs-memoize", "unstable": { "version": [ - 20191004, - 351 + 20200103, + 2036 ], - "commit": "b3129775a6d5c0d9cdacf5aede9683f5962c464e", - "sha256": "0mk7m2iwhpic688kdxgdyjg79rmp04daa0g8qgiiv1pm69ra2b71" + "commit": "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd", + "sha256": "102f34iw2vslimihf557vwn5599xcw1vf422vypdg3ilk6s8z2ax" }, "stable": { "version": [ @@ -58344,17 +59600,17 @@ 20191025, 851 ], - "commit": "c8b0f03efcb472f9dfe2277fde322bfafea305ea", - "sha256": "1fq2ahj6qnmyqp3yd33fqcdcd77mx61lkz3589mwbfb1aab3wxwn" + "commit": "28fc61128198f023d88c104e98451e17c896afd9", + "sha256": "0lc2y6lb4h0l0jlmsyf4n6nf87z6nfixnsipyg5cbkj7xzji0xys" }, "stable": { "version": [ 3, 3, - 2 + 3 ], - "commit": "ddf678dd937bc7375f618ad5898caa53a7107319", - "sha256": "1z9mcxflraj15sbz6q7f84n31n9fsialw7z8bi3r1biz68nypva9" + "commit": "73e9771bcc1c8f8575b505a62c58ad40004cf5f7", + "sha256": "12mh5p87rjwvkf6dqmxka4jbvhcd729972b726im6v0a27ncqh77" } }, { @@ -58394,14 +59650,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20190503, - 1726 + 20191206, + 443 ], "deps": [ "f" ], - "commit": "6b3cc82cf68528d9056dd3803dc5fab62300a44a", - "sha256": "1zkayx8bafadkwsllbmj5whfy3kvcb39llkhbx821mbwl5cwkijv" + "commit": "83eb6627d793db39a147c7b499f65637db1341b2", + "sha256": "110im31z8fvl34h80y0kq6070id9p6cr7d6ssfkbmipl3w26x71d" } }, { @@ -58435,11 +59691,11 @@ "repo": "legoscia/messages-are-flowing", "unstable": { "version": [ - 20170219, - 120 + 20191029, + 954 ], - "commit": "ef879726957c850c3a5afd7f1118604991e37e32", - "sha256": "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq" + "commit": "d582a564a63b7b90764ffc5c618bc5300225d0ab", + "sha256": "0lgh8vi6ya7mnzc3ik8189kx6lqh4xfnsxpn7r52q7745x4d8zb1" } }, { @@ -58522,8 +59778,8 @@ 20191018, 242 ], - "commit": "b02a056e1fa1a044a5bc5d44cc0fb0b8c62e1442", - "sha256": "1vglshyg8i5q17zxs9s5f0r5qwm18rah7qp7rd00pn4qg48zhy2b" + "commit": "58398120907504ff200adfd9b817f297142c9680", + "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5" }, "stable": { "version": [ @@ -58536,6 +59792,24 @@ } }, { + "ename": "metrics-tracker", + "commit": "e0250d97fd363b90ff4b69757cac3370c37c4b8f", + "sha256": "1823irgkfpsjl550pkc9qc7j5qkx1gw1b3116b203g4nhzh20h6p", + "fetcher": "github", + "repo": "ianxm/emacs-tracker", + "unstable": { + "version": [ + 20200105, + 1555 + ], + "deps": [ + "seq" + ], + "commit": "e8b2d96114ae52060e757d21003a5f242e744fe1", + "sha256": "1c6l7a9rl69vkvfidz2vc8agk4fzdlkjcn4dw01zq607m036jwzi" + } + }, + { "ename": "mew", "commit": "362dfc4d0fdb3e5cb39564160de62c3440ce182e", "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk", @@ -58543,11 +59817,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20190825, - 2345 + 20200106, + 143 ], - "commit": "3bc70db24c4f1410eb91017ea37173ba7da70281", - "sha256": "054fcl303jjkswnjyx5apas8l6v8f8m3haxsvhn7f1xbcxvjmr9s" + "commit": "9cd86a81ee71268f007f949184a5d386cf737d77", + "sha256": "0zmdjxkp2mw9s2s7bryif5gjrqx29gjh47xkq05l8vvgf36r98rg" }, "stable": { "version": [ @@ -58581,11 +59855,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20190324, - 1908 + 20200104, + 108 ], - "commit": "2d23c1b0f3e8c53052a4a59f09da491e0548e9e0", - "sha256": "1jrzd36zxdl3hlpzl4jlbxg44imkmvbxhpg5433sinrs7lir63s2" + "commit": "f07387225bfcb0b67850546ace4b74dfefb35ab3", + "sha256": "02pk90zrbrf8vwg0i83z48xvgaziwaar89rghnd5lggrj429kahv" }, "stable": { "version": [ @@ -58794,8 +60068,8 @@ "deps": [ "dash" ], - "commit": "d523de5918a842cd67c029535cf399278396264b", - "sha256": "0vqn7wdwyr5hqqimncq4w1m734bixzkz4kxx64v45v3x51xfcivw" + "commit": "01608829d895d3a6f4160e3b33175e1a5bde628f", + "sha256": "19qdzn8jd8k85aalkl4751fyfw5lcrk0vvwrrvp2qmj5s3rr16jm" }, "stable": { "version": [ @@ -58942,26 +60216,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20190918, - 2048 + 20200103, + 1239 ], "deps": [ "dash" ], - "commit": "ca6a3e77ddbd19cdf363ea71ba357096395a5de5", - "sha256": "16rplpbfy3dnvqqgavk9jb1f1ihr5875zlixd4zxb1pqxs3jkgw3" + "commit": "c331c1516111b9d2136e632a218c1d7707215356", + "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4" }, "stable": { "version": [ 0, 3, - 1 + 3 ], "deps": [ "dash" ], - "commit": "d36d2445420460c81bcd4822d0bfcbafaec2c682", - "sha256": "0q2y37zfxlbfvgdn70ikg3abp8vljna4ir9nyqlz1awmz5i1c43s" + "commit": "c331c1516111b9d2136e632a218c1d7707215356", + "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4" } }, { @@ -58972,14 +60246,14 @@ "repo": "arthurnn/minitest-emacs", "unstable": { "version": [ - 20160628, - 1820 + 20191229, + 1711 ], "deps": [ "dash" ], - "commit": "1aadb7865c1dc69c201cecee275751ecec33a182", - "sha256": "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1" + "commit": "6d9f6233b7ce63c63c96675514c228fd93a2b6a1", + "sha256": "01mfsyj0iq6rgh0q5b1acczdzr46n0nj5v94gb3iw9hs54vm4871" }, "stable": { "version": [ @@ -59025,6 +60299,21 @@ } }, { + "ename": "minsk-theme", + "commit": "36546342769ce5b6487a9b9ca3ec48bc81b6c880", + "sha256": "0cxwrc8nw7kkpc3z2pa7qmkyamsbsnfs93ybflv3z1wzp6z9q1b8", + "fetcher": "github", + "repo": "jlpaca/minsk-theme", + "unstable": { + "version": [ + 20200102, + 1829 + ], + "commit": "2ad8e88530fb0b66b5798ff8d692144691c93891", + "sha256": "16fyqw79vfdklzibqc0j78d6ws77naxz7yj1iahp3wcwqlwln545" + } + }, + { "ename": "mip-mode", "commit": "cbfefacda071c0f5ee698a4c345a2d6fea6a0d24", "sha256": "0jr8lzs1qzp2ki7xmm5vrdc6vmzagy8zsil0217vyl89pdfmxnyr", @@ -59074,8 +60363,8 @@ 20191023, 1025 ], - "commit": "f512a803fdfcea9ca17e0f57a16d4059b1772390", - "sha256": "0153lk2wv1jqacl5fxgqg07ypvz88pc8kyy96yrs7s18fp0fy55l" + "commit": "fbc566ace3ed7508dab6bec90ba185f21c829aab", + "sha256": "0175w364alym0qvvqlsgmy0j100pzdx5j1ck07hif3k5bs69q22i" }, "stable": { "version": [ @@ -59463,6 +60752,54 @@ } }, { + "ename": "modus-operandi-theme", + "commit": "6f3291ebede304fe14240870372c0d396f43c0d9", + "sha256": "15rq4l14a7y6p8vhgbs017crfwyp7fq61n03xbfycq92mlx89kgx", + "fetcher": "gitlab", + "repo": "protesilaos/modus-themes", + "unstable": { + "version": [ + 20200106, + 1823 + ], + "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b", + "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af", + "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r" + } + }, + { + "ename": "modus-vivendi-theme", + "commit": "74909ab53df89c5b720c89527b3b4c9aec8351b9", + "sha256": "16bs48amvwikp4ikv8fs9zrsyz942jdzlz9ddf3qv8c9vpc5x58q", + "fetcher": "gitlab", + "repo": "protesilaos/modus-themes", + "unstable": { + "version": [ + 20200106, + 1823 + ], + "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b", + "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af", + "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r" + } + }, + { "ename": "moe-theme", "commit": "4efefd7edacf90620436ad4ef9ceb470618a8018", "sha256": "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6", @@ -59622,11 +60959,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20190924, - 2152 + 20191115, + 714 ], - "commit": "b5dcc197cf36b181362b468da48b67a5f2199cae", - "sha256": "1shpaglvwdhybpkfmigz8vvw5500kybl5mri05h8sfn3b8331kfc" + "commit": "622e3a7203907978ce0d2409e3df2d65c63ce938", + "sha256": "08gl9wcr4xi1v8750j2bqvn0szv2iifi3y8ay9c9lscqax9knx83" } }, { @@ -59700,11 +61037,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20190930, - 1013 + 20191101, + 1955 ], - "commit": "9d116403a8b55d76d65f4d6d450a1f4def74013d", - "sha256": "1mz6877zls1xk64blghibryxqwn3n384l5y6szp9xjgkc9vf8zrg" + "commit": "0b07bdc7e77e19d7c722c2db803be0d3b47aa692", + "sha256": "0i40rbc0m4sya4f2lcfc6v6kn4kc6rny3j14b5rma66jyx08fcwg" }, "stable": { "version": [ @@ -59724,11 +61061,11 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20191010, - 125 + 20191029, + 743 ], - "commit": "4236e4209f82f16c1d80c5dfb71148713ff333f6", - "sha256": "182b2j2lhy2n2cis7qdq0j9x2lkrxi525ycldb0gyvyzyhljw78c" + "commit": "77ff4bfd954d46bc7580175ef443a9168938f9cd", + "sha256": "02aqp3na2401n0mc6fbqvlwrfvbq283kyn9fhan4d0i6mrgvdblx" }, "stable": { "version": [ @@ -59748,20 +61085,20 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20191023, - 2104 + 20200103, + 1238 ], - "commit": "d37945b3a4c6ea5560eaf15f39d98aa23537d70c", - "sha256": "03ppghb45ply0888pac8axazybyxfzrkl608qn09arhkxkyrpxpq" + "commit": "3616a6bd7c6b028753dc11feabd14597da694a63", + "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7" }, "stable": { "version": [ 0, - 4, - 1 + 5, + 2 ], - "commit": "e0975e844876f0962b2e9481c26739397bd23541", - "sha256": "0jci21ycsyf1mblcv8vbii4wisw1zcs15q5xwld7ai24kgj70269" + "commit": "3616a6bd7c6b028753dc11feabd14597da694a63", + "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7" } }, { @@ -59772,11 +61109,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20191004, - 18 + 20191118, + 902 ], - "commit": "3a4cda574152b03e4c83bc4197947b88ee6713c3", - "sha256": "00pmbbc9a9643sfpj1vmk6hd0lwj1zpfpfxfi1vyalcs1f3b0qaa" + "commit": "f16c8c509990932f3db7570a838a441d5c22dec3", + "sha256": "172ih3wa3n6q46i7hcjddvnpy4h3vjldj42wvid4lpny0ibjazfy" }, "stable": { "version": [ @@ -60174,15 +61511,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20190911, - 632 + 20200102, + 1938 ], "deps": [ "libmpdel", "navigel" ], - "commit": "e09904bf31ed465ea93ef2c165e8a6f705229f57", - "sha256": "159nb9ws800d5lx5plh8y0mmjl1y6spwhaxm9f5kxs6psa89mckj" + "commit": "706268d988a7f3560190694f5d21e27f5eeb58da", + "sha256": "1jsh6x844j33n27ny2rwc5c0psc89fzqy8g2ny09sywm3j4lg281" }, "stable": { "version": [ @@ -60315,30 +61652,30 @@ "repo": "yaruopooner/msvc", "unstable": { "version": [ - 20190426, - 1045 + 20191211, + 540 ], "deps": [ "ac-clang", "cedet", "cl-lib" ], - "commit": "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06", - "sha256": "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h" + "commit": "9fe50e5961fa63fc5cf7326370f441993e9d5cfc", + "sha256": "133pidan95qyn78gdhfxlyk8x5f28rm5rwb9wdw1gpjy4l72q22f" }, "stable": { "version": [ 1, 4, - 1 + 2 ], "deps": [ "ac-clang", "cedet", "cl-lib" ], - "commit": "c3b86fb517e95c9ae4d6b851984f4f4ed1864c06", - "sha256": "0mn12za94ciqfagia3ga7azl86abxa41191vlczh8kwspwci4x1h" + "commit": "9fe50e5961fa63fc5cf7326370f441993e9d5cfc", + "sha256": "133pidan95qyn78gdhfxlyk8x5f28rm5rwb9wdw1gpjy4l72q22f" } }, { @@ -60623,17 +61960,17 @@ }, { "ename": "multi-project", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x", - "fetcher": "bitbucket", - "repo": "ellisvelo/multi-project", + "commit": "a5b0dadc609d13737d56657c17a945f10e840222", + "sha256": "0zq2lwrllj4icksq6y7hz61ah39k60v1jc5qr16zvwyfqxhk8hpb", + "fetcher": "hg", + "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20190710, - 947 + 20191117, + 1203 ], - "commit": "88e5e67fd58cfb6643f8ec28d3d432c3ba95afdd", - "sha256": "0sfdcrfhjia8vv3lb9kqddyfdsb4ryzy1r4fmdi9mlk0jjqjqda9" + "commit": "4045823d51f6330466b6ab83828b6c598ac817a0", + "sha256": "18z1mmmjq4xw238mw1417nlqv67qv07blz0lxhpl8m1wma4v96af" } }, { @@ -60672,11 +62009,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20191020, - 218 + 20191104, + 1156 ], - "commit": "59f54c4680f62b37a19587f20b7d81da10faa146", - "sha256": "16fzzmk9b85ma0n3gfafyr01gz4wlw6qn79ai4gg1lfpl8qx58si" + "commit": "8deb0f2252399cca2426eb3cc3e9646c5de726b3", + "sha256": "19qbhxhpdsi76jlf6cfacy7g5z6a0r27v2hcf159p4xc4w93yphy" }, "stable": { "version": [ @@ -60749,14 +62086,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20190820, - 749 + 20191210, + 1759 ], "deps": [ "cl-lib" ], - "commit": "b9b851a7670f4348f3a08b11ef12ed99676c8b84", - "sha256": "0gg781vaa8jhmq5pdis3lwx3k114a0an2ggzhgqyrx0y3wic51ff" + "commit": "b880554d04b8f61165afba7d4de19ac9e39bb7ab", + "sha256": "0dcw3rw9ahk8y51d9sbqj0f4jdxmykh4jlz4h71cvariqlxw9pq8" }, "stable": { "version": [ @@ -60901,11 +62238,11 @@ "repo": "flexw/mutt-mode", "unstable": { "version": [ - 20190302, - 1515 + 20191102, + 2330 ], - "commit": "92763c5ff9abbf4ef91ce15fa7cc6b23da1cfa2d", - "sha256": "0n04500kr4d3qg6g98nzmdjcdy7qqs5r7f9cbi50r15jr9ihsjvx" + "commit": "1d495de49e6f536459b00d5396a2f5ce5ad4757b", + "sha256": "1nxsbvhh99kwbgaxzmraryayppfmci2grg591zj8yhdh6d3l1jmj" } }, { @@ -61027,10 +62364,10 @@ }, { "ename": "mynt-mode", - "commit": "22eaeb5041155d56483d2ac6b32098456411442b", - "sha256": "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "0dbbz86k5c70aqi8czbpd4lxil10zfqs0lmknvrzmnv31r2mgxfr", "fetcher": "github", - "repo": "crshd/mynt-mode", + "repo": "cbrst/mynt-mode", "unstable": { "version": [ 20150512, @@ -61051,11 +62388,11 @@ "url": "https://git.sr.ht/~jakob/myrddin-mode", "unstable": { "version": [ - 20190804, - 2205 + 20191225, + 2120 ], - "commit": "b996da5e3bae842eacba4b3e429899bb841b077e", - "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" + "commit": "51c0a2cb9dfc9526cd47e71313f5a745c99cadcc", + "sha256": "17qaxdzygk59qdm3hpyhc70jxiijfyq2n39dy68cwzhyd13i8f2i" }, "stable": { "version": [ @@ -61344,16 +62681,16 @@ }, { "ename": "nanowrimo", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31", - "fetcher": "bitbucket", + "commit": "2790c00a79df237cf853a00f094fdeca9e532a9a", + "sha256": "0c4wzhhk1779r0lgc6bhfp0qafmp3ggdvg1205m8a7k0kklq58bg", + "fetcher": "gitlab", "repo": "gvol/nanowrimo.el", "unstable": { "version": [ 20151105, 228 ], - "commit": "25e2ca20ed3486e3241a1b9a6cbca77f0d4bac61", + "commit": "b1d41458926ccb39cefbb1bb74aefe4f02fd349f", "sha256": "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w" } }, @@ -61488,11 +62825,11 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20140508, - 2041 + 20191204, + 1427 ], - "commit": "53f5bc59e3f32c1192d15637d3979732dacb2c35", - "sha256": "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg" + "commit": "dbb91216637e0a1e8bfd59aa883c75d45db70daf", + "sha256": "0f8dsxgk1a994clwkii9hv2ibvkf38kbvgd4sp3w1sf4vy12z5n5" }, "stable": { "version": [ @@ -61554,26 +62891,26 @@ "repo": "DamienCassou/navigel", "unstable": { "version": [ - 20190828, - 449 + 20191229, + 1357 ], "deps": [ "tablist" ], - "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", - "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + "commit": "2695f1df2260398930319095cf6b6a49ba98d6a5", + "sha256": "0v9f7wb6yghds3hjj8x5di6gfa8n5kjwhav7la1ca2zwgs2c1a9p" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ "tablist" ], - "commit": "6f53ec5c5c070b524624ef23ea6a096f9d7c8af7", - "sha256": "197n5p9x1sbrghgnqzbapmdcbqcwqvkibpmfa2qadlvb9plry50m" + "commit": "2695f1df2260398930319095cf6b6a49ba98d6a5", + "sha256": "0v9f7wb6yghds3hjj8x5di6gfa8n5kjwhav7la1ca2zwgs2c1a9p" } }, { @@ -61618,11 +62955,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20190704, - 201 + 20191207, + 1936 ], - "commit": "8eed91b268403cb9043e0c9d9aaf324db1ab7d7e", - "sha256": "00gwj4dw0ky94fhgy6zckmh2s5lfphvc0hkcqvcvvqcwy8a03ynv" + "commit": "22ac2901c7dfbc73f802f6280621fa4e2f92ff78", + "sha256": "1n6c43l0c8csagsajc7ibg4395qmigfvhsprba0xgqm95pl7whd9" } }, { @@ -62039,8 +63376,8 @@ "repo": "nim-lang/nim-mode", "unstable": { "version": [ - 20190823, - 1009 + 20191219, + 847 ], "deps": [ "commenter", @@ -62048,8 +63385,8 @@ "flycheck-nimsuggest", "let-alist" ], - "commit": "3fb6643ff684c5b5f3812cf66ea370a9c0e9559e", - "sha256": "1smv4a8rx9minmnw2vx8542lq6wy6n2prcxsvzrrilpykz1qdg38" + "commit": "16a245e4974d21a6e9e7163e7fbfb50a0bd89f99", + "sha256": "0fil6x2wshrini0q2zdi96hrvqgx5l4ljnirgqcr7q7lmjdijpci" }, "stable": { "version": [ @@ -62075,11 +63412,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20191023, - 1143 + 20191123, + 1238 ], - "commit": "0b527301a4f6a32e3f794bb12b6d83d74f484ef2", - "sha256": "1s49nynik0jpbgi5zws5hcxkyjll0dfyh8xhv9q0hm00sxajqf2s" + "commit": "c3d2b591de0763df11dbf62101578ca385ebe7cf", + "sha256": "0jc4zp1b0fk4fc1d2byi2vrbifiy0k89b75kh4qr702vkk9vgl4g" } }, { @@ -62093,8 +63430,8 @@ 20181024, 1439 ], - "commit": "21bd971ea9381e6c36d3a3be17a501899922ff73", - "sha256": "1vahangjygyx9y6blwml55l7anb74fa9malll7jirz9lxcah1mnv" + "commit": "bab5626e57a8b07b6778cd6d41ff29155fefb2af", + "sha256": "1jvcn32986xk33i7ashpva035qaaxw1sjs3g587x2j7iqqhp0s74" }, "stable": { "version": [ @@ -62137,6 +63474,21 @@ } }, { + "ename": "nix-env-install", + "commit": "47dbcb798012e53a7e02277428006db50781d009", + "sha256": "0srbdq93d6apmn4wbcgaz3fil82n44wvcslxmjc95warwz859xmd", + "fetcher": "github", + "repo": "akirak/nix-env-install", + "unstable": { + "version": [ + 20191223, + 1651 + ], + "commit": "f362590216e8a86ff85b3f444695f8e1dd1b2bcc", + "sha256": "108lyrix9gh438df6y432qppagpq3m2vn3gqsgp9sv24bvkv3wkf" + } + }, + { "ename": "nix-haskell-mode", "commit": "aeb879e2e8b017d3e1ccdc8d19f17d09b2ad5f1b", "sha256": "1rygqmq01p27gbda6hgnzisng7xqf63x462a3x31ym67ivxsyqz3", @@ -62201,15 +63553,15 @@ "repo": "travisbhartwell/nix-emacs", "unstable": { "version": [ - 20171004, - 1706 + 20191126, + 759 ], "deps": [ "dash", "s" ], - "commit": "45c8d90748304c90e1503c9fa8db0443f3d4bd89", - "sha256": "0hsr8acsvfb42drb8f2wkpgqyh3csny7l82qv4k2l83xf022cs1d" + "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", + "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" } }, { @@ -62238,8 +63590,8 @@ 20160209, 1841 ], - "commit": "45c8d90748304c90e1503c9fa8db0443f3d4bd89", - "sha256": "0hsr8acsvfb42drb8f2wkpgqyh3csny7l82qv4k2l83xf022cs1d" + "commit": "977b9a505ffc8b33b70ec7742f90e469b3168297", + "sha256": "07vidk3bnby1ch51i67llfdx2q8xc4ax5hvlrc3f72y9gkcpir4x" }, "stable": { "version": [ @@ -62332,8 +63684,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20191024, - 2241 + 20200102, + 1857 ], "deps": [ "anaphora", @@ -62341,8 +63693,8 @@ "dash-functional", "request" ], - "commit": "f027a94a50f2fd83b1cd55787dba8a7ea56b02fb", - "sha256": "1dlrfd1nr5nlxidfrq06gb7vcl6n0p4i2wl0krqygsrdk8k6qmxp" + "commit": "da85bf90989c1a4f4e50a40fa64c5b5e82e03043", + "sha256": "1p1jc8daflndbp19ya4h8719zc60xsvxn2l8z3rh291wm2azp2gf" } }, { @@ -62368,8 +63720,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20191007, - 1425 + 20191215, + 1438 ], "deps": [ "anaphora", @@ -62378,8 +63730,8 @@ "request", "virtualenvwrapper" ], - "commit": "6ed30881fd1fc7776766ed3a31c1c1dd7d7c10a5", - "sha256": "0694acgkhribvv2pz0j8ia3bnc6pq51z033016a19nrgmf37arqg" + "commit": "b5655519c1bf4c540f17bfd6e1af03241e3c1fc3", + "sha256": "0m4gfx87lyz5p8d3bwp3hw5y95vaijnwl8gg9cjy98riw309xpzf" } }, { @@ -62405,26 +63757,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20191022, - 659 + 20191203, + 645 ], "deps": [ "cl-lib" ], - "commit": "9f50a2fd5f5ca07323c09e47dc5456dc67c391cf", - "sha256": "1rg5a01msxdcxlw32wbvgjyvb6ddq2han818brmvp9cb7jzfkl4k" + "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7", + "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "99ae007ead688689b5b25a9482f98ec67663bb61", - "sha256": "0sg4qh9a6k1m24qamsf7ldpghjcawbdgh114gy08jnw478nf05kv" + "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7", + "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir" } }, { @@ -62643,20 +63995,20 @@ "repo": "arcticicestudio/nord-emacs", "unstable": { "version": [ - 20190616, - 1757 + 20200108, + 833 ], - "commit": "52756cdc909b29691eef228897b3de561cd99f43", - "sha256": "02nyczvdj0xnzq8vcyknr862dq3mj82djha5v44n1hs2dwipfdjf" + "commit": "d828752e270978a56bde19986c98b1bbe8f51386", + "sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "commit": "ba8f9b98a5028d3ec8c44e43889e7edda9a3b8dd", - "sha256": "02nyczvdj0xnzq8vcyknr862dq3mj82djha5v44n1hs2dwipfdjf" + "commit": "0f5295f99005a200191ce7b660e56cd0510cf710", + "sha256": "096f8cik4jz89bvkifwp3gm9iraqrd75ljy2q9js724v7yj88711" } }, { @@ -62715,20 +64067,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20190525, - 1602 + 20191214, + 1128 ], - "commit": "7eb9615b30274033cc0c828244569c709906c40b", - "sha256": "1x4sbvfwxj2b0sfkfkhkfb9q780xwxc4hmfs6b192qjfi2zin6k3" + "commit": "cedc6db19d2bb37ce0c8f74be25cdf045b35caca", + "sha256": "19siq81y03ngj3idc3g892fpg0qvhf1y40spmy8ffnzzliqysvcj" }, "stable": { "version": [ 0, 29, - 2 + 3 ], - "commit": "1c8d9e172e57bad26ebb94a8cb22a959ebedb9a3", - "sha256": "02v0h60vglkjivwq6n0xbg6pyf7dd9ndfmywk0amxq9gg0szybbl" + "commit": "a59ef7d02cb229c2ec3569024918024003568aea", + "sha256": "0w9k7jfhcp34inkqciisrjfgflrx8h5q4svfa6bij9p93g1hig0b" } }, { @@ -62800,11 +64152,11 @@ "repo": "muirmanders/emacs-nova-theme", "unstable": { "version": [ - 20190724, - 2019 + 20191213, + 2202 ], - "commit": "f5eec6957ad814bba64c340c14a9e82b972bb477", - "sha256": "19c8324l5nnkk3rg6pkd0s4fakdkd1318wm9xj32jcpfpqgjdwnp" + "commit": "ff566133747cd3508f4d576234a1c3fcd3f8cf09", + "sha256": "0lpjbrnpxw0dxl34hlkn6lb1ddmwazi1l5201rwpf1yg512x176q" } }, { @@ -62959,11 +64311,11 @@ "repo": "joostkremers/nswbuff", "unstable": { "version": [ - 20191013, - 2037 + 20191210, + 815 ], - "commit": "19c04c1042fa1ff45bf923e9e50271c0bb57268d", - "sha256": "15qsc494xl4mwvwfybla45q7l43cxdd827d7nx4wfmbpw0c6cyc5" + "commit": "54b590303626fcd53b017f92454ffe97c97ca69e", + "sha256": "1n0kjnx5xgd7x9zqrkgy8klydkv4ihxmn0gvprzsscp268rkrfnh" } }, { @@ -63092,8 +64444,8 @@ 20170224, 1249 ], - "commit": "44d506105989873dc1725e0cfc675925b35c9c98", - "sha256": "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22" + "commit": "b17cb826f14c18c2875d112574edb5e4f46f5296", + "sha256": "1g030806d2l238sr173ypdkkq0g8kf8qdp7a1ls5d3rw0bng4ds1" } }, { @@ -63307,8 +64659,8 @@ "deps": [ "axiom-environment" ], - "commit": "505d85ffc051a7725344c960b1255597dab17780", - "sha256": "1251xc58nc2h6n4dibfdp7z85y609dkpc499ga8j9s0nwif009fs" + "commit": "3e7885d694efef923e7b53827d277c28bfa09320", + "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih" } }, { @@ -63530,6 +64882,24 @@ } }, { + "ename": "ob-elm", + "commit": "9109c178f49c300b8a5247b94ecdab265d32f4ce", + "sha256": "166yxninqiwv3vjn59ir23isnqhjjzvw8dcswnbwgcb4f4ixs12q", + "fetcher": "github", + "repo": "BonfaceKilz/ob-elm", + "unstable": { + "version": [ + 20200102, + 2000 + ], + "deps": [ + "org" + ], + "commit": "8b49ca0ecdff9df7c3f428bac22a96ed675ee5dd", + "sha256": "0prc0bddyppdzckfkjd6h2j5qg9plfzccg2gyn4jkmjhkx0gi09g" + } + }, + { "ename": "ob-elvish", "commit": "90e979025f56061bc960f630945b09320a3dd28e", "sha256": "1rpn3dabwgray1w55jib4ixr3l1afz9j7nyn0ha2r602hs02x1ya", @@ -63578,6 +64948,25 @@ } }, { + "ename": "ob-graphql", + "commit": "3d4572f599ac5794d8a5c310f1d1e138a11a45a8", + "sha256": "1rgwfyq5f602b60hza9xnszxdjqms90gkvrw9hjmivyp2swwy5vy", + "fetcher": "github", + "repo": "jdormit/ob-graphql", + "unstable": { + "version": [ + 20191223, + 1358 + ], + "deps": [ + "graphql-mode", + "request" + ], + "commit": "c62d6a2ea2c162772d5e255715cff7b35fe660d5", + "sha256": "1s4rgr6v7xxpjr219a44309jg50iip5isch6x90zk5vig735c30h" + } + }, + { "ename": "ob-html-chrome", "commit": "ac4380b5ea63c5296e517fccafa4d6a69dc73d0d", "sha256": "1z3bi5i9n6dqvarl32syb6y36px3pf0pppqxn02rrx1rwvg81iql", @@ -63717,11 +65106,11 @@ "repo": "arnm/ob-mermaid", "unstable": { "version": [ - 20180522, - 1659 + 20191208, + 2346 ], - "commit": "5deaea757b3a5de874d94e40c03116fbc8195308", - "sha256": "0vyqxqkkyb2dychg3i5vbik5cf58ls5f95ynq88myfpn0sivfbz4" + "commit": "8dcbfab869829b586ce9992897a2ebe2bb52b770", + "sha256": "0h0aig17hsjisa2dyz6y7x748fwmb6908dc4sr043hq2hlv60bj7" } }, { @@ -63795,8 +65184,8 @@ 20190410, 2130 ], - "commit": "149abd3832fc5a6a1cb01a586a1622a8f25887dc", - "sha256": "033pqfm3hj2585ibmqjhf7s1imckf615s6zg38jsq21wxv5fx8nc" + "commit": "331899cfe345c934026c70b78352d320f7d8e239", + "sha256": "1k34cl2whc32ysd7anvz8ii66ljfrmkvx3cgb6i42jcx74kavlfr" }, "stable": { "version": [ @@ -63816,14 +65205,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20190626, - 1824 + 20191119, + 924 ], "deps": [ "restclient" ], - "commit": "53376667eeddb1388fd6c6976f3222e7c8adcd46", - "sha256": "1djg53cp7y83gic2v71y6r5z76kwrbkp0r69hl25rs99dx6p89dy" + "commit": "fa4ac671756c9d4e395bd481405239d06b202bae", + "sha256": "119rkz8dwrmxdsybkq3yhw6g4gral3xfqvdgbnl4i3w89j16wwcr" } }, { @@ -63849,15 +65238,15 @@ "repo": "stakemori/ob-sagemath", "unstable": { "version": [ - 20170131, - 233 + 20191106, + 828 ], "deps": [ "s", "sage-shell-mode" ], - "commit": "68d3e516c712bc7aa5042f305f3eb5bbb6d656c2", - "sha256": "1yr7d3ayrdnycapnhc08zyf6b9gp7xw0pngz90h75s6j33pisx30" + "commit": "79645bce0c25a650bae61e550434bed836995dce", + "sha256": "134d3pz38g2ki4war1jxp5440yq5smfkdjnknz5r29p49sch0zvx" }, "stable": { "version": [ @@ -64131,14 +65520,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20190717, - 853 + 20200107, + 1319 ], "deps": [ "cl-lib" ], - "commit": "fea114824e11fdae7871fb3b5ddf4ed2472cbda0", - "sha256": "0lf88ivfsl5la075jg1y56kf0v96hp2539b54lwyabz0rpc0c7in" + "commit": "8dc17701d1dc65b5d2113e7ca406136bf612bc9e", + "sha256": "1ly7lkv27n7dp8q25w5yk8a69vqzmxp72ln329j7ik13rjyhj1dc" }, "stable": { "version": [ @@ -64349,14 +65738,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20191024, - 907 + 20200107, + 851 ], "deps": [ "org-re-reveal" ], - "commit": "641c905b7453855bc99ba64441d1346b03d44fae", - "sha256": "1awcazkv01ry7430ghsqrk93pvpi79cd8wig3wlcj4fyvy1g9chf" + "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e", + "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6" + }, + "stable": { + "version": [ + 2, + 1, + 1 + ], + "deps": [ + "org-re-reveal" + ], + "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e", + "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6" } }, { @@ -64419,11 +65820,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20190923, - 840 + 20191217, + 917 ], - "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499", - "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa" + "commit": "6c7505f426c1bb55bb209e45ea69e9a3cd683be0", + "sha256": "0m65wc7jz3hvq8kspr3h9m0sf3klf8facf59q2k2xpjn33ab6dps" }, "stable": { "version": [ @@ -64969,11 +66370,11 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20190925, - 915 + 20191112, + 1629 ], - "commit": "68c9dbe235b1f97f12ff0f82878bb9e0ac971b1f", - "sha256": "0k5xsz0mlg4yhra80pixj10zl8dmy78r68hhd5q24dwqg6yic7f0" + "commit": "6ecf211b56e4296898aa87eec8c6fed365a5d220", + "sha256": "15plspxxg18nch4q22ilc6pvmyrhnhfz18g7p6c9hmxkrlkvg43n" } }, { @@ -65168,29 +66569,29 @@ "repo": "diadochos/org-babel-eval-in-repl", "unstable": { "version": [ - 20170511, - 1214 + 20191204, + 18 ], "deps": [ "ess", "eval-in-repl", "matlab-mode" ], - "commit": "bfa72c582ac1531ad42aba23e2b1267ab68e31f6", - "sha256": "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k" + "commit": "e111b4b5c6844bb389317354ea172cd96a8bb658", + "sha256": "0j1z1kp85fvn874l7s8h0cf528khaa38bs5ccx5dwf8mkb68vjgm" }, "stable": { "version": [ 1, - 4 + 5 ], "deps": [ "ess", "eval-in-repl", "matlab-mode" ], - "commit": "3f26e3cf8bed9ec8e025e4143e708e6e470258d4", - "sha256": "0g2057v6qjqi5xl2m1sa2k046lmis83c3g80d13h6plv0rrsvwz2" + "commit": "929d160685db57c4f0aedf26b52f9d7a918a40dd", + "sha256": "0dk2kqwf7pg18iny02rz146jjjlfqn1vd9ay1sxq7vgsv6c1cs80" } }, { @@ -65247,14 +66648,14 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20180904, - 1709 + 20200103, + 514 ], "deps": [ "f" ], - "commit": "eba5ef7a3c992c4a9da86f64d12fca0c1158208a", - "sha256": "1amq48yldydg9prcxvxn5yi0k8xk87h1azscr9hh9phnll2yys1d" + "commit": "38a2813f72ff65f3ae91e2ebb23e0bbb42a8d1df", + "sha256": "09rfp0zf68gnhiwh61wc10kgqk75ypkbk0hawrw1rhida1bi2wb1" }, "stable": { "version": [ @@ -65274,14 +66675,15 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20191018, - 1325 + 20200104, + 2235 ], "deps": [ - "org" + "org", + "org-ql" ], - "commit": "94727f6d6b5bdf1ba3fc9471075980a14916ac8c", - "sha256": "10mmi1nfhphrxck4g5fnmdicdcz7a8bmvb131bn5962jrhyy3vsj" + "commit": "5cfacc842842132894f6d8f4f0cb4ade8a9d657f", + "sha256": "07csazgchji964ch5yccfx6prrpdqpzk4hdjisx4qc8d3hjvhw78" } }, { @@ -65379,14 +66781,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20191017, - 2015 + 20191201, + 1435 ], "deps": [ "org" ], - "commit": "440e0a11b4af85f558aa138de58d347020439f0b", - "sha256": "1c30ssi533gi1rp865fkrbxp7igzpwbrxr4hmmpxhs6qsj1f8pwi" + "commit": "a40ad1e5cda5a80faca255a344c14280b841ebbd", + "sha256": "1sr035jld69sv4yx787ci7rsll8z59q1s3gsmmmdkiab6sah09v6" } }, { @@ -65462,11 +66864,11 @@ "repo": "justintaft/org-clock-split", "unstable": { "version": [ - 20180909, - 2047 + 20191219, + 457 ], - "commit": "b2f1497b62e7f4a767be02e249e4ac95d4f8f21c", - "sha256": "099jxkyx7ikfqz99sx632a6c0mc630qkix3c307sm7y317jcdz8l" + "commit": "361a7a96af2a7d09ccaf561423b80caca7a108cb", + "sha256": "00k7av97l609rf31zqndy92ypbdyvwnr0bdpxfisw33icw7706nb" } }, { @@ -65477,11 +66879,11 @@ "repo": "mallt/org-clock-today-mode", "unstable": { "version": [ - 20190915, - 701 + 20191204, + 1558 ], - "commit": "18af3fede1aa0ccab83ce9195f94f9097f51c548", - "sha256": "0knjks1rzl7p38r36g7a186mlxsc5dr88a7q0mxjsgg86vjx1xwf" + "commit": "e326a45b60e0fd4ca057f1d1dc3e99a516a5aa2f", + "sha256": "08x1907kh6gxnji34gc3r6vya4idd7b79xqxyn8ibn9zswicyy2p" } }, { @@ -65647,14 +67049,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20191016, + 20191219, 1227 ], "deps": [ "async" ], - "commit": "29d919126fac7277261bce96c99744e35d3c193d", - "sha256": "0514i261n9lca3dwqn8s9km3f06xcy1y6l355n49ivrh06kikwc7" + "commit": "a367669384859261bcb11bac4b782f231f972353", + "sha256": "0yh1pfr3k04f98pywq54pgajhl3l1hy5x3marg0waqzgrbchr7yi" }, "stable": { "version": [ @@ -65705,16 +67107,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20190727, - 1930 + 20191219, + 2100 ], "deps": [ "org", "persist", "seq" ], - "commit": "7dece4a5e4b37ff32a7733e407d19ba67422008b", - "sha256": "0m5lv0hm5wd5v9ghk5sp1hvdm11hq6aj5kkymr76z6zx7q29jsn3" + "commit": "d2fe915d7a6602b337d4413eec10baa1c1a10dff", + "sha256": "1d87z3fwr5p657fbl6h8gf3xw1znjcc12090y0lk1n88nfmwbckf" } }, { @@ -65934,8 +67336,8 @@ "request", "request-deferred" ], - "commit": "36e9933b0238acb245e6d8dc89944583482fee1e", - "sha256": "0jvav64yysxf0rvfmkx8mvpx2cw2d3ppq8wyx8bp9vdi027czg3n" + "commit": "6821e349673e9ba8d7ae7b84789f931889273dc0", + "sha256": "12alwnk50gsiz5b9mw8qvn317f7phb5vh2x7yvi9m72zdrdaf8pz" }, "stable": { "version": [ @@ -66114,20 +67516,20 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20191011, - 1315 + 20200103, + 1227 ], - "commit": "19e3b4dd07d8b0145896011a2b4522234b62a50c", - "sha256": "1bacprp42abk84hg0ha44pq9n15rdrvvd2pvdjw5yhnqansnx8l5" + "commit": "11b8255d8839515895581450a090351d18770c99", + "sha256": "17mqbb3hddkinr9r7q5m4rp20hp97fbygp18rnx0j2vhc7jpc4g3" }, "stable": { "version": [ - 1, - 15, - 1 + 2, + 0, + 0 ], - "commit": "af2819c41b34fc88e2aee473fbdf695451ba167c", - "sha256": "05kxs63ssgc6h47cjldxxmx9ggy1fyaxxrxzaq078gj56411gmld" + "commit": "8eda1119f561561b993eea72a550a6b1f0ef35e1", + "sha256": "18dqd0jy2x530lk0h4fcn9cld9qh4w7b3vxa60fpiia628vsv1dg" } }, { @@ -66311,8 +67713,8 @@ "deps": [ "org-pdfview" ], - "commit": "af09bdf2c83499be9f7c271bb3c0cc3c46ed95f4", - "sha256": "0bm8i4bfa76igzzjlv9qx9fh3diplmvhn99bz1clq1ifr4i53sv0" + "commit": "bba86a9b9979bd79e9bfaf4a7b472682b9435490", + "sha256": "1ndd1iw207jnv0mib2r6mxldba4c4nna69wdvj8mzynn6ldxg5bk" } }, { @@ -66323,16 +67725,16 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20191014, - 2307 + 20200101, + 305 ], "deps": [ "dash", "org", "s" ], - "commit": "d2f61e3c7e995adf0954cd85139842e57d744eb4", - "sha256": "042z0l0hhrfm01jj1r0yd120a67xflzgv5fz6kf28202d6apsv9v" + "commit": "f640826c8e66c83adb2b511f99f32525e9da94c0", + "sha256": "0n3gm2g2zyqnqnbizajmlvy3h3bhvazfjvw68vikdn6x9fcnvmdl" }, "stable": { "version": [ @@ -66357,14 +67759,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20190805, - 57 + 20191226, + 2309 ], "deps": [ "cl-lib" ], - "commit": "4bd5d55ba9bca84ffd938b477c72d701cf3736df", - "sha256": "0a9vjlg5rz3c61wvy0wsj9l5y3p6b1v8hz84ksh97xnmmzclp1nx" + "commit": "b1899762170eaa656555ce62c58e613ca3509ec4", + "sha256": "1p3ffxanjpb83xvk4c42lafhfbckh4rkmi32wjdp86fkqx30nvrg" }, "stable": { "version": [ @@ -66394,8 +67796,8 @@ "dash", "org" ], - "commit": "16a8aac5462c01c4e7b6b7915381fde42fd3caf6", - "sha256": "0ipkmws7r8dk2p65m9jri90s8pgxhzidz7g2fmh7d6cz97jbk3v7" + "commit": "95347b2f9291f5c5eb6ebac8e726c03634c61de3", + "sha256": "0mkmh1ascxhfgbqdzcr6d60k4ldnh3l8dylw4m7wglz15hm3ixbm" } }, { @@ -66424,20 +67826,20 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20190610, - 2005 + 20191121, + 840 ], - "commit": "1547191254f6fc58b62864d0224356e72bd7d933", - "sha256": "0j3gscmf8i05ixj31ipdc88kbb7zqs5sdhbd3ipqpahakmg6axhh" + "commit": "1ec07f8ce60b3eca281072e51f88065469450ab1", + "sha256": "1a2vp6bk5lgcgy95ynflql5hacr3ckmfh8nq36bkakqw97k7wih9" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "1547191254f6fc58b62864d0224356e72bd7d933", - "sha256": "0j3gscmf8i05ixj31ipdc88kbb7zqs5sdhbd3ipqpahakmg6axhh" + "commit": "50bf0ec93b3c60eaed7272149bd317bba69a5b6f", + "sha256": "1ydq2y1zibh9mzfpw598nsci6aw4nsnsjc7wv8xjma7pwkzz8wfd" } }, { @@ -66448,33 +67850,33 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20190916, - 2334 + 20191129, + 2329 ], "deps": [ "htmlize" ], - "commit": "7616a9760bd1e3fb0e6a22f6e1cbc2bf71a733df", - "sha256": "0mccaw4wvh4624iyxfbv1jr01z7fkjg5mcl56scq164daznm200g" + "commit": "a236211e4928610c56b5ee40ea401db60bc2845a", + "sha256": "04ngim6204pii0xpg6cfdzac1b4dfyy7lnp6zfb9mjajrf40fyr1" } }, { "ename": "org-multiple-keymap", - "commit": "0a22beed723d149282e70e3411b79e8ce9f5ab2b", - "sha256": "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "104vcwawrzl99nfj3afq1mh83yirhscwfa1xw7z84ikrf6m0xir7", "fetcher": "github", - "repo": "myuhe/org-multiple-keymap.el", + "repo": "emacsattic/org-multiple-keymap", "unstable": { "version": [ - 20150329, - 106 + 20191017, + 1920 ], "deps": [ "cl-lib", "org" ], - "commit": "8ebc532df7f0dd6e6c3aa7c380a51d4166c668e8", - "sha256": "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3" + "commit": "4eb8aa0aada012b2346cc7f0c55e07783141a2c3", + "sha256": "0ivgvwrakgr527lylz9si1z3ip3n7bx02pj1acw8ab8swp1cxmy3" }, "stable": { "version": [ @@ -66523,8 +67925,8 @@ "cl-lib", "org" ], - "commit": "d051a5909878e2214422fd275968ab4d7ef9bcab", - "sha256": "12v13l4va28abjgcq1q2lzml8cahh5qbbl0wzvbm41y9cmlbgmxq" + "commit": "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d", + "sha256": "1ysz8v2yakchs4va5niaf5rnydwrmz721hbaa2l63wjw0nsmi7l3" }, "stable": { "version": [ @@ -66596,8 +67998,8 @@ "org", "ov" ], - "commit": "b95b6a7ed9289637cb512232470633b330ca9713", - "sha256": "03x3n2ywgk2x7slpzy26bw3l9l000pd964z0yifvf9fqhpbk5d0r" + "commit": "22014917dd7e751c46fa13e1e836c2d0265ce82f", + "sha256": "0gjvd7xd9kl06cgdyya2qbl7r4a9y4zfq1ci0109w5axs3zjin1m" } }, { @@ -66644,8 +68046,8 @@ "org", "simple-httpd" ], - "commit": "d539731d7a38899ef034b905f834f383ed102881", - "sha256": "1g8ins9kp0sl19dgk697xhh9vnxbryz74zc4qk61gbmfd5farg7y" + "commit": "d0e55416174a60d3305e97ca193b333f4cccba4f", + "sha256": "0l1jkap8wjprsaglys5hy5ijhaxfv8bzry9axqcfg6xr0bmbyhm7" }, "stable": { "version": [ @@ -66753,11 +68155,11 @@ "repo": "tumashu/org-picklink", "unstable": { "version": [ - 20190902, - 654 + 20191203, + 59 ], - "commit": "e8c95e188b60ff84d794cbedbcce6732ccb82e4f", - "sha256": "05b488h1b5yvh0892358ndina2lywh67lhvqp180rp5ivz7zqm10" + "commit": "f79040ed988bdeec63b098b187e00f2b80d3d570", + "sha256": "0a0dzg8w617sn079mshihfv5sm74xphab81kmvi1dqcc5iyi15kh" } }, { @@ -66768,8 +68170,8 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20190823, - 1530 + 20191116, + 530 ], "deps": [ "a", @@ -66777,16 +68179,16 @@ "dash-functional", "request" ], - "commit": "11bde7699634926369fad0081d5e6d7525ac3260", - "sha256": "03zs5y0wm49pma739574sq6aky26l64j3bi6c8k52zzmg3pm3shy" + "commit": "f073f3ed8c2e78f5080c617d01b1f6bb3df63d1c", + "sha256": "13bqcwlappxz0gsiyvklrf0xv4an6s4id48s3ydi0hki1na9fzzk" } }, { "ename": "org-pomodoro", - "commit": "e54e77c5619b56e9b488b3fe8761188b6b3b4198", - "sha256": "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "0pcf8a57fgf6f2pwlnrxc3kwm96lc2ji934y4ck8cm5rwwh05lk7", "fetcher": "github", - "repo": "lolownia/org-pomodoro", + "repo": "marcinkoziej/org-pomodoro", "unstable": { "version": [ 20190530, @@ -66839,15 +68241,15 @@ "repo": "duncan-bayne/org-present-remote", "unstable": { "version": [ - 20181001, - 2141 + 20191206, + 533 ], "deps": [ "elnode", "org-present" ], - "commit": "d0f96dd57c152e7aa311ecbe03e7be287fd5979f", - "sha256": "1n0cafvpc8vqhh34d4kicw6a5qn1jpnczjh67nvwd2iw48pii5rk" + "commit": "d66aa2022eea65c83b6e5e5b99a1331284a7ec30", + "sha256": "1ji1qqhp6hpsmri0lgwzvvn1477njlcv60958xf6akvryk6azqh3" } }, { @@ -66858,11 +68260,11 @@ "repo": "marcowahl/org-pretty-tags", "unstable": { "version": [ - 20190715, - 1843 + 20191120, + 1343 ], - "commit": "8249601b6c75ac26254f3f12e38f5cb51e22bfdd", - "sha256": "0ws9b473b0dh8sp4qaj8v8p1qvfi0xxmgwnv1biydjwm50mzlran" + "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77", + "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii" }, "stable": { "version": [ @@ -66994,8 +68396,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20191019, - 710 + 20200103, + 1257 ], "deps": [ "dash", @@ -67008,8 +68410,8 @@ "s", "ts" ], - "commit": "0d6523f85b48080582a84b1dc1213f80de40d3c6", - "sha256": "0g01yrf5zcpnf6m4q37b3qzkqgs5s97b6l5wdgf9yy8rgj7rbpgr" + "commit": "21c7dc15878f90eddee6375faf6b138d7784579c", + "sha256": "0qv4hysrgk34mzkfzmmqy1w8mbar768hcwjwbnz4pr15jq016d6d" }, "stable": { "version": [ @@ -67107,15 +68509,15 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20191020, - 1137 + 20200107, + 751 ], "deps": [ "htmlize", "org" ], - "commit": "62f0868c4e9b098fb43b62b257bcd924779838c0", - "sha256": "0nbbynpgwmw85y90frbkna0s0sxxdhskpijnl41f9l6psll70mq4" + "commit": "29bc467201220dbf5091fe2d32a2b237c744ff10", + "sha256": "17rz5z1gbwav2ihszl509vqmhpavg3abs6ggjk41v5v11szckyf8" }, "stable": { "version": [ @@ -67193,14 +68595,14 @@ "repo": "m-cat/org-recur", "unstable": { "version": [ - 20190719, - 846 + 20191216, + 2353 ], "deps": [ "org" ], - "commit": "23c3c3a85d9042dc09ed6147b274f4043cfa50f7", - "sha256": "1sw9h6543zgsyss5ns3bjviz0nblsr077hp8b15pva0ch2836vg5" + "commit": "ae20a538b2b4dcec139089bb44f1e4abc5b04f72", + "sha256": "1x0gpq7n8crn48nfj2hmbfxd4yj5implgh5mvfnr0k1d89r6gwcn" } }, { @@ -67226,8 +68628,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20191023, - 117 + 20200107, + 1307 ], "deps": [ "dash", @@ -67241,8 +68643,8 @@ "pdf-tools", "s" ], - "commit": "58ae484729aa2027fcc3283a75f4c2c19cf499a2", - "sha256": "1sbjxrs6axfpwiy74dbq9nrax6qyjmypg4dnxy4y1xab24n6q4fk" + "commit": "52cf11378b31b070111ed43fb59138146819f926", + "sha256": "0vcpy107znh1xvi121kd8rhqvhibwmspcqdyvy2h2xp0pd2xnhwx" }, "stable": { "version": [ @@ -67303,8 +68705,8 @@ "deps": [ "dash" ], - "commit": "a3bc7846531b55337ec069d0696b8d8a04fad3de", - "sha256": "0xhsv46xx9bzakzpb9y133s9drj5vyg8wrm15llqhgnaygakpfj6" + "commit": "7668fb561320bf01e73d98795eb6ad69f1e933ac", + "sha256": "1vw4996dj9j10b72vf9cya61h031bl2a4dsrqdg52v2j45bhk4dy" } }, { @@ -67365,6 +68767,26 @@ } }, { + "ename": "org-scrum", + "commit": "8315b6834d76180fd050b0d5cc2239d604fe2f3b", + "sha256": "1bvxcj5675kh7zf839qb0hdy6jlllpqm7ngb5ixx1klax7l8n7pr", + "fetcher": "github", + "repo": "ianxm/emacs-scrum", + "unstable": { + "version": [ + 20200107, + 1048 + ], + "deps": [ + "cl-lib", + "org", + "seq" + ], + "commit": "227de5157d9dea4fb52527d3a30a61969731a040", + "sha256": "1hh29gjj7d629g5mzcpvvh6jpsm7fz1vypiq8ppfmpi9jxflz631" + } + }, + { "ename": "org-seek", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7", @@ -67486,15 +68908,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20191005, - 413 + 20191224, + 1909 ], "deps": [ "dash", "dash-functional" ], - "commit": "c9f0f91437131dbace3299ff5912e85f07bf2b21", - "sha256": "0w51jv9jlkl35296g5v2q81mdrncsj2arnrnj8w3hv18dyrx2db2" + "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", + "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" }, "stable": { "version": [ @@ -67525,8 +68947,8 @@ "org-starter", "swiper" ], - "commit": "c9f0f91437131dbace3299ff5912e85f07bf2b21", - "sha256": "0w51jv9jlkl35296g5v2q81mdrncsj2arnrnj8w3hv18dyrx2db2" + "commit": "4c0f01a493a6dc9ab3fec50e0b458aa0d35464f9", + "sha256": "1c2vjxgscngg0k7qxr67ad0cws9yv88yhmdrn9qq4rxzc9fdjkzg" }, "stable": { "version": [ @@ -67550,11 +68972,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20191023, - 633 + 20191107, + 805 ], - "commit": "d8522a7a245a47e850f42d4773e5ceec0fff4e94", - "sha256": "1g5x3imrbazxk9rfwaijgsd1wzxd5fm3wa1wg28mifyp873wypk5" + "commit": "6381b933853878eb0eac9404d9596ea59c5b1a1e", + "sha256": "15xrginwc7lhykwllsz68n8ms8zfg6sx63lm87f3f7aqf8hrsnig" }, "stable": { "version": [ @@ -67574,14 +68996,14 @@ "repo": "alphapapa/org-sticky-header", "unstable": { "version": [ - 20190406, - 2313 + 20191117, + 549 ], "deps": [ "org" ], - "commit": "32c13a56a78a4de239010031fea4b9583bac2512", - "sha256": "1vngxj8d946qmi65x9yiz4pihqrim8fl1sbxfjzp8fkykx0ybiy1" + "commit": "1053ebdeb3bd14fc8d4538643532efb86d18b73c", + "sha256": "171j10ngngra45sxmlkzrcmhhqf2b6yjqq0r5gl16zcbgggg936a" }, "stable": { "version": [ @@ -67604,8 +69026,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190925, - 958 + 20200107, + 1609 ], "deps": [ "dash", @@ -67614,8 +69036,8 @@ "s", "ts" ], - "commit": "a87ca11fbbe72ab6c1c4c3b55ae9e1e93ebfb8ba", - "sha256": "08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff" + "commit": "bd6f821e6e812ffe84cdf8d92cef7502f62355d7", + "sha256": "0r3lzlh9xw0zm0ycq7qkap60y204715vd80hbypcc2fpdqn6kmf4" }, "stable": { "version": [ @@ -67746,11 +69168,11 @@ "repo": "mtekman/org-tanglesync.el", "unstable": { "version": [ - 20190926, - 1345 + 20200107, + 2134 ], - "commit": "d99181f173b4e55b4e835d99fcd415e62beb047f", - "sha256": "0x94gy1bgfd1f3p9w2bfrqj11bwy9ql0cpi1gw6srpj7kykx0lml" + "commit": "e17f64c6472ab2c90d1f32eae83b9fe0843fc028", + "sha256": "1sljzjgwgw654lijl20p82pr8pas8v64dmyjagm6cw9ss8p75vj1" } }, { @@ -68037,11 +69459,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190914, - 2046 + 20191207, + 2022 ], - "commit": "5f3e67448cc98fe2875115163849acae4d9e8526", - "sha256": "1w0dhyr4i0nx0g70smgclcfsbv6cfilb7df330njzaqk8j2gdfws" + "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", + "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" } }, { @@ -68052,11 +69474,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20190810, - 124 + 20191130, + 703 ], - "commit": "df5e2d3bc0c3970e5fd553ee9d55878c4f9a163d", - "sha256": "0x862pqya2q4pg8448qlp5267x8ycqq1zmkbvcyrzanag3983d8v" + "commit": "4f5d71225e946999f45ac9f96996705fee83df5a", + "sha256": "1w8miq52d2rlyslbss5173gnbv7rmkn2cicd9h272v6ybb585hcd" }, "stable": { "version": [ @@ -68091,8 +69513,8 @@ "repo": "alphapapa/org-web-tools", "unstable": { "version": [ - 20191022, - 337 + 20191217, + 1459 ], "deps": [ "dash", @@ -68101,8 +69523,8 @@ "request", "s" ], - "commit": "3f528c0d2cf6eeb5f0a672d1ed719b7476472136", - "sha256": "1gjcfgh53d75slhw1vcn1mcccjbm7qs8qys76n45wl7ral5108nz" + "commit": "ebc7888f4f4cad26ec1298edd7bf606a5ea2d564", + "sha256": "09ihqas9rx7c6146zmb3p0q395gxkfscxixlmz4v05smrhka1xz8" }, "stable": { "version": [ @@ -68129,8 +69551,8 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20190930, - 1912 + 20191114, + 1632 ], "deps": [ "alert", @@ -68138,8 +69560,8 @@ "dash", "dash-functional" ], - "commit": "f2ea8a719cf61742def57475400222a498256bb6", - "sha256": "0wrr52bryvv1aj2fk5ik71iifh15bzmvrw1ixzs1afcdp2fn0bcm" + "commit": "713c5205869dde4d42127fd9365f5831ec222503", + "sha256": "0585v39lxrqnv4p2k2pcswmx14gvm6l17j05q30cssn5zqy8cv8a" }, "stable": { "version": [ @@ -68158,15 +69580,38 @@ } }, { + "ename": "org-working-set", + "commit": "8df6c37b8d5b7f4a296e57ad1fd758cb99aff718", + "sha256": "0dkwgci0s6znc25hcvj3a3djarwmwdjyx2lgfrf6sgbqd5l30s8l", + "fetcher": "github", + "repo": "marcIhm/org-working-set", + "unstable": { + "version": [ + 20191117, + 1948 + ], + "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c", + "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c", + "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m" + } + }, + { "ename": "org-wunderlist", - "commit": "44019e5d9e3d0f3e2cf76fa5828e1f953fd5e60b", - "sha256": "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "08lxxdm740cnzkzar1hqrapwjh087nsgm0kzi9fxlq405gc0sza9", "fetcher": "github", - "repo": "myuhe/org-wunderlist.el", + "repo": "emacsattic/org-wunderlist", "unstable": { "version": [ - 20150818, - 213 + 20191017, + 1917 ], "deps": [ "alert", @@ -68175,8 +69620,8 @@ "request-deferred", "s" ], - "commit": "f7f1ca73661356b9fa072efd73431592ff1182e1", - "sha256": "169wzfjc9bbk2ydgq1zghrwkfp2fjwsrnwsw86npslj4c4bz41mm" + "commit": "1a084bb49be4b5a1066db9cd9b7da2f8efab293f", + "sha256": "05kd8d0687dlmy8a4qvxa3bdcsvxd10hxkl5i4654w88pg07qm8g" } }, { @@ -68187,8 +69632,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20191021, - 130 + 20191102, + 28 ], "deps": [ "htmlize", @@ -68196,8 +69641,8 @@ "metaweblog", "xml-rpc" ], - "commit": "b02a056e1fa1a044a5bc5d44cc0fb0b8c62e1442", - "sha256": "1vglshyg8i5q17zxs9s5f0r5qwm18rah7qp7rd00pn4qg48zhy2b" + "commit": "58398120907504ff200adfd9b817f297142c9680", + "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5" }, "stable": { "version": [ @@ -68355,11 +69800,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20190923, - 1308 + 20191125, + 1630 ], - "commit": "f839bf213520d3736c3e3f712af3ca7ae5321411", - "sha256": "0xjn90wg0f7rich6yja9jm6h3104rihgizim59i1jq6rjngazwhv" + "commit": "15746df5f3af5ee308cd4f546ef229eef2d825ac", + "sha256": "100axl6ajddfw23lr98k8b05zrd4hajcq68mi90vddqbn06mk577" } }, { @@ -68378,6 +69823,20 @@ "f", "s" ], + "commit": "8299bdfd65105feb8d7fb85d2951954d73671cd2", + "sha256": "023gkvhaxx54gcfz6m3pc0yhygf2y43391r1dghivk8420savdjg" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "cl-lib", + "f", + "s" + ], "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20", "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr" } @@ -68422,30 +69881,30 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20190717, - 1526 + 20191205, + 2300 ], "deps": [ "dash", "magit", "org" ], - "commit": "1e578f8cf97b07835f02858f05a094ae9a5e99bb", - "sha256": "0y8s7w12j39q6fj7adb1018gj3av88dwg894fa5drwzjzh7cgc0k" + "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", + "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" }, "stable": { "version": [ 1, - 5, - 3 + 6, + 0 ], "deps": [ "dash", "magit", "org" ], - "commit": "ea79e0567ae65fc922fcb05da0f7f4af8eae1973", - "sha256": "1ywavzki510rslsgfm0cnn3mlh644p61ha2nfb715xhkg7cd3j9g" + "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", + "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" } }, { @@ -68470,14 +69929,14 @@ "version": [ 1, 1, - 3 + 4 ], "deps": [ "dash", "org" ], - "commit": "e9e90e16ddaceaf99c9b251a215d6338b9762b4d", - "sha256": "0vqyidi54rbpqwqi6iv1xaqkr9gfr0pfhr1msxckh8jy6avgy319" + "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", + "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" } }, { @@ -68612,6 +70071,24 @@ } }, { + "ename": "ormolu", + "commit": "ab315f96d9b8d01ffc3b4748d01c70861daf8c1a", + "sha256": "0d6pgmp1iy3yylvx9bbdia5p0c7m59m8hca55lkxb7g6ck2c628y", + "fetcher": "github", + "repo": "vyorkin/ormolu.el", + "unstable": { + "version": [ + 20191201, + 1243 + ], + "deps": [ + "reformatter" + ], + "commit": "aa2c561e0e71584c1d8dc354d2dd1c541f226f57", + "sha256": "0vrp0yl3v3cmli8ryq8d1zf0q4kv4fd311gij1w6kb5mjdahqfvb" + } + }, + { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm", @@ -68674,14 +70151,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20171026, - 734 + 20191206, + 519 ], "deps": [ "cl-lib" ], - "commit": "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa", - "sha256": "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp" + "commit": "1b79ff64c72485cb078db9ab7ee3256b11a99f4b", + "sha256": "1lnjpsb09w48ibjvabqkxqh997mv61zpvqhx3d35q4lw5sirgjxg" }, "stable": { "version": [ @@ -68703,11 +70180,11 @@ "repo": "raghavgautam/osx-lib", "unstable": { "version": [ - 20160920, - 0 + 20191121, + 1440 ], - "commit": "fdbbb41e07ba64d6a09b54bd142a7c7b83bfd09f", - "sha256": "0n03yca62znrri1pg0cl4xzm4lkmdqyf1p9sm1vfjwlwxk552z5x" + "commit": "01cba80ccc20412759f87b8f7531580bb04ec9c1", + "sha256": "0izkifcxk6cp9y4xcmpkhpd2vv1rqapxxa74ks12a55sflyxx36f" } }, { @@ -68850,20 +70327,20 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20181122, - 1121 + 20200103, + 1239 ], - "commit": "38cb0c5ce6bee61a8fbc1040e102792725735bfa", - "sha256": "0zbvxwdgghckqrn5w1j2p1vp0ajsls062l491zx2v50h6pzpmk71" + "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", + "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" }, "stable": { "version": [ 0, 1, - 1 + 3 ], - "commit": "8788f3e6f922f54b4eccfb80e4c246203a7e81c3", - "sha256": "1ms4mgh8jlvyhdsx5166jqfjdx6rqfbhaqzfrzplgcn6v37097l4" + "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", + "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" } }, { @@ -68965,15 +70442,15 @@ "repo": "alphapapa/outshine", "unstable": { "version": [ - 20190717, - 1147 + 20191112, + 1414 ], "deps": [ "cl-lib", "outorg" ], - "commit": "4c6107da8fd6119ba1b2379cd2f68c8c7374e8d5", - "sha256": "0i2mhb78d0rcvqv94h4qa98rm1nm11ag8l90v3z819bwph3f44d6" + "commit": "9334b555aaf1426a9e405a57b80809a1615627b3", + "sha256": "11r6advraz5rkrxr25mj0wpfgzxcvn5gzppsc7ma51zqfmijg7dk" }, "stable": { "version": [ @@ -68997,11 +70474,11 @@ "repo": "emacsorphanage/ov", "unstable": { "version": [ - 20150312, - 528 + 20191127, + 32 ], - "commit": "fae7215b3dedba2a9ced145284332e4609bfdc38", - "sha256": "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2" + "commit": "d1ae4d2a488e8ed99ab395e567bc00d21dd6c478", + "sha256": "0d8px0j9drviw02mx7zqkl5sgb9qa42dsczkqg02ggcbvhy6cm9g" }, "stable": { "version": [ @@ -69078,14 +70555,14 @@ "repo": "anticomputer/ovpn-mode", "unstable": { "version": [ - 20190811, - 2200 + 20191214, + 310 ], "deps": [ "cl-lib" ], - "commit": "dce04d9f35fd203afd098ba413595db6c2cbc051", - "sha256": "0ix53rlwzi1mh35msh6gahfnip67p53jc3qxkbaxji7hlxi130fb" + "commit": "8457f72de59929d6c176883e92d1a706163d3170", + "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj" } }, { @@ -69163,15 +70640,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20180306, - 340 + 20191122, + 237 ], "deps": [ "htmlize", "org" ], - "commit": "594c90953a91948505bb394350adf110e041f19a", - "sha256": "1alm6hh7qg8sv50cm5p03icx47za2g7b2nvbwzx6kxkrgmgqfq6c" + "commit": "bd36f9fb4e3b1b9e8686b993b02ccd780ff75a96", + "sha256": "03wj3gx09lbfmsanfhqfbzz61zaszia1mhfvlywhygknpagxr3lp" } }, { @@ -69281,14 +70758,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190905, - 303 + 20191217, + 1543 ], "deps": [ "org" ], - "commit": "b5672ea8925eaff93c4e17982b35acec302ba5e7", - "sha256": "1z9c85z55an38wrg6vmal8vp8k8qp1wkfxc9ijjlqsh0i2809x6b" + "commit": "d2892b3b5ea19f85063f2fba4a5b7ffa1123a395", + "sha256": "1z0y07y9m1svxiypfgcadsajfd728aksa1bmka5a7y9fsag3l4zh" }, "stable": { "version": [ @@ -69395,15 +70872,15 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20190819, - 1506 + 20191225, + 750 ], "deps": [ "org", "s" ], - "commit": "96b7d330b77b02f7039adabe488595847a008bda", - "sha256": "1whysxp4s84lhvgz8vnj2r51dfnk91v5plvbj61rac0077md6df5" + "commit": "8ce0fae6e8b596b93e05dd512be13973cb3cfa54", + "sha256": "1fwwvp4jvdx8namdy0nb68c2jj3nfw7adwp7vk2c2b5cp6fc6cl7" }, "stable": { "version": [ @@ -69427,11 +70904,11 @@ "repo": "linktohack/ox-latex-subfigure", "unstable": { "version": [ - 20190816, - 1905 + 20191208, + 1616 ], - "commit": "5436eaf0cb036fed0a2042533ec1466a33cf9493", - "sha256": "1j9z7qr5nxbi96s22kkjp10jf29k7i61pwhs68j0lb4v238vdpsj" + "commit": "b9e3ee8abd3b9f29e03f8b0b9cd6b4df134ca159", + "sha256": "09nv9anqldqlxqk71g40by1hch9jw7siilxgkc59hn9dn2ibbbq9" }, "stable": { "version": [ @@ -69592,14 +71069,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20190918, - 1627 + 20191127, + 319 ], "deps": [ "org" ], - "commit": "5fd940e01ae76ba305d46a0c0cfc4d27aa131d33", - "sha256": "1m1fl07k1qhcv96cqgwqcwnak3gx9k5z496y43sc48gldkwq69qr" + "commit": "a4c12432ec564187b8acd0814d5f66e45ea30e4d", + "sha256": "04rzrx9y4imnhg47rq16sqmhdwyl82w1fjylxm8s6p2s89ql1d7f" } }, { @@ -69786,20 +71263,20 @@ "repo": "marsmining/ox-twbs", "unstable": { "version": [ - 20161103, - 2016 + 20191216, + 1011 ], - "commit": "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28", - "sha256": "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f" + "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", + "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" }, "stable": { "version": [ 1, 1, - 1 + 2 ], - "commit": "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28", - "sha256": "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f" + "commit": "cf56accf8633f72c741fff19a49c24cc8bdd8974", + "sha256": "12w58nvpzn0fbica3m679n08hczzikqr1xi1n4k7a6h1l60qykl7" } }, { @@ -69829,26 +71306,26 @@ "repo": "w-vi/ox-wk.el", "unstable": { "version": [ - 20190526, - 1024 + 20191231, + 2058 ], "deps": [ "org" ], - "commit": "3da2213be1874d9d3e8a9337b09003d9c102b943", - "sha256": "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1" + "commit": "d34d1b72e4e940745a377bfa745dfb618900a09e", + "sha256": "05813w4adafm596x1rikvc7xqk10xwfihdpdq1zr2zyqcpdabqza" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], "deps": [ "org" ], - "commit": "3da2213be1874d9d3e8a9337b09003d9c102b943", - "sha256": "0aw6ykcgyn6p7hhggyd7jfyx9b25pr0vgnlfvcwhjc3w0lm94yi1" + "commit": "d34d1b72e4e940745a377bfa745dfb618900a09e", + "sha256": "05813w4adafm596x1rikvc7xqk10xwfihdpdq1zr2zyqcpdabqza" } }, { @@ -69959,8 +71436,8 @@ 20190702, 253 ], - "commit": "2a99b8e27be1702d94ce077ecd75e1089fa18a32", - "sha256": "0cf5rnk96wyl3xkqabnsw5ampcr645y43rlj9rcm0s09pqbpr0z8" + "commit": "3d108ff6af00d2fe978787217a13660af057cafc", + "sha256": "1ssrm6qafy0a49lpnqfs9va56m0mympavwr8rv5fyzrj97vqiabp" }, "stable": { "version": [ @@ -70024,15 +71501,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20191018, - 1144 + 20191220, + 419 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "483556c39c4b7929b28723509d0f26cf790b91c4", - "sha256": "19qx71vnr8jj2vqxgcr27zjnagg7nj4lr9xc9fgipwisg1x0yxhx" + "commit": "3b26941686700a7500ca4c68650e9235c823a410", + "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil" }, "stable": { "version": [ @@ -70055,14 +71532,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20181117, - 856 + 20191116, + 45 ], "deps": [ "package-lint" ], - "commit": "483556c39c4b7929b28723509d0f26cf790b91c4", - "sha256": "19qx71vnr8jj2vqxgcr27zjnagg7nj4lr9xc9fgipwisg1x0yxhx" + "commit": "3b26941686700a7500ca4c68650e9235c823a410", + "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil" }, "stable": { "version": [ @@ -70147,8 +71624,8 @@ 20180318, 1729 ], - "commit": "f350cc446c65b85bcc213265cd6dcadee1568762", - "sha256": "018vv0riqc571sanmfz82l1n322kfa4p4g9x2wf4m3h1819n53ky" + "commit": "c41c3dfda86ae33832ffc146923e2a4675cbacfa", + "sha256": "1272xmb3l8ddfijqzci3x0kxwibqb0sbkci4rbcv9ba9hpxp4d1v" }, "stable": { "version": [ @@ -70189,11 +71666,11 @@ "repo": "kadena-io/pact-mode", "unstable": { "version": [ - 20190903, - 1542 + 20191117, + 2337 ], - "commit": "f836c376e142b372a92900b630511fde9937a51a", - "sha256": "00xp8j9hgqscz865pp4s5khngpsidad6arwybcxh1cfsncc6w8f2" + "commit": "220bf985cb31d60f47042d5f424de8b9a589e544", + "sha256": "0cz87z2y54lqvsl2xhpjmndccj7051f2v9qpqrjr3qdwmfr6azsw" }, "stable": { "version": [ @@ -70475,8 +71952,8 @@ 20190124, 1828 ], - "commit": "5f3e67448cc98fe2875115163849acae4d9e8526", - "sha256": "1w0dhyr4i0nx0g70smgclcfsbv6cfilb7df330njzaqk8j2gdfws" + "commit": "eab07dae119129066624e692c1c75a53b2ab10a5", + "sha256": "1q9g8kza6hv6pv1sjzkl6b4gxcx6fsvv8lk5w7kk9gpws5vjz5bz" } }, { @@ -70567,11 +72044,11 @@ "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { "version": [ - 20171127, - 205 + 20191121, + 2328 ], - "commit": "acbe10fdd85d2e91831adf70b6a828bc7e900da0", - "sha256": "1c7ag0cvd6rl5fsj3dpfcjpyb8xjd26d864z98a74cirn8pc8f7l" + "commit": "814999bb320e6d5aaa9c8ff663b1933157129571", + "sha256": "0jb3qwx8bxr7x17cgqbd6v53634i9lmrcnqn847bnnlsvy0j094x" }, "stable": { "version": [ @@ -70651,20 +72128,20 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20180318, - 2025 + 20200103, + 1238 ], - "commit": "6d9358295911f1b44efe81054c535eb2c2bb5a2e", - "sha256": "0lr6z90kbgi85bchk247cr91q5ryk73sqp5cvsiph4ryxpy9isyl" + "commit": "eb4a51b8ef455e0914108105e7c0008d675457cc", + "sha256": "17bdcxah216z928387yx6z9lmp4jsi461n8fwiqaibn2qy5fagas" }, "stable": { "version": [ 1, 0, - 4 + 6 ], - "commit": "a45d111153a76c481fa0b36d6172ac90e073dfc4", - "sha256": "1cr0vnm57lxs48z17ddcv7qlfvks7wdsp01zsw0c7i3h5ajl8myp" + "commit": "eb4a51b8ef455e0914108105e7c0008d675457cc", + "sha256": "17bdcxah216z928387yx6z9lmp4jsi461n8fwiqaibn2qy5fagas" } }, { @@ -70762,6 +72239,38 @@ } }, { + "ename": "parse-it", + "commit": "3f163ca64c2533603410f320c7e9b9b1c2635458", + "sha256": "076b981jdhgv7kqdj6xnckp3x25wfymy0il9fffrpyfs7hrcdzgf", + "fetcher": "github", + "repo": "jcs-elpa/parse-it", + "unstable": { + "version": [ + 20191209, + 549 + ], + "deps": [ + "cl-lib", + "s" + ], + "commit": "ff9f9049ac039473f0ba5d070ac0e6d89cfbf851", + "sha256": "05ckrhkxffzcz1igqwznbkxc1hpidvsnwv6cxp8n4q6kmniagx4i" + }, + "stable": { + "version": [ + 0, + 1, + 7 + ], + "deps": [ + "cl-lib", + "s" + ], + "commit": "318cb29153c6ae0032ddceb69bb8c1f2a7df5ef6", + "sha256": "0f2fjb0a0yj62dy3j820fgxlpg2gsv1awaswwrb2rv7mp44drr4f" + } + }, + { "ename": "parsebib", "commit": "c39633957475dcd6a033760ba20a957716cce59c", "sha256": "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd", @@ -70853,15 +72362,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20190331, - 1058 + 20191113, + 831 ], "deps": [ "a", "parseclj" ], - "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569", - "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc" + "commit": "f42ff988338484815ccd925c8f83a32c5d52319b", + "sha256": "0cx1zf82mjwlnj6znas8b94ws1f3n2h0imyybi9qirvsp90qd4sl" }, "stable": { "version": [ @@ -71031,8 +72540,8 @@ "s", "with-editor" ], - "commit": "b830119762416fa8706e479e9b01f2453d6f6ad6", - "sha256": "0mf59506qa2zrrk18gr5sp9gz8lx03f6c6qccir5cf6s4rmi5x9m" + "commit": "88936b11aff49e48f79842e4628c55620e0ad736", + "sha256": "0hjb0zh94mda4xq20srba40mh3iww3gg45w3vaqyvplxiw08hqrq" }, "stable": { "version": [ @@ -71409,10 +72918,10 @@ }, { "ename": "pcmpl-homebrew", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1mfkg9i2hqq8mkhnc8yzc9br9wlhjv17vdvjzwhkybcbmhqf2qkm", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "100a64d8qvxdz1lk42pidj48iqsycyyw92jjqcrn8rnqw1rnb3s7", "fetcher": "github", - "repo": "kaihaosw/pcmpl-homebrew", + "repo": "zwild/pcmpl-homebrew", "unstable": { "version": [ 20190213, @@ -71424,10 +72933,10 @@ }, { "ename": "pcmpl-pip", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "1vl21i3aqdk2qr2r64sqg8jbslj3vxblwmbpzv732sl9gafsl990", "fetcher": "github", - "repo": "kaihaosw/pcmpl-pip", + "repo": "zwild/pcmpl-pip", "unstable": { "version": [ 20181229, @@ -71547,15 +73056,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20191007, - 1436 + 20191228, + 1005 ], "deps": [ "let-alist", "tablist" ], - "commit": "3407af25899c9bc0cb7b710e86ba316ab622f2c7", - "sha256": "1dhygjq95y57a5f3a2hw1i36mgn0njgllba8i9f8bc0kpb8ykbb0" + "commit": "cc29d4c9c2d81fcb1255f7172fd5b9b7851d656c", + "sha256": "0833x6q048sym8jlc7fhi2ypsdc1vgiy5b6ijg4wgsnskg91nyva" }, "stable": { "version": [ @@ -71716,20 +73225,20 @@ }, { "ename": "per-buffer-theme", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn", - "fetcher": "bitbucket", - "repo": "inigoserna/per-buffer-theme.el", + "commit": "2a2a6c0bf1cad99ed82db7b90b8b7ab79827ac17", + "sha256": "06vykjgf4rxh832z74jxkhi4jxlh60hnh8zjvdyr9nbh1dy35bjn", + "fetcher": "hg", + "url": "https://hg.serna.eu/emacs/per-buffer-theme", "unstable": { "version": [ - 20190703, - 2014 + 20191101, + 2333 ], "deps": [ "cl-lib" ], - "commit": "b4133c09b6ea8bd97ac513442448ea1ec5254587", - "sha256": "0qwdsiflsg8xjlypcna0rv7sjcjjlyp39f4qlqbjyk52kw01qxiv" + "commit": "7df4d2f4be64dbcf0bf10a2b9ac3db858fbcd9c8", + "sha256": "04s14x3qi5aa18bfcr3zjbb109nm2pgwgnl36g7fw2crj8mz03v4" } }, { @@ -71862,28 +73371,28 @@ "repo": "rocher/persp-fr", "unstable": { "version": [ - 20180801, - 727 + 20191108, + 754 ], "deps": [ "dash", "persp-mode" ], - "commit": "3f536440b120499464106fd25f182d7580192870", - "sha256": "0bnplxv6igry7ak3wvn2b88zm4aarv35z4z5q38x52k4zac94rl8" + "commit": "1adbb6a9f9a4db580a9b7ed8b4091738e01345e6", + "sha256": "0f9ljpmq8b97n6wa8bwn4f2v7imvfxc2pjqk6xjkmwbfpihrns10" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "dash", "persp-mode" ], - "commit": "3f536440b120499464106fd25f182d7580192870", - "sha256": "0bnplxv6igry7ak3wvn2b88zm4aarv35z4z5q38x52k4zac94rl8" + "commit": "1adbb6a9f9a4db580a9b7ed8b4091738e01345e6", + "sha256": "0f9ljpmq8b97n6wa8bwn4f2v7imvfxc2pjqk6xjkmwbfpihrns10" } }, { @@ -71972,25 +73481,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20191025, - 314 + 20191211, + 401 ], "deps": [ "cl-lib" ], - "commit": "9e119c99853ddc4e1267bbec4d7f7a1610502f34", - "sha256": "0aa51kv632iynjb36qja1i8b012hayiabwg7vbzqfbwsyy4gd27m" + "commit": "f5d0424440656834540534d4074cca2f607bc8ae", + "sha256": "10bhq654ripqhnankxscgjrc0ihrw6xfifxv5yqrxb1wdjyzjb4k" }, "stable": { "version": [ 2, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "8e2f122de408d7866136dd861d513a9575cf32e6", - "sha256": "0pd5sqrrz6y3md20yh6ffy32jdcgb1gc9b4j14pm6r54bqxik68h" + "commit": "1ba7e2ddc37df4f453e7d8cffccc13981af658b1", + "sha256": "0v13dljkspx01w88q7nb7dcjni1blp5682wpvlvpx3phnfyjqs5g" } }, { @@ -72125,15 +73634,15 @@ "repo": "emacs-php/phan.el", "unstable": { "version": [ - 20190521, - 203 + 20191125, + 1408 ], "deps": [ "composer", "f" ], - "commit": "82c2d962cd5cab647e8f2f5636bc83511ea40cb4", - "sha256": "1bypr6d85xr623bqq9j4hl2q4jiw8hyjhx1mp7q4jcm7pibkbjci" + "commit": "2a6e1b66c2aad25fddb8b4f706a28a1aafaaa4c7", + "sha256": "1ivkkmjg9drp22l5hvira5m0ialca8kzw6pzj01wm4ykqsaajnlf" }, "stable": { "version": [ @@ -72157,14 +73666,14 @@ "repo": "zk-phi/phi-autopair", "unstable": { "version": [ - 20170217, - 353 + 20191220, + 311 ], "deps": [ "paredit" ], - "commit": "3c7556779c3a53b045f5df33ae2a0c67469cbf60", - "sha256": "16gh2r1mhmirbq20kklym4l60rfcfn8dsj0vv3hx3fj8q81h8qc9" + "commit": "5685b9541c4c9d4cc8a892743fdf245aceea1682", + "sha256": "16kib35s7pffcs8kiljydbf5z1qq5l2d04dqqcnbbi0539y979n5" } }, { @@ -72208,11 +73717,11 @@ "repo": "zk-phi/phi-search", "unstable": { "version": [ - 20180322, - 129 + 20191106, + 233 ], - "commit": "9a089b8271cb1cff9640848850298c9ec855286c", - "sha256": "1gr5plcbrfdc4pglfj905s89hf8x0kc083h30wcnd81bnw9jwz1x" + "commit": "2a8fe73aa9ef014e27e202964c5a4f4e94ef24b2", + "sha256": "15yc5nlfx2z48n8p7pb6qzgbzfpnapb83w5xx6z8lq0mywf3k5jj" }, "stable": { "version": [ @@ -72441,20 +73950,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190930, - 111 + 20200104, + 21 ], - "commit": "5ba2a16e1751446502652021942f59f2e36aea41", - "sha256": "1zgqg6i114g8nylyizrcdf68f35klc140x829cbjrkbssj8vck8z" + "commit": "167b35749dbf700543d4a540d098c015af58df2b", + "sha256": "1zmk5qrw5af6bv19914xifcbkiqd3vdifzimhmy84rgl9gw78fi2" }, "stable": { "version": [ 1, 22, - 0 + 2 ], - "commit": "58de9a7db0b8908e047dfe308858ef5dfd464868", - "sha256": "17137l24s0nkr77l1dlmnkjpikks30mf5haskbg5i447lbpcm64r" + "commit": "433864b0755d99ec6b496ed45476c1e2eca0228c", + "sha256": "1r4bpyavlndd4c78cv5cc97bc0gkd4cggiyz4kd2vg6zlyc1nld3" } }, { @@ -72533,8 +74042,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190913, - 1340 + 20191207, + 2030 ], "deps": [ "async", @@ -72543,8 +74052,8 @@ "f", "php-runtime" ], - "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", - "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" + "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3", + "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn" }, "stable": { "version": [ @@ -72728,21 +74237,6 @@ } }, { - "ename": "picolisp-mode", - "commit": "33b151c3aba268977b105965c816716d8b35ad6d", - "sha256": "1g45gmg3wd52yi3838bjlz3ccf71fznm6l3nkp7a7929q3rj9d90", - "fetcher": "github", - "repo": "flexibeast/plisp-mode", - "unstable": { - "version": [ - 20190824, - 806 - ], - "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", - "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" - } - }, - { "ename": "picpocket", "commit": "e88dc89311d4bfe82dc15f22b84c4b76abb3fd69", "sha256": "0p2mrjcd8ig0h7dk0zvyfma4nnfk2ic6gp2dwfqyqq6irb010f45", @@ -72828,25 +74322,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20190623, - 1421 + 20191203, + 1015 ], "deps": [ "cl-lib" ], - "commit": "910d0fae61badd7e25e148d2ea84f0188b802fb1", - "sha256": "0v6gg472b6srsvn1p26dam7iqkjsqdnd7idl68fck1mchy3k39iw" + "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", + "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "910d0fae61badd7e25e148d2ea84f0188b802fb1", - "sha256": "0v6gg472b6srsvn1p26dam7iqkjsqdnd7idl68fck1mchy3k39iw" + "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", + "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" } }, { @@ -73258,14 +74752,14 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20191019, - 1309 + 20191102, + 2056 ], "deps": [ "dash" ], - "commit": "fec1d4fb9d3b720f15931308b207cd8ad65f4f75", - "sha256": "19lg1lcjysqy0ziyp0y3xx2akgchhvqkxmxxnxjlwqrn9bqgibxh" + "commit": "ea45a13707abd2a70df183f1aec6447197fc9ccc", + "sha256": "0rbmn2964w9kms6ql25dzpnyygj693123xs7gxasylgw5jall9wx" }, "stable": { "version": [ @@ -73459,8 +74953,8 @@ 20190914, 513 ], - "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", - "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" + "commit": "02738af25707e39d8a608b09a24173bb05f5be9f", + "sha256": "133wm5fd91z9k3zpflb455nglpgy1dqyz3mz2s694xyppw4rvkia" } }, { @@ -73558,17 +75052,17 @@ }, { "ename": "pmdm", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b", - "fetcher": "bitbucket", - "repo": "inigoserna/pmdm.el", + "commit": "279923aac9f668cd295709d5060e7a984be0c5a8", + "sha256": "1a6mvb3dcxkzk9acchi0xbgd3ki092l4c18qls6pgahwsj7wsk9v", + "fetcher": "hg", + "url": "https://hg.serna.eu/emacs/pmdm", "unstable": { "version": [ - 20151109, - 1836 + 20191101, + 2346 ], - "commit": "f50a547741568cee40bdc80fa3223157a49896e4", - "sha256": "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff" + "commit": "1f30adce8a23da94b3c2460b7248d5910592d8af", + "sha256": "0nwrzf7lvimay83k1s4nxz86d1a82v55j23vp2915c307gkwrl8z" } }, { @@ -73768,11 +75262,11 @@ "repo": "kunalb/poet", "unstable": { "version": [ - 20190127, - 2220 + 20191215, + 201 ], - "commit": "d84f7b259cc9b6ff8d442cf4c38bd6c7065ff8f4", - "sha256": "0a84jdaj619mb59a46dmkk2sfs42rylqk9ryl1drgs8d3lia79mz" + "commit": "ad998dce8a953eb6101e61bd6bb5ff871535d383", + "sha256": "030qm41sf4z29f0gghrk6a4lpf775lgg9vvlmcnl678vgy7p9fa5" } }, { @@ -73869,14 +75363,14 @@ "repo": "lijunsong/pollen-mode", "unstable": { "version": [ - 20190310, - 538 + 20191223, + 1920 ], "deps": [ "cl-lib" ], - "commit": "819edf830e9519f8ca57e9cef31211e3f444d11a", - "sha256": "0c06kfbyk2g0kxwlh6g3r7ij06ip6x9ni0bin24drwr0qj2vis2d" + "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be", + "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5" } }, { @@ -74184,11 +75678,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20190714, - 2017 + 20191208, + 1239 ], - "commit": "01232ad3800e974938199c9ac07fad57fcec540c", - "sha256": "136d1mbk00c0pz10nvklh934yzs6q1i6brvp9xnv947aazsgwj4m" + "commit": "9eb9dce9c9a1d8c92e837818f576463c5bcf8952", + "sha256": "1ygwcq435nb8ndw4flf220psgvz93gxypdqgvgbfd4s2ad9yx1vw" }, "stable": { "version": [ @@ -74500,15 +75994,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20190917, - 1634 + 20191231, + 1631 ], "deps": [ "cl-lib", "popup" ], - "commit": "953f599c1fd9d6843ec9380cc0fc3f8248390d24", - "sha256": "1h0mxx1304fp4ilv4cz5mb65a7df1b3hi6n4dz6k9kkzbvihsacc" + "commit": "e66769ea72f1fd38c2ba3cff505da334e2b26b45", + "sha256": "0b2w12cqpd7ms47x788x8qd1h5mkp73v62dxiz4kyzz70pk65szb" } }, { @@ -74596,11 +76090,11 @@ "repo": "pitkali/pos-tip", "unstable": { "version": [ - 20150318, - 1513 + 20191227, + 1356 ], - "commit": "051e08fec5cf30b7574bdf439f79fef7d42d689d", - "sha256": "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23" + "commit": "179cc126b363f72ca12fab1e0dc462ce0ee79742", + "sha256": "1rz6lqmhs7l49cwwqs7gl2i49l3gvziz1gs556jzsic7jzf9xk1j" }, "stable": { "version": [ @@ -74620,11 +76114,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20191013, - 756 + 20191219, + 57 ], - "commit": "d75dc1547a6a1cc2b385c736880eee77d7981aec", - "sha256": "0ssbpkmanljxw8dqk6ks643x4pacfwfw5xfzv5jnny25ph656r1f" + "commit": "913b90dee7de5b6cb7e0791ca2b1dddeec5da38d", + "sha256": "1mbpwih6l2ixllv82i5gwzihc7lllqwlfiii4cwvr72ryyvy01ld" }, "stable": { "version": [ @@ -74692,14 +76186,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20190323, - 213 + 20200105, + 2053 ], "deps": [ "cl-lib" ], - "commit": "6ef4a06c3c583045accbc957b6f449b7c0c57cd8", - "sha256": "1ybm5y03if4wbzhx5p05wwgf2d8l2c4vwi22d0ygvlwrzfk8n5dl" + "commit": "edbb464eef680efc9d408730288c716cd4cac404", + "sha256": "0j1bb9dyr76m68gn94qk6k6bxhdqbiq59fzi4mnx3ivnnkbfz6n7" }, "stable": { "version": [ @@ -74808,6 +76302,30 @@ } }, { + "ename": "ppp", + "commit": "1442ec5baf60f85e9603cb2a70745914174d5c9a", + "sha256": "0x71y998a81w79bambwds58wgzywa3qjvm4brkfjqfd1n7cfzsz4", + "fetcher": "github", + "repo": "conao3/ppp.el", + "unstable": { + "version": [ + 20200102, + 929 + ], + "commit": "345cc3c2b4e6166cc67231aee0962bca89e227d7", + "sha256": "0g6c5s82babc2khsvf2p5ljp4spx0zifnnyj4b8f3mqr1mahzqj2" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "6aabd694bcc66775c6a4328fa653a83e39791252", + "sha256": "043wsaibkz82ckxdw4r25nfb8pql3ba9jcyd3vg92lvjdzblm05l" + } + }, + { "ename": "prassee-theme", "commit": "15425b576045af1c508912e2091daf475b80b429", "sha256": "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs", @@ -74853,19 +76371,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191025, - 347 + 20191224, + 220 ], - "commit": "82a90c4142c369f4090a42536179c6029d3fdafd", - "sha256": "0n919w068j73dnlxfzsvzh7j385phi4z718pi6xq6cygkjkq9zq8" + "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", + "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" }, "stable": { "version": [ - 3, - 3 + 4, + 0 ], - "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", - "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" + "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", + "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" } }, { @@ -75181,16 +76699,16 @@ "repo": "rejeep/prodigy.el", "unstable": { "version": [ - 20190714, - 1102 + 20191212, + 1242 ], "deps": [ "dash", "f", "s" ], - "commit": "0a12eec1f001a4eef16b2c0c524f02f2647a4ff1", - "sha256": "02kysq57kqzg0zkhaf302ada9cp9spgp71z8vbdq4c7dl6x75h4g" + "commit": "6ae71f27b09b172f03fb55b9eeef001206baacd3", + "sha256": "16w1xidfbqlbdxq45ff6am9j1hzlxz3pwqvimwk4432prrvnf8zg" }, "stable": { "version": [ @@ -75293,6 +76811,15 @@ 20190517, 521 ], + "commit": "22830177a0cea19acf29fb9910b784ea5f66f551", + "sha256": "05ks95j6706rabfh1487nix2cjbxa6pjjr0xm01nhd3vcfr1m2b0" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], "commit": "fc4e9f774cae42a6fe135833774daaecf2b3dac0", "sha256": "07056jd1z9i65db4pcshhdfrk5yb6xc28k3ihq7pixmya71l15pk" } @@ -75416,14 +76943,14 @@ "repo": "hying-caritas/project-shells", "unstable": { "version": [ - 20171107, - 851 + 20191123, + 914 ], "deps": [ "seq" ], - "commit": "d9401de750e444697c2eb9de1ff79f2a2eba4af8", - "sha256": "1x16l0gijirmj667s8l87nizsiww2wzjka9ydl4yxzchl7a486cp" + "commit": "5aea9ee0de93f2568afb3f18bb7b43a9715a9a2d", + "sha256": "0zh0hwvh5hdn9gpyhqv14l46pbsids83ps86asikd9in7sl2abgn" } }, { @@ -75434,14 +76961,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20191024, - 721 + 20191216, + 2105 ], "deps": [ "pkg-info" ], - "commit": "cbdd0f071ca5cc2890738f08aa7223101ef2d032", - "sha256": "1sqddfnmz8xr1l4r45yir3fb43plj5ha3z94phh69wa67m3f23ja" + "commit": "1e7b37f0ae07a6b4ac1b1a5f0e5422cfcb8e1c55", + "sha256": "16shvynx98r34wanbmphlw090iiydjnhgiqcz5xn8zhl0giljmza" }, "stable": { "version": [ @@ -75555,8 +77082,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20191023, - 621 + 20191226, + 2100 ], "deps": [ "f", @@ -75565,14 +77092,14 @@ "projectile", "rake" ], - "commit": "b127797372af61ca35f5fdea598004c16bfacee6", - "sha256": "0n3z88w58ls62pnxibgfhdg8ms9i305kdjzxygs4gqqh0gjykhcm" + "commit": "411f8a4ab54f58a27b8f1f0cbd2f68f3fb4ee216", + "sha256": "0194lp2fdw2dik9gvbdvsllqg32fwdhwmcrdwv0q09b2x2hwfqkn" }, "stable": { "version": [ 0, - 17, - 0 + 19, + 1 ], "deps": [ "f", @@ -75581,8 +77108,8 @@ "projectile", "rake" ], - "commit": "78f5cbe2c212ce19d4732212c46472d1c412659f", - "sha256": "09aby7yxk28rqz0vaps889idl5n41wj72pa0dr7bqmidq8i5jv4h" + "commit": "85c5bfef22a0ba95ffc65320b53462077531be49", + "sha256": "1kzb1mr19zsn87rjbfxsvxp5ss9q7z97jk8nzysb13yrpb4f3d7l" } }, { @@ -75806,14 +77333,14 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20190711, - 328 + 20200106, + 619 ], "deps": [ "async" ], - "commit": "99fdb3b7efb813af41f825b24d0615d603baeede", - "sha256": "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy" + "commit": "4e764a50e0c3bb87193ea7bbd7f5c67f10e80d54", + "sha256": "01fbs2d7dkhamb690jnx6vw1c7qzgiibxzxsbyzpqcflaaga0wn8" } }, { @@ -75866,11 +77393,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20191007, - 1041 + 20191209, + 2031 ], - "commit": "15ccaec24ce935de366cae08b906c130379758ce", - "sha256": "108qijk2r0kgvbkhc3m04g1krx0xrr1zgjmr5ikwxvvvlxvrzkm2" + "commit": "cf904b955056f16e46d1541b3ffb1ca1533c936d", + "sha256": "0yfpnihhfvkwdza98szwa4m5nlgn907q3v22x8pim2c0nrc0z9xp" }, "stable": { "version": [ @@ -75973,17 +77500,17 @@ 20170526, 1650 ], - "commit": "342a2d627c023dfe5dcf1c9d9fd014338a0665be", - "sha256": "1m3yx23w64n0g7454p0n8fgn0b07rvfyl5hlbd38l9ivv9s2l9k0" + "commit": "3214d0b0b20f98a2e3172ceab2d2c55a8ffd344c", + "sha256": "19sr6p9a86lcsqpjxz75k6l9qc5c4iwcbdzpi2ci57l0jdsw0l3n" }, "stable": { "version": [ 3, - 10, - 0 + 11, + 2 ], - "commit": "6d4e7fd7966c989e38024a8ea693db83758944f1", - "sha256": "0cjwfm9v2gv6skzrq4m7w28810p2h3m1jj4kw6df3x8vvg7q842c" + "commit": "fe1790ca0df67173702f70d5646b82f48f412b99", + "sha256": "0j456a42k27khpa4g8mm0xh3zymhhypqdy4gdiqrw6wv3z2r66s5" } }, { @@ -76038,8 +77565,8 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20190326, - 2110 + 20191217, + 1144 ], "deps": [ "company", @@ -76050,8 +77577,8 @@ "s", "seq" ], - "commit": "a10cc85565f330ee277698b27f3f715fef2e1ce2", - "sha256": "1nj8g31zys86p2kb1yrx9w0657qg3ckz5awfwz5wd5w1axxigk23" + "commit": "2a9394422da317b54aa1da021aea6cded19004c1", + "sha256": "18pfi04grvdbgz8v5yb06y5mv0q6mkwm4rj43h35nw75l2gwaapv" } }, { @@ -76185,30 +77712,32 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20190502, - 2121 + 20191219, + 2321 ], "deps": [ "deferred", "esxml", - "s" + "s", + "unidecode" ], - "commit": "67fbb6e8834feda85e8301adc5c17d9e38395d6a", - "sha256": "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0" + "commit": "9ab55cfd8bf243cb43cd4d68dd157bcb846940f6", + "sha256": "0x0sy2bkgs1gwl6rgrxp6jwhmk6jybz0irxh10zjzlx3wqzyzm84" }, "stable": { "version": [ 0, - 2, + 3, 1 ], "deps": [ "deferred", "esxml", - "s" + "s", + "unidecode" ], - "commit": "67fbb6e8834feda85e8301adc5c17d9e38395d6a", - "sha256": "15bwjxc7g43m5pi8z17anaqqkvi209r7kk1chmf175477gvrv7c0" + "commit": "a220f446e9b075a4f1b2ab4fc532e850b27083a4", + "sha256": "1qs3n7d47sn00406r4f2z1jfwnmyrzf53wa93jp6xq1c3hg220fd" } }, { @@ -76672,11 +78201,11 @@ "repo": "statmobile/pydoc", "unstable": { "version": [ - 20181025, - 51 + 20200107, + 54 ], - "commit": "abb948e27efaf2452f339c62cd99a1c69930bbfe", - "sha256": "1da08x2hjjd9d832fwrd4rbd3h6f7m031kkxh53v9xdavkp0xqf1" + "commit": "1dfbab7800827adadb649d6e02c31dd9cd65f0d3", + "sha256": "1lpc9picbrnqyyh2sy365dvfkxf2phh8s8j4bhizvkd2gallr6vr" }, "stable": { "version": [ @@ -76795,8 +78324,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20191014, - 333 + 20200103, + 558 ], "deps": [ "async", @@ -76804,8 +78333,8 @@ "pyim-basedict", "xr" ], - "commit": "485cd94dd2a651f7ecd69bdf80200f0d0033754e", - "sha256": "1frd6xshhvy0l8h4chf11g46dai757mbmy0ag0h024934agqd4n0" + "commit": "03b06703a42fe1feb3e1ef8f024db3625c8c125f", + "sha256": "01mn59cc81wbx45savskxx369j6amh6rl2fyn3ppp7zdsyf8sxqx" }, "stable": { "version": [ @@ -76950,8 +78479,8 @@ 20170402, 1255 ], - "commit": "97f4f2ae187df933f072d74fd8347ec14213f5de", - "sha256": "08i0likgznkc7xwb4p47cndza0dy4h12l3im47h12vgjl1r5ayna" + "commit": "b3d52631ea19328ab3ff5b2a12c280bc4e63ccaa", + "sha256": "06zy9k8zd48x0shcp8mb2274n1nigxwwapw5yrjkkh5mp21fbpv4" } }, { @@ -77034,20 +78563,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20191016, + 20191218, 530 ], - "commit": "b57705d55a067456c6160489672feddcc6085713", - "sha256": "03plhl4z75rvf3llhw8dwmc8r3hwhwd2pwq3r66kbqdvr0yrdl42" + "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd", + "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9" }, "stable": { "version": [ 0, 0, - 6 + 7 ], - "commit": "b57705d55a067456c6160489672feddcc6085713", - "sha256": "03plhl4z75rvf3llhw8dwmc8r3hwhwd2pwq3r66kbqdvr0yrdl42" + "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd", + "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9" } }, { @@ -77180,11 +78709,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20191018, - 1735 + 20191220, + 1543 ], - "commit": "1e64dd421f1848dd902bf9f39b5bac8d3f33a96d", - "sha256": "0wckkg4ykrhfpyz5dankagai8jfbhzi3kjd99ds1j1515jxmawmg" + "commit": "a79b5d111b18a83b1d0eb6ae01a5178f47938c93", + "sha256": "1rcqwxw5k4y5752hrp0pa2sqaq07k3s68rx34wbggz9l9r6c0jhr" }, "stable": { "version": [ @@ -77338,11 +78867,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20191006, - 1304 + 20191202, + 1039 ], - "commit": "103d2f158ef2a760741682e18741e44107c68f3f", - "sha256": "055sgk8zf4wb5nqsf3qasf5gg861zlb1831733f1qcrd2ij5gzxx" + "commit": "861998b6d157ae73b829f02a5a6c8a9118310831", + "sha256": "0w7w95cjhpvy28mcvmv21ajspngkyrx3yjx3293bmclv699lfbwc" }, "stable": { "version": [ @@ -77506,25 +79035,25 @@ }, { "ename": "quelpa", - "commit": "a496196d405c152600d44ef4aa28557f489c542c", - "sha256": "0qm4dxwlvaka6j8ismb4lhar4dzlhpvjsx6524w15ilcbdbyqqjl", - "fetcher": "git", - "url": "https://framagit.org/steckerhalter/quelpa.git", + "commit": "c599f1254808a9d9bab87c35769052d5df2a01bf", + "sha256": "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs", + "fetcher": "github", + "repo": "quelpa/quelpa", "unstable": { "version": [ - 20191014, - 628 + 20191223, + 1925 ], - "commit": "0c4dab17591b15cea7dccf905afac9991f3b4971", - "sha256": "18j5hyyssmqi57h3i28dyv5mn0pmqkcydfzgn8yc5c53qvq9ixc9" + "commit": "667fce0d43eb2b112b1eaefbeb3ec5bc186cdf4e", + "sha256": "1g9g1m7a1qxhw278y6b5f66j1k97fp2l3k20rl6x69ljxn8icj02" } }, { "ename": "quelpa-use-package", - "commit": "a496196d405c152600d44ef4aa28557f489c542c", - "sha256": "1rdhnv7iz9clcy68j1gqv8cwq70ip4w12179v553lyikk9icrpp8", - "fetcher": "git", - "url": "https://framagit.org/steckerhalter/quelpa-use-package.git", + "commit": "c599f1254808a9d9bab87c35769052d5df2a01bf", + "sha256": "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9", + "fetcher": "github", + "repo": "quelpa/quelpa-use-package", "unstable": { "version": [ 20190210, @@ -77534,8 +79063,8 @@ "quelpa", "use-package" ], - "commit": "6f3cc87caa6cb8795079c5cab3c6665970859098", - "sha256": "129pigh1njn50s1lq81blcn54bkb6hwrlxg0sk7m1zsf6rybw0rf" + "commit": "207c285966382a1f33681f6ac2d7778d4b21cb21", + "sha256": "01hzxfy8l1aqlfyj01p0b6pdzlm2vbc5r00skamx6id3s6qg1d9i" } }, { @@ -77570,17 +79099,17 @@ }, { "ename": "quick-preview", - "commit": "98270840568fa1fca2d92f26108444fb24609e83", - "sha256": "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9", + "commit": "c52a1ea0afa8e5f439b7ac987b79c49eb08fe95a", + "sha256": "10k69yiil8i7xvhylrr4rwzqidm3ljm1rdlr6k2r3i9mkiv9pcif", "fetcher": "github", - "repo": "myuhe/quick-preview.el", + "repo": "emacsattic/quick-preview", "unstable": { "version": [ - 20150829, - 439 + 20191017, + 1920 ], - "commit": "29c884c6ab385ef67d9aa656ebb7c94cabeb5c35", - "sha256": "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c" + "commit": "a312ab5539b9a362da9d305e4da814e17c5721c9", + "sha256": "07qipy0r0v8y5rm2g1kqqqy81635wbclzvjgq8y9sziwchww2v20" } }, { @@ -77649,11 +79178,19 @@ "repo": "zzkt/quiet", "unstable": { "version": [ - 20160508, - 1256 + 20191230, + 714 + ], + "commit": "aa3a6e039dbc9437e7dd178a6596d43cf19293eb", + "sha256": "0rl3l7wwdfn8bm1a1lajqsxp62xdqn9xihglv8a1ggq3wi40fw61" + }, + "stable": { + "version": [ + 0, + 1 ], - "commit": "6f20309f99e26fcae2601d1544b342f044e54baf", - "sha256": "14q7x341gqcxn3bq72wmfxipqmj2dh35kxcrwjkyghbsbd43rv8n" + "commit": "aa3a6e039dbc9437e7dd178a6596d43cf19293eb", + "sha256": "0rl3l7wwdfn8bm1a1lajqsxp62xdqn9xihglv8a1ggq3wi40fw61" } }, { @@ -77779,14 +79316,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20191023, - 1526 + 20191204, + 205 ], "deps": [ "faceup" ], - "commit": "5c1b8c8134741b08c51f3dc47741b05f68f5fd68", - "sha256": "1g7fmxrbyydci0qz3x3sm4a2nviri19vd8j9x4wbzbxw2s3c73g3" + "commit": "09eba92e846733db1acc8b9e58ff2b5f52c79b23", + "sha256": "1q610znwy4wi26ka6ri6lzx2kl1pwi4sc4cbajk3d5i2c1d00rv3" } }, { @@ -78133,20 +79670,20 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20190925, - 2046 + 20191115, + 1858 ], - "commit": "831041ea12bb4963fb72386f6c17faf9988013e8", - "sha256": "0ssyyw67pvl6py33gq9cfhqlpbsw5dwli130h6lqnjm6yy8li8z5" + "commit": "18ef567e65d1437e9a9e03d4f30a02d60e926d85", + "sha256": "0kr10j3f0dd7q102db4y16yj8yfv06wnqsgnx2l9jyc8qhkbxq6w" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 0 ], - "commit": "dcc8ca8b9c1e42e637b9225b7ad8a3d50dd01be6", - "sha256": "0rrpjq3dczwp2vj4dclylid27hwd0am0l8p9kqy67wldkkcc0qz2" + "commit": "e46137e36a3bdba8dd4d27017b194a8524c7375b", + "sha256": "154y2adh2pgn77ycidkd6ndjg9wjxsjmbkb8cppf9csq31vmc313" } }, { @@ -78428,16 +79965,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20190912, - 744 + 20191123, + 1341 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "cc5d1236879a2dcdd91c9a842987f2f5a3accd11", - "sha256": "0a27lmaqbhg227insacadrcxhzi6pi64hj4yx3mkppnhiyaasy6v" + "commit": "2cca776d28c4d6ebef033758ef01f2af2e9b3b96", + "sha256": "0jinap8v2491za6bxsdq0i68jifbnrwzrn8rcl3v861zdkax0sa7" }, "stable": { "version": [ @@ -78482,15 +80019,15 @@ "repo": "realgud/realgud-ipdb", "unstable": { "version": [ - 20190604, - 209 + 20191115, + 1116 ], "deps": [ "load-relative", "realgud" ], - "commit": "3642767a286e0542bf03cbb240cf47b2a89ad3f5", - "sha256": "1lgqh80w4ksa4a3zyxdz812jn0yg5xn1z5z0c23sf5vqzzxkzx7h" + "commit": "347090928d7866a9909208c5bbe2cb8fa7b55cd7", + "sha256": "1m7v8qsqm8b8liyfdfqpcsjnlcbs0lpl6m91ff3449a94l1g99k7" } }, { @@ -78501,16 +80038,15 @@ "repo": "realgud/realgud-jdb", "unstable": { "version": [ - 20190625, - 1911 + 20191125, + 1700 ], "deps": [ - "cl-lib", "load-relative", "realgud" ], - "commit": "8cfe452f5028f3ac0f6e0ae7fa03c2a31d197ded", - "sha256": "0yglfw7bc9lz9k7mi4v9n0yd1aslph0q3fjb241ji77gq67wh69r" + "commit": "99b7f08e0fcec9e33dde8dbbe60e42cfec08bc17", + "sha256": "16q9wxa518f3g54zk3imgj8ml06bn66d9jyyg2k86j94ny7q1azd" } }, { @@ -78686,11 +80222,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20190920, - 2209 + 20200105, + 2137 ], - "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b", - "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g" + "commit": "ba9b8b5eba06d97d81fc391dc3a9f0c6105b96ad", + "sha256": "1mmxqrzy1dyw3gq2w7j25limw46v9yzp9dkhsdsckmv7y912gan5" }, "stable": { "version": [ @@ -79017,8 +80553,8 @@ 20180418, 1434 ], - "commit": "4b13acd64cf523442f87337f7c41261e1dfd37dd", - "sha256": "1f99xjskd9am3f8wcx3hdzjpp06y9rb10dr2l38z3015bjfpil5g" + "commit": "c72190de76f7ed1cfbe1d2046c96e99ac5022b0c", + "sha256": "0rbzwkdai9bpcnldrib90p02p36qfgnwk18iz2pcz32xs73frx82" }, "stable": { "version": [ @@ -79083,8 +80619,8 @@ 20181121, 21 ], - "commit": "5069c89fb0cd8fc1936ac8aa1e5dd6f4c1691db4", - "sha256": "00l3zraignzlz5vmn7cqjizin8h0gbgvpyd3jbl5vza4r9bp1l2j" + "commit": "0904065857c4388c18d1eacca89769e566d36a9f", + "sha256": "0yvn3c8hx0xj911n197xp5islx0hnbzzn2wx869scysn7wfh4kd7" } }, { @@ -79130,11 +80666,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20191006, - 2321 + 20191103, + 357 ], - "commit": "e15598a0ccbf4866f4939cceaac897924ba7690f", - "sha256": "0dfx0k8q3d4bbvndy9nnhwi2rc2jxmjjp3pi1qbd4nqy0aj6yas1" + "commit": "6c5e7f64c5ac1178dff5ca28d9809c08398fb3e6", + "sha256": "01qsd8fdwmxn2513jhhdg5jwh7wy0nchwnnz0k3srhjlk41qady1" }, "stable": { "version": [ @@ -79337,20 +80873,20 @@ }, { "ename": "remark-mode", - "commit": "161a45835a153c6ac81b99311482f5dd36507da1", - "sha256": "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0", + "commit": "083f2070eb27d66f09552bf42a346f41a9b9b4b5", + "sha256": "1ccgii79h05bjl16nz7rgvkf35s9y18vp7l6mx6chciwjz6l78kn", "fetcher": "github", "repo": "torgeir/remark-mode.el", "unstable": { "version": [ - 20171218, - 756 + 20191103, + 1825 ], "deps": [ "markdown-mode" ], - "commit": "e8a95f25d865d6165a7fdb1cadf5e6f0bb5ee73b", - "sha256": "01qdaby7mn5d8y95wcbqzwzcbjmf2329g6yjbvmdd1gn6s7qzs0b" + "commit": "e80a1b78304045dec3eceffb6c8cbaf2b6c7b57a", + "sha256": "1l06hh728p9gnlliz1nq9qg641gyxfzb7mlz8x88bmvb0wyzyr8r" } }, { @@ -79370,10 +80906,10 @@ }, { "ename": "renpy", - "commit": "cc928aed12275dc3780d7d8acc6ceca0f69ef63f", - "sha256": "1xfk3j13wzgxg56izbwad0kw4izg0hdzkh7h7cfdmdf4v6mxc7f0", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "173391mcv56ljrkhl6hb9fhkl2vic9wj2xmd21hq88m3awpjmill", "fetcher": "github", - "repo": "billywade/renpy-mode", + "repo": "treymerkley/renpy-mode", "unstable": { "version": [ 20190419, @@ -79546,20 +81082,20 @@ "repo": "canatella/repo-el", "unstable": { "version": [ - 20190326, - 1644 + 20191201, + 38 ], - "commit": "c53c06169dec4e556982fb06ca780ca4708dc436", - "sha256": "1brsc8k590qc4x93qydiq8ylq26zbdv8565fz194zpik9d239mja" + "commit": "7b3ce731f1209d74113cb65a2d6aa6f54ce8ed27", + "sha256": "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 0 ], - "commit": "d7b87cd515bad8a67d3a892a46a23f5fe81e08de", - "sha256": "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz" + "commit": "7b3ce731f1209d74113cb65a2d6aa6f54ce8ed27", + "sha256": "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb" } }, { @@ -79605,20 +81141,20 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20191022, - 615 + 20191211, + 2051 ], - "commit": "6d170649ae9ef1c7c3d545517f896c03ca12062c", - "sha256": "1sc387x1v82i9r0p5r6v2wrwypk0dvkrmpivnyfkvrpg7vhff6yn" + "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165", + "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi" }, "stable": { "version": [ 0, 3, - 1 + 2 ], - "commit": "ef9f509b5579f2b529a20e43f7e0f061e641fec5", - "sha256": "0fhhd349l4iqkrjxqzpckfk2w45x2g4cccpm1dqzv9m49md1wphx" + "commit": "22efefeaa394f6deef957818f5c5332061c88d1c", + "sha256": "1djywhvvb6kwdj0nd3axjvb7k2g06dzkc6hsf29w9rsk96vr8ryl" } }, { @@ -79636,21 +81172,21 @@ "deferred", "request" ], - "commit": "6d170649ae9ef1c7c3d545517f896c03ca12062c", - "sha256": "1sc387x1v82i9r0p5r6v2wrwypk0dvkrmpivnyfkvrpg7vhff6yn" + "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165", + "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "deferred", "request" ], - "commit": "ef9f509b5579f2b529a20e43f7e0f061e641fec5", - "sha256": "0fhhd349l4iqkrjxqzpckfk2w45x2g4cccpm1dqzv9m49md1wphx" + "commit": "22efefeaa394f6deef957818f5c5332061c88d1c", + "sha256": "1djywhvvb6kwdj0nd3axjvb7k2g06dzkc6hsf29w9rsk96vr8ryl" } }, { @@ -79821,6 +81357,36 @@ } }, { + "ename": "reveal-in-folder", + "commit": "26682a1fb2d885168ca922521df7f3d8fbfe43a8", + "sha256": "0nhrsmilimffpjnv9hn8a49wckdi1lywjlb2fpxpqdi8zl0bgkzs", + "fetcher": "github", + "repo": "jcs-elpa/reveal-in-folder", + "unstable": { + "version": [ + 20191209, + 514 + ], + "deps": [ + "f" + ], + "commit": "e3cc73688d8dc3b47ccb1db49519a83b275b1cde", + "sha256": "0xdpm7r83nd5j4ss530l3srz4qy2z0m7wp084i3v2sfqi3in5qgl" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "f" + ], + "commit": "715e34b7c4a93840f6188386a13d15231907257b", + "sha256": "0d75hgaskhc6gwjdcc19nligb4xj2irg33cirrc0wp23k7il1m6f" + } + }, + { "ename": "reveal-in-osx-finder", "commit": "2bf40285279b761b0efd6bc8542ae9aad4b329e1", "sha256": "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc", @@ -79852,11 +81418,11 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20190428, - 1711 + 20191113, + 1509 ], - "commit": "e30815653aa81eac097f27be14886806d9df4ea4", - "sha256": "0i34q5bj5y0xnvc8d82w5vpfscl1nvqv584sd9kqpi81gy3qphrw" + "commit": "a04ce1236dd6bfaa0c520162e6c5a1017c099030", + "sha256": "14cq2162gcasv8112jdmb1cx6fidszqlcf2kalgq2ikj5bqs03av" } }, { @@ -79890,11 +81456,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20190728, - 1435 + 20191227, + 1255 ], - "commit": "3066beb9f3b7ef64da870b829bec8fe73e84b07c", - "sha256": "1ql9ap1zil7hlv2vmqzcjvsky29cpgclbf32x88v9jx588ni2gwq" + "commit": "09b41ca47d99e7f1baddcbec6408ca2f60aafff4", + "sha256": "1rlk9wxqyac3dz1vzy157wc59gf67avwgiahjyj81y13kmz88nxc" } }, { @@ -79950,8 +81516,8 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20191017, - 1843 + 20191230, + 943 ], "deps": [ "cl-lib", @@ -79959,8 +81525,8 @@ "transient", "wgrep" ], - "commit": "fcb3c16dc67d22afb5a5eab14f00bebe3a0720a6", - "sha256": "1bzd7xfy5hf4jlf5f4yl9csgr188dl9kdv5yd2f67z36miia5h6h" + "commit": "2b01b8bb77e687f3f9243a8649b289ca9823edb4", + "sha256": "1lsq9h842gg722mm2xbpcjldby2rgsj07rmcf167ghba0rwn3kf4" }, "stable": { "version": [ @@ -80207,6 +81773,36 @@ } }, { + "ename": "rivet-mode", + "commit": "ab197ee315e5e67ce56d81374e3589ee894000bd", + "sha256": "0491r8qq5i7al972jjqch5wb1mj83fms6axvxq2zykw5xcdrgs8d", + "fetcher": "gitlab", + "repo": "thornjad/rivet-mode", + "unstable": { + "version": [ + 20191230, + 1842 + ], + "deps": [ + "web-mode" + ], + "commit": "ac15de8c76978638e129c26869123c75d5b1f8c7", + "sha256": "19pv8qpcm0cllbbckzpjxrbkdavirq6b8p8jm274klkf4b7k32f8" + }, + "stable": { + "version": [ + 4, + 0, + 2 + ], + "deps": [ + "web-mode" + ], + "commit": "b40bc13761e0b14b4ba67a0c600d69fd129c8746", + "sha256": "1g7xz8yygpbcqn0fjnad8kim75q6yqlvsab596my115w9p9l23y6" + } + }, + { "ename": "rjsx-mode", "commit": "b83be7efdef2457e1320fe3dec46484fbd20263c", "sha256": "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b", @@ -80244,11 +81840,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20190508, - 609 + 20191218, + 257 ], - "commit": "7045b8116a0bf899a51e6d91a373a693faa310e1", - "sha256": "1wgp0xb2c5b6hxxwwwlz7kl4namb7r03cpfkraqzgiia13m9pihr" + "commit": "2bc1afe528b70b8aad4243a3b2b72bcf09a599e1", + "sha256": "0pg2q275qd83i8c1g0f1xlwvbqd40xm3gw2ahl80blyllsvz04j9" } }, { @@ -80343,11 +81939,11 @@ "repo": "marcowahl/rope-read-mode", "unstable": { "version": [ - 20190715, - 1753 + 20191215, + 1240 ], - "commit": "86938769fe8c4749ebd11b0fd839a871ce6544c6", - "sha256": "1n9p801sif4sn0n2wmwr63zfz9cx3637ail16844an7bw612wzlj" + "commit": "879af5c8cfbe284fa37695840784f1d74d730837", + "sha256": "1673b1xcmjg7058q44v190a940kgla6vxr1z5imx4hbjn5b76var" }, "stable": { "version": [ @@ -80367,11 +81963,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20191024, - 1942 + 20191109, + 1939 ], - "commit": "5795c4dc88a359667bffd49b7724c26761d6fd96", - "sha256": "0j0bdnnv8zmxgs2w8b2nsiqpbvm10napdxrjdg4p042w1c2p370g" + "commit": "46ce6b5c16d24ebd80da39cf48f207cf12f1a5d0", + "sha256": "10h2hy1inrk6ph4gi3bd8l89mf4lbf0cizfwlymmarkjfmlrsz2w" } }, { @@ -80468,15 +82064,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20190912, - 856 + 20191206, + 1559 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "66ea7cc9699d6edc6115daa024818adbd85efc20", - "sha256": "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8" + "commit": "c4353a1bff164bccf6c55fda16aa7b9c9ab36685", + "sha256": "1xfxm54nyyspfly4f4wszb2v1r8f4q04bd8g9mhc57bjfrpqvzpy" }, "stable": { "version": [ @@ -80499,19 +82095,45 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20191002, - 1643 + 20191227, + 958 ], - "commit": "f2633f565fc5e7e6958993ef105225f4e68e43ba", - "sha256": "1bjgr7wa82ccrc25r7agfaq3iz7xlp1qchvkmkx3xy59jv4yafjz" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" }, "stable": { "version": [ - 3, - 23 + 2, + 37 + ], + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" + } + }, + { + "ename": "rtags-xref", + "commit": "4e6c219d38a3f3495470fbeeade3f771439e0df0", + "sha256": "15f3dcq2r4zhb1agd48k91a2d81ny4697hhyw8g6iq8y7m7nrrxx", + "fetcher": "github", + "repo": "Andersbakken/rtags", + "unstable": { + "version": [ + 20191222, + 920 + ], + "deps": [ + "rtags" ], - "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", - "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" + "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be", + "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh" + }, + "stable": { + "version": [ + 2, + 37 + ], + "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec", + "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv" } }, { @@ -80653,20 +82275,20 @@ "repo": "knu/ruby-electric.el", "unstable": { "version": [ - 20170810, - 1130 + 20191217, + 1214 ], - "commit": "3553448a780a1ea5c3b0e9becd820d4762876593", - "sha256": "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v" + "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99", + "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m" }, "stable": { "version": [ 2, 3, - 1 + 2 ], - "commit": "3553448a780a1ea5c3b0e9becd820d4762876593", - "sha256": "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v" + "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99", + "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m" } }, { @@ -80844,8 +82466,8 @@ 20170718, 1416 ], - "commit": "85a6d80fb05fef396a8029b8f944c92a53faf8fe", - "sha256": "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7" + "commit": "020b02ed6e9ab49e79d2ddf63e4ee2684c1728f4", + "sha256": "0nkjs6012dxayf2y8d7sw11czgb7lhyhcbcbmdbicnygf7wbm67h" }, "stable": { "version": [ @@ -80874,17 +82496,17 @@ }, { "ename": "run-stuff", - "commit": "0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef", - "sha256": "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2", - "fetcher": "github", + "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", + "sha256": "038brammgivaq2423sx0iy6n7d7lyx3r939a0b85ix8zvkcbinia", + "fetcher": "gitlab", "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20180209, - 748 + 20200106, + 443 ], - "commit": "ed42a7bc9a197ccf1ca87f9937bf98f0a9ed3f92", - "sha256": "1w49v868n3723q6887y4bc5q8spd7xync5d581vvxdpi75qgvr0z" + "commit": "d9f7fde3d33446481655d18ca5423c03a23c2e41", + "sha256": "1g0n3cji2yj35hkcq3p4wnw3iv99k2hagidg6z7qpfavxasyxyn9" } }, { @@ -80971,11 +82593,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20191023, - 918 + 20191208, + 1654 ], - "commit": "5ad9b599c6beea43d6262c3ad81d95512a7e53b8", - "sha256": "1i1899lclwq2c238jcyz2hixvixwrqgks8xgw5048zpxvdb6vm6a" + "commit": "d0f3f45cc4fe1c5b72466253f051294d275a4b64", + "sha256": "0q6gq4qrcjz7hgjfqs4h2qh0v7z4zf5q8fvnpv7jn7agrzhrfwnm" }, "stable": { "version": [ @@ -81018,8 +82640,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20191019, - 2022 + 20200107, + 1956 ], "deps": [ "dash", @@ -81033,8 +82655,8 @@ "spinner", "xterm-color" ], - "commit": "030e0dc5777ac2c27d2e99ace19c252eb52a50bc", - "sha256": "0xs0lyapkp91nhrjhqgsv03zmvmp8mg4jz434w03cwwcbm8k1j55" + "commit": "3f1deff592ee5349d3618c080a0b26b5e30fbc63", + "sha256": "1w1yfiv80plbczw1y52vk8wkpddkbp57sj0jkxr0i3w14733cpjs" } }, { @@ -81185,16 +82807,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20180215, - 835 + 20191103, + 1040 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "9f07ff835e8d19afe571dbe414afb690c7b1cb5c", - "sha256": "07al41ir1ab0z2m2acvx63scr33bfp3asshjl05shs4j9d4bkmdp" + "commit": "8ff9888fd84a96816512403a1b5ded93b4d4278b", + "sha256": "0rrp137r5cf049xqry3jz514pmdzfxkmri9z8kv08yk3w3c9sapj" }, "stable": { "version": [ @@ -81287,8 +82909,8 @@ 20181130, 101 ], - "commit": "ae0b3c024b66275f22809e2b41f428b01c259b96", - "sha256": "1468byxxd0ysqzmi9ssypfhfyqrjgj5w7sx42qgw66m57sis8ra3" + "commit": "46352169bd6d2a86ca9c2052cd05ecd16fc7657b", + "sha256": "1k0b1w9a3b89ricji92nq4cqbh1l2fm7ly1bdl8pvf59drp7cpd4" } }, { @@ -81451,11 +83073,11 @@ "repo": "hvesalai/emacs-sbt-mode", "unstable": { "version": [ - 20190929, - 1531 + 20200106, + 753 ], - "commit": "5d2edadff23fe23e911379d6c2141d55b23e7254", - "sha256": "1alxn4q38pssgm6y39xhdi7rydrlrl5n481m5vh76wl4hx0dfjhg" + "commit": "633a315ad453cd963588c9b8fba02d9cf75296b4", + "sha256": "0ha2lyw42ir16b2d09y27q0rsdx6azcfv258frp1ja63mx0jiqic" }, "stable": { "version": [ @@ -81478,8 +83100,8 @@ 20190413, 1246 ], - "commit": "6ec97fda154b0578688ab98723685c66af7a7a71", - "sha256": "0vq85dv6yrglvfrnf3vxrdlh6cwxfcmrxqwfv596jh0l834cbsgg" + "commit": "552643c03e90ff47ae905c06f1d1afbbdb808966", + "sha256": "0gqazmv279b45ycvmkf403cxi3imd0vn97k1ldnnbwxjp3993cp7" } }, { @@ -81841,11 +83463,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20190826, - 8 + 20200106, + 442 ], - "commit": "271b4aa6b38c2550119a36efac2b92cf1233e6e3", - "sha256": "1ia2mcl42r69dlyxabjh76c550x0nf0irhpsdbda0h3in62f7q6m" + "commit": "2fbd643ea9632d0e15d32e70b6f3c641476e3071", + "sha256": "1gjwsyvjwj4xsp83nws4bcmzsyxv4zp95a9fx0md86cc9gxw3h6n" } }, { @@ -82013,8 +83635,8 @@ "repo": "shackra/secretaria", "unstable": { "version": [ - 20190116, - 2000 + 20191128, + 250 ], "deps": [ "alert", @@ -82022,8 +83644,8 @@ "org", "s" ], - "commit": "40f2df829c8b858922559cd1dfbf13a9f78db3e8", - "sha256": "1kxr9cl6zkr20llivlwyra268kj7iy4mn0505w6kdakg1v8ba22f" + "commit": "03986130a2ada1fa952d45e83536729f20230fcf", + "sha256": "10ikd6ksz5adpldyx9h8s3qnwc488rqixzwnd0rjjwqigmllj9lb" }, "stable": { "version": [ @@ -82248,16 +83870,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20190623, - 1537 + 20191123, + 1851 ], "deps": [ "htmlize", "simple-httpd", "web-mode" ], - "commit": "b9044a416694eb40550a17af678c0ac52b3e9f28", - "sha256": "0gsq0yvjp56y8h0hj3mpchf128b30azx2835phxiqkfkbwkpa9rd" + "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85", + "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa" }, "stable": { "version": [ @@ -83003,8 +84625,8 @@ 20190930, 730 ], - "commit": "361297e8539770f2f396d30928ebc01de60ca637", - "sha256": "1cnzi91mm3mg5x25v7vg86d1ri7ka7cvspb5l7ikmdv6cb9978ll" + "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604", + "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy" } }, { @@ -83079,6 +84701,15 @@ 20190924, 621 ], + "commit": "bd0e47d7d61bf04a923a1d1689693a47af3a2b22", + "sha256": "0nq02qf7rxswxqcsl1lv7skd14ixmmyjkhk7wdbn5j3dhw192bh7" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac", "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm" } @@ -83224,34 +84855,19 @@ "repo": "o-nly/emacs-shroud", "unstable": { "version": [ - 20190623, - 126 + 20191219, + 1722 ], - "deps": [ - "bui", - "dash", - "dash-functional", - "epg", - "s" - ], - "commit": "1d5e83cfcd549a5f553fb123d3d783ae418f72c7", - "sha256": "1r0dyqmrg0skkmm0h7s0pw8sqblkrarimlgn45flyjcv5kmcfgmm" + "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa", + "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra" }, "stable": { "version": [ 1, - 83, - 4 - ], - "deps": [ - "bui", - "dash", - "dash-functional", - "epg", - "s" + 105 ], - "commit": "c7ea92e8694060fa6236074cde79e1021f23edc1", - "sha256": "1yvdjx0kp4y8w5yz2cbqq9n6xl5splvmsyyx8ld1xv0q1c9872nf" + "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa", + "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra" } }, { @@ -83292,20 +84908,20 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20190929, - 331 + 20191027, + 2130 ], - "commit": "42e175378fa78a2a0b7230deea60e29b60a8b312", - "sha256": "04f6ldl81p6pd60i0jspiphdypgkl7qy5qq72dh8hzrw9fcfvf9r" + "commit": "298f96e68068d6891d20e6188e918ab55ac56b30", + "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "42e175378fa78a2a0b7230deea60e29b60a8b312", - "sha256": "04f6ldl81p6pd60i0jspiphdypgkl7qy5qq72dh8hzrw9fcfvf9r" + "commit": "298f96e68068d6891d20e6188e918ab55ac56b30", + "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb" } }, { @@ -83346,11 +84962,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20190903, - 818 + 20191217, + 919 ], - "commit": "0d23b13938d4443463ee66956bf57e0a459cb166", - "sha256": "1mg0x390nzr844l4zlr4ismkxb9zyy35kg8zjlmy6pcggn7cf82c" + "commit": "6f01a16919f3efadfe628cfd9405426b539bebad", + "sha256": "1m280zp44bxly1r1y217i9rx4j3hzgy7zqzy0p7afiyy26n6jl46" }, "stable": { "version": [ @@ -83512,14 +85128,14 @@ "repo": "skeeto/emacs-web-server", "unstable": { "version": [ - 20191006, - 1956 + 20191103, + 1446 ], "deps": [ "cl-lib" ], - "commit": "67f2f1e665fa66d7ef3beed8e82f94962bfa4f3b", - "sha256": "0w0psk98qnwnjyispkcahgh7kyp8jz6m6kwy3hwicsbxbiydrivd" + "commit": "22ce66ea43e0eadb9ec1d691a35d9695fc29cee6", + "sha256": "1ghwfrnml8qmfm981xrrqga2ayw36pqv9s2zqaqzl6szzpwnkz8i" }, "stable": { "version": [ @@ -83711,8 +85327,8 @@ "repo": "chrisbarrett/skeletor.el", "unstable": { "version": [ - 20190212, - 339 + 20191129, + 841 ], "deps": [ "cl-lib", @@ -83721,8 +85337,8 @@ "let-alist", "s" ], - "commit": "47c5b761aee8452716c97a69949ac2f675affe13", - "sha256": "12bdgykfh4mwsqdazxjdvha62h3q3v33159ypy91f6x59y01fi0n" + "commit": "eb21383a9c9e7cf7ae2bbb85cb6d4f42aa3cb37f", + "sha256": "1vq4g8kpq9q4zyybw4k4hgvn13avxz653gdfrx4x5wvfqcr91mbx" }, "stable": { "version": [ @@ -83778,15 +85394,15 @@ "repo": "skeeto/skewer-mode", "unstable": { "version": [ - 20180706, - 1807 + 20200103, + 2247 ], "deps": [ "js2-mode", "simple-httpd" ], - "commit": "a381049acc4fa2087615b4b3b26c0865841386bd", - "sha256": "12fsp7mwmjxh5mhshriyxw8mlghzn3gfswf6hkz1hcb0yfd56d53" + "commit": "123215dd9bfa67ce5cc49cd52dd54c0ba7c7e02c", + "sha256": "0in27qfkshy84m0iyy2vfvvlapawxhxxpi2jzpqq6sps40kax4xh" }, "stable": { "version": [ @@ -83872,8 +85488,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20191019, - 1858 + 20191230, + 1016 ], "deps": [ "alert", @@ -83883,8 +85499,8 @@ "request", "websocket" ], - "commit": "25df7218ef17c03ddad057a1ba50f99160b71675", - "sha256": "11m951hl6ykk7h028nhvzlc7ywdc93z7n5vpf9w4m73jlgy1kcbr" + "commit": "4e536bb4ee7a743605c5bfe7b91fc72b5c77fdf0", + "sha256": "1paiy7fx7b8fi6b2dd18qmwwldr2sdilccmvhdm4s70xrg90yxkw" } }, { @@ -83945,15 +85561,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20191025, - 1421 + 20191224, + 2328 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "2b9feb2fef764c6713ce433a6318cc412127172d", - "sha256": "0x74ph37s5wbc0xmjllh3z4j2synfl1w36mb2plcvixgj67y59yk" + "commit": "e1a640a92ee8e63cc2670ef0cc44673f0c0bad0a", + "sha256": "0bycp6zcqxhrzq8ihqhqkyws2y8623jwc399ln4gklybgsdm1ibf" }, "stable": { "version": [ @@ -84170,11 +85786,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20191024, - 1500 + 20200101, + 1514 ], - "commit": "0e8c0f9ce0612d52086792cc960ccbf0b528a624", - "sha256": "0akffwzca8yiq2nn5fmpblfddi9vlacwlfdmh856wn5hkhqnvr7k" + "commit": "91e5a8e7401c9907825b4e72e0fde3498c10021e", + "sha256": "0jgpf4d3sik45l7y7igh3kgd3iqigmz4n3ic59mqcfi8lrhppscm" }, "stable": { "version": [ @@ -84241,15 +85857,15 @@ "repo": "joaotavora/sly-macrostep", "unstable": { "version": [ - 20191013, - 2138 + 20191211, + 1630 ], "deps": [ "macrostep", "sly" ], - "commit": "be2d24545092d164be1a91031d8881afd29c9ec0", - "sha256": "0v8m3zkccpqd2l8m9340y672l2mm3mrry8422nva5kfvpcwdayqb" + "commit": "5113e4e926cd752b1d0bcc1508b3ebad5def5fad", + "sha256": "1nxf28gn4f3n0wnv7nb5sgl36fz175y470zs9hig4kq8cp0yal0r" } }, { @@ -84500,14 +86116,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20181220, - 1756 + 20200106, + 2016 ], "deps": [ "smart-mode-line" ], - "commit": "79261aeafa89664039201e3d3f405bc8b0a6aa8d", - "sha256": "06x1na621cm7183im2g2gxkvaqm0yfr9b9i0fbz9bwkcmijxrgmw" + "commit": "e281b52b164a477fcdb6a468976e8a1bdde1ca26", + "sha256": "0m4c63anrmbbdaf0chiagzgkcgbi30bhkjx3v7c4i9nk98yz9zkw" } }, { @@ -84679,15 +86295,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20191015, - 1754 + 20200105, + 1259 ], "deps": [ "cl-lib", "dash" ], - "commit": "9738360eb2afb58b4c21815f9d5c793b8125f540", - "sha256": "1msaggijlladdfpza4qqbdr4ylx3lla3dyjzapj0vs1cv4r30ivg" + "commit": "9449ae08593180ba99e4517897e8e825d3c422a8", + "sha256": "1h08awp6jr6ab7kb79dld6aygjl2vjnml81q3h7hqm3p7v9jv2h2" }, "stable": { "version": [ @@ -85252,14 +86868,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20190721, - 1046 + 20200106, + 57 ], "deps": [ "cl-lib" ], - "commit": "794245665c3374af74880cbc7b16b4da02ad0411", - "sha256": "0s63fxdznclqz5gy0vqvw50g92dgk452mqwx67akj68yl35apj8c" + "commit": "2bfb3efe5a646079389dad6ca60e5e7f2c986829", + "sha256": "04inv9iny0ndkm2lwr82gvyfv73v50bn0sjrdbdqhkzxqxf8yr2k" }, "stable": { "version": [ @@ -85282,15 +86898,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20190809, - 1202 + 20191212, + 1808 ], "deps": [ - "cl-lib", "dash" ], - "commit": "55cd77b61b6968048c61e13358ba487d217f24c0", - "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g" + "commit": "fac531ce8890795850bc12bb3ca63526b5252a07", + "sha256": "0rfdhfyp0b60cfz7q9bdk5y8nyr0rp6jg0mrb34mvnxc54aardag" }, "stable": { "version": [ @@ -85321,8 +86936,8 @@ "flycheck", "solidity-mode" ], - "commit": "47f15b2663a6cf92ae6ebf655841a9509ad79017", - "sha256": "0zhr5fcv8vlkcnya36y9smpgw7ylb0fkx0px8zr0zhr2f9xgjmph" + "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", + "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" }, "stable": { "version": [ @@ -85342,11 +86957,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20190302, - 909 + 20191214, + 859 ], - "commit": "47f15b2663a6cf92ae6ebf655841a9509ad79017", - "sha256": "0zhr5fcv8vlkcnya36y9smpgw7ylb0fkx0px8zr0zhr2f9xgjmph" + "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1", + "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq" }, "stable": { "version": [ @@ -85558,8 +87173,8 @@ "repo": "r0man/soundklaus.el", "unstable": { "version": [ - 20160314, - 1231 + 20191220, + 2112 ], "deps": [ "cl-lib", @@ -85569,8 +87184,8 @@ "request", "s" ], - "commit": "09ec030843482594beae2664b8fe1e0ad1e66472", - "sha256": "0w5ac515ymj43p5j19nhfqk0c3251c7x3i97r550g780niby1nc5" + "commit": "15ce6e7f24a45e4f202d83cca9fa3bfdd94ca592", + "sha256": "03c86qxdya306p6150f3vwhlh51q5vsbgqzgcdxhm72raf32gs59" } }, { @@ -85689,8 +87304,8 @@ 20150719, 1931 ], - "commit": "7f70ee36297e5ccf9bc90b1f81472024f5a7a749", - "sha256": "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb" + "commit": "9826265c2bceb2ebc1c5e16a45021da0253ace97", + "sha256": "0aplwmm17ypbns5blc4rf5rr6dasj0zp5ibykpfl43fh4bd8z89n" } }, { @@ -85701,8 +87316,8 @@ "repo": "TheBB/spaceline", "unstable": { "version": [ - 20181223, - 2024 + 20191230, + 1221 ], "deps": [ "cl-lib", @@ -85710,8 +87325,8 @@ "powerline", "s" ], - "commit": "ae45a819ea7ae52febb4d7d82170af44dff10f19", - "sha256": "01dyi0s8yilkgs0ifi489004195l4zrm9dqbybip4136l9zmlini" + "commit": "1b26af2c1a701481ac5d90928fe0200e389756c3", + "sha256": "11lwckqcgzsahrkkm5wk1ph4kc7d4yz05r7251g8c9f0q6vdj9dp" }, "stable": { "version": [ @@ -85771,11 +87386,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20190820, - 816 + 20191227, + 1039 ], - "commit": "32ddc1a9b9f4f58ebe8410abc1124b7acf0f36b1", - "sha256": "14bga23rf9zn18fbs8zdhksi2kyxq0s937fbjpl0q91x05b6m61f" + "commit": "06a41d03274902bf16888b89db5a6ab6a054b11e", + "sha256": "0iml1qisamwv9pf07h0k5a3sff5m7vlnk4780k5nyv324aih1r05" } }, { @@ -85918,25 +87533,43 @@ "repo": "parkouss/speed-type", "unstable": { "version": [ - 20190526, - 953 + 20191204, + 1107 ], "deps": [ "cl-lib" ], - "commit": "c98f9ebd4abf96db967f9c0dff9ccfa4b7f4035b", - "sha256": "1hjpxr5nb08g5vz7wmlf3zxazvj419528rfwdpkpbmdsjmy67fbf" + "commit": "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21", + "sha256": "17xh7f1ps6bfs55a08d0jjma2hs117fv4j90w4xif0n2h49m4pjp" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "cl-lib" ], - "commit": "5d691f57743304db63b6afdc5bd79dabd282d390", - "sha256": "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf" + "commit": "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21", + "sha256": "17xh7f1ps6bfs55a08d0jjma2hs117fv4j90w4xif0n2h49m4pjp" + } + }, + { + "ename": "speedbar-git-respect", + "commit": "f468cf6a61479f15d02368ed8c3f6c94214d72db", + "sha256": "15py09mjkjci00578nlvniw3inr4jdr8sashkv5li5kzl6b30gwk", + "fetcher": "github", + "repo": "ukari/speedbar-git-respect", + "unstable": { + "version": [ + 20191121, + 2120 + ], + "deps": [ + "f" + ], + "commit": "4703650c20cb77f08833747529b55be13d450bae", + "sha256": "0qb2azx3blm8iz0y5f8p5zxkbmx6pjzxwpfzg64qi3741xijv8lw" } }, { @@ -86291,17 +87924,17 @@ }, { "ename": "sql-clickhouse", - "commit": "a0ef23e6825924094eb69bd8526a95d8fab210c1", - "sha256": "083i9aaf69yk71mndl5x0pimn3bkkhp3mfppxvy0f5lzf2847q2j", + "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", + "sha256": "1sxh22dl0px81z85dj9r97nj8pnc6g9ah06q1bgf3bii7yl6qdy8", "fetcher": "github", - "repo": "leethargo/sql-clickhouse", + "repo": "rschwarz/sql-clickhouse", "unstable": { "version": [ - 20180302, - 1555 + 20191209, + 1443 ], - "commit": "2edccd94145c55a040a3a87193793f06cf01f64f", - "sha256": "0zajd35i02h869mg6n2pn2fnb80ddny6ss1kap21b75p2gw79lb7" + "commit": "8403a4a5d332dbb6459b7fbce6ea95c36d390a5b", + "sha256": "0c039m67jc2xq9pmn0xmqr07nzdssc4vbk51ng0272kcs9mbslrf" } }, { @@ -86352,6 +87985,21 @@ } }, { + "ename": "sql-sqlline", + "commit": "0fd21ac42207156f7300f4ab6ac082c801740daf", + "sha256": "1b5jkdajif0yc558nv29y8vimnj6bq52z2m91qj6mplcbgpdrnn6", + "fetcher": "gitlab", + "repo": "matteo.redaelli/sql-sqlline", + "unstable": { + "version": [ + 20191028, + 939 + ], + "commit": "990c79b7ebbf8ecb1e1161c9a942973efd8e2833", + "sha256": "0jl13ymbb0yxvkqipw821wq797izzj5j72vzdc5d30dwdd2wxm83" + } + }, + { "ename": "sqlformat", "commit": "6bdaa1ccae12f2ea779ac6989607d8027feac2c9", "sha256": "07lf2gx629429b41qr04gl98gplb538gb5hw7idzrmi3higrmv8m", @@ -86447,11 +88095,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20190909, - 1149 + 20191123, + 1753 ], - "commit": "0879e2fe1872fe11c3ddfab631987ed64bb5c437", - "sha256": "0mwy50rydy64zcy9g08b952vjd5ij9gwgcsl6ipaq52kjhs7x8l8" + "commit": "bbd9b9239fc1a05f1aa1b7e7810166b4aa463ccc", + "sha256": "0ikxqxm4bfnl6v6ykn0zzbkqn7bj12b66x4bcyz8cp3vqv5v8fkg" }, "stable": { "version": [ @@ -86584,11 +88232,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20191001, - 2041 + 20191221, + 1051 ], - "commit": "3d3e9af531003d5456e1a3a3b54147755f070eca", - "sha256": "184j4ap4yfis55r87g9rycj78zy2m6lkadbwvlha45d478n35lqh" + "commit": "e9f009c064f63ca488c89c30ab0d3857a0155f86", + "sha256": "1f6bj718jkdsbj38f75kwvg54kk4fisv7s9dcgh3gjf0n7xalkgc" } }, { @@ -86660,20 +88308,20 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191015, - 2040 + 20191106, + 131 ], - "commit": "bcfa6f49ee3a0ec8a808f3b80286db192b34f6c7", - "sha256": "1vvyik4yx19qq5jmy3yi1547s06rm2qsdbvdw88m9pqfffp1xllr" + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" }, "stable": { "version": [ - 9, - 3, + 10, + 0, 0 ], - "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", - "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" } }, { @@ -86684,28 +88332,28 @@ "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20191015, - 2040 + 20191104, + 1056 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "bcfa6f49ee3a0ec8a808f3b80286db192b34f6c7", - "sha256": "1vvyik4yx19qq5jmy3yi1547s06rm2qsdbvdw88m9pqfffp1xllr" + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" }, "stable": { "version": [ - 9, - 3, + 10, + 0, 0 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", - "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" + "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a", + "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0" } }, { @@ -86863,16 +88511,16 @@ 20171130, 1559 ], - "commit": "8fc2c5cd1d7d74e59a35699d12907d5d7efac190", - "sha256": "110dgbkqn0x1cw99n6z6llc8547ly7zvp9659d13qhiswbifs8vz" + "commit": "f2086b33ab310b70a47453011318d0ed5d432239", + "sha256": "0rx5h0d54f9w232w7r654qzpk2937zcgv0s3r2sya0ansxkk79kx" }, "stable": { "version": [ 0, - 20 + 21 ], - "commit": "4f2670ed6da97b731a51e57a01cab581d1b9c52e", - "sha256": "17zmxhj5qzhsnaj796szpdsl30v9cfxkvds0vx2hav9f4ix0pl1s" + "commit": "ce4e2a7493ce77f86d94afb1fbe9539baa337c02", + "sha256": "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7" } }, { @@ -87708,16 +89356,29 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20191013, - 1658 + 20191226, + 103 + ], + "deps": [ + "dash", + "lsp-mode", + "swift-mode" + ], + "commit": "04c2bf38c16d7cf03a43c065baabaed3a80e78d3", + "sha256": "0xi23ywj9kf5qsw933raqs66yl859hhg62na3zybm78l2kq6dnhg" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "5b5eee7122803ca405bc68b67d967a1757d4404c", - "sha256": "1vz1dd3w978b3k2ix3vjgz8i2xaxqf24qc5cwhar7n1jwjrzgqig" + "commit": "661e6fe419948419da4abf916b193b331b80a3be", + "sha256": "08w9h12y54aj2q6k48p9fglacppb5mlqh18h43n45hd7rcph3j93" } }, { @@ -87728,14 +89389,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20191013, - 1451 + 20191130, + 544 ], "deps": [ "seq" ], - "commit": "b260308e922bd0361779f66a2e5bc1ef0aae4d30", - "sha256": "00qabygq71fpnrwrkbgkz5c33b82ni3sxs77nihd00ia2m1524i5" + "commit": "1268425311ab20f1618df4e52cb1b79e28b553df", + "sha256": "1ghm5spzxxdvwn1lk3xci62hiv12x4hzjk5xh9q522a833nl04i4" }, "stable": { "version": [ @@ -87812,14 +89473,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191021, - 1015 + 20200105, + 1958 ], "deps": [ "ivy" ], - "commit": "d2052bab4eecebab84e75b8a10b66f66a8574425", - "sha256": "0kxv03mb00ia48vk05xb6bqhkphjjh2pry6r2f5pyag0wgh5vyma" + "commit": "3c6e5daccbc8678ee881b435ac956778de82a076", + "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6" }, "stable": { "version": [ @@ -87966,8 +89627,8 @@ "repo": "vermiculus/sx.el", "unstable": { "version": [ - 20190114, - 1523 + 20191229, + 1746 ], "deps": [ "cl-lib", @@ -87975,8 +89636,8 @@ "let-alist", "markdown-mode" ], - "commit": "49358eae36dd4bb5b9207313b30df085e7f25cef", - "sha256": "08x2bli821b47sp1jwgg8k8q292z4ryl052rfna0vkcjqv6l5bav" + "commit": "e9d1093c97507a6d7b4f4710ef65200dae725e5f", + "sha256": "0m90ddwm8j0y6d1ppqhd2gil1107k202blw6mzm5bdambn4nfqkf" }, "stable": { "version": [ @@ -88001,11 +89662,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20190608, - 442 + 20191224, + 250 ], - "commit": "e40a7c407f24158c45eaa5f54ed41f5e416a51dc", - "sha256": "0ibz3392d3jw1l8006h9kf8s7bg6vl7jc92bmqc031a433009ic7" + "deps": [ + "seq" + ], + "commit": "8096a684c29bae20e1f5a1c7adbe7881680a5c10", + "sha256": "1x7ghzxn5634amvj6r786j8nm25b780pz8h57z7qk40x0s6qk5a7" }, "stable": { "version": [ @@ -88050,8 +89714,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20191010, - 1915 + 20191203, + 2038 ], "deps": [ "cider", @@ -88068,13 +89732,13 @@ "slime", "smartparens" ], - "commit": "955c160af27c585d339dee8dd8eda394b253d3cc", - "sha256": "1h0n9f19g7i0dw2pz7mrq9frfp5vjb9kzxs2cksk4n37h7pam3kl" + "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1", + "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ @@ -88092,8 +89756,8 @@ "slime", "smartparens" ], - "commit": "88d09bdae222ae4ad0e40fbb1a724d63d06af214", - "sha256": "0nd96apnmdi4iv4pcai1bp9s5zrq5nsqqq1k5kdjbpiybhjdzk98" + "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1", + "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x" } }, { @@ -88208,26 +89872,26 @@ "repo": "hpdeifel/synosaurus", "unstable": { "version": [ - 20190305, - 2206 + 20191125, + 552 ], "deps": [ "cl-lib" ], - "commit": "bc26f5c22b4d08dd09d0852435814977433c9521", - "sha256": "0hpcnslgs5qh3knapw1x7imia3b1yplicpddnzzpxnjsp7psypwh" + "commit": "14d34fc92a77c3a916b4d58400424c44ae99cd81", + "sha256": "1z6ij6yydjym1ds2vshnkaakng0qgix4r7kzndh8jwrisvb5vml3" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "cl-lib" ], - "commit": "56efdc38952b9bd56a445591fcdeb626aede8678", - "sha256": "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2" + "commit": "14d34fc92a77c3a916b4d58400424c44ae99cd81", + "sha256": "1z6ij6yydjym1ds2vshnkaakng0qgix4r7kzndh8jwrisvb5vml3" } }, { @@ -88256,14 +89920,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20190923, - 1030 + 20191119, + 1007 ], "deps": [ "cl-lib" ], - "commit": "a6c2c24453d18a653fe365707692ad354781cba3", - "sha256": "0k3ndhgw2hglkd572zgyaf3znk6pmm8sdn4ma681b4vd7m1j2yw1" + "commit": "5760319d8fdb3672dd0e95880c30e9c4d92ab239", + "sha256": "0rkqflaz0npclnjsy2r6apkjrzlw5zrpa6j87sbjpnnh0jgcsmsq" } }, { @@ -88406,11 +90070,11 @@ "repo": "holomorph/systemd-mode", "unstable": { "version": [ - 20180629, - 2106 + 20191219, + 2304 ], - "commit": "401d71c2dd24e424216ae5e4275c830f2a9c6b0c", - "sha256": "06b8j64fk711fay0p4ifypvpdv2l2kz80rx1hhm6g9991h0x33bj" + "commit": "51c148e09a129ddf33d95276aa0e89d4ef6f8dd2", + "sha256": "0mikrj91qip5f0sj62c4gamvw7h6wc0yz8cfyzj9h3gxrllkp87k" }, "stable": { "version": [ @@ -88561,11 +90225,11 @@ "repo": "politza/tablist", "unstable": { "version": [ - 20190414, - 643 + 20191129, + 1850 ], - "commit": "8079801527da1f596bc942162026328d7bdf6ad9", - "sha256": "11bm7z4kdxrq6pv93zwrmg729mnvqvhgmna9r2wqx2wyf87vdh00" + "commit": "41a9612f51bad36d6689667c11f42f8143103bb2", + "sha256": "0j6y9jh3qynbsya5aag3pfjfdizmxdz4ldry0qnx4rd9nz0cs7mi" }, "stable": { "version": [ @@ -88694,11 +90358,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20190204, - 1104 + 20191120, + 327 ], - "commit": "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c", - "sha256": "07vvlglmkj87hpxz79s3bl2cjn71vain57fdxs7j9vlr5jkchxwn" + "commit": "d5b9693fcabf2281319acaf09e685e3eedf27e8f", + "sha256": "1spwnhff3mlhi5ffqfz7fyy8d5wq4qk7q57ba7p7wxq6i08mwbms" }, "stable": { "version": [ @@ -88718,11 +90382,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20191009, - 1506 + 20191128, + 1140 ], - "commit": "fa0a5e0c4d36a6f007fc3932f7067fb09ba41de8", - "sha256": "1346r8r3m4kpmh90bgdxz7h1d0l7lna64xn7lh6788yfm8rl6sdj" + "commit": "b3e844ae64b9a7cbbb1427a26fca2d01f8e74c6d", + "sha256": "0yj1mxy81pfz71drdyvz5gmam6ypw798m5wiff0zj93kjs5f2k4q" }, "stable": { "version": [ @@ -88760,14 +90424,14 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20190912, - 1357 + 20191108, + 1346 ], "deps": [ "cider" ], - "commit": "e704c2cb737db5481a6b085d82b1fb81e9b0fbac", - "sha256": "0hn2i7c6msr8i6b6p578qbdikslap41b5adjrmdra591pmia2cqq" + "commit": "079028b7547743a36384650981ea068849aac53e", + "sha256": "06sjr4fv8p8y56a35pzghn89r1nzr2h5h3m98h0296bgnz8jgyg2" }, "stable": { "version": [ @@ -88846,14 +90510,14 @@ "repo": "Wilfred/tco.el", "unstable": { "version": [ - 20190309, - 55 + 20191129, + 2040 ], "deps": [ "dash" ], - "commit": "482db5313f090b17ed22ccd856f0e141dc75afe6", - "sha256": "1z7xkbrqznk6ni687qqknp8labcyhl8y6576hjfri89fn21385y9" + "commit": "d82478d56568f60b3a82fd010b3ca0bab2ef5dc9", + "sha256": "0lh04mpa1yb3mwasvnnbdzffcig7ndlk13d96a0lavqn49a10fa3" } }, { @@ -88918,26 +90582,26 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20191025, - 1359 + 20200101, + 2251 ], "deps": [ "visual-fill-column" ], - "commit": "699579b11b358af86e1cde5823a0987d40054afd", - "sha256": "1y0q7scjni4jw4pah0v2pwxc07557q59axk3hb6651kvbig7hq4l" + "commit": "88623eeb1ca4b79667d1a860496f5ea636611514", + "sha256": "1w5krpqraxfiwyz8nr9fwa4gfrj0fzr698dhvxzbpyjibdsna5xx" }, "stable": { "version": [ 0, - 4, + 5, 4 ], "deps": [ "visual-fill-column" ], - "commit": "4457087e1e34e7340d3678714807335665d798d8", - "sha256": "0s2a9hwa775qyfad1zikah0vnpn9mbydzf8ipsyabns2hhjzf225" + "commit": "9bfb637b2e71f5f293debd35abd627a064faf8ef", + "sha256": "06v8i3862n5kf2lnxii8vp9g8cq5ql51kr8yxh7l1wccsidri67a" } }, { @@ -88971,16 +90635,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20190424, - 1934 + 20191120, + 27 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "408e05e105e8e521735221f4c98fc358e007df3b", - "sha256": "123fxr4pjm7z3pidrwgcalb99s0vq3d6imkwgla6fyqyyn9wvag2" + "commit": "bfe7b189d708d9cbc69ef2eaf5542108edc4257d", + "sha256": "0dkscbjms2557fzd7gawgsic6gfzypyn973skiyhy0y8zimmr406" }, "stable": { "version": [ @@ -89370,21 +91034,21 @@ "cl-lib", "json" ], - "commit": "9353d89f568a7e8c1e8e4191f764f435a63f0df2", - "sha256": "0bibcdbjyfskwj28dk2krnvslb5pnqv5q1clgnwimpmyd6ijm9bj" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ 0, 24, - 2 + 3 ], "deps": [ "cl-lib", "json" ], - "commit": "729307d17c08c9f2baf1925a51b7f36d8f035e01", - "sha256": "09ziq6l63418z307bcfnyjcbir9vv93qnaapkk65shi6pyj47z30" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" } }, { @@ -89403,22 +91067,22 @@ "cl-lib", "tern" ], - "commit": "9353d89f568a7e8c1e8e4191f764f435a63f0df2", - "sha256": "0bibcdbjyfskwj28dk2krnvslb5pnqv5q1clgnwimpmyd6ijm9bj" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" }, "stable": { "version": [ 0, 24, - 2 + 3 ], "deps": [ "auto-complete", "cl-lib", "tern" ], - "commit": "729307d17c08c9f2baf1925a51b7f36d8f035e01", - "sha256": "09ziq6l63418z307bcfnyjcbir9vv93qnaapkk65shi6pyj47z30" + "commit": "0d19800db70a6348c627a69f444b91d21ad89629", + "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" } }, { @@ -89614,14 +91278,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20190606, - 2049 + 20200104, + 41 ], "deps": [ "auctex" ], - "commit": "b3e137ed123cc077d77b056ca3e0f850a451d327", - "sha256": "0jj742sv5gb3zw8jnzlh0w5jlfzk58mdhc14zxhslvxm9hk6ghx8" + "commit": "2a5561b4534a3b78718e2c5fe30550c89341874e", + "sha256": "1i583i2h9f5bsg663yl9xriv1lc5gb5w4ql6b5r9dwv33lg7l6mx" }, "stable": { "version": [ @@ -89791,8 +91455,8 @@ "deps": [ "cl-lib" ], - "commit": "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1", - "sha256": "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv" + "commit": "67ca7e6ac4740a412a1ea29f86e46ceeb636535a", + "sha256": "07bfiikrbmk1jc9ir5d3iwvsi3hbfcsira8gsicphwzhaiahqc1c" }, "stable": { "version": [ @@ -89928,18 +91592,18 @@ 20180905, 1050 ], - "commit": "59613a5631665e2819df3c9fac3ec83ab5f9b9ad", - "sha256": "1az6s5q6vcx4gl2xvvz5im7ydhwvxncr764vhm0lc07aywx2z5mp" + "commit": "71240fbb5fec6d0aef967f26cfe6f29d5fa0404c", + "sha256": "1m8ahhz02fii84arzn9zpy0i2y1z2rbc1743y9dhf2ajqc0znigm" }, "stable": { "version": [ - 2019, - 10, - 21, + 2020, + 1, + 6, 0 ], - "commit": "a62d2e395a8ff3dac6400d089064966f84c15b52", - "sha256": "19svp3qk6yn3zspv6b8a7j9mfm1y80xfvqyy2jgs0yckl8i03iyn" + "commit": "1362aa1d2d0ccc8a3ce28957a1385c216e72bad7", + "sha256": "1axhy9rg75bmqckahriaxrwg9avn67vnna5d9m7cpzq2pj7spssc" } }, { @@ -89989,26 +91653,26 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20191018, - 2235 + 20191210, + 1647 ], "deps": [ "haskell-mode" ], - "commit": "47e2072676bc9fb0e95db172f7f0ad6115de4163", - "sha256": "1bixpx0q4f4k1lmxf325qj4lbdsxhf2gali4sqppyqjghg6qda63" + "commit": "014560454f352997839ffd54dbca24b638a9d456", + "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li" }, "stable": { "version": [ 1, 4, - 4 + 7 ], "deps": [ "haskell-mode" ], - "commit": "47e2072676bc9fb0e95db172f7f0ad6115de4163", - "sha256": "1bixpx0q4f4k1lmxf325qj4lbdsxhf2gali4sqppyqjghg6qda63" + "commit": "014560454f352997839ffd54dbca24b638a9d456", + "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li" } }, { @@ -90019,8 +91683,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20191004, - 1231 + 20200103, + 1159 ], "deps": [ "cl-lib", @@ -90029,8 +91693,8 @@ "s", "typescript-mode" ], - "commit": "b8ce1d8c224cf72ccc3491787a1222be63603127", - "sha256": "1q4g8w4p43zbblbwf5fsbk0p2ccy3v5yf139b4ivfkkjy7x8aq9g" + "commit": "ac0f0a6f688c5abade71a0277ea5f1cef45a0b8b", + "sha256": "11igdklmsn5y6xx9ws2im2m5hn70kqv8l4n9c5abr4ibslxjaffa" }, "stable": { "version": [ @@ -90409,7 +92073,7 @@ "org", "transient" ], - "commit": "5543b75581a559f29f35f2577a304e0f15f87100", + "commit": "3b8f8b4fc6d5cfdfca149b142ff7cadba6ffae7a", "sha256": "0w8d53njk81smdk7vm6mxdrrg1310cyxapjbylv2a51d442hrf5g" } }, @@ -90475,8 +92139,8 @@ "deps": [ "cl-lib" ], - "commit": "e9dc7907eb8e9cf9a016bd73e6a96421534a70ae", - "sha256": "0ga1vbkaxjybxr3l5laakxvy9cbf82lrrsjqi67krh7s303az0bl" + "commit": "ce213afc026590871ca7d514e563720ef967c938", + "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k" } }, { @@ -90784,8 +92448,8 @@ 20171210, 2102 ], - "commit": "e4af7143bd32907d0bf922bee53a96399f0376fa", - "sha256": "1ccxin0vp3z8lxcfm9bci06jkwy0nwasdwg95wp9hdnccpr63s38" + "commit": "0c79138fb2d37940654649787cb17cb619268748", + "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk" }, "stable": { "version": [ @@ -90815,6 +92479,24 @@ } }, { + "ename": "tramp-auto-auth", + "commit": "0c8a8841cc7d7634f47610aeecc4a63b20f459f9", + "sha256": "033110y1kdkqm21pkzp9izp9ic7239km3xc8wifw4vs22js341jj", + "fetcher": "github", + "repo": "oitofelix/tramp-auto-auth", + "unstable": { + "version": [ + 20191027, + 1419 + ], + "deps": [ + "tramp" + ], + "commit": "f15a12dfab651aff60f4a9d70f868030a12344ac", + "sha256": "09nkjgwppjfgv04q0gv468qihgx4y3p39lpwbd6vbh3wgbccas9k" + } + }, + { "ename": "tramp-hdfs", "commit": "4c185553314a2a9fe18907fd9251077777b33538", "sha256": "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b", @@ -90870,14 +92552,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20191017, - 1115 - ], - "deps": [ - "dash" + 20200107, + 2156 ], - "commit": "ad7f2553088faf633d32b51894de796e01a1cacf", - "sha256": "16ab68jf98hhy061i41271kdgm8mnmvj62j8y9hmjp7wsw3yzxdr" + "commit": "95389b31ec45984e3ff0849f4216adbd183d946f", + "sha256": "06c47pcicjqcfs8w0jfs4ggb1x431zwz9frx52w6xahb0p37qirm" }, "stable": { "version": [ @@ -90954,6 +92633,30 @@ } }, { + "ename": "trashed", + "commit": "0a0609353c8ef01ca5da44b6239e1d4756da3a92", + "sha256": "0vpfga0kp2r9p0b91fm5y1nf15j8c3r4aqf4wsl12yqgy0v08s6f", + "fetcher": "github", + "repo": "shingo256/trashed", + "unstable": { + "version": [ + 20191124, + 1351 + ], + "commit": "cc0243c9a4f01dc889f5c5ced3e311f918fe0750", + "sha256": "0nyipnrjwbmh4mvfv1nwz6ypg8c1j0g9y9kc4cym49q9vy3wy56c" + }, + "stable": { + "version": [ + 1, + 9, + 0 + ], + "commit": "f3e970c139e44fc7d36ad781566fd6b288d691a9", + "sha256": "13grdi12iwlw4fiphdfmvclfpbr6ajlgfbfyi7v41z8k3rxz4ypz" + } + }, + { "ename": "travis", "commit": "c064a0dc7922cbe4cff2ae65665c4f10e6dbff27", "sha256": "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix", @@ -91005,6 +92708,42 @@ } }, { + "ename": "treefactor", + "commit": "e3e956cbbaed3af8beeb927a730cb553df1fac21", + "sha256": "1jfsiv2adj0p2b118qmfzxljz523q1xcjq9x60h1a4xymm3kqb0y", + "fetcher": "github", + "repo": "cyberthal/treefactor", + "unstable": { + "version": [ + 20191223, + 1230 + ], + "deps": [ + "avy", + "dash", + "f", + "org" + ], + "commit": "caa431c3a512426de8abade3300d7fd21b969f7a", + "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd" + }, + "stable": { + "version": [ + 3, + 0, + 2 + ], + "deps": [ + "avy", + "dash", + "f", + "org" + ], + "commit": "caa431c3a512426de8abade3300d7fd21b969f7a", + "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd" + } + }, + { "ename": "treemacs", "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137", "sha256": "0is4waygw902vkha4jwav0i05298zhf4d559m91gmsfg1cfrlrr3", @@ -91012,8 +92751,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20191013, - 1020 + 20200103, + 1907 ], "deps": [ "ace-window", @@ -91025,8 +92764,8 @@ "pfuture", "s" ], - "commit": "6fb45a351b6d888fda44d5fc86b330b3ea54338f", - "sha256": "0ks80b9331p81w9sp1dcq2crb0xgdamy6i5hka2slwm01qharg1j" + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" }, "stable": { "version": [ @@ -91055,15 +92794,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190927, - 542 + 20191223, + 1047 ], "deps": [ "evil", "treemacs" ], - "commit": "6fb45a351b6d888fda44d5fc86b330b3ea54338f", - "sha256": "0ks80b9331p81w9sp1dcq2crb0xgdamy6i5hka2slwm01qharg1j" + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" }, "stable": { "version": [ @@ -91086,15 +92825,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190719, - 815 + 20200108, + 553 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "6fb45a351b6d888fda44d5fc86b330b3ea54338f", - "sha256": "0ks80b9331p81w9sp1dcq2crb0xgdamy6i5hka2slwm01qharg1j" + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" }, "stable": { "version": [ @@ -91117,16 +92856,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190731, - 540 + 20191223, + 1047 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "6fb45a351b6d888fda44d5fc86b330b3ea54338f", - "sha256": "0ks80b9331p81w9sp1dcq2crb0xgdamy6i5hka2slwm01qharg1j" + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" }, "stable": { "version": [ @@ -91143,6 +92882,25 @@ } }, { + "ename": "treemacs-persp", + "commit": "82679a4f04733556adb66bd31e2a56f2923b301c", + "sha256": "1r48rxhzx1qq9lfdp5plqgny8yh43f0qjwp0gr499g405ja2zyas", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20200103, + 1832 + ], + "deps": [ + "persp-mode", + "treemacs" + ], + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" + } + }, + { "ename": "treemacs-projectile", "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137", "sha256": "1lldvpasvgsd5xvnlafddqp47w7rdvf3vqfhr26rxn99kj5s9xzp", @@ -91150,15 +92908,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190619, - 1516 + 20200107, + 1640 ], "deps": [ "projectile", "treemacs" ], - "commit": "6fb45a351b6d888fda44d5fc86b330b3ea54338f", - "sha256": "0ks80b9331p81w9sp1dcq2crb0xgdamy6i5hka2slwm01qharg1j" + "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a", + "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb" }, "stable": { "version": [ @@ -91181,11 +92939,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20180724, - 656 + 20191108, + 2217 ], - "commit": "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d", - "sha256": "04zwm6gx9pxfvgfkizx6pvb1ql8pqxjyzqp8flz0432x0gq5nlxk" + "commit": "306f7031d26e4ebfc9ff36614acdc6993f3e23c3", + "sha256": "09k95b846mzak62acyzrmqvc7kwkni14w8d74079kr7lnar9g6zq" }, "stable": { "version": [ @@ -91334,8 +93092,8 @@ "dash", "s" ], - "commit": "540f6a5adab5d881cc5f50835c0a3fe70e74b992", - "sha256": "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb" + "commit": "df48734ef046547c1aa0de0f4c07d11964ef1f7f", + "sha256": "0hi0dfcwrr0vxp26v3f6radpmmwxbiz3px3br0cydfi6axikw9xl" }, "stable": { "version": [ @@ -91432,14 +93190,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20190805, - 958 + 20191220, + 2314 ], "deps": [ "caml" ], - "commit": "74e7f66f31290f6599fda0067d795e201270be43", - "sha256": "1fgaa3kq3aj6ddkkbag8bcqq67y8xq51cmsp2cvmzsx5lfwv0y3p" + "commit": "c12061eb80c1487a1963af7cdae268d709a70ca9", + "sha256": "0x85yy20caqb24n7qx3h8nw259p6593y5dx43jl5iapy2n9za1gy" }, "stable": { "version": [ @@ -91684,11 +93442,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20191025, - 1425 + 20191209, + 1107 ], - "commit": "f20103a4487a404d11521305db63f550d9eb3fe1", - "sha256": "0w2j1qvykllj6dv8azz9vhaibhygmwhb7nsrglmc0xwnmrrvawsi" + "commit": "761f3aec6e192ddf0a9f1cc3d5d2ee77d32cb06c", + "sha256": "0b9gcidsgrmnz7dca8wx9ky8cqprxfi4zghf0cbfb31n0x2dqq5n" }, "stable": { "version": [ @@ -91769,11 +93527,11 @@ "repo": "jorgenschaefer/typoel", "unstable": { "version": [ - 20171209, - 1023 + 20191202, + 1033 ], - "commit": "9dad93b6f367f02f52c8d9bf15d446d922cec294", - "sha256": "1xaikwl265v67b7hilrhjgwzr6bcha9idnp82f27msqzdfdzxf0f" + "commit": "54a9dbcfb24a146fd14232e927109eec59b50171", + "sha256": "02ri51iyw99m1735j76qfd5spyyvxwg6mjzjd7g493h23pc6bvy6" }, "stable": { "version": [ @@ -91905,6 +93663,24 @@ } }, { + "ename": "uml-mode", + "commit": "d2dbf909ca733aef6a3da6c48165aa3d2e9dc186", + "sha256": "0arkq5cymlvnga5fgzjfy5a6i6zpr0g6m66ycmxa04h6qkd73m9i", + "fetcher": "github", + "repo": "ianxm/emacs-uml", + "unstable": { + "version": [ + 20191231, + 1145 + ], + "deps": [ + "seq" + ], + "commit": "4ce7a07670832e3b22de2cef2130bc7867aadbf6", + "sha256": "0v2q2spk19n2mn7jfywnnik52kn7n30bgsznw6vs38z59z8z1nqn" + } + }, + { "ename": "uncrustify-mode", "commit": "5327aa1a1143c2257e9454663ff140f2371d07e3", "sha256": "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd", @@ -91927,15 +93703,15 @@ "repo": "sviridov/undercover.el", "unstable": { "version": [ - 20180403, - 1452 + 20191122, + 2126 ], "deps": [ "dash", "shut-up" ], - "commit": "3fc54ef92f0b4b7d26d962d6ed29a81d526a3a66", - "sha256": "0iqj1a6nj1ka5ahcy4rrn7k427bs1ifv0v0i7gj79m7isjj15qc4" + "commit": "9f4fbd04cd25c61397a7058bf2bad33c7b669aa4", + "sha256": "13cn2cxspaqa9filclk66963by7khaci4lyrxgmjpdz04rijkh1q" }, "stable": { "version": [ @@ -91959,11 +93735,11 @@ "repo": "marcowahl/underline-with-char", "unstable": { "version": [ - 20190715, - 1627 + 20191128, + 2309 ], - "commit": "82e15447fe5dcb99fcb9fc72128199a9bf6b7be5", - "sha256": "0hr9mha3kyzm8mgqr6pmfwlgvqrdzr1j9cjnr8wwxxl4fzv5m345" + "commit": "36577e72aa4fbfa7f1abad01842359209f543751", + "sha256": "14ybav1f82m2gsxkciwlc0pm01ihqqaqq6arnjqvgxdnw0z6qniq" }, "stable": { "version": [ @@ -92000,6 +93776,21 @@ } }, { + "ename": "undo-fu", + "commit": "0ca16994315f7d5dee9fff76db036e084162dc52", + "sha256": "1b0616zlblsd5405sfh02lxjyq6gl3s9m8vsxbqi6fryr4y750s9", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-undo-fu", + "unstable": { + "version": [ + 20200103, + 1445 + ], + "commit": "a0e111b955c6f654faaf8125f95558a804a7b37c", + "sha256": "18vz67ifmlwprf5x7bp3crbimmg086a80cv1pd0lar25nc2cs7v6" + } + }, + { "ename": "undo-propose", "commit": "308eec15ebfd301b34f0d9f019250c9089c4d6e2", "sha256": "0r0xswj9n24ghw44l1m1izapjqrfvcw8qn3qp61s2ly0i7la185j", @@ -92007,11 +93798,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20191005, - 512 + 20191229, + 2229 ], - "commit": "f80baee566807d733fbacbab08a897bcd62579c3", - "sha256": "00rqz63bhh66q78l646q3w16gydygj8h4d8np0dpbifgzciak90b" + "commit": "71002612480fe5cb2b139e73d18c87ddf1fd76b2", + "sha256": "0mlmck46cgm95hsdqskadd975fdq03mh6pq6lfgzl1ffd0nfqm0z" } }, { @@ -92040,11 +93831,11 @@ "repo": "purcell/unfill", "unstable": { "version": [ - 20170723, - 146 + 20191227, + 2026 ], - "commit": "e03771f2d1163d04ca75de76fbfbaa2689c6a9aa", - "sha256": "148znb55dbh1hzl9gclg858varx0lwbc5f8d31jladj5yf5pffp1" + "commit": "bb5755b2bb7a4d1fbfb525ab7bf9a36e4dede319", + "sha256": "0a9gyidkr2i2x9i7jxgdi82ygnb16nij7rrrqb4sslh4yv1hi0qy" }, "stable": { "version": [ @@ -92458,25 +94249,25 @@ "repo": "davep/uptimes.el", "unstable": { "version": [ - 20190328, - 856 + 20191121, + 1030 ], "deps": [ "cl-lib" ], - "commit": "1f726d31b502d764a3e3191aaf92ed4855105131", - "sha256": "1ymv5fh0bfjzkkd8vc9f1n8921bx1czbb29s0rw6zy37vkhs6v3s" + "commit": "29ae6585eeed5a00719b2e52f5ae1082087c1778", + "sha256": "0njpgw4is5lbv499jpc9c987yfvr6srhcmvg6wl631kpv0h8q9a9" }, "stable": { "version": [ 3, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "1f726d31b502d764a3e3191aaf92ed4855105131", - "sha256": "1ymv5fh0bfjzkkd8vc9f1n8921bx1czbb29s0rw6zy37vkhs6v3s" + "commit": "29ae6585eeed5a00719b2e52f5ae1082087c1778", + "sha256": "0njpgw4is5lbv499jpc9c987yfvr6srhcmvg6wl631kpv0h8q9a9" } }, { @@ -92556,14 +94347,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20190716, - 1829 + 20191126, + 2034 ], "deps": [ "bind-key" ], - "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", - "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" + "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", + "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" }, "stable": { "version": [ @@ -92594,8 +94385,8 @@ "key-chord", "use-package" ], - "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", - "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" + "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", + "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" }, "stable": { "version": [ @@ -92656,8 +94447,8 @@ "system-packages", "use-package" ], - "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", - "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" + "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925", + "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj" }, "stable": { "version": [ @@ -92715,6 +94506,18 @@ "deps": [ "s" ], + "commit": "edfc3f4b50aec2234792c0cc894774e4916ce26a", + "sha256": "0xy522czbxva2dpfbfjqf0xm6wi7cc98pz6ha7glgylsmcvhlvar" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], + "deps": [ + "s" + ], "commit": "8c7f50a2b6f5bd55cdd92e351371386ff4b6edce", "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" } @@ -92754,17 +94557,17 @@ 20190715, 1836 ], - "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", - "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" + "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", + "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" }, "stable": { "version": [ 2, 4, - 2 + 3 ], - "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", - "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" + "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", + "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" } }, { @@ -93022,20 +94825,20 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20191010, - 1129 + 20191223, + 1331 ], - "commit": "0b052a6e38b58a123ab48001473dab1df2eaa4c6", - "sha256": "0jc6vjbb43mvy5p2slgb0z0isavwbinqxiacawqprnw9jn218l92" + "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", + "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" }, "stable": { "version": [ 1, - 8, - 1 + 9, + 4 ], - "commit": "0b052a6e38b58a123ab48001473dab1df2eaa4c6", - "sha256": "0jc6vjbb43mvy5p2slgb0z0isavwbinqxiacawqprnw9jn218l92" + "commit": "8fc2e2c33334c9ff6d4c4d20a99d258e6cfdc567", + "sha256": "1bf9swaj49yx59c1yj96q5rj839535wz2d1ihj98an2chd5czjh4" } }, { @@ -93046,26 +94849,26 @@ "repo": "redguardtoo/vc-msg", "unstable": { "version": [ - 20180605, - 58 + 20191128, + 1010 ], "deps": [ "popup" ], - "commit": "ffd8db482cbd9fb63dace0e5ddcc7207a9c99f5e", - "sha256": "1zq01k50d958prl8aaz8n2sv541lrq3s1dn8vnfal4drn3iffgv9" + "commit": "93794111daa95b809e46e6d961ad5f68eb8f78ed", + "sha256": "11xci11lbw06syz3y6zhrbh7984mj523i5fphrmdqh76iivkphwh" }, "stable": { "version": [ + 1, 0, - 0, - 4 + 3 ], "deps": [ "popup" ], - "commit": "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee", - "sha256": "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf" + "commit": "76951fccc2cf66916af2ae006dfa758583e2415d", + "sha256": "0zmpc2w02ynm6ck01q5l9kv5flbl5zkgxhxyplqddh37ml31pka0" } }, { @@ -93133,6 +94936,29 @@ } }, { + "ename": "vdf-mode", + "commit": "203d755a2c083ecdb75a41ce6d6030315651b16c", + "sha256": "1ja7c0sn25r9fqxlp0c2c74qrblvxrb9akh0gf6f7x2hiqa0mygk", + "fetcher": "github", + "repo": "plapadoo/vdf-mode", + "unstable": { + "version": [ + 20191122, + 823 + ], + "commit": "35f5c3531b256b6578b9878ac2ce1ed79b3c8511", + "sha256": "16650xwq85rp98z4nljd5s7f14fg4rr90nr7ipfshj1i6zvbk229" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "f474047a35a2779e4ebaf9166f3d54f359cf9f3c", + "sha256": "0r3kb89zsxac98q8g4w0gyji83qnyxlqwcvmd7b9aa8sx8ry1asz" + } + }, + { "ename": "vdiff", "commit": "e90f19c8fa4b0d267d269b76f117995e812e899c", "sha256": "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l", @@ -93211,8 +95037,8 @@ "org-vcard", "seq" ], - "commit": "255496e6808e7a3da1b0afef873dc4920c2b117f", - "sha256": "0zq2lqj4s3n4japfmjm56yg120l1lk7d0h1jysdp8d4mzdb2m0p0" + "commit": "a9ef32a70a1f14416e3dc5fee478ce138cc011d3", + "sha256": "1r60gp3h7cj34wc5kjvpxzidb01gyqsd04ykmhk7asv91m598vs3" }, "stable": { "version": [ @@ -93400,14 +95226,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20191007, - 1546 + 20191213, + 1109 ], "deps": [ "yasnippet" ], - "commit": "5750f359de2956f853b131c46cf56726a5a5dfd3", - "sha256": "0yhcv006lrd2c8a3q3iganp7zdlacdafjzg97q3q48ihb864bx7p" + "commit": "2d1c45c63392ed869625bd062c19422600c9f555", + "sha256": "1gn57jfmma5h90m3b7l698rncmbygd2dbp48vvx1d1z9ks2rm8gg" } }, { @@ -93462,16 +95288,16 @@ "repo": "csantosb/vhdl-tools", "unstable": { "version": [ - 20190929, - 1532 + 20191127, + 2102 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "9cf9ae509afb79c5579f645907387b8253db167a", - "sha256": "0s1pw0a6ykny4r4wvq7867aqkx5rkvlbh3s8jxd8ycpjz9j419dj" + "commit": "e174a7077eb8b80cd76bb9688a4a5f08a747f212", + "sha256": "1c8wkfidvzpsv73d666n0n8marhavgm1yc6bv6ig5h4xsblhaigc" }, "stable": { "version": [ @@ -93800,11 +95626,11 @@ "repo": "m00natic/vlfi", "unstable": { "version": [ - 20180201, - 2254 + 20191126, + 2250 ], - "commit": "31b292dc85a374fb343789e217015683bfbdf5f1", - "sha256": "18ll47if9ajv0jj2aps8592bj7xqhxy74sbsqn07x9ywinxxi9mn" + "commit": "cc02f2533782d6b9b628cec7e2dcf25b2d05a27c", + "sha256": "00wqq9x3p4iwgsga3wvlr8c7iifvh3b0j41sahccdx6hqh4a0pzp" }, "stable": { "version": [ @@ -93897,6 +95723,21 @@ } }, { + "ename": "vscdark-theme", + "commit": "8f3accf76fcd91e1507b9e8ac8577d3af5ae0b88", + "sha256": "13d3g6bjnry7964pnphl0i205vn9gvl7glydzj5wv82s7yav752w", + "fetcher": "github", + "repo": "abelikoff/vscdark-theme", + "unstable": { + "version": [ + 20191212, + 107 + ], + "commit": "8eba74059e8a9db974e4056ee024e52fe54da485", + "sha256": "01p5ys23m4zk5hniri55bcn8j7v6pd6ryi41qx20w29mramwzxl9" + } + }, + { "ename": "vscode-icon", "commit": "90a07c96a9223a9ad477cbea895ba522523c5be4", "sha256": "0rhsqzgxl7hs52kniyi8yn4f953g7dgx49j4lzf2yr33ydxiw9d3", @@ -93904,11 +95745,11 @@ "repo": "jojojames/vscode-icon-emacs", "unstable": { "version": [ - 20190610, - 17 + 20191102, + 2010 ], - "commit": "14199fd1dbe0ca1da85f9917faee9fe078cb75ea", - "sha256": "13yjjg68a55sbk6hj4nfvka6w8ahpws0s2bf7c9idqrd6cvbfy62" + "commit": "4304e9f0a47406048129dc62171f08b67325a2ed", + "sha256": "0dpmw1kg9ivrn92vis7bxs8nlb1ixk72fhd4s4f5c21k0j4s12rd" } }, { @@ -93919,11 +95760,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20191025, - 1349 + 20200107, + 1419 ], - "commit": "57134b682dc58308d9edf353decc952f49814594", - "sha256": "147p1cvfh8qmrybrzb4f45x93m6wsgfqjvf34f44n6ca80s7y0y3" + "commit": "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c", + "sha256": "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6" } }, { @@ -93934,14 +95775,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20190816, - 633 + 20191209, + 928 ], "deps": [ "vterm" ], - "commit": "ecb5a44650515ea554ead078dcf824888e8c234b", - "sha256": "0jsf7sac45zc43linajmzkqv4lsxyf5m6zvhq01skpvb5y3hl881" + "commit": "88c823b532493b95a24d9cbd749278552a047860", + "sha256": "0ascpjc3c5q9pw2xbqfc60vxmsdhw7yakb2rvkgglha314p3fwkb" } }, { @@ -94047,11 +95888,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20191002, - 427 + 20200105, + 2322 ], - "commit": "361297e8539770f2f396d30928ebc01de60ca637", - "sha256": "1cnzi91mm3mg5x25v7vg86d1ri7ka7cvspb5l7ikmdv6cb9978ll" + "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604", + "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy" } }, { @@ -94173,15 +96014,15 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20190626, - 1533 + 20191122, + 1408 ], "deps": [ "dash", "s" ], - "commit": "0d5f6ac7515b8be134868543d97ba715b5a4ae66", - "sha256": "1hzq3gfr3m4g8gwcqijxb0jg2gzm336pxda38kf45274d3ncgvxy" + "commit": "93a5a4ecab1973e5846b35f856391daf8068d12e", + "sha256": "067149rrl6rgfdq55fpx8d2y4b0kqi1ify53ajksrddz74fl6h0c" } }, { @@ -94468,11 +96309,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20190916, - 1858 + 20191104, + 1859 ], - "commit": "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69", - "sha256": "1552wq8v4d0pj00kyhc05a4wq0p639r5yxa0rf6y3n4vy94190ql" + "commit": "cd000fcfce97152f8b831b7eef4ea0d0b1eed11a", + "sha256": "0fm9gwgcg3qgx8q2l27lsn76mzdkdsxvrwgwfsq34gzwzm1yg2xb" }, "stable": { "version": [ @@ -94612,28 +96453,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20190310, - 1048 + 20191214, + 649 ], "deps": [ "cl-lib", "request" ], - "commit": "bd38635d926a45a3cbe453fd9b41c8624a6d2309", - "sha256": "1z4l2j66mfnx1l1svx45sxkxjlyzdyw10ybsfsjhwdsi6ll42nar" + "commit": "8f9322fb1c6b8a80187f48ba2cb96cc107fad2b2", + "sha256": "135gz07zwizvp4iv9k3s20rx8f5rmzmqwas5rfkx9c2nffarnjii" }, "stable": { "version": [ 3, 0, - 1 + 2 ], "deps": [ "cl-lib", "request" ], - "commit": "7345c5f62d5cff4d84379eaf5dc8b2bb8bc4f99c", - "sha256": "00dfp2dyj9cvcvvpsh4g61b37477c8ahfj3xig2x2kgfz15lk89n" + "commit": "1a6c0e967f0340d825df33f4fab339eb904f5f5f", + "sha256": "15b97rszszgcivrsdx7368nxdb8lsag6wvmcvvm977splh9yjpwi" } }, { @@ -94644,25 +96485,25 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20191017, - 30 + 20200102, + 637 ], "deps": [ "cl-lib" ], - "commit": "5be01c6d1a8e87d001916fc40a77d779826fcacf", - "sha256": "0k2rxbacravwjxz3jbkm2icqkfhh5zhpjv7lm0ffbccm5qfyzyy9" + "commit": "ee44af2cc55415591e7ccb1007193294c702affd", + "sha256": "01pc03kial647r1nad1vw6rcbd251hrvjjh87gqqlhh9ksrcwnl9" }, "stable": { "version": [ 1, - 10 + 12 ], "deps": [ "cl-lib" ], - "commit": "0d96ba2ff5a25c6cd6c66f417cc9b5f38a4308ba", - "sha256": "1dgrf7na6r6mmkknphzshlbd5fnzisg0qn0j7vfpa38wgsymaq52" + "commit": "491a60b8bb8a6c3bd081c70354ab82040b0a7db3", + "sha256": "0g0vy2yc118mcka9f26950gdmb780zpxck9y6nli602vj32dw1g2" } }, { @@ -94927,11 +96768,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20190802, - 240 + 20191221, + 1857 ], - "commit": "42a25055163141165aa0269dbca69735e704825c", - "sha256": "0d27ka6pgkzv6bj31q4c5ksm30dspl9zy42ynnh4y2xb5wzp5ml2" + "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a", + "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05" }, "stable": { "version": [ @@ -95065,20 +96906,20 @@ "repo": "whizzml/whizzml-mode", "unstable": { "version": [ - 20190920, - 2342 + 20191216, + 1743 ], - "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", - "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" + "commit": "65fa17f8c1dc50dcb90277b64019c2846a317293", + "sha256": "0swlmzfrxpv3slssmpad3hgxfxlmi8jp3422mvcsg9xbdslg2qb5" }, "stable": { "version": [ 0, 35, - 0 + 1 ], - "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", - "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" + "commit": "65fa17f8c1dc50dcb90277b64019c2846a317293", + "sha256": "0swlmzfrxpv3slssmpad3hgxfxlmi8jp3422mvcsg9xbdslg2qb5" } }, { @@ -95094,6 +96935,14 @@ ], "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152", "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152", + "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw" } }, { @@ -95597,26 +97446,26 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20191024, - 1905 + 20200102, + 2147 ], "deps": [ "async" ], - "commit": "d5c777298cd8f62fef701fb45684c626d384bf76", - "sha256": "1c093vzfjh9y2abfb0n1r95b7xx77ynpkx5cqz56x2jyb9qhnp26" + "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a", + "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d" }, "stable": { "version": [ 2, - 8, - 3 + 9, + 1 ], "deps": [ "async" ], - "commit": "66bec91c859f305445b766394eb25248c1172426", - "sha256": "1z2h9casyw1b93ikq2mf9xixyvbl90zddf0s66lqfiyj2y376pq3" + "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a", + "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d" } }, { @@ -95627,11 +97476,11 @@ "repo": "twlz0ne/with-emacs.el", "unstable": { "version": [ - 20190820, - 1326 + 20191219, + 1521 ], - "commit": "b398e54bcce2fc023b0c0b6fa1ba6686192d8b9b", - "sha256": "0hdz7adag2m97h07j3llzdnwwg2dp6n2q46hx7klp3khdlgrh2z1" + "commit": "295e5d5b16fd96ed476ea55efa60819515daafef", + "sha256": "1fgqzwg1p9by1zqhhdvh8g25wdig6d9d4p5ish70qij46gvaf7a0" } }, { @@ -95676,15 +97525,15 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20190913, - 1524 + 20191127, + 2116 ], "deps": [ "s", "seq" ], - "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", - "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" + "commit": "7b044003150ee39505234080b86f474c60ad3471", + "sha256": "1y544fff80cjdzx9js5fwqnicdc75k5kn6i0hl6ns0cr6779b3z2" }, "stable": { "version": [ @@ -95713,8 +97562,8 @@ "deps": [ "cl-lib" ], - "commit": "283b35e33f012657ef23e154b6bdf362377d82e6", - "sha256": "1s0vnsvhlcx1z5sbiyhk4iizakx4cbvjxwygdamrl8s0bnigqhfd" + "commit": "3728d3a60c600d7ac505ce281cd2579a8992c14d", + "sha256": "16gb7fcgz2akd78hxi8fy0h62957xfrgqb7flw8hkrixxi26jxyn" }, "stable": { "version": [ @@ -95901,8 +97750,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20190930, - 1027 + 20191116, + 1730 ], "deps": [ "ace-link", @@ -95910,8 +97759,8 @@ "swiper", "zoutline" ], - "commit": "69790b0405e794c4507882fa944d6dafdcca84d8", - "sha256": "1iklq4k3b61ivf1as992mvy27x0b9f71h813r2n06m27p2fmx2br" + "commit": "b1fb5771c4a3a47b628b8c349595c4ace347113b", + "sha256": "0s6c91r48cr306dh7pf3jlrkjvjbipxvv7936h8q8a8l97y3a5wv" }, "stable": { "version": [ @@ -96094,25 +97943,25 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20190406, - 2135 + 20191208, + 2351 ], "deps": [ "visual-fill-column" ], - "commit": "ebe522ba5a0367cf82ed03ffeb63fe597b84f4a1", - "sha256": "0w2lmkkij79khjpswk2zxj371fa9ws94j9dqzrgzf37lnimgnsff" + "commit": "fa17eb651102502f60086d62784f1dae15c0630d", + "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8" }, "stable": { "version": [ 3, - 8 + 9 ], "deps": [ "visual-fill-column" ], - "commit": "ebe522ba5a0367cf82ed03ffeb63fe597b84f4a1", - "sha256": "0w2lmkkij79khjpswk2zxj371fa9ws94j9dqzrgzf37lnimgnsff" + "commit": "fa17eb651102502f60086d62784f1dae15c0630d", + "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8" } }, { @@ -96146,11 +97995,11 @@ "repo": "josteink/wsd-mode", "unstable": { "version": [ - 20180807, - 1130 + 20191031, + 1211 ], - "commit": "0583df8efb742c90dc56df00f9714e13512cf6d9", - "sha256": "0f90qm5zx7lkyvaz519fln4hijfyammc675105f19492h1bc1bva" + "commit": "b87dee6d2d21fc868a3fae35bbd3f08910ad57e0", + "sha256": "1phxq59nsxw6zx1v097j9iqm54am9pln2wzcszsxj2ipjskiz7xn" }, "stable": { "version": [ @@ -96200,20 +98049,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20191016, - 2324 + 20191219, + 418 ], - "commit": "2483a797763a9839a5dc942906e65f574dadd502", - "sha256": "1y1wprcdbm5iwz7496pbcdq3hbsrf4hfqkplpyminj94f4ac3pcy" + "commit": "95c417f49321071645214a5774209393f0db3dbd", + "sha256": "1scw0lzbix4ifh0mkh20wbb4a9h32n8ncpxnlxwdim8z4b469w11" }, "stable": { "version": [ 0, 0, - 5 + 6 ], - "commit": "2483a797763a9839a5dc942906e65f574dadd502", - "sha256": "1y1wprcdbm5iwz7496pbcdq3hbsrf4hfqkplpyminj94f4ac3pcy" + "commit": "dc56b11e0f5c4e4a121e6ac72523fa0e6cae4c02", + "sha256": "0mjvdj9j1l27i5nmam087fig6183awbn6xnib4wrrfbyc6q4qxlw" } }, { @@ -96369,11 +98218,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20190223, - 716 + 20191226, + 2348 ], - "commit": "cc8b3bc26998bc29f82e87667c0d1ef90894ff66", - "sha256": "19q20mp5gzkm0ch5wz1jxajkb8cqmknsldlzb7jsa8hzyvl2mb7m" + "commit": "b3702573524c8bde14a6eb32cf2da20cfa0a0bbf", + "sha256": "10rlpd8jxndv3pg2vafq3dgpfifzdid1377agmxr5m646n8a4ddf" } }, { @@ -96605,6 +98454,36 @@ } }, { + "ename": "xml-format", + "commit": "5e4df4dc715884132a7c409e041b303eeb727f18", + "sha256": "1xk3236m497n345i95l1k0xpyb7v8h3mar36j7yjjwxavjrh8ygg", + "fetcher": "github", + "repo": "wbolster/emacs-xml-format", + "unstable": { + "version": [ + 20191011, + 1148 + ], + "deps": [ + "reformatter" + ], + "commit": "2861c4e33e18b077112efa072316b031bca4236c", + "sha256": "1g0v5ir6nwpamnwvq509d1s1s60n0s5p2lvqqm0n0rk9r753cqkh" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "reformatter" + ], + "commit": "2861c4e33e18b077112efa072316b031bca4236c", + "sha256": "1g0v5ir6nwpamnwvq509d1s1s60n0s5p2lvqqm0n0rk9r753cqkh" + } + }, + { "ename": "xml-quotes", "commit": "ab315d783765730aceab43b4fd8c4872a1f1cc05", "sha256": "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq", @@ -96674,11 +98553,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20160319, - 1612 + 20191124, + 2312 ], - "commit": "f5d185da46414c0509ebd0aa0fab416becf94612", - "sha256": "178bdfwiinhf98qm88ivmgy6rd0qjx5gnckkclanybva0r8l6832" + "commit": "80f30becf860db4277e71e3445994fccaf35ba98", + "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" + }, + "stable": { + "version": [ + 1, + 21 + ], + "commit": "80f30becf860db4277e71e3445994fccaf35ba98", + "sha256": "0vs8l739104s3zqmqna4m0n0pkz4m04mivx6r9iqdjmg4khh6bfi" } }, { @@ -96697,6 +98584,21 @@ } }, { + "ename": "xonsh-mode", + "commit": "f408aee5da4eadd8f4550893336f6decf00c9281", + "sha256": "15bb2zz9rb7bn0wrwhpi46f9knfr8hbjl9drks6xma3ln7nvrn9v", + "fetcher": "github", + "repo": "seanfarley/xonsh-mode", + "unstable": { + "version": [ + 20191214, + 114 + ], + "commit": "01819823822b6ebe01c02af548276cb2deb343f4", + "sha256": "043ijxkab06zlag9hsd0xdw5bxqi6n8sd10zr62f7drwchmw9ln0" + } + }, + { "ename": "xquery-mode", "commit": "e8ea1c9e26963f290d912df21b81afd689543658", "sha256": "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg", @@ -96799,14 +98701,14 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20191002, - 2158 + 20200103, + 1327 ], "deps": [ "cl-lib" ], - "commit": "12296bb1f0166a81b7e602493ed81e04d3381989", - "sha256": "1vab02yjcycvzkyzxpks048mmda89ssvb9bghigw1h20c7zk9x5j" + "commit": "4b21b619841c93c4700039a93eb1881beee9248c", + "sha256": "1v4i74xdp26k9r1nvbdz625l62acvfb2kkp1nvld05p6xkh0q68z" }, "stable": { "version": [ @@ -96954,21 +98856,6 @@ } }, { - "ename": "yahoo-weather", - "commit": "ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f", - "sha256": "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0", - "fetcher": "github", - "repo": "lujun9972/yahoo-weather-mode", - "unstable": { - "version": [ - 20181026, - 320 - ], - "commit": "1d2db14daa1706e03dfe4379397eb89234a56400", - "sha256": "01hydsjj427j4xyy8cwiz5kn67vwwi1qnih5qfyw04w29r9njh1n" - } - }, - { "ename": "yahtzee", "commit": "200169fdabce0ae3a2ecb6f4f3255c15ec3ed094", "sha256": "1fnywiami9mszagmms27dmak6chcichdi7q70x5c6aimc4jb98jk", @@ -96979,8 +98866,8 @@ 20171022, 1412 ], - "commit": "7cea3314ad9f1f00543afb578c97e45acbfc3fa7", - "sha256": "1mh0imhk9n6as7rz959r3wak0ivg8cyxpqk0bkx67gc7p6l573zy" + "commit": "f13ba9d613c0edaa23fac57721529cf41413353f", + "sha256": "1ijacfcz2b7cmgxfyx9b7yhs9nybv19388fb9y0527nhbnjls4v4" } }, { @@ -97036,11 +98923,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20190625, - 1740 + 20191127, + 2314 ], - "commit": "5b4a0db384f996554454b5642e4531c502421de8", - "sha256": "18g064ardqi1f3xz7j6rs1x9fvv9sn0iq9vgid8c6qvxq7gwj00r" + "commit": "cecf4b106b0c4236931b14919fdf87ff3546e2c9", + "sha256": "10dz6zz5mhf09wnhqag93zvdcnh6zyizpsdj189jgza58dq2vp1v" }, "stable": { "version": [ @@ -97117,11 +99004,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20190904, - 1507 + 20191228, + 1345 ], - "commit": "2f110f4aacb00c58439385cabb18cfaa8d759e64", - "sha256": "1hwmap0z4jjfs5lwmr0zrybzvx49qbqa957wg21l8h31pq40d3k5" + "commit": "0230b1dd2477673ba45a7c07da6bac15414f10cd", + "sha256": "01007dz4lxv50qkcb3z4z5ibc0jkqw79hyxg7qfjdar8157ylb2s" }, "stable": { "version": [ @@ -97140,11 +99027,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20180830, - 733 + 20191103, + 2100 ], - "commit": "b858225e1debe6734ee718e5c3c209152652a8b3", - "sha256": "16bpshqk47slcifx9v70ka202lnbspkcjdl5npxpf12abc1syh06" + "commit": "530ca2b589070edfe9bd59034af55c924d03b83a", + "sha256": "14f2zfb4l3fd2sry7b3cjzk0bhdfsmwjqsc25zaf2y5dy0ryllds" }, "stable": { "version": [ @@ -97217,11 +99104,11 @@ "repo": "anachronic/yarn-mode", "unstable": { "version": [ - 20170709, - 1937 + 20191208, + 2153 ], - "commit": "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b", - "sha256": "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424" + "commit": "218cdb3c53d740b4520c807cb0d8479bfecedaed", + "sha256": "0pf98jkz8k4gyc650wwfhww6gli847hmxb8lrnmw50yb88dqa38f" }, "stable": { "version": [ @@ -97266,14 +99153,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20191009, - 216 + 20191222, + 2206 ], "deps": [ "cl-lib" ], - "commit": "a66f15e6c975a4370877df272c1ae87490835d28", - "sha256": "0ypjl44fr36n4xj3sx51v4z4arslfqdqfqyhmi9dmd3nm5fqr6f7" + "commit": "3bf9a3b1af37174a004798b7195826af0123fa6a", + "sha256": "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv" }, "stable": { "version": [ @@ -97314,25 +99201,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20191010, - 1106 + 20191230, + 1405 ], "deps": [ "yasnippet" ], - "commit": "a34020042ccc1fdf8b30910dfb937462f4349db6", - "sha256": "1a2ikwkih1hjmjlvpjffbbnkvdsgpk70v4gjlb0ph14169sja6x4" + "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", + "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" }, "stable": { "version": [ 0, - 16 + 20 ], "deps": [ "yasnippet" ], - "commit": "c5ddec3a3c0ab2eb045e54709f6852467a90d4c3", - "sha256": "0k60ll62daszn6pbhldcdngp548kxx2vyrd6j8awzfwi97cjbi8a" + "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", + "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" } }, { @@ -97372,11 +99259,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20191005, - 346 + 20191226, + 351 ], - "commit": "80692d8b8828a36ad44e8fe6b8d2c1d423898e05", - "sha256": "1zk5s5w2b4w78ah99j048nskailb1c00h2lm0m8ddvrmxgjl8nwv" + "commit": "89a13c59674f57dc057594117f2dc929500e82a0", + "sha256": "1si880lg2idb088c7hywyyrkrm3by3f957kjgd28r4zv8d2z0k0p" } }, { @@ -97439,8 +99326,8 @@ "request-deferred", "s" ], - "commit": "6f4f7384b82203cccf208e3ec09252eb079439f9", - "sha256": "1bl86x8nqw4jqzb8pfm6hm316hmk1bx8v3qz7wq9z92hb67ck2kn" + "commit": "bc81b992f79100c98f56b7b83caf64cb8ea60477", + "sha256": "0kwm5q2sv2xrsmnr0gc2fimp6b2cvwh5mhqsmcc3lgs32m4j1kwv" }, "stable": { "version": [ @@ -97493,14 +99380,14 @@ "repo": "alphapapa/yequake", "unstable": { "version": [ - 20190921, - 225 + 20191121, + 1726 ], "deps": [ "dash" ], - "commit": "d1f24c1cb49ca4b23fa2a639136ec58ab620cd1f", - "sha256": "1fzy4xfyfjrlsc8jzryqp75qz6i623173qa1w5n6knwdn4hgh4r1" + "commit": "16dd29c68f4b59ee2da7b7c13d17a687c9c79e16", + "sha256": "1mgnnbss3id8hnas69gc91v2ni3fjy93wn1fjmmw5qq1gl56bgqc" } }, { @@ -97584,8 +99471,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20190916, - 313 + 20191227, + 242 ], "deps": [ "chinese-word-at-point", @@ -97593,8 +99480,8 @@ "popup", "pos-tip" ], - "commit": "c8c76a1584c9a39ab5df7bba3ba3c728cbd30bb2", - "sha256": "07vngrn17x91anhwvnaa7ryfipgszipaghnj1404yik9w9j9mff9" + "commit": "a745e3197cf3498244265efab8e1cc1f4fedcddc", + "sha256": "0b74crwlslvl4hvjai6a5cphxy9rjnlkhjdlfprqf7s1ygycy1m0" }, "stable": { "version": [ @@ -97689,6 +99576,21 @@ } }, { + "ename": "zen-mode", + "commit": "42911a6fe084d88ed12fb87e0e03f7a6f176ec6c", + "sha256": "1fr6bp60jbv7dkhkwqk83d8g139rsfk95ljyjch5xvhl1bj0jmwg", + "fetcher": "github", + "repo": "zenlang/zen-mode", + "unstable": { + "version": [ + 20191224, + 706 + ], + "commit": "3d34bce20c1d7d35b99916672ea0dd67a96c7716", + "sha256": "1ykc58imkrhk4ib8mdgs7q7qrjbj84bm0rgfpgqk0dkfy16daj2q" + } + }, + { "ename": "zenburn-theme", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9", @@ -97696,11 +99598,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20191016, - 655 + 20200105, + 1010 ], - "commit": "2f4f6e7d0bc37f1a99ab14bb4506a0e53d359da5", - "sha256": "0zhj7fak79x4n0spz8vapk5njjhc649ys27v81jncsac6877fs56" + "commit": "eaaba83ce08e8afff5f4c8dd6be0921ef34f9cef", + "sha256": "1a02cpm0j9x59f864nkhbv4acr111kmrwdv4myd33m0yf31x9ilr" }, "stable": { "version": [ @@ -97785,6 +99687,36 @@ } }, { + "ename": "zero-input", + "commit": "5dad98623a72d61e1421abbe859e5f8764381751", + "sha256": "1av9qd2ggngrb23z3v9rwxnr8calmybis96ja7xfs5z8gnky5bhz", + "fetcher": "git", + "url": "https://gitlab.emacsos.com/sylecn/zero-el", + "unstable": { + "version": [ + 20191110, + 910 + ], + "deps": [ + "s" + ], + "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4", + "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56" + }, + "stable": { + "version": [ + 2, + 0, + 7 + ], + "deps": [ + "s" + ], + "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4", + "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56" + } + }, + { "ename": "zerodark-theme", "commit": "d00b78ead693e844e35c760fe2c39b8ed6cb0d81", "sha256": "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9", @@ -97814,6 +99746,24 @@ } }, { + "ename": "zetteldeft", + "commit": "c643adaf73e8324092874887636cdf0365c481ee", + "sha256": "1vd70mrwn9cfalmiv97ja79hbdmyl5bm9cqsz5c276gk6v6pzvpc", + "fetcher": "github", + "repo": "efls/zetteldeft", + "unstable": { + "version": [ + 20200105, + 1705 + ], + "deps": [ + "deft" + ], + "commit": "fbd9c3f619548aab0bff088c2682e5c70b4c2fcd", + "sha256": "1q6j3aqrrfmv1jdsg51vx1vby5rjb06cx76a8jlvlcc8fgmb4s45" + } + }, + { "ename": "zig-mode", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", "sha256": "1kg1x0l65nqqpzn5np41ya9khr1yqcg5ki7z3jw0g4wxdbz7lrbx", @@ -97829,6 +99779,28 @@ } }, { + "ename": "zim-wiki-mode", + "commit": "a10d6b0fb4d5b87d7dea1bbc4e4e0495aa51627c", + "sha256": "188g8jf5004amq10gm7p9w1m1ff67l8sxlp1m38wpkivhkgfxzcb", + "fetcher": "github", + "repo": "WillForan/zim-wiki-mode", + "unstable": { + "version": [ + 20191208, + 2241 + ], + "deps": [ + "dokuwiki-mode", + "helm-ag", + "helm-projectile", + "link-hint", + "pretty-hydra" + ], + "commit": "030fb78600a6782f8746fe547b979bcc9a24f0ed", + "sha256": "0b3rd83mbpyf782jnfv2yfhfq2ffps3wbn31iblyydmv790lpdvx" + } + }, + { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0", @@ -98024,11 +99996,11 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20190523, - 1300 + 20200106, + 1204 ], - "commit": "e2aad25dfd334299a7e53df21796b8652142c5b5", - "sha256": "0nr21gmji24bn5j73hrl8qy9llv3cmc9w5j30pcnsi4zi2svh9gc" + "commit": "4d4b6d9feca600f9cc0f0dec2e8988c3a07f9189", + "sha256": "0fxks1508ah0c3i2j454cjapc2k5fq4akvhjzz9lj04wwhjxilgg" }, "stable": { "version": [ @@ -98150,8 +100122,8 @@ "deps": [ "request-deferred" ], - "commit": "23a4a9f74a658222027d53a9a83cd4bcc583ca8b", - "sha256": "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c" + "commit": "1578e7fd82cb09a7a4349fd8e4d59f16d0ed7074", + "sha256": "0ynaz90an0ar4r5yjmjy2nvv00gg0qslshnqg15n6j7gkq1zg1rd" }, "stable": { "version": [ @@ -98227,17 +100199,17 @@ }, { "ename": "zprint-mode", - "commit": "125f6358dd8d715b61b12de5d39215453e53ea10", - "sha256": "07ziwnk1c620s7rp42fylpw5vgin0p7aapp3g8aif60vcb8g3m7y", + "commit": "188d40daec1ff86dcfa807a91eb77a1281de3951", + "sha256": "1dwf941plwxib96n4g95pm51hhhaq643djn1hps8s7yyrzz77czz", "fetcher": "github", "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20181111, - 1945 + 20191130, + 1829 ], - "commit": "e1a7b7fe48e36e5cdf1269ab394d3cf779fdab58", - "sha256": "1ayw2ni49fvks6xaiqkvyn3rbkfw49kxhrnd2vnvcn7qhajbh435" + "commit": "4d0dd23b40155618181d9d1e4c82849e0d73b659", + "sha256": "0im63h7ang7zypzbf45k5pxz11svyyk8pab9d4qg9jsb7bz9v7k0" } }, { @@ -98248,14 +100220,14 @@ "repo": "fourier/ztree", "unstable": { "version": [ - 20180512, - 1850 + 20191108, + 2234 ], "deps": [ "cl-lib" ], - "commit": "c54425a094353ec40a8179f9eab3596f76c6cf94", - "sha256": "0j8fpxds8m1zi04nrs8vv21091abvh4n8ab76f1sgdxnp4l5cfb0" + "commit": "0a5b25f364490a58ef7371534a39c75d11f54132", + "sha256": "0a0p9srdkc79isw99al3vba50vc435654wix07r9jcgdh856zbsr" } }, { diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix new file mode 100644 index 00000000000..bcd947983a3 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -0,0 +1,22 @@ +{ fetchurl, stdenv, trivialBuild }: + +trivialBuild { + pname = "sv-kalender"; + version = "1.9"; + + src = fetchurl { + url = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; + sha256 = "0kilp0nyhj67qscy13s0g07kygz2qwmddklhan020sk7z7jv3lpi"; + postFetch = '' + echo "(provide 'sv-kalender)" >> $out + ''; + }; + + meta = with stdenv.lib; { + description = "Swedish calendar for Emacs"; + homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; + platforms = platforms.all; + license = licenses.gpl3Plus; + maintainers = [ maintainer.rycee ]; + }; +} diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index 42edb7c707e..e4643102f0e 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { done ''; - installTargets = "tags install"; + installTargets = [ "tags" "install" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2862ba7184f..98653517b5e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { done ''; - installTargets = "tags install"; + installTargets = [ "tags" "install" ]; postInstall = '' mkdir -p $out/share/emacs/site-lisp diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index d32a3fb5f1b..ab149131b80 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { }; src = [ ftesrc ftecommon ]; - buildFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; - installFlags = "PREFIX=$(out) INSTALL_NONROOT=1"; + installFlags = [ "PREFIX=$(out)" "INSTALL_NONROOT=1" ]; meta = with stdenv.lib; { description = "A free text editor for developers"; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix new file mode 100644 index 00000000000..7187a2df80c --- /dev/null +++ b/pkgs/applications/editors/glow/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "glow"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = "glow"; + rev = "v${version}"; + sha256 = "0q35napi1aa6dfrqz26hvhzijymb9sxsf3mrrn1mh7ssgkhvmqqc"; + }; + + modSha256 = "07imn9p0s79x1h45dk05hjcm6946d84j6k5pnljqrz4zk64hy26c"; + + buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; + + meta = with lib; { + description = "Render markdown on the CLI"; + homepage = "https://github.com/charmbracelet/glow"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry filalex77 ]; + }; +} diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index a6437f070b9..c87694321f3 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk"; }; buildInputs = [ ncurses ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=stringop-truncation" ]; patches = [ # gcc7 compat (fetchpatch { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) ]; - + meta = with lib; { description = "ncurses-based console hexeditor written in C"; homepage = https://github.com/LonnyGomes/hexcurse; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 48af3c9b014..3286e342744 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -150,7 +150,7 @@ let with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; - maintainers = with maintainers; [ schristo ]; + maintainers = with maintainers; [ schristo ma27 ]; platforms = platforms.linux; }; }); @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.2.5"; /* updated by script */ + version = "2019.3.2"; /* 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 = "0p0shikhf73ayflv5bm212kz06hiy3brww9h9ijjp6lcadxc9pmf"; /* updated by script */ + sha256 = "0aksix22cbbxny68650qxjbbm1fmgbsnp97qix5kl5nx4y4yvlii"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.2.6"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0g57njcklyskadxmvwb0r0z3ckq9qmcwh8qd80w396gj8fgbg50g"; /* updated by script */ + sha256 = "1h7va6x625kxc2i22mnya64b1kb4vl5xgjxrv3lqwz725q5hkrxa"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0rkyw3532qvr6jhr09m3h0ssdy5ilfgfvqqliyf0cacwzw9lfv0p"; /* updated by script */ + sha256 = "1lj5i71nw2m9xwv6q48b86kipiwj927bxiwxppb4isqax2w6250d"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "012vmclx6kg85gffgc9mr3fp1ffgx20dz7xvafk7c1iynawx8wgq"; /* updated by script */ + sha256 = "0285jdh350dalvk76ajy57mi1yg1g905cnfhcjlb465bsxaw0z5n"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "09mz4dx3zbnqw0vh4iqr8sn2s8mvgr7zvn4k7kqivsiv8f79g90a"; /* updated by script */ + sha256 = "0rb726nh2c7zxnpjcf6fyrpl29y9wgr6qhpb6hjxia2gzxab9jz0"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1bx8s4hh96pjfyccldwfarwv5fky6kg2kyc0h2arhfzwq1pbaisl"; /* updated by script */ + sha256 = "170ppd0inn3s1yxd5ybspzgx2il78838z900fpg2pznq2hi0rn2h"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.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 = "00dl3yx13lw8qyc23dirw96vm2d8c6zsx73ds1ha8zycfh6hkxf8"; /* updated by script */ + sha256 = "1cph2v7gaxikrvvdaz7ihk17qgdzrn86jamik9fijb8sjli3695v"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.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 = "14ab1cvypanwwn0k1hrx3rl964av6pvridgc19z49idw5wpgxgw7"; /* updated by script */ + sha256 = "1bjijwc5f1is2920b497d395ckswhpxilmxaljb6pjwq4a2k8yzx"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.3.1"; /* 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 = "13br6zmqpvi9hcd6wdnalkhj50gzr7cwrdh4v2bpda77iby2pz93"; /* updated by script */ + sha256 = "0cs8fc3h6d2m84ppiqjy0f3xklpc5gf0i6c4bzv04y8ngh0cwgl2"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1dqp222zvi8ikqdkprmqihyjxiq90vd0a0zl5935xjg1mzf8ald9"; /* updated by script */ + sha256 = "0xadjx4szd9rk3bl3fqzhnfq744gmkbz9li80j5rqm27qhf4axfx"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.2.4"; /* updated by script */ + version = "2019.3.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0iz9qgrbhn1rxr8n5q1y7klfs27j1f55pw8hqbl2ln4df94zqi5j"; /* updated by script */ + sha256 = "0qjqd1a44mdlpvv3l4sx2n5clirwxialzh6s2dlb0dibx8zvnckp"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 70b2d3c148d..2682c1e789b 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sed -i 's|liblldb LIBLLDB_LIBRARIES|liblldb LIBNOTHING|g' CMakeLists.txt sed -i 's|> arguments;|> arguments; ${lintIncludes}|g' src/source_clang.cc ''; - cmakeFlags = "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so"; + cmakeFlags = [ "-DLIBLLDB_LIBRARIES=${stdenv.lib.makeLibraryPath [ llvmPackages.lldb ]}/liblldb.so" ]; postInstall = '' mv $out/bin/juci $out/bin/.juci makeWrapper "$out/bin/.juci" "$out/bin/juci" \ diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 19fef1c42dc..35efe76cfb2 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "12j0l2k6ii9ajp90lil3apk0xsz56cb549ighabik73a1w3c6ib6"; + sha256 = "0p532r0ld6j6fpwqyf9m5m0d27y37chgbvcjp1x6g5jjvm7m77xk"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 7723b9482a2..0f15a63be7a 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1iq4lxbl8gq4qvydyz34ild4izw21cp22adlz9dc054v0wis331j"; + sha256 = "1xzk0zgbc4nnz8gjbhw5h6kwznzxsqrg19ggyb8ijpmgg0ncxk8l"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 21b469347df..ed5017a0487 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.4.5"; + version = "5.4.6"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j"; + sha256 = "01jmrmwbc1hrvq7jdfcc7mxl03q2l6kz57yca2j26xwyvfcfv5sz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 7b2992201fc..4197792d736 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.6"; + version = "4.7"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1s98jsvkfar6qmd5n5l1n1k59623dnc93ciyvlhxjkvpad0kmb4v"; + sha256 = "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -38,15 +38,6 @@ in stdenv.mkDerivation rec { (stdenv.lib.enableFeature enableTiny "tiny") ]; - patches = [ - (fetchurl { - # fix compilation on macOS, where 'st_mtim' is unknown - # upstream patch not in 4.6 - url = "https://git.savannah.gnu.org/cgit/nano.git/patch/?id=f516cddce749c3bf938271ef3182b9169ac8cbcc"; - sha256 = "0gqymvr5vxxypr7y3sm252rsi4gjqp597l01x0lkxyvxsn45a4sx"; - }) - ]; - postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 4ff8c759a26..e1d1fa3070a 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "nedit"; version = "5.7"; - + src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/${pname}-${version}-src.tar.gz"; sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; @@ -14,9 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xlibsWrapper ]; buildInputs = [ motif libXpm ]; - buildFlags = if stdenv.isLinux then "linux" else - # the linux config works fine on darwin too! - if stdenv.isDarwin then "linux" else ""; + # the linux config works fine on darwin too! + buildFlags = stdenv.lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index b3e2ed51015..2fff5cdce85 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -2,7 +2,6 @@ , libuv, lua, ncurses, pkgconfig , unibilium, xsel, gperf , libvterm-neovim -, withJemalloc ? true, jemalloc , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc) @@ -50,8 +49,7 @@ in ncurses neovimLuaEnv unibilium - ] ++ optional withJemalloc jemalloc - ++ optional stdenv.isDarwin libiconv + ] ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] ; @@ -92,16 +90,11 @@ in hardeningDisable = [ "fortify" ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=${jemalloc}/lib substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; postInstall = stdenv.lib.optionalString stdenv.isLinux '' sed -i -e "s|'xsel|'${xsel}/bin/xsel|g" $out/share/nvim/runtime/autoload/provider/clipboard.vim - '' + stdenv.lib.optionalString (withJemalloc && stdenv.isDarwin) '' - install_name_tool -change libjemalloc.1.dylib \ - ${jemalloc}/lib/libjemalloc.1.dylib \ - $out/bin/nvim ''; # export PATH=$PWD/build/bin:${PATH} @@ -126,7 +119,7 @@ in # those contributions were copied from Vim (identified in the commit logs # by the vim-patch token). See LICENSE for details." license = with licenses; [ asl20 vim ]; - maintainers = with maintainers; [ manveru rvolosatovs ]; + maintainers = with maintainers; [ manveru rvolosatovs ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 9893c6085a6..aae37b5a262 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.2.3"; + version = "2.4.0"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0g7gs5gigk3krydxdpmscgfr1fms0a6rc6am2y4c5szkgbd1d0ph"; + sha256 = "0jlw0qksak4bdzddpsj74pm2f2bgpj3cwrlspdjjy0j9qzg0mpl9"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index ffe597b00db..c0b97667757 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -101,7 +101,7 @@ let # Only display the log on error since it will contain a few normally # irrelevant messages. if ! $out/bin/nvim \ - -u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \ + -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \ -i NONE -n \ -E -V1rplugins.log -s \ +UpdateRemotePlugins +quit! > outfile 2>&1; then diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index d9c3bd0825d..ceb119a5f0a 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.0.3"; + version = "2.0.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "13l8z3bchha4ax14s48pcqdxh8gnj4mlvv06lk9dwk9fplc93821"; + sha256 = "1gij5gqidzvwym7yq5fx0344n4fkydx5diwz8g8kwkcsz7z1w45a"; }; nativeBuildInputs = [ @@ -39,6 +39,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Focus on your writing - designed for elementary OS"; homepage = https://github.com/lainsce/quilter; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 6bb40f0166d..622c4a680f5 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "1xs2wvm9g8vypz25li7rm8m0j4dsdpqpajcvrc756x5m149dxc08"; + sha256 = "1p43xncqb898rgfx4vv1nxy6dj57pvxpc0b5j3kgs58ir70rg1js"; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 8ca3f8cb2a9..91e2427a6c8 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { git python3 ]; - NIX_LDFLAGS = [ "-lz" ]; + NIX_LDFLAGS = "-lz"; postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 71043cb78fe..c45025dd80c 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "0vrj9w5lk3vf6138n5bz8phmy3xp5kv4dq1rgirghcf4hbxdyx30"; + sha256 = "1qnh5g8zkjpjmw2l8spcynpfgs3wpcfcla5ms2kkgvkbdlzspqqx"; }; buildInputs = [ qtbase qtscript poppler zlib ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index e1c939c93c9..26b7ab5a0fb 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0wgjwjh6296vs8awl4rylb5nshj9q9kzxv7j4vlmiabll06mx6gi"; + sha256 = "1hfpjw4fac0kq3n9jqwfzbys6h35qjbh5rpc4jzhlln200h6zvwj"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index ceecfa73ce4..485f1d0dca3 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.2407"; + version = "8.2.0013"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1h23lncm8py0ip8p61y8hivmnd8fzf8xpwpkd73d3a3fpiyd2yx8"; + sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f"; }; enableParallelBuilding = true; @@ -24,7 +24,7 @@ rec { description = "The most popular clone of the VI editor"; homepage = http://www.vim.org; license = licenses.vim; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 equirosa ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9abee88d8b0..663c64ac5de 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l"; - x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm"; + x86_64-linux = "00b6q3rvf9v993i8d1vh9ckb86s655mz6kqkw0lxg8xmhpm568ra"; + x86_64-darwin = "1r4qbjbypdqx9qmycykgkrg8anckicmdmawwwsszgkdd0zd5idgg"; }.${system}; in callPackage ./generic.nix rec { + # The update script doesn't correctly change the hash for darwin, so please: + # nixpkgs-update: no auto update - version = "1.41.0"; + version = "1.41.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 310d839088d..e7bdacc1390 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1njxa19mzzydz1jacghwmha3dl4a13m9xzzwsb0rbks5zc9a0v7m"; - x86_64-darwin = "0cpd87q0q3i172l4s43s79by42wa9k5pyik3v2z5mq8zpms8qcq4"; + x86_64-linux = "0n4wcg072a0b76jjv08cig2kygkmakvwav5vvl0h6ww9sbdcwl1x"; + x86_64-darwin = "0xvyh9qypsyzw02vpmnfa0hdszj8ylvf78yjbmg86m4xml0sbj9r"; }.${system}; sourceRoot = { @@ -22,8 +22,10 @@ let in callPackage ./generic.nix rec { inherit sourceRoot; + # The update script doesn't correctly change the hash for darwin, so please: + # nixpkgs-update: no auto update - version = "1.41.0"; + version = "1.41.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix index 0f3cd7d136a..243690bc263 100644 --- a/pkgs/applications/editors/yi/wrapper.nix +++ b/pkgs/applications/editors/yi/wrapper.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; # For hacking purposes - env = yiEnv; + passthru.env = yiEnv; meta = with stdenv.lib; { description = "Allows Yi to find libraries and the compiler easily"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 4000c834602..8734fabfdcf 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; postInstall = '' wrapProgram $out/bin/grass76 \ diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 82c625310e7..21d16282edc 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "OpenOrienteering-Mapper"; - version = "0.9.0"; + version = "0.9.1"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "0wnxj2xf529941dwss6ygb1krfx18lzl6rf67060b0zndc7n6l8f"; + sha256 = "1fyhvf2y89hj7wj89kxccx3dqcja6ndy3w4rx1vmzrp246jpz7wb"; }; cmakeFlags = diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index b30d8f0ad75..de436088fa7 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.0"; + version = "3.10.1"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0qq4dznxxbpj8b4ypkz7dixc0b0v6rmf3c5hs4m3ka3rzck8jsqc"; + sha256 = "0xq0nnp7zdqaihqvh5rsi1129g23vnk5ijkpxfzaggafgmhf5hgz"; }; passthru = { diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index fb06266cdc5..87bddf9099e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ] ++ stdenv.lib.optional useUnrar unrar; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postPatch = ''patchShebangs version.sh''; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index e2a7a9fe5c4..3595908f143 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.0.1"; + version = "4.2.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "13jwxwvwb9nnjxcnh9vfi22n4c00bhdypl84wrpdg5xw9325zhvy"; + sha256 = "06g12gqri1sgfklla6jfpi7wm2qjazakcjs2w2rhrphnl50r6ca7"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index b2060f5db31..2f636764e1f 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Symbian9"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1hrr9lhsbjyzar3nxvli6cazr7zhyzh0p8hwpg4g9ga6njs8vi8m"; + sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 4f4f04af28b..53e04dc7f78 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,16 +3,16 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 -, ocl-icd, pcre, gtk-mac-integration, isocodes +, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: stdenv.mkDerivation rec { - version = "2.6.3"; + version = "3.0.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0"; + sha256 = "7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes ] ++ stdenv.lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd - ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; + ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration + ++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp; cmakeFlags = [ "-DBUILD_USERMANUAL=False" diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 548b004d794..c71e95b21af 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.3.2"; + version = "12.4.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1hh4616dbq0fqldlph7vyl8vkibwc3xpcv9r1m2v949kn84yi2j3"; + sha256 = "1mngn90cn9hixa0xkhk7mb02gjp480wnipjy2jzkq8kwpai1gm1m"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index de7d76ec45f..1eb99a9a7e4 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A light-weight image viewer"; homepage = "https://feh.finalrewind.org/"; license = licenses.mit; - maintainers = with maintainers; [ viric willibutz globin ]; + maintainers = with maintainers; [ viric willibutz globin ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index e4dff59670a..3df7ba493c0 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -63,6 +63,13 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { description = "Find the most beautiful wallpapers for your desktop"; homepage = https://github.com/calo001/fondo; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 2762748bc1a..f729c9c2bba 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; - sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be"; - + sha256 = "1siv54vwx9dbfcflklvf7pkp5lk6h3nn63flg6jzifz9wp0c84q6"; }; preConfigure = '' diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fa29c979b05..0a06c42b5fc 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -48,7 +48,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; patchPhase = '' sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure @@ -141,7 +141,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; src = fetchurl { url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2535f7514f1..5b6dd42e09e 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index e4ab5639ba6..e870df4bc6e 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' make release diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 205376b1257..d82238f925b 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { description = "A fast image viewer"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index f8d50a7c798..76bb0bc1317 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0z35lglf4anfczizynjp8sd1jpix5mkmm1nh39n1v94l7ahjxsww"; + sha256 = "1chmk51xwylnjrgc6hw23x7g7cpwzgwmjc49fcah7pkd3dk1cvvr"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 36afe8dd3e0..ba5ee230ce4 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = https://github.com/cassidyjames/ideogram; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index a87d54459c1..31085cd8023 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc , cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff -, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: +, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: stdenv.mkDerivation rec { version = "0.8.0.6"; @@ -34,14 +34,12 @@ stdenv.mkDerivation rec { buildInputs = [ libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng boost cairomm libjpeg libtiff - ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu + ftgl glew gtkmm2 glibmm gtkglext libXmu ]; #doCheck = false; - NIX_CFLAGS_COMPILE = [ - "-Wno-deprecated-declarations" - ]; + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index bbd2f0b5929..9c4a8b22939 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , boost , cmake , ilmbase @@ -14,15 +15,22 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.0.12"; + version = "2.1.9.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0v3k33jb0glb30jdhq3c732a9dxvnidaclz6b2wpqwik8l3658mj"; + sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si"; }; + patches = [ + (fetchpatch { + url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch"; + sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0"; + }) + ]; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 7225efadebd..c743f8bd653 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "1.8.16"; + version = "1.8.17"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps"; + sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 3df2ab4ab40..f31506ce733 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3"; + version = "0.3.2"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "03v4wc531dwmbjqgs3y3ncdn6g3xirv1w6h1mfgglb6sjll8jxp5"; + sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; }; - modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; + modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 68afdd8694b..14c49d30004 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "photoqt"; version = "1.7.1"; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 1ad51e92d47..7639a2a9c76 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { description = "Powerful image viewer with minimal UI"; homepage = http://www.pberndt.com/Programme/Linux/pqiv; license = licenses.gpl3; - maintainers = [ maintainers.ndowens ]; + maintainers = []; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index c527ce2b229..839a87214e6 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -6,12 +6,12 @@ let pname = "runwayml"; - version = "0.9.0"; + version = "0.10.11"; name = "${pname}-${version}"; src = fetchurl { url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage"; - sha256 = "0rg7ipp7kx0l4qgcymfg5d3saz0c6d2j0c6rf28rwqgbm92gbjjq"; + sha256 = "0f3icgpwj1sk9bkycqw65c8bhrzzpw5yzacw52siv4j1gl4casnl"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 4e8519d17b6..cc5d00d64ec 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -3,56 +3,43 @@ , xorg ? null , vulkan-loader ? null }: -assert stdenv.isLinux -> xorg != null; -assert stdenv.isLinux -> vulkan-loader != null; - -let - graphicsBackend = if stdenv.isDarwin then "metal" else "vulkan"; -in - with stdenv.lib; - rustPlatform.buildRustPackage rec { - pname = "rx"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "cloudhead"; - repo = pname; - rev = "v${version}"; - sha256 = "0f6cw8zqr45bprj8ibhp89bb2a077g4zinfrdn943csdmh47qzcl"; - }; - - cargoSha256 = "05bqsw0nw24xysq86qa3hx9b5ncf50wfxsgpy388yrs2dfnphwlx"; - - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; - - buildInputs = optionals stdenv.isLinux - (with xorg; [ - # glfw-sys dependencies: - libX11 libXrandr libXinerama libXcursor libXi libXext - ]); - - cargoBuildFlags = [ "--features=${graphicsBackend}" ]; - - # TODO: better to factor that into the rust platform - checkPhase = '' - runHook preCheck - echo "Running cargo test" - cargo test --features=${graphicsBackend} - runHook postCheck - ''; - - postInstall = optional stdenv.isLinux '' - mkdir -p $out/share/applications - cp $src/rx.desktop $out/share/applications - wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib - ''; - - meta = { - description = "Modern and extensible pixel editor implemented in Rust"; - homepage = "https://cloudhead.io/rx/"; - license = licenses.gpl3; - maintainers = with maintainers; [ minijackson ]; - platforms = with platforms; (linux ++ darwin ++ windows); - inherit version; - }; - } +with stdenv.lib; + +rustPlatform.buildRustPackage rec { + pname = "rx"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "cloudhead"; + repo = pname; + rev = "v${version}"; + sha256 = "0mhpq9x54d884ydmfv1358sgc4jc7bghfx2y0k7p879hyyxr52v1"; + }; + + cargoSha256 = "0fnrgijfkvapj1yyy9grnqh2vkciisf029af0gfwyzsxzdi62gg5"; + + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + + buildInputs = optionals stdenv.isLinux + (with xorg; [ + # glfw-sys dependencies: + libX11 libXrandr libXinerama libXcursor libXi libXext + ]); + + # FIXME: GLFW (X11) requires DISPLAY env variable for all tests + doCheck = false; + + postInstall = optional stdenv.isLinux '' + mkdir -p $out/share/applications + cp $src/rx.desktop $out/share/applications + wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + meta = { + description = "Modern and extensible pixel editor implemented in Rust"; + homepage = "https://cloudhead.io/rx/"; + license = licenses.gpl3; + maintainers = with maintainers; [ minijackson filalex77 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 92cec3ca82c..0e8a5f34f6c 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -1,5 +1,5 @@ { stdenv -, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng +, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng , gettext, pkgconfig # List of { src name backend } attibute sets - see installFirmware below: @@ -24,7 +24,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ; - buildInputs = [ avahi libusb1 libv4l net_snmp libpng ]; + buildInputs = [ avahi libusb1 libv4l net-snmp libpng ]; nativeBuildInputs = [ gettext pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 377a5ae6168..314b4007aad 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 fftw ]; - cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; + cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; meta = { homepage = https://github.com/Y-Vladimir/SmartDeblur; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index cd9d068b8ac..6d10a7cae23 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lz" ] - ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; + NIX_LDFLAGS = "-lz" + + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix new file mode 100644 index 00000000000..157ef3753e0 --- /dev/null +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -0,0 +1,23 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "yeetgif"; + version = "1.23.5"; + + goPackagePath = "github.com/sgreben/yeetgif"; + + src = fetchFromGitHub { + owner = "sgreben"; + repo = pname; + rev = version; + sha256 = "1yz4pps8g378lvmi92cnci6msjj7fprp9bxqmnsyn6lqw7s2wb47"; + }; + + meta = with lib; { + description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang"; + homepage = "https://github.com/sgreben/yeetgif"; + license = with licenses; [ mit asl20 cc-by-nc-sa-40 ]; + maintainers = with maintainers; [ ajs124 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 8ef705f7ef4..7b14d7750c3 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ./switch.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 40e69f8c9bc..0bfa850cb26 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -146,6 +146,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksudoku = callPackage ./ksudoku.nix {}; ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; ktouch = callPackage ./ktouch.nix {}; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index bb44762e65c..978baa925e5 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, qtwebengine, - kcmutils, kcrash, kdbusaddons, kwindowsystem, + kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, mailcommon, libkdepim }: @@ -16,7 +16,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtwebengine - kcmutils kcrash kdbusaddons kwindowsystem + kcmutils kcrash kdbusaddons kparts kwindowsystem akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit mailcommon libkdepim ]; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix new file mode 100644 index 00000000000..3641c1b3332 --- /dev/null +++ b/pkgs/applications/kde/ksudoku.nix @@ -0,0 +1,18 @@ +{ lib +, mkDerivation +, extra-cmake-modules +, libGLU +, kdoctools +, kdeclarative +, libkdegames +}: + +mkDerivation { + name = "ksudoku"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ libGLU kdeclarative libkdegames ]; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ genesis ]; + }; +} diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f869f984e00..f0501ffadee 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -22,8 +22,5 @@ mkDerivation { outputs = [ "out" "dev" ]; # Fix build with cups deprecations etc. # See: https://github.com/NixOS/nixpkgs/issues/73334 - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=format-security" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=format-security"; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 4b4148bdc63..2db8f7b26f3 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -101,7 +101,7 @@ in buildRustPackage rec { gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz" install -dm 755 "$terminfo/share/terminfo/a/" - tic -x -o "$terminfo/share/terminfo" extra/alacritty.info + tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 68cd91c1676..cda75ac4c05 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Edit the Pantheon desktop application menu"; homepage = https://github.com/donadigo/appeditor; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 8945ffbb384..665198b3d1f 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -9,19 +9,25 @@ assert ncursesSupport -> ncurses != null; assert waylandSupport -> wayland != null; assert x11Support -> xlibs != null && xorg != null; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.1.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Cloudef"; - repo = "bemenu"; - rev = "33e540a2b04ce78f5c7ab4a60b899c67f586cc32"; - sha256 = "11h55m9dx6ai12pqij52ydjm36dvrcc856pa834njihrp626pl4w"; + repo = pname; + rev = version; + sha256 = "03k8wijdgj5nwmvgjhsrlh918n719789fhs4dqm23pd00rapxipk"; }; nativeBuildInputs = [ cmake pkgconfig pcre ]; + cmakeFlags = [ + "-DBEMENU_CURSES_RENDERER=${if ncursesSupport then "ON" else "OFF"}" + "-DBEMENU_WAYLAND_RENDERER=${if waylandSupport then "ON" else "OFF"}" + "-DBEMENU_X11_RENDERER=${if x11Support then "ON" else "OFF"}" + ]; + buildInputs = with stdenv.lib; [ cairo fribidi diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index a3f0a3b84f2..d0af940ac92 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,28 +1,30 @@ -{stdenv, fetchurl, cmake, sword, qt4, boost, clucene_core}: +{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +, qtbase, qttools, qtsvg, qtwebkit +}: stdenv.mkDerivation rec { - version = "2.10.1"; + version = "2.11.2"; pname = "bibletime"; src = fetchurl { url = "mirror://sourceforge/bibletime/${pname}-${version}.tar.xz"; - sha256 = "14fayy5h1ffjxin669q56fflxn4ij1irgn60cygwx2y02cwxbll6"; + sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - prePatch = '' - patchShebangs .; - ''; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ + sword boost clucene_core + qtbase qttools qtsvg qtwebkit + ]; preConfigure = '' export CLUCENE_HOME=${clucene_core}; export SWORD_HOME=${sword}; ''; - buildInputs = [ cmake sword qt4 boost clucene_core ]; - - cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug"; + cmakeFlags = [ "-DUSE_QT_WEBKIT=ON" "-DCMAKE_BUILD_TYPE=Debug" ]; meta = { description = "A Qt4 Bible study tool"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 8c4833be3e6..0af78852204 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -16,11 +16,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.81"; + version = "2.81a"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1prp0f2152f1sz23jlc86vndfvmplb7qhllikkirq7hgpykrshna"; + sha256 = "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j"; }; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e506829b575..d6680c61eb9 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i -e 's/ -Wno-format//g' Makefile ''; - makeFlags = "PREFIX=${placeholder "out"}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Lightweight and fast battery icon that sits in the system tray"; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index d760cee6374..e06ee14a2d3 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.38.9"; + version = "0.38.10"; src = fetchurl { url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; - sha256 = "0xal09ijgxbzvp003s40xbrfnpq3ald1fw8nnpqq3yg7h6g6c5pw"; + sha256 = "1bj83b7lwqir13fp9slcdn8mgign06vywy42x8zvsp22fjn4p7f7"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index ef47e3e0358..cdcfcc00481 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -10,18 +10,17 @@ , glib , gtk3 , libgee -, xdg_utils , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cipher"; - version = "2.0.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "arshubham"; repo = "cipher"; rev = version; - sha256 = "0n5aigcyxnl4k52mdmavbxx6afc1ixymn3k3l2ryhyzi5q31x0x3"; + sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a"; }; nativeBuildInputs = [ @@ -42,12 +41,18 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace data/com.github.arshubham.cipher.desktop.in \ - --replace xdg-open ${xdg_utils}/bin/xdg-open - chmod +x post_install.py - patchShebangs post_install.py + substituteInPlace data/com.github.arshubham.cipher.desktop.in \ + --replace "gio" "${glib.bin}/bin/gio" + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 0601514546f..c09457d2c65 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -5,13 +5,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "coursera-dl"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "coursera-dl"; repo = "coursera-dl"; rev = version; - sha256 = "0dn7a6s98dwba62r0dyabq8pryzga4b2wpx88i9bmp7ja1b1f92f"; + sha256 = "0akgwzrsx094jj30n4bd2ilwgva4qxx38v3bgm69iqfxi8c2bqbk"; }; nativeBuildInputs = with pythonPackages; [ pandoc ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 60598e56539..d0011eee9c1 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "6.3.0"; + version = "6.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "07j2r2kfjhfv8zzzzp5qj3ppx4vv7llpx4lwip6bnjfkh80ny22a"; + sha256 = "0yr79p4vdg6s6c8sry6qnf2ifjcjdapn0sff2crsnz331rsh27sm"; }; installPhase = '' diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 9b877c2594b..7d211b26a42 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' # Version 1.7 was released as 1.6 diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 37ed8eb23fb..957d3ee72bb 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: +{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.1.3"; pname = "diffpdf"; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 1332b265d54..fbe21dd9a5b 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index e7d0e6a63a5..857ef9ac27b 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -59,9 +59,9 @@ stdenv.mkDerivation { ++ optional (uiType == "gtk") gtk2 ++ optionals (uiType == "cocoa") [ AppKit Cocoa ]; - makeFlags = "INSTALLDIR=$(out)"; + makeFlags = [ "INSTALLDIR=$(out)" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6 + NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; meta = with stdenv.lib; { description = "An e-book reader for Linux"; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 26478c7f2ed..b777c3b72e7 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "formatter"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Djaler"; repo = "Formatter"; rev = version; - sha256 = "1ghxd2h0pklhlrjslfr46vza1kjsm3mr0sdzzjiqi9jd6hddnk7i"; + sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql"; }; patches = [ @@ -61,6 +61,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 1a9789114dc..d578479787b 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.11.1"; + version = "1.12.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "08py1f48ylw83712h8313rxz55igbszxcwr2yxkchpr4233avzph"; + sha256 = "013bavyqvnay38c844n1jvirsmj807f0wg2qlclkdghkj316p1pz"; }; doCheck = false; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index baf2f5165d6..5db328072e4 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -4,18 +4,20 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "2.99"; + version = "3.24"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii"; + sha256 = "0yd84ncb6cjrk4v4kz3zrddkl7iwkm3zlfbjyswd9hanp8fvd4q3"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; - propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple]; + propagatedBuildInputs = with perlPackages; [ + HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple + ]; preConfigure = "touch Makefile.PL"; doCheck = false; @@ -33,6 +35,7 @@ perlPackages.buildPerlPackage rec { license = licenses.gpl3Plus; homepage = https://squarepenguin.co.uk/; platforms = platforms.all; + maintainers = with maintainers; [ rika ]; }; } diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index b2a992b850e..aa901a7ba51 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=deprecated-declarations" ]; + NIX_CFLAGS_COMPILE = builtins.toString [ + "-Wno-error=format-truncation" + "-Wno-error=deprecated-declarations" + "-Wno-error=stringop-overflow" + ]; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 7fba1d49d74..3dffc5c77c2 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation -, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools -, qtconnectivity, qtcharts +, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools +, qtconnectivity, qtcharts, libusb , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -16,22 +16,22 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.5-DEV1903"; + version = "3.5-RC2X"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "v${version}"; - sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3"; + rev = "V${version}"; + sha256 = "1d85700gjbcw2badwz225rjdr954ai89900vp8sal04sk79wbr6g"; }; buildInputs = [ - qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib - qtconnectivity qtcharts + qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib + qtconnectivity qtcharts libusb ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; - NIX_LDFLAGS = [ "-lz" ]; + NIX_LDFLAGS = "-lz"; qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; @@ -39,7 +39,14 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + + # Use qtwebengine instead of qtwebkit + substituteInPlace src/gcconfig.pri \ + --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT" ''; installPhase = '' @@ -53,9 +60,6 @@ in mkDerivation rec { runHook postInstall ''; - # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm' - enableParallelBuilding = false; - meta = with stdenv.lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index b80d31cee9a..8ecb546df70 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -29,17 +29,17 @@ GEM sanitize (~> 2.1.1, >= 2.1.1) stringex (~> 2.6) twitter-text (= 1.14.7) - json (2.2.0) + json (2.3.0) kramdown (1.9.0) mime-types (3.3) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.10.5) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) - rack (1.6.11) + rack (1.6.12) rack-protection (1.5.5) rack rouge (2.2.1) diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index e9a177ee193..251e84f04c3 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - inherit pname ruby; - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 080c5b8b098..61e0db781b8 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; kramdown = { groups = ["default"]; @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.7"; }; posix-spawn = { groups = ["default"]; @@ -171,10 +171,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; + sha256 = "1riq0z408dwvqcqrpq05bp2w879l4sjxzb4cbrbx55kpi6h2g1cj"; type = "gem"; }; - version = "1.6.11"; + version = "1.6.12"; }; rack-protection = { dependencies = ["rack"]; diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 60feecd665d..3e4c9828ede 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ python ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/jarun/googler"; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 36ca31707c8..4416e1e62c2 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; meta = { description = "GTK-based audio CD player/ripper"; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 6e6145e7908..c44523a8b75 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix new file mode 100644 index 00000000000..5f403c9b7b6 --- /dev/null +++ b/pkgs/applications/misc/heimer/default.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, qttools, qtbase }: + +mkDerivation rec { + pname = "heimer"; + version = "1.13.1"; + + src = fetchFromGitHub { + owner = "juzzlin"; + repo = pname; + rev = version; + sha256 = "1s6s5rlzr917hq7370pmikbdvd6y468cyxw614ah65d4v105qfv7"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qttools qtbase ]; + + meta = with lib; { + description = "Simple cross-platform mind map and note-taking tool written in Qt"; + homepage = "https://github.com/juzzlin/Heimer"; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 0d25d3d686c..31ecfccd584 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hstr"; - version = "2.0"; + version = "2.2"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20"; + sha256 = "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index d6f8983c5ee..69ca6a83764 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.61.0"; + version = "0.62.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,12 +10,12 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1ad70g4gb44dk48pbgk48jzs44b6l7ksxb739ahp7vs1nyvvgffr"; + sha256 = "1rdfx5gv0q64ivyg0ilb96p5nksip9cj75fmvw0bjky9w6i07yd9"; }; - modSha256 = "1jb1iqlp1005aj8smcgznmwnqaysi5g5wcsj8nvvm70hhc9j8wns"; + modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs"; - buildFlags = "-tags extended"; + buildFlags = [ "-tags" "extended" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 31568c7b0fd..cbe26b817e2 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "3.5"; + version = "4.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "0q0m3sskgmjv28gzvjkphgg3yhwzc9w9fj9i342pibb50impjazy"; + sha256 = "1s9291y38k4adc2wqj7plfhj431nf36zs262jm6mmb2fs910ncgv"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index ff0332e1e5f..c4b4fdfd42e 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.167"; + version = "1.0.177"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw"; + url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; + sha256 = "023q3yxqsv0vd76bvfhyhh0pnfia01rflfpyv0i6w6xnb5hm2jp7"; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index a3cbdabeacf..ac46c48d407 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15492"; + version = "15628"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl"; + sha256 = "19yn311h9x1434832i0awpv2n9vhbhkk1j1mi9zggy9f256f80c6"; }; buildInputs = [ jdk11 makeWrapper ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 2a9e162e7ea..1aece5eb4e2 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index aedfff40d70..69d78575e2a 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -65,9 +65,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; installPhase = '' install -D -m 755 k2pdfopt $out/bin/k2pdfopt diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 06fc04ba8fb..bab4c2d0b7d 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools +{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin , curl , glibcLocales @@ -7,7 +7,6 @@ , libargon2 , libgcrypt , libgpgerror -, libmicrohttpd , libsodium , libyubikey , pkg-config @@ -93,7 +92,6 @@ stdenv.mkDerivation rec { libargon2 libgcrypt libgpgerror - libmicrohttpd libsodium libyubikey pkg-config @@ -105,7 +103,8 @@ stdenv.mkDerivation rec { zlib ] ++ stdenv.lib.optional withKeePassKeeShareSecure quazip - ++ stdenv.lib.optional stdenv.isDarwin qtmacextras; + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras + ++ stdenv.lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication; preFixup = optionalString stdenv.isDarwin '' # Make it work without Qt in PATH. @@ -118,6 +117,6 @@ stdenv.mkDerivation rec { homepage = https://keepassxc.org/; license = licenses.gpl2; maintainers = with maintainers; [ jonafato ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 756c8e25971..c435eaefed5 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, python3, fetchpatch }: +{ stdenv, pkgs, python3, fetchpatch, glibcLocales }: with python3.pkgs; buildPythonApplication rec { pname = "khal"; @@ -11,11 +11,14 @@ with python3.pkgs; buildPythonApplication rec { # Include a khal.desktop file via upstream commit. # This patch should be removed when updating to the next version, probably. - patches = [ (fetchpatch { - name = "add-khal-dot-desktop.patch"; - url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch"; - sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c"; - }) ]; + patches = [ + (fetchpatch { + name = "add-khal-dot-desktop.patch"; + url = "https://github.com/pimutils/khal/commit/1f93d238fec7c934dd2f8e48f54925d22130e3aa.patch"; + sha256 = "06skn3van7zd93348fc6axllx71ckkc7h2zljqlvwa339vca608c"; + }) + ./skip-broken-test.patch + ]; propagatedBuildInputs = [ atomicwrites @@ -35,7 +38,8 @@ with python3.pkgs; buildPythonApplication rec { freezegun ]; nativeBuildInputs = [ setuptools_scm sphinx sphinxcontrib_newsfeed ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest glibcLocales ]; + LC_ALL = "en_US.UTF-8"; postInstall = '' # zsh completion diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch new file mode 100644 index 00000000000..c3c982547ae --- /dev/null +++ b/pkgs/applications/misc/khal/skip-broken-test.patch @@ -0,0 +1,21 @@ +diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py +index 27b7fa5..5978d72 100644 +--- a/tests/ui/test_editor.py ++++ b/tests/ui/test_editor.py +@@ -1,5 +1,7 @@ + import datetime as dt + ++import pytest ++ + import icalendar + from khal.ui.editor import RecurrenceEditor, StartEndEditor + +@@ -19,7 +21,7 @@ palette = { + 'edit': 'blue', + } + +- ++@pytest.mark.skip(reason="Mocking breaks in this testcase") + def test_popup(monkeypatch): + """making sure the popup calendar gets callend with the right inital value + diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 0a65f2532d6..6900f305c0f 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.15.0"; + version = "0.15.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1gh8lcyqpkwvmjxwiq5d43sd43bg3c49fyy2x8drqdzj34gc49qg"; + sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p"; }; buildInputs = [ diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch index 92a65258855..bc1b369d98d 100644 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ b/pkgs/applications/misc/kitty/no-werror.patch @@ -3,9 +3,9 @@ @@ -217,7 +217,7 @@ def init_env( cflags = os.environ.get( 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std={}11' + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' - ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' + ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' ).format( - float_conversion, std, + float_conversion, optimize, diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index f3daedfb96b..d7d23853e11 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.5"; + version = "0.9.7"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1g8a2lmg9agcs2kwbwh6sj9hkrbzad7bkxk39nx5536svnifbg1c"; + sha256 = "1b8yz6r6x46xajx900m8s0sjfwiwbpp6nfb780ygfcz6inb1234q"; name = "${pname}-${version}.tar.xz"; }; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 16bf65262cc..08612850886 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -5,7 +5,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnome3Deps = pkgs: with pkgs.gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -23,7 +23,7 @@ in buildFHSUserEnv { allegro dumb # Desmume - lua agg soundtouch openal desktop-file-utils pangox_compat atk + lua agg soundtouch openal desktop-file-utils atk # DGen // TODO: libarchive is broken @@ -92,12 +92,12 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite + vulkan-loader xdg_utils sqlite gnutls # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e643c212225..08643577b49 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; postInstall = '' wrapProgram $out/bin/merkaartor \ diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 5c31cdf6e72..7b6be997ffa 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -2,22 +2,23 @@ , pkgconfig, meson, ninja, python3 , wrapGAppsHook, vala, shared-mime-info , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive +, discount, gtksourceview3 , hicolor-icon-theme # for setup-hook }: stdenv.mkDerivation rec { pname = "minder"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "1z3if8bbiigb3m5py641y0j8d9z0s6kbb325waxbqs240pcxipml"; + sha256 = "0zma6hjx0068ih7fagb1gg5cgci0ccc764sd8qw6iglg61aihpx7"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; - buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme ]; + buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 0c8ad9ae1b3..b2012801e17 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -61,9 +61,7 @@ stdenv.mkDerivation rec { "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #and configuring ~/.mlterm/key correctly. - ] ++ stdenv.lib.optional (libssh2 == null) [ - "--disable-ssh2" - ]; + ] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; postInstall = '' install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 443fe2f1d6c..531f8d851f1 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -62,10 +62,8 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - NIX_CFLAGS_COMPILE = [ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - "-Wno-error=deprecated-declarations" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 29e768c257f..2263dfc1fbc 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { patches = [ ./CMakeLists.txt.patch ]; - NIX_CFLAGS_COMPILE = optional sdlSupport "-I${SDL.dev}/include/SDL" - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"; + NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" + ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); # we choose only cmdline and speech-dispatcher speech options. # espeak builtins is made for non-cmdline OS as winCE diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index 55538925abd..ed0b7b12e98 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "NSSHARED=${buildsystem}/share/netsurf-buildsystem" ]; - NIX_CFLAGS_COMPILE=[ "-Wno-error=implicit-fallthrough" ]; + NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { homepage = http://www.netsurf-browser.org/; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index da7775769d4..b91f8018c57 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -34,6 +34,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; homepage = https://github.com/lainsce/notejot; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 4568c3e8acc..d75ec9ef2c2 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { libtool ]; - configureFlags = "--libexecdir=$(out)/bin"; + configureFlags = [ "--libexecdir=$(out)/bin" ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 3a0a548be0b..1c5858b5677 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "Creates a cute cat chasing around your mouse cursor"; diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 8ffc8ec69fe..e5838dc1bbe 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -12,17 +12,14 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "GIT_VERSION=$(version)" + "GIT_VERSION=${version}" "GIT_TIMESTAMP=" - "SHAREDIR=$(out)/share/" - "INSTALL_BINDIR=$(out)/bin" - "INSTALL_MANDIR=$(out)/share/man/man1" - "INSTALL_SHAREDIR=$(out)/share/" + "SHAREDIR=${placeholder ''out''}/share/osm2xmap" + "INSTALL_BINDIR=${placeholder ''out''}/bin" + "INSTALL_MANDIR=${placeholder ''out''}/share/man/man1" ]; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; - - installFlags = [ "DESTDIR=$(out)" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; buildInputs = [ libroxml proj libyamlcpp boost ]; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 1adab6b70a3..a44cccf9a9d 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs librsvg pcre ]; - cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; + cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; patches = [ # Fix build vala 0.46 diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 5ce7d06d727..83e45e25581 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "pgmodeler"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "15isnbli9jj327r6sj7498nmhgf1mzdyhc1ih120ibw4900aajiv"; + sha256 = "1wkvg20krfwkziz7skgmwlinx07jm5nl3455payg5brv69zf60kl"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index fcc6ead550a..e1045663a3b 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -24,16 +24,15 @@ assert nlSupport -> ! iwSupport && libnl != null; assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; -let xcbproto-py3 = xcbproto.override { python = python3; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1z1m6dxh2i5vsnkzaccb9j02ab05wgmcgig5d0l9w856g5jp3zmy"; + sha256 = "1ss4wzy68dpqr5a4m090nn36v8wsp4a7pj6whcxxdrrimgww5r88"; fetchSubmodules = true; }; @@ -51,7 +50,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ - cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil + cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index f185524da58..6b68071d4d0 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,5 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , git, gnupg, pass, pwgen, qrencode +, fetchpatch , qtbase, qtsvg, qttools, qmake }: @@ -25,6 +26,16 @@ mkDerivation rec { enableParallelBuilding = true; + patches = [ + # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded. + # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available. + (fetchpatch { + name = "qtpass-Dont-hardcode-pass-otp-usr-lib-path.patch"; + url = "https://github.com/IJHack/QtPass/commit/2ca9f0ec5a8d709c97a2433c5cd814040c82d4f3.patch"; + sha256 = "0ljlvqxvarrz2a4j71i66aflrxi84zirb6cg9kvygnvhvm1zbc7d"; + }) + ]; + qmakeFlags = [ # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7045228d6a2..243913d0a09 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -7,20 +7,20 @@ assert imagePreviewSupport -> w3m != null; python3Packages.buildPythonApplication rec { name = "ranger-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "ranger"; repo = "ranger"; rev = "v${version}"; - sha256= "1ws6g8z1m1hfp8bv4msvbaa9f7948p687jmc8h69yib4jkv3qyax"; + sha256= "1rygfryczanvqxn43lmlkgs04sbqznbvbb9hlbm3h5qgdcl0xlw8"; }; LC_ALL = "en_US.UTF-8"; checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ] - ++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; + ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ]; checkPhase = '' py.test tests diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index 71d79b88f44..ac62ccc00cb 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { dontUseQmakeConfigure = true; + NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated" ]; + # Disable annoying update reminder postPatch = '' sed -i s/'^\s*initUpdater();'/'\/\/initUpdater():'/ src/app/app.cpp diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index eabf77f0e95..d8e600f6019 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper +{ stdenv, lib, fetchurl , autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check @@ -19,23 +19,18 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; - postInstall = '' - wrapProgram $out/bin/rofi-theme-selector \ - --prefix XDG_DATA_DIRS : $out/share - ''; - doCheck = false; meta = with lib; { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ mbakke ma27 ]; + maintainers = with maintainers; [ mbakke ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 8c24d27f075..1c7284a2db2 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,6 +1,5 @@ -{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }: +{ stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }: -if theme == null then rofi-unwrapped else stdenv.mkDerivation { pname = "rofi"; version = rofi-unwrapped.version; @@ -14,8 +13,15 @@ stdenv.mkDerivation { rm $out/bin mkdir $out/bin ln -s ${rofi-unwrapped}/bin/* $out/bin + rm $out/bin/rofi - makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi --add-flags "-theme ${theme}" + makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ + --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ + ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""} + + rm $out/bin/rofi-theme-selector + makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \ + --prefix XDG_DATA_DIRS : $out/share ''; meta = rofi-unwrapped.meta // { diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index c427eda8c77..137ec920f75 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; }; - cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr"; + cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 4f8315f060a..4199e198c53 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -29,6 +29,12 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Friendly SQL Client"; longDescription = '' diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 1829407705b..b3ad833e3f2 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.11.0"; + version = "1.12.0"; sha256 = { - x86_64-linux = "1ljam1yfiy1lh6lrknrq7cdqpj1q7f655mxjiiwv3izp98qr1f8s"; + x86_64-linux = "0y9b4haaj7qxr92wnwacziljqrkf4vlyqq3rvis8ribq6zr5b24w"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -87,6 +87,7 @@ let postFixup = '' makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] }" \ "''${gappsWrapperArgs[@]}" ''; }; diff --git a/pkgs/applications/misc/slmenu/default.nix b/pkgs/applications/misc/slmenu/default.nix index 193bcf205f5..55025621fc7 100644 --- a/pkgs/applications/misc/slmenu/default.nix +++ b/pkgs/applications/misc/slmenu/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchhg}: let - s = + s = rec { baseName = "slmenu"; version = "hg-${date}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchhg { inherit (s) url sha256; }; - makeFlags = ''PREFIX=$(out)''; + makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; description = ''A console dmenu-like tool''; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index a3247b29fb8..b786b34e955 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1f73wvqqvj5pr3fvb7jjc4bi1iwgkkknz24k8n69mdb75jnfjipp"; }; - makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm"; + makeFlags = [ "PKGCONFIG=${pkgconfig}/bin/pkg-config" "binary=stupidterm" ]; installPhase = '' install -D stupidterm $out/bin/stupidterm diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 857dcfaf69f..5a722ffe111 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.3"; + version = "0.10.4"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "12s1v65h4z051k4gi1b5f3z4hpbgqnhkjnz2xv5bdwhs24zxrrif"; + sha256 = "068v63bb1bq6vz7byhnd28l6dmr4jmivailxmjv86wakbsqvlhbi"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index ee516ac97aa..8d58c888748 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig }: +{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig, Security, stdenv }: rustPlatform.buildRustPackage rec { pname = "taizen"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "09izgx7icvizskdy9kplk0am61p7550fsd0v42zcihq2vap2j92z"; }; - buildInputs = [ ncurses openssl ]; + buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 08bea18d8e9..10b487828ea 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ]; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 6b38c3d59c2..a0dc7b7c71e 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -56,9 +56,8 @@ stdenv.mkDerivation rec { cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/ ''; - installFlags = - # kde_locale is not defined when installing without kde. - "kde_locale=\${out}/share/locale"; + # kde_locale is not defined when installing without kde. + installFlags = [ "kde_locale=\${out}/share/locale" ]; meta = { homepage = http://www.taskjuggler.org; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 15c675c902f..e619ab053e7 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -62,6 +62,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Simple Mastodon client designed for elementary OS"; homepage = https://github.com/bleakgrey/tootle; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index a5024cb7f36..3c6c4a87f98 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "vym"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "mirror://sourceforge/project/vym/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1rnrfqlff7wv6yni8bvff8n90pmn82k82zd4sn1jsx9r1n3qsfkh"; + sha256 = "0lyf0m4y5kn5s47z4sg10215f3jsn3k1bl389jfbh2f5v4srav4g"; }; # Hardcoded paths scattered about all have form share/vym diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 002bdef7333..84735feef21 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog +, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z"; + sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -42,6 +42,7 @@ } ) ++ [ "-Dout=${placeholder "out"}" + "-Dsystemd=disabled" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 4cf4792696d..289c60b4402 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -1,25 +1,18 @@ -{ stdenv, lib, fetchhg, pkg-config, wayland, gtk3 }: +{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3 }: stdenv.mkDerivation rec { pname = "wofi"; - version = "2019-10-28"; + version = "1.0"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; - rev = "3fac708b2b541bb9927ec1b2389c4eb294e1b35b"; - sha256 = "0sp9hqm1lv9wyxj8z7vazs25nvl6yznd5vfhmwb51axwkr79s2ym"; + rev = "v${version}"; + sha256 = "147yarm26nl0zc0a2rs7qi4jd7bz48vvyaygsif1qsv8fx0xiqqf"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ wayland gtk3 ]; - sourceRoot = "hg-archive/Release"; - - installPhase = '' - mkdir -p $out/bin - cp wofi $out/bin/ - ''; - meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 6ff09a5b4b0..d4b34e2bb7f 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "A two-pane file manager with advanced file manipulation features"; homepage = http://www.boomerangsworld.de/cms/worker/index.html; license = licenses.gpl2; - maintainers = [ maintainers.ndowens ]; + maintainers = []; }; } diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 441cab3dd7b..b1bf98704c5 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.1.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1lkw7xrj20ppfmv7abki9i60yjks9i7nr8ni9p6n7rilfbp4603k"; + sha256 = "1rwnlhzhasfa2iklrp897c0z7nvav2bz2z6nk41fvwwd3bsay2sf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index aa851e14ab5..c7c10254c0c 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]; + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ]); patches = [ ./parse.patch # Fixes compilation error by avoiding redundant definitions. diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index db952758f04..612e4a557a7 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "MANDIR=${placeholder "man"}/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "A keyboard layout indicator and switcher"; diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix new file mode 100644 index 00000000000..a1e54b50228 --- /dev/null +++ b/pkgs/applications/networking/3proxy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, coreutils }: + +stdenv.mkDerivation rec { + pname = "3proxy"; + version = "0.8.13"; + src = fetchFromGitHub { + owner = "z3APA3A"; + repo = pname; + rev = version; + sha256 = "1k5rqldiyakhwhplazlhswkgy3psdkpxhn85605ncwaqx49qy8vk"; + }; + makeFlags = [ + "INSTALL=${coreutils}/bin/install" + "prefix=$(out)" + ]; + preConfigure = '' + ln -s Makefile.Linux Makefile + ''; + meta = with stdenv.lib; { + description = "Tiny free proxy server"; + homepage = "https://github.com/z3APA3A/3proxy"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.misuzu ]; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index a19e07d8d93..ef0b8ec7619 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.0.0"; + version = "1.1.23"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0mfwwyc00v6kny1fh20kaad8b6sshaxrlf35z9qcdsbm4n19wg1l"; + sha256 = "1kb40h5d76k6p338h75p8lxs0cb88jaasss0cmb7bfc7zykfqmd3"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index c3f5cb13164..2b910fe0c5c 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,14 +1,14 @@ { stdenv, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: let - version = "1.5.2"; + version = "1.6.4"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "0b9aycyif0hfhfkivlnvinr13r9h4qyxx768286966p67napbd63"; + sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l"; }; in buildGoPackage rec { @@ -23,7 +23,7 @@ in buildGoPackage rec { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "1z78kgxrbi2jy20rbq6kx5mjk4gpg58w4rb3flp42l9p7bhdbr2h"; + sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/applications/networking/browsers/browsh/deps.nix b/pkgs/applications/networking/browsers/browsh/deps.nix index fae04b4d6a5..9a6a898beb5 100644 --- a/pkgs/applications/networking/browsers/browsh/deps.nix +++ b/pkgs/applications/networking/browsers/browsh/deps.nix @@ -1,3 +1,4 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { goPackagePath = "github.com/NYTimes/gziphandler"; @@ -49,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71"; - sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7"; + rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } { @@ -103,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; - sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } { @@ -166,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; }; } { @@ -184,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; - sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; + rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; }; } { @@ -260,4 +261,4 @@ sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } -] +] \ No newline at end of file diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7ce1c35e9eb..31e69916196 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -16,7 +16,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core -, jdk +, jre # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -124,7 +124,7 @@ let glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core - jdk.jre + jre ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 3abdef62eef..ef0b5ac0eb6 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.293"; + version = "32.0.0.303"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0rgriqdbyrzpm1bcph35bhzd5dz21yim56z93hkmbpdqg7767dwm"; + sha256 = "0b2cw8y9rif2p0lyy2ir1v5lchxlsh543b9c743a2p85c9p7q62b"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index f107ebffb11..6a4e46e74bd 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1wxw4l4hhk91x7drcamaxvh03ckxwv5567ccmpk743vb74nkd9z1"; - sha256bin64 = "1fzgdfph2jj3rac868y3r0mlgqj740bivrgh1nq51v3ni507366n"; - version = "79.0.3945.79"; + sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g"; + sha256bin64 = "1jfsswjqzdif6824p9a6raw5j9309y61c80kgfq23247vr514ky9"; + version = "79.0.3945.88"; }; dev = { - sha256 = "18ijz7ailnmmz6b9n1jkdj0v8wiqdr845xzi0f7n5xcp4wf7xafk"; - sha256bin64 = "19irp7x44h49cs1wvwv34jl0inwxk0g6vb44p4ab1jmfmdznv9lx"; - version = "80.0.3983.2"; + sha256 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969"; + sha256bin64 = "04fscphs4w6jb1kdc25jc568r3k4x3nmg0apggjfnbdwzb5zkmf2"; + version = "80.0.3987.16"; }; stable = { - sha256 = "1wxw4l4hhk91x7drcamaxvh03ckxwv5567ccmpk743vb74nkd9z1"; - sha256bin64 = "0dygich61ldy20bqcc84c396vkarmjp1syhyslzkg9kwn9xzr7gb"; - version = "79.0.3945.79"; + sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g"; + sha256bin64 = "1k44fnn41n73j1lff4h8s8f79pw8w180n467lwff4g9izh6c2blz"; + version = "79.0.3945.88"; }; } diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index d5a1063a688..ce0617b8d3f 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "The always-incognito web browser"; homepage = https://github.com/cassidyjames/ephemeral; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index cdd6415fc41..32681750455 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "72.0b4"; + version = "73.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ach/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ach/firefox-73.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "10778f9e5d8514bcfa645b677fc5fd67af9adfbb425eaccc28698a02e628e96e47a14c7d90d5e30ab7a4a8a2787ff6d9c28dea4a53760843421d56f7cf8374df"; + sha512 = "47987892d0fd833240debe8e514caf6dd5b6c386bbbf7cb5823199e1096a8ab7fe6e2bce18cffd874ff5bb55157abee220b0d76cf90e55b94078589127bce826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/af/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/af/firefox-73.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "c902ab0e753d6580c523140c723725862794234cfee94a4a2839e450435cbbfe60a761726e5034e5899dd2157e24a6ca0a9f64325447a94ab3a8247ad26e2af1"; + sha512 = "6f04227c13dbb06264e85959c193486a8bd2eca2ceaa384d6930bb8512e3d38c8bfe7f0e138349ae30946dc01c06a9a9451276199f067647dcc382185a089807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/an/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/an/firefox-73.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cea9124311c558030c669bde0c11712436b8ad3dd3e2bcaed28c8e5148e694e286882b0f1fdaa85570e84fba06d95732f5409d968bb183bedf5e5624926d70c1"; + sha512 = "1a4468bc5dda9fd023f42d9d549bb715b9b24b898f047b98f8fb0dc2a4a8ba025ff9904fd6d3417e5a3c9693914e806f08aefa71eadcd5bbee182d959f718e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ar/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ar/firefox-73.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ccf0bb4ed01cb80914a1e208304ff2f5a23cec2dc7a7a5dfac52c1931e2b8b2641adc6afb1b549ff3d72440a480dd9effefe016f211952fd7d25df75e2821f72"; + sha512 = "4debd211bc2562543d1e144f902afb5c3feadee067b877915d15d7287a46b1b62344463fe295c00e32ced9addf004ef25a5dedaeb6f054889afdf2a9fa55dd0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ast/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ast/firefox-73.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d2af3df2105238258d1307483dd68056862c269543c434d211143d46225961f2fc8231861a49c03e048c0dd474c8c947a334fdf277baa3fbef5e145f4aff021e"; + sha512 = "854a527ecb67b0d312c761cb63560d67190102ed9d143aad77a0e6a0daa3bfe1a3798473968819396287cd9695caec8522f7a765f91decd9bf0e05172942190c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/az/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/az/firefox-73.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "46ca85de7d5adc17c7b32a64f8aa7bea926d4bb1c722e2ec3a92d4763225e90ebd0a7a3def868804d7722c71a5b348517750d11f33e7b40031f4c8223481ffb8"; + sha512 = "bb70aec58ea49dfb8e8545a7c0416f339ffbb09b491990ebc38a050f0116f892551f1c444fa071b4a043628831144c6a97d3d175df7ec545ce163c189b7a64dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/be/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/be/firefox-73.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "78a453467e7d97099ade27f2dafe25afa45e2b00b0532aaf60696b4a8867e4d8039e1383f66dd94e8d9986bccf9b17db2ba48d83979ef9268720755ed26839c5"; + sha512 = "e63dc6e79dcb474c7cb3ba6e6f2f77e47b0e770dc5867a879a0ebe6b26cca20874b047e56b321d1f03caeba6cbf1e6cfe85943f9be7faa4847b2190be2c948b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bg/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/bg/firefox-73.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "140997deaa24f6150ecabf82c2fda974dc294bb145781b98f448749b1d80a5caf29d7336b64ddf3bacda6d1036712dd89248e1c7781255d26876831a319d8c99"; + sha512 = "b49587827d62931ec80f5bd6128a029a06d2797047bca887c66f8611f407793d8671640edaf9a33ced8a37a66fb38d60fdcfa48fd8d84202207bf2f1ee0befc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/bn/firefox-73.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "469e4e1bc1b72b7ce8735c0940c778eb008905a0f5fdc2dc3a04a905ee7b151fb3cb34784eac2d88ce820565f795d9e44a82a95b9637c91255cf9178e1677ccc"; + sha512 = "7912536afa1f5ee2af642a4cb35f7d30ccb69ce026695ff6272f3c83f4801e781c064a75cf757c3e70fd2a6fe6e087e87717c6c30082542d521d9b7087785c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/br/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/br/firefox-73.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bb57d3bfcebab646d10855dd1883806c6b477b0e3e4b84c370752be83accf121a55c90f1d7a1d4a2fa4f54f7d90f65d3362357963fa7b017971286134c69d13b"; + sha512 = "2cf4c9a51487709a17ccf1c73f0f233b881de377d2b162dfe5596ffc78cbac8d40c01ac14d50f8a2ea64a24b185aff6ba3aaa798bc89954dcc1b65d3235fccc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/bs/firefox-73.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "5833a204b389a80518cb8c389f03ba2cc3be1d553c2deaeb4ec9eeb94f1cd45cbd96f8aaff0b2ae639b0993ff29f21b9a1d03f28e96a476c8867f670a05eb7c1"; + sha512 = "5eee204bbf3a191258082036595ea04232b8512eac7a0bd69735f0775b3bb17c077e073e605574cccbc5ec679e826b7109429248ae89bcf946160d64967c5514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ca-valencia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ca-valencia/firefox-73.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "1c43377660b7be3de41f2c2c804d5cc638cf044979343f77b74f6e42190017d2c6eecd252a369dcc619b0e9bd97729261cb9cafc6964b3c7f0d2424f601aa44d"; + sha512 = "a9b69e1b6114fb1c82a4e1bcad02d93efb79a7cf0d4ec59e23439485a9f5a2b20d45f84a369de2a8631a5e5c1b618d1544b2669dc7c4fab043e69415b2411d42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ca/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ca/firefox-73.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "169f024df0834bae9a8d5d2cc31a3af0bea865308b5642b3ed51ae4e65ef3f81dc6d1e00669dc1f0ef9e68cb22cdc6d1460567094bc66446f66804195d01afbc"; + sha512 = "d7d2bb1225ceca021114bc666725076c893f2e1adf9b4668e556753ed1bf515be23d8576582cecd3ac1b53b60502ed6f2819973c6216cccceb29e5b65a5e9de3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cak/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/cak/firefox-73.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "2689c6b338ff45d7c94e1530b3bc53cdbf4f3fe11424c770e03bf754ccb0699e75d0047b18be531f529c63da76a8170af85d76fcbb35a47f341efd8d485560dc"; + sha512 = "8393b967f2615c59614b0b5b5d604d76ef5078a3d8b27d259e6492f65c98c1e042695a3dea1c6a027d8f247da8509d22942b997daff380ff85357cd9e750b356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/cs/firefox-73.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2bb94f4f324aa394e7aa4f98b3d22417b68449e2b15f12e3b6df576272506472984ed97bfd5949f1a1e7e2913e1afa57191361ea02b46c723e9590e916c9c81a"; + sha512 = "38bbae4c4b3b96ad98b855ad11312f3e8f05c78b94cf5aad265bed739ec0caa4956554b20e18bc9d3888bc6b42e47e14a681b15822cff3a5e99b96c2ac840a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cy/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/cy/firefox-73.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "18778da2d0069c846c20323f8e8e786e13a8c08ea4152aa195b416f449b906bb73001ec0a9e6ce841b7b555b5c87643160827ff3a46f46a354fada07dcc9e0b7"; + sha512 = "52ba1a1b98ef9121ebf175998f69c197eaafca85abff9cd844840bd06acddaf34baaebf9ef61bcd71e5dffddadb33b2cd31e61ec962416c6652f8cc0677324f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/da/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/da/firefox-73.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "33d190f5126ecbe033db03609dd38c9edf9020aefb3aedb9410434e3d0f630da7cf31769735e05622640720db1d251f83b744a061d3b08561147397b76ef13f8"; + sha512 = "349ccd82de11f9aedcb6e4b57344985b7a925a3ed5e10064614e56578d66bfca0fd9fb5b381ee95ba40d43ca107e20db7aed43b2a7df911f53a4941cb15d4df7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/de/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/de/firefox-73.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2ccc6b0be2e17491b78df4a7bb4e46f1d96f4e2ac89a429f44b8e37db3d364477f998ec9032a15c8d9df8060e8b15133111bf163cfc781f015dbaf17827125eb"; + sha512 = "bb2166bad1fae402052357ca34c35a94e2f03788bc55643bef7dfe42c7bc92158f84045c3bef12b8b678fbc84fd8c262a167c6d3c6ec07b1312f49c9612f064d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/dsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/dsb/firefox-73.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f040c247f36018c4aa4731b9f6ca0a1e3a21111d2ea99b8026270392a9f125f9e0ba060c5cd02cf60e6ded63f56d0a257eca001966b8ed96cb695b4a68e10c4a"; + sha512 = "d877e177b08907a98aa0f3c2c456243a9b4a7553333a01722e7c0c691143b5468d1d6e7cc0199cbf93efe0a21d8216fb98553a8f1cf744ba4468b906b446ccce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/el/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/el/firefox-73.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d7a2385b2ee59a7d39cd73f27b945b486f3df393e9807c74b3fa86130b25a8d4144861024c071b16ad9a1ae14f49eb66ce0c8e85ab56237e4461513adbc25106"; + sha512 = "4c1b5d4a39457fd24957697f333b00615f3dd836c6fcbe651adef339c76e487f0ca87269d8e3254c6fa02d9b97e517f4cf49f19911b842eb07a3e9a98fc8a7b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-CA/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/en-CA/firefox-73.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "8d276a97e68a437116755126f4ddd8168b825c9754422ee1fae03a1bccb447506f45693cb4df70d08a765a45c648255f63df363d7109befaf2dcc5808fb8d872"; + sha512 = "f517080957c5a9e86662c7104536a618fb14c46c6449cf533e9a643269365c9e9b693fc3bf0662d5122c09aff925b10a88fc2ce7fa9ff537e7b6c4253e8f584c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-GB/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/en-GB/firefox-73.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "eea97bfeb278b3c2c19bf48009971dd50631215c36ff00fae4d533c70e6a3056085562d8a399ec6c85b676bb320111ce2a3621e1dee022408ae9d40d5df5c085"; + sha512 = "da5862255bfda7f8add2fd5d7b129b0adfd8c420afcb99440f07c2b8517e3cc46dfcdeb28a200fe72448718749d82abdbf3cbbfbca326c933a42d94acead2b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-US/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/en-US/firefox-73.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7ea54472c3be609e7fc1dd4702db2d1a961f1d18acfc60a63b54d53ea77c87447492f05509a72cff48475f96af673dc1822b99f4fcf87b1b56a9f3537d1810d0"; + sha512 = "4955bf26435b201749c8153ba35cbd07f66e93b4b0352904bfa6d90695413660c67da8b8a62436a40c10cd4fdc7d6466ca3f70f27f906a31ec444a78e8fca113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/eo/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/eo/firefox-73.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "227fbd8fc7ea8a703ccac5c324e42258b96c5125faac201d5dbf70579215720e06a9726b197df3ccf85ace84e5df5bbf80ea09a0eaa1ed0b5c4f275d6f3d1939"; + sha512 = "5e9a1083d0978d9456c052ee16f332fdaff50f17e8e17d52630cfae14bbcf147e4452a8af177985d1d120bbbbc0c77cf8ba4f9f95637e0310448aa2af40ecd9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-AR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/es-AR/firefox-73.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "917bd89db5eb3d50a86c8b37589fb73c5bfca676af857cf0528dae236e4bb2f0d25ab0a1620eae832f8c3f55af57f4a983362828244c3cd5ebaee5b8c03c5f75"; + sha512 = "6d7f4b66ed8b8ab111b114c0c2247cbb646e2cdf96c9adfa5f340721ab8e7dc6f781379b199713f9f06767bdd73e1a357f72f0fc3b76ffd7d04ea0f5756a1fc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-CL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/es-CL/firefox-73.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b7d586c9c770a346324e26a2e2f9ace455827bd2e8c1bed4e12411ef419b8d5434e6acf99f15876d95343203242bc96b77fffc3f18f789c42e37a6c22ede3a46"; + sha512 = "2dc3ba64def0979a68c73d2d28094c72eb9756206489a0ce4611e8ca5fe6e2bd9f7f3ad0da3f1961f02732ee1f5e42908d07f9875924b65c47003244a7a1a40b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-ES/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/es-ES/firefox-73.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "d94e2b0442158d6f4ca4de81230f0b29b64714561fe6172cb14c35d5b742802c6ea5d84cd7a4e1cea14848892e451125bfff8c1feca663e1b57e503c96f7e928"; + sha512 = "21135fbf0daf56a8f69ed6558669589943f0f166d2f13679cdd3616395f3336ab77696a1f754c84b188f43033f41941f0ebb1beffb0ffa5d4f19915532022dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-MX/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/es-MX/firefox-73.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "545901f49f6bd877780624be3ffa2c8a0b54e785d6e1b4509eb7b11f88bddabac84a14dbd0d463a74f7b487e8fb36077662d577cebfe56719b1715e7488f2598"; + sha512 = "499edbe88b5b3925bd2c6164ccf51d818954cca8319e8035916ac6c8f80d87fdf4fd5970fdc197e19bc9237230ad4156797fcbb79cf3bbb73039bba58aa84fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/et/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/et/firefox-73.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d36bc766733be0da86cfc65fad481a41bcb983ce665117113d8d34f536af96cc342d84db502ce4d262050b57d39b60e2e3b96f2681ba15df625b79e0dc6e21e6"; + sha512 = "579ee6d3d21cd633e4e2a4a51bf49438cb473ac9fa01d80ffdc8af9484eca23bcf271e0e8accf7575ef903f0310fe72bfb761b735e5bcdd02c136aa48f0aad3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/eu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/eu/firefox-73.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "57cb10ba3b24d617865f2aa500024889d93ef7c0ab79559cbaa15544424d0bf32fd7ac435b1953ee75ca241cf2164ecec56eddc874f57b103b2f1f9402509784"; + sha512 = "4e87ef42b573f39183a3b8e626c61515b48cb353c1f3e7b2329df1869ce1c3a0bc47498da1633606c85307f4f3934817125442af83864b15cbdd20daa7dd1a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fa/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/fa/firefox-73.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "4aa25840114b704c92e8a1b190b8c809b5ef66ae0288d495835a2766a9c7fe91e3da28b272e55bf1f51fecfbb044333bfdc8290dff9ff6f0654195d31cfa846a"; + sha512 = "1a1b3d5e3fb49a8924c74ca30fe239917d9104e3727b93eae1648866ee85be48add791299bc7f0e64678bd5935c56be04e0ad379cca59738f831411f2d99368b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ff/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ff/firefox-73.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5a0c4d1fc711d449b6188f021691f1b4c4c73c9d48d957176d1d6ff70e818a9cea194394ef4feee4e50823eeafca94366967bf9f11b2c128ab3987035db500d2"; + sha512 = "e3e35d68390fbbc574680ec47aa5cd9f2ff1a4777ef0359139189fcf01565c43400790b41f6c5c6241da49248a13e58952e669400d60c4e00c00bbcea3a39e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/fi/firefox-73.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e09fd700313ba64481eb460d6693b38904cf1a8fe9b9069015ed052ff38720b24a9ee99048e35063a3b632a81da190958eb6f2ef4dbbd100d1fc3ca1fe940296"; + sha512 = "83b7408fadf51a409a5a740476a6098ce6380a4c9d530891314753feff707d50a3003dcf4ead593f8bd47839029672c575b5eb7e20c657a4a459ff9ca957c942"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/fr/firefox-73.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "85c2ac0a335589ab1f188b1c04de7cf4659d7ea15587b04ee7c8d4e9633f73f8b43d7a9befb648ab565ef396917e1ae4e5482a1cd0d76bc183b065b219159a23"; + sha512 = "7aa26cea38e4776c508242a1115d158b829dc6789716877a6f0fc0923205154ddcbbda531015ff29fd9f1cd6d9a76c33bac196541694ee1593d21c868ee80519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fy-NL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/fy-NL/firefox-73.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "5016901adc6a1f53f9060522fbb1382c4c688a94936f1054cfccad5c6b0b2024900c1193eb8da3dc75ba88236ed1f6c6bf792365e3e140eef86ad5603ca22be0"; + sha512 = "b51b87288e7cd3129be40b71d0ccbaed62f990c0ec9285194785f7ab297cf9005d094d7af7e5d85c1a29fed03ca7e7553bcd7bc6e4b994e0d9942f90039af700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ga-IE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ga-IE/firefox-73.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "31ab37f8b09d09cdaaefa78f0d15e72d431c5a6b88b3dfbc40a0a9fe6468c6ef75a9bdd839eb54ed8e79aa022ed13adfa1db2d923d7c04f6ee1481defaee4a68"; + sha512 = "0659c95e78765662ab9919c917ebf0b743e3c5e2b9c083a1fc90e99520e80675fa3f8604056522f484c421945171953712210de50cc75ab2295ba5b41b77a8e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gd/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/gd/firefox-73.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "312c48338a80d4ab7fe06fb124fc19ffd70735adaacfea55095d756af473f605593bdf230c544120293e1a34b147cf10fc8df26a61a3446b5d6529497eb5681f"; + sha512 = "77831e9fe97fc0851f622be6c3898c03e44ad30f4fe5b68b7c03ccdde83cd1dccd44d207e623291ba79cc657fba6bc15e328e3f2f761492ad09a836b197aa1e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/gl/firefox-73.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ece63c5b308ad4491bd379ff41808033e4daa472f96d52e5a629670eba33053a49b45bee4ec6d34fbfb4800079d4f62cbc3bb958bf63b7ae5039dc0ee7ea2b92"; + sha512 = "3b641f6fc998a32606b17c70ddfe93070963f71fa2d5f28149fda3119221ab87dbb9723f263214e92390617f0fe01ca0bc380648f9f2ececd77cb493999d07e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/gn/firefox-73.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "92d41dd688156750418f04c03b5290fae253129fd850ef87e8dcdab2e663beb130b67902bccd9bd429f3aac1d34ef01e3cfa3bc830a3950f9d8639a23faa8e79"; + sha512 = "dd33cbe7c085e1e3667b4ebd2d7beb86328d0936aedd53b1b6a38dfab5e6d423fef0ad17b4920588a263ecda475a18f828d994b30378baa7ae602a2038849baf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gu-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/gu-IN/firefox-73.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "e846b051288374077143e755d6d1e9d372305a6ed11fc775e9226302249370e597833f56cb31c56f85db54e23f8482e9b14f5f87d2f2958694a879e2d9b02b39"; + sha512 = "cce88efe455ecba8acf46782e6b62e645eb5592a77121c3e9dfd6c50a2cbf4f7e4ef2f02f5aa26d1abd0ac2072fb393df2745e9069d2167c562c12a9ac8e1c64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/he/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/he/firefox-73.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "8937f443a1a1ccd4ce26d230b895b538b8f81f5462895218fd92a3ada3037cf7a84fa3759efb2c5ec136de0f535ea4a2c94749b41fb55c6a71b4a5d8b232620c"; + sha512 = "bd06abea5ba16cdfffda21812272a24b3f78a9c42749d462b7ec110a8387329d271b064865ff5ef6d7895dd246282a78980dc125c81dd2ff0333e0881a2ada86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hi-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/hi-IN/firefox-73.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "50a68e2d85708d2241710fdd78d9fc76357aa7a5df267cff989cb8011a20588c2b7d07a0cf29f9b323e4a376fc5241e2851eb3292f63dfc42f0c77ae07109777"; + sha512 = "a2250eb6d59e662ba06d8e45caa4ee119515eff2472f986a09257a35f1235956f405f80ea6f7c9e674724e441a4c3ef99557dafd13c1dc27f527825ebc1825aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/hr/firefox-73.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "eb3a5c80a564f7d4d4a5bb5dafd21738e374c8305c6461fcd45fa905a990c17ff05ca59764f4a129986929f3c3143e4c8167a97a3294f6868fea9f500f7d679a"; + sha512 = "ae306d500db1a51fa74147dde1f99214f982c5f874274fe5bfa966aa34bc6339f0586e930091bfe95f02f9da708db2b2cb93ec0862e8189c1deaaf3e47a5c06d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/hsb/firefox-73.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ac88de2b8766f665f6a21dcca48053abbc52c7f5e8b29b61c8c220c0aa7a1d5acb827ce0ad8fb15537200479c563165563e0dc54d1385b13ab0bb7a2fd2abb29"; + sha512 = "a2f52071b336a0b374697557591ba927fa976fd6159c7a4b31680c6d0543a7b3175df8684ca19735b771d365f9e8f8028f3b155cf7c310d7cd6ca89e3597753e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/hu/firefox-73.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7adbeebef6577755db12ffa392fdcc47f1e2e73f988071337b509f4972daf34c5ba7b5585e02f2fc1c024c6f5cf7f6ec8a8559e08e185fc2ffdceb8808ac7287"; + sha512 = "110b1012b7c4a8f06b531c6e7c7f9c83762577bdaf5b46a4de56900ec21b65cf722de2ec857c2b56dbf65153e0a8748e2d30fa8d4f633ad2ded76551b7a3640d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hy-AM/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/hy-AM/firefox-73.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "09f3224e70a5cb166ae29e4d1e847646d8d296fa303a64b0dfffbd3aca10e70ccdeb3ba1ac4ddf0e8250ed05b2b8a48723f84a2478da834908e7c7f8a228a921"; + sha512 = "9cebf9abd8c8126e738627b4c34b6920188ad5ae5604ba6243f400e61057d05cfd13376bee96951f9bde27c81044ff73b5692e4b90d4283052ee0533a50ef30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ia/firefox-73.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4bf144e6b24b0fda96505ae468bc69e3d7274397cb3d1d8154db0312fd3e0a1a75326f932739408dce363510e90090be5ea2139d4dc00d3280537224d4807d60"; + sha512 = "4ecdde1c5b62feb8cc7ddd5948772b3079a308d78e7150c03f4b0f7f69796f6a55f23d47823e917ac80645c00a7a18a77348cd209fb3b6265e994276132733d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/id/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/id/firefox-73.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "7720000f5a642129fe14854ddced162160d4f8eaaa752790cdda7728c35f6d1b00302c88027c43d2ba8e4f5b4f12ea5f9317640b650615d4a9fade83678b27f1"; + sha512 = "30a3c80bb9082769215c13930378acdce265a1058fab3819e6c645bb35537a06d442ad4e2d36606b97c0f8b503a4281e22d295e66338bef0f5142f4a9e842fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/is/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/is/firefox-73.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fbf8d788585f1cd8c019fe360b9b063f6a7686bc3b1692088966e01c4abf0303c52a82f5b385606381051b6cff3d6449db41b80c02f99aadb32d65642fc48819"; + sha512 = "b1d7795ebc32f5e4113878384a84927a4169f484d302145f5b9dc8a4797a46d1eb3d57d4d911de06a5a28e0bdda95230b86c0df8f74866f25e50cf1954e84723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/it/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/it/firefox-73.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0fd05ed4de599148372f164a3a28b5af8aa43e2c164e231ec10a0d74ade3a02f5e1085f7627acd27563ab231426a72d2e7c5f323b7b9b94e72c9271ecbcb5d74"; + sha512 = "9cca01c62232f7bca15a81f20e6a252e587f2c4c9bdc5cfe48fea549273440f98e43ed7f36da666bfb07889f5d29f3605208fc44b49e8173e844ae7af5716a82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ja/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ja/firefox-73.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8eaf09d8f89589078433b03e62c8bc24de30dc40dff5072e59f8cdaf3ac2d1bac8759185cdfe5de1c4db10bb521e80153472ade065be459e20887da37677f0e3"; + sha512 = "b79e00816ab0dc8ff7e0ffbecd0c7f09976b55e98a53b864a6be3565e05737814c591da0e76e8e5d7a3ea3d57252ffac9885812f2d1f131364533029d12145ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ka/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ka/firefox-73.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5bb9b88ce3cf82dc7df0114cd6588f900e31ae5dd2595bfe4b85f4d732d6a1bb9f2bf7e0925ca1c5c9f827fe86642c496bcd5697a26c06f9eb4444907560a1cf"; + sha512 = "dbce1def842a038e0182194560c7f44ec4daf66916d000e30987fd27a26b9482ad318df9b2d55ef87d25c5724c9aee3b07b5a6d302488cbe06e0edc7ddc374db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kab/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/kab/firefox-73.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a3b86e59bb9bc4771399f07cd11f354a246b83244be8c7ae2e9dd3980eba992f0eae8f1fd7ba27c44b308fb79fa940a96aded4e917198056f008a9d59cf6c0bb"; + sha512 = "17b5bc4fb4f78700b2265332d04b29a00baebe13916598674bdc13553a6c04d6cae5f7552a002db2c99bce18fd75b84b818a4d1b1146c12cbbab3251a37f2499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/kk/firefox-73.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "747e861143ebf9a2c3fca15077e128ee1a93c2a9d2debfec4424c3f587413e8be01cb1a8697c04651e06ea857ad435f116789139017c1954f92faee8eddc40ae"; + sha512 = "eaff45187fbb30a35ee86434e00be2fca9905db5841a8359fdd38c3e4c28cfa7f196fdde50d827d5caad46d9bd2b093ecd23f60134cce4c4c51539deb755a80e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/km/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/km/firefox-73.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "c763db70f2c74e8a51c16c881e766be1f54a3ebd34521305486d4a811fcfd026b7bebecfc36979f4143b040640ae0d2c4802fb2377ebfbdc25d034f39824e32d"; + sha512 = "8445d2019dc772a601f6e26d4a5032a006a5339406b216fe488582b4d13ff58552c34a5d816b69cc6077161b7339b7b3cecebc120d1524c6bfd4bf07bba90acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/kn/firefox-73.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "09a8f41146ca0efd0beb68f1291be5b12d8b0436c82ee58ed88da8c3caf8a0193cbc674390a1bf596c7e70250bbbf8a7c081180ad91cc2da5993c3e0b9b9067e"; + sha512 = "f5243bbe7a6db8287995d1a6397bd8e9d3b4413160518a354b9f4a8190b27702600422cc77b50ec41ea92ce2b730c893248fcd89f94ba4198e7f2ebbd03679a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ko/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ko/firefox-73.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "ef7c8a77c375835ea8243612f8543084c21d3437b02701c05c68917bc6efd34cdb00c3559f256508fd43f980d7d5c78376e5af8c59a1552d0ce417fbeecce082"; + sha512 = "be9e05a80473745c02a0e24570cbd69cbb3e4ed52d11f736388dab44228857e17c5544da530fbcd7b5ba68032544677259f5aa7793f6ca976a1ee4cb5c206235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lij/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/lij/firefox-73.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "0b144239ec308c0aca679e939cd620adf90c89b2269e6a16bc34315f0e8b0f1ae7e6c698424d5e8f5ea19f0e8f26c4c189d69735fa3b3c69d08f27300fbcbd17"; + sha512 = "b1450f4e280694f8ddd3ba943cf598222461e646106ba62acb804c2d4080482beea269bc7c93e8744ef021dfd5b761cab0b706599a72a756f643d2395de639f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lt/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/lt/firefox-73.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "bf285af55d5af190696990c007285663bcfc0d58538bd11a79f9325cc5ca7c578863936314f8d5bcc551aeab414977d12bf1936aa07bff4152122b8b94b5f49b"; + sha512 = "4741b86b44a8568bd3b218e78534fbbf6537ebc1b358a24062fa99d7abbeb55c72c344de5fb009e25abe66ea5d1fa43f24a8345cec353dd1b76f4cc892aa4b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lv/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/lv/firefox-73.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "50b380115bf11732a481c1b9fd029a7307ed62ce90c18f43b569575c736d362b3ea531937b7e4f2386e27e38edfc5b76cb9b9a2664fe75ae56b0f71eee892c8c"; + sha512 = "46ea4f15a873b73b8d503d632a7bef57e6579b9167591256128340fec20a0bf2ef705e3c86ecfb1ef5f6a31e537925f9ab2cff6fc15246eee288b779b40bf8d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/mk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/mk/firefox-73.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "3ef8d24d7fdf80a88884e6b6becd8e9673123d21b897c0087716d185bf5fa1d22076c97bc9b7d1a08b884cbfdf62011cab141d743fdbe554546eb9780f2b17a0"; + sha512 = "04d5035d959c0d6e1bf400a721727dae41cf6b3abddba9ce8a3b2b2d7a33223251c7c090ed8976e0e78e42b4067bbc869c188e030f1627696cf43f5ab9bf9034"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/mr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/mr/firefox-73.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ad662cbb98826105f48e457df8b426fde80974bc8777b4ee155a6a27af765e21835c01bce2144c352d6e61c869f7a082edd5e828b5b9241ce12c295cb28be100"; + sha512 = "7ca06b0f7e6f0254c1a802e3b00be1b92011ccae9477b46f0d470b949c9928216939462f25161d8b5fe4b0fd89aee9b007ee25d713f573fe961dc780980ee1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ms/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ms/firefox-73.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ac62b3659a6c412f6e7d29818890cb0058f7660e8a4c41788dad3b6ce7c688fbf93afffb9fb637a2dfcb57a9dfd4143ce5eb2610b11d83add961f420cbcbb2aa"; + sha512 = "4b51107622faa24c3f6f513ac8a03268255d89360023ae3052dad04df91d7e3a04fdb608a8e5e7aaabc2eacb757ba9a451e0f05b2497b38d90854d79ac19538d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/my/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/my/firefox-73.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "33387b6147f584597a18ca8f50ef5278546d057e5015dc69d6b4d90279a01cd7f9befefcb1fd4a6cb8b5807cf6c054d80dfe0d1b7f28eaa6337542d128d8fdc9"; + sha512 = "1348f5b74005e622e3434bccdfb89a8586d534f0fdaaab1629905c3f6fda8a33eaade73a6f04e7dd8c285cd4b88121714cb5172c8efdef62b82f231694e5a3b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nb-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/nb-NO/firefox-73.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "405053e48ddd9a8573e20bd3e7b9f0cd36b3459e35159056d8325892f07b25732fb6c7bab5dbf4ded60a40492402c708c511272c58325adabdefb01d724a3de0"; + sha512 = "7ba6b164732540b40c0c1cde5609bf4a86db1e6779a7d783911c9ade003503387c9a66ce025aa3e902fd008dbe6f13a91267c3281af638a223f3ea85976cb480"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ne-NP/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ne-NP/firefox-73.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "a08f962fc8a40404e4cc0ca752230aa006fb59eea753650002aa66ae287abf4778fdb5deb2ff165a4da38b3bcbb7151ef0c9b6b3506d9e6ffb1b8620b1469d41"; + sha512 = "d88e416aa279e9d74fb9700bf290b9bdd87cea035dd250f3892f0d64a957ef46ebe8200c9a4983e56a240083e284d4ca2984011befdb3ea82332f80a7085dde0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/nl/firefox-73.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a485f80af7d0b041e8ae629e8992f0f1b5ea298125b3a8dd6dc391b0faa3e5de7dfef627400ab2a938e1e0d73d95b39a0a3c6ba5a416e3842bd35ab12ab0c9e7"; + sha512 = "0ad1d71f283cfc399477311a991c582a7cc5151486c3e6b646e2fde8d23edfa3d82f8e0758e21a8427f16c47fa02d3a4f5912e26efadadde6e3b53dcb013eee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nn-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/nn-NO/firefox-73.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "594f85634e1b10b79144f4594ccd3af46aba3291eddced012a39d7dcec641d37b6c55eaee985aa7529313e188e7fd0457317f3d7724c2f667e867e0b29bee1fd"; + sha512 = "76ffaea7e4c8e7dab49873d10df681b1b3232d10c909ec72cad5daaa5ac70194e0bc32781ae4f3b1123715351469b56a3b0767983b7f1cc22fc8629121f86dd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/oc/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/oc/firefox-73.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "364928646f14d0197f85017f93d854d069f65f54fb3b79e59c819cb7bb2c259a220f4c9f1c8a17543ef5a3760ff94e2469921443a6d64bc9b1527fd2a931c271"; + sha512 = "00b3da139d22590fda0ff983a291d8e15eb6e39c0126fa65760e444cd6e793c7f0a2cc64a2e4483f3c6745915752de97f99ea09cabe146558252343248434913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pa-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/pa-IN/firefox-73.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5abddf19f937a8022f61de702a877af2a3d8bae417746cadfad9c55419dea53665104b66a17800ee5648bd9630b2e7ee159a1d1720feb5dc82b72b63138103cb"; + sha512 = "a9fa7c9ecea8fca19bbaa8c6e5c7a8ee6b19944f6e9daced95a6af315ed23d1a530024dffb3d358fb64a44510333930674887e76c15bf82f2c3642b227b41068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/pl/firefox-73.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "732089cd288b0a589a6708df4cadb9506874eb9c1755d4138d0b05f7a83c977873438f5ccb897b8e337bfd86b8bbc5400a1fcbff2fde309d50c4970d972ba610"; + sha512 = "8e72223d18c62b38baf79b34947d7d63f534661795d9a0316550fae55bf155e7f130487a0790386d64c092bfaddfbde53f2851d7ad4255b030c984aa40558c2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pt-BR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/pt-BR/firefox-73.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "5c7de2ff62d03d39754679af7e7a291574ba6dd4444e6326281fd9d01b01505f6dd6f8dac207599a0f6adafb17c4e5c853084d312e3a5dbceaef8e8613ac6248"; + sha512 = "0e09c23df11ccc242d792b0106f76052334820a0c44e125e3ba2578d1587efc61dd452dd579366e38f0a1ced978e0d76b0f212c74493793b1b236a9e0cce7572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pt-PT/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/pt-PT/firefox-73.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "9fa37ff418595ab4a058c7b6f4c67b89bed7b3685619d7a27b379e19816245053acd266e91a3d0e1803c93cbe4570ab1c9b095db848e2b69f5f58b1990e06ef8"; + sha512 = "165232a7bf90e8dded6d5070a6a24f9b58dbad2ebf5f8ba48d763d188a4a01d6cac3506c0536ea7625c4b37c0bd587f70d93685ad0f58f9c28daeee71e0473b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/rm/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/rm/firefox-73.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c071f91eae6c6824ff9ac4441ba429cc78c165846936b2f7c91cc0f78ceab4f3eda083ffa4cce7f68b4b77dcfc5c00f535f02e911b50a7ebf6066acadadac4d4"; + sha512 = "c0d932ba5f9ee063c09decc7dfbfcc68474fc9c1361e43baa6340c887fb619e3d62fbbee308146b996ac8110a3b7264930c0810b1b9b0a8e10216a317f43fcd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ro/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ro/firefox-73.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "dc093fd6eccddbe2e7ba25f22a74a9edcd03f1b080c5effaf1ca11058a66e7d171a6f7f3caed1d52847323f1055751e1ad290eb0192d6b8e9ea719cc27d9a816"; + sha512 = "c4c3e2c1e7fb4bb284e8f0eee96c1f7b9c9ad3b6032436016b1421321e24535d50f548c6e89caccdb7f25baa0140b1a4bb1dc9edf9ebf960985533de880c1afb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ru/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ru/firefox-73.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fadcf3ae2c5bc81f524d2be1ff060e1286d697cd4b4a8a8af9a8d7b0d221175de0d93cc1850e2dd678aab6c865266ef6edd0915ca188920b51771be4ef7ffd03"; + sha512 = "12c0a54f9bb8a683230385ad1df030b42f534b7a121977c8fb3ff69757ec3af07e7df8488df564e9b01f2205f4aa821351e336add0d42d9efa1a2e8d08e89d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/si/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/si/firefox-73.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f080a3aeceb726cd62cf57bcb96a95f32d0cfcfc639bec7b8628c7cdf5fe42d327cac474de4ded04f3f4c27fda8513d5588ca2e9354887104459f30128ba20bf"; + sha512 = "2ab259b94d008104d5bc74e38f954e3c9e902155aaf9f8049801e72a0aa2e2a525ecf5126df00d2b29384cccd454842dd6e68fa3836ee3de2e5c859b17314f25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/sk/firefox-73.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d0e40f3aaf8ba495159d314773115861095e07f8ecf8d30a03ca4b05f87586ac4bf96cd20012a5325cd4b76bf1b6bafaee1c925327bc244f3cf0d7e266486cea"; + sha512 = "8000ae7e131498d1cdba331bf4796422b52629bc92da15374a000fb1b866758c3545265077fb2c777e34c0bb823a667fc49731ce692fb0750fcccdc1de966b82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/sl/firefox-73.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3bfa3965c337ca889f1f04930c9b8dce372a34f7c332397b4f074a2ef7ebf6120baa54e94973d8fc6a5eb8041c0bc170681d9bb882edf91b081460bb33314751"; + sha512 = "743980ecb078bca76915de91c74c258a1812d52a78bb6afb5b018ba827ad68666c336ad8ad52d07d4b503a3b5bae03afd25e3597c5b053474d1a3a74d5cf9c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/son/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/son/firefox-73.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1e51babc67e116a8f0d324a929fd6ee821d5852519a4870870035f1110a7434c6e0ea900f23cfb489142eaa8e914be0e5235784028e3c539b902ec0f16bb8c43"; + sha512 = "ac8413a2ee264812d470f763162bd585fbf667f2c8e3a53abc634c9fdbe765b0e0258bd71771a7123a493061e697add6a6296ca355cc8d7107baef3b1ee2ed65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sq/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/sq/firefox-73.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "d7f8d94d1a23b580f489e5be24d2e2a45210d82f7da25b36d9c16c91136fc7b9785e141b13e14c3c19d3a5a3434dad600d3699ea206177f01ac1b539bbd59da0"; + sha512 = "286fb2ec1009d595e78a8d6057eeeb2ad401dd70f497705e12c518ac898550ab67343d0a00c7a8195a0a23dcef8986e7c7dbdbb959c3cddb132ed56031243102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/sr/firefox-73.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8816a768e79c84b2ba3573d00f3154d87fc995019b499f5d9d7e945fe29a18dbb8a2582ec8a3ffee520de2d91f239714b84ad6e5627b54da4644f25ee8d6f439"; + sha512 = "f4838ba6e2c8a405eba0642f638a217feba3576927c3c25766a47129df140b0e0b8808ff295ddc25bd7d7a94a87e1308ee6b30bdc3dc7c34a8ac2cdf37e68ea1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sv-SE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/sv-SE/firefox-73.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "44f09518b34866de5aba13308d638eddbb79941020a72c42825c2ba619a44c6e239124179ba4b5b88a2c79a875ae0c9d6983b691a6e637c7da017d9ab772da0f"; + sha512 = "c9fec171e6b6cff992042352dbdfe3087dc52c24d45989f069e7a343861cf03e20221e17f1e54e33bfaa37b28537287f064909b7c039168143e4979fd2ce92b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ta/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ta/firefox-73.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "216d999c6f3e7aa9aa0f95622aa62830103a6eeb7f56636a9577be6963090c106ef5e6b825fb0a39b7ab634a2b59351a376127bbe26989139041042a7bf092ba"; + sha512 = "97508865912f71ef9b3edfad4c2707495fc3f1a5328651cce76a104e884693cdf215d066761ae6fafe2341717e766ad768290fdde3fb0fd4b931bf2cca93b091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/te/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/te/firefox-73.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "fe20b19cbe0eaf688dbb834e57b77d1982007808221a978475f5dfa9ad98c5c488661c2471f3302d56cd04b84808b7c1b3d8d076888026fc7736ebfb9b3bd050"; + sha512 = "e16c015f100fb425b4e2ea1b4ffcef4abc392e9ef45cace553c9efd928157afe34471b3257295f69b60bde988c4e1e4624bdb12f8e24a9fd91078e8342f95905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/th/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/th/firefox-73.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "25743569ab5c90e88f046d71ed9ef0356b4c49541e42e35405045d5161b4bdb54836325eb71c118b4a8422335633463071cfb5792e5d9ddad2233d3e2f120f6b"; + sha512 = "5b8e98c39273e609b1793c48686b58484cce14d5b128dc6a8022faf2f23fd3f5851e08d69f324763fb2159c7da5330d1985a1ecc58be58793a9de92745cc67a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/tl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/tl/firefox-73.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "61797fea9bd40a323c2fcbd7959cfccd5597bf8ab323f0c2294afdf3cfc1bab1b58df3f4efc365c145b3943f68cef3eed0c455acc51597cb26b5a55302bc5850"; + sha512 = "6c5e97fd62a4d57732032e77333c52f55c7f48522d481946262c72aed89c06b1a69e87041f15ace932bb2f57e7b6007826fd12999937d61928feda0eebdee2cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/tr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/tr/firefox-73.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "21cb703efda21f1206778b6c018e4001ed95d45304740fb059ee618e96aa15f755569614d510890e5afea96685d6c8e564a23d1a83585c1963824c8c00ed97fa"; + sha512 = "e2c6bfe8172f65d8b0753d60cb0629214109f405d307e547b468295f2050ecad89da07f15ac3026be06708a07d076bb75d1cc172acbd1b065b2e80f6f2eb15a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/trs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/trs/firefox-73.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "e7392a0f1e9771140598bfb2a150c7bb24095af79a846cdd21f96eeca0e9f22d38bd780137a4dc62750dacf6521bc8de2de1fa5fb8f757b092b814c31879c842"; + sha512 = "b5954794d6662f78584a6dc713a89d4839873479def846d1ef42c6c726962d42f42a8f658aeb1b107ab926532fac6b24e96bc5d14554a2f5ad3a714ad6dfe5c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/uk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/uk/firefox-73.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "f08cb0be78afc2a6573273168dafb86256f2afd5e6d36baec8308baa4e9c04c6defa23c200b50b621495ce214e2a401fd793ec20561dd31f5a1d17cdfb50bd18"; + sha512 = "481c9df28badb22a59f6fde55ce1c2aeb6b2f2204698ff0ec7ca16b6c9bacaef856f61c7ddd4d6c7d04ee3c15d5d2250ca56288ea7793283a9b7eaf9e6341ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ur/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/ur/firefox-73.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6b363fba4ca9250a8e863e58a055d879ec7e817c5fde7c79903ee04af0c7471ba9563327f223109d77491ed78b2504abb3836951f02e9b1a73e365823513f26b"; + sha512 = "6cd9ff5ca3d4058d8bd4053ef8aead82593eea8309b522c61e93847c8c2ba83456ba93b07458db1dd1300fd5870af509d44f49e57938d6ba0b5c422f3f435878"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/uz/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/uz/firefox-73.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6521a885d0efc8b1c0929ceab087bccffa1236f518b920c0e3f8f450ca2920cf87f8ed72af4547fc4e3e38cea267462344289c52caaa035f59c688fe65073470"; + sha512 = "5015329b4e0dedc2af64858ad6b575173d1391beebc582583431431cdc05df475d156e52b30abd81be18107e052a3139486f5e79e1c8e9e299e90b099151fcfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/vi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/vi/firefox-73.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c14ba7d59e46cc3dc3f507b1549eb38125f3f5c60156ea70bfdbb047721b91a7611ad25dddead6bf8d62f0e90324cf0b4fa50ee30a07efd07f48032cade22eba"; + sha512 = "2ef185beab0e2855f916bd2af12e97434b1ae1c210d06f1f7c47639b2ff744f1743c17356c0af438346f99295fb096c717b99943d5dea1d65d22fc93b3fb2c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/xh/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/xh/firefox-73.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "26d47e833b8a4e376bde4db86a71eda8cfc3901afe89f76676065384f359de46e474fcd156f95d18f239e7420a064e67b9dddbc97139c49c059d0a59e5f8dc81"; + sha512 = "7ccb4f27766660cef3e88bbb6fcff073c55b8ee6a6ff99503a2e73f9cfd1e1b3a94f2d350c9bca2f787c6a2a03d1fc6d454344148220520b4b40f5e32486101f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/zh-CN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/zh-CN/firefox-73.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a87129e3fed358669a2376abf1717c10b463d83a58fd8ad3069f35b54569beaafe6235610d0f148fe9f2759184699784e72b4afb65f09fee60411dc593bd65ba"; + sha512 = "fd9dc51cb0c02f4c8b4790e203825ae6f17e25047e198278614d2a8b6826c29e190458f3093755223f6a5b09c22bdec25265e3b31639842fd929d833dd0042dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/zh-TW/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-x86_64/zh-TW/firefox-73.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "af28d2d450d7e76390902ea28dddacf356371e96d2a1711ee2842e551f10f5048488015b57ad2744546855c8134967294c3e5a0e939de657fb884f7885e8c039"; + sha512 = "d42805fc1bbfd4f2a4d16e2c42743a4b85bab0e28c63d74393954a23127c10b660ba4ca96c7f2d6fd5c08ffd1e86650c7da286e0c71767d843e93f71c1fd8b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ach/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ach/firefox-73.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a5e3dd292b9e611bc7218459ffce0521992d43d8884a451e611bb41f59c6d0a0729752af0a711897b653f5cd3efe586d100ea783b5b009f6115fd0d5ccda0dde"; + sha512 = "adf8e2d2fbae828f4c796260dfe1855ca63d16553a5121428473330d92c59f30b63135169b8a425bbeaa43064c942f39cd0de8ce90bf5c4e93ab4c8ada956f69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/af/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/af/firefox-73.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "528c94fb5984344576e5ed7ae6c9e0f42a7eb8b00715ee8cf0add14fbc65c29b85a888ecd34f0b729283b14dbc2771927ae9d7b3f471f4c7a81c11222350c870"; + sha512 = "7978afb08ede31377e1c9fb7948bcb523125161da8fab74ecd00cced4ed668319b8747ea4b1b7a0a3b38ce65f206126f24654ef32431a30a1eb27b45ead1e08f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/an/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/an/firefox-73.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "447754e83d868fe8a531f7c44a037003f9e0ab6a10ed8ef1f0db7107804c75936e792a8a6df69dc4db1c544f9ef9f6edff248878f25ea3a81b72fe509494fdb3"; + sha512 = "cce41c91f5c05955de318280c1471ed7d00c5d69fa6f76eddece326d0bca9f2c6106e3c44e4c67603ed03f1b883350625e95d988b6a6dad315a5c0b42dcf1c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ar/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ar/firefox-73.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "91a2016144ddc0184e954ccdebc3535c8cd36dae79869e95cfabc1e9d9a7f49345611d85ef5252db3dbc31c2421061bb87941fddf62ca38e2c8fffff4f410011"; + sha512 = "0979b285a8dea587046b43f4734cce5e4d7af29afa12cd70f57d895002ad26e2ad0beab075da97ad6a0b7f10446fed303eaa9def4bc627ec011ba5ff4b3a83e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ast/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ast/firefox-73.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "46783dbb86c1b50bbd9ef03509402805eedb1ac82c017d0e6d6c1692f0888d1ba14a61ff99f3a88e758d96435326a1b0807a47bbc18ad73b0b1ecd36870ce4bd"; + sha512 = "f75e39c09838983bddfbe4f67b5d6a71571d316505e7b45340458cd2b47c167d2c661bbe9f6e62b3da9b4e5f1227e0b58ba536846e2a00c519e1a91b89959bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/az/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/az/firefox-73.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "2ef54123e01952612fbb3596736b5ebb948d986fd6ffd2eaf2285dcd269bc6ba4cc2489d052336b2cb4fab94baebe460a4313011444f21de55f0bb095553345e"; + sha512 = "0a99a8148d5e16f2ec82f967f8ba368505343bdebc4ea441c9528c5bdf25eb085bcfc098a10dc2a3cf96bff2ded7cb135327d3949ab713a90045769d40ad8d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/be/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/be/firefox-73.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "93948950bd416f0b48ac3449abf5d15ce0db59568e93625f5aa82af3e5377c01529d08b3a1aee0b7b6ed8bd7ca76d238adb083031f58bafaa7152bd44f6038f4"; + sha512 = "3d84e37524b67e03495d9e17f27cdd1577fb4079117959bdf2dd4ca4a2c9e0cd9c1fe51e195b86df5d41893ebfa00adf81c4481d8e6927833dfde98fc9f5c4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bg/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/bg/firefox-73.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4004520711d7052425c3c9951230961e584b816a9d35f5d97cafc1714d1d38e9743593b6707fea4550f63c770878b67f7ec0e3affdd9e57110bffbbcc492af32"; + sha512 = "8f58078575c1de5e5c710c9b802ae761f200c3290fc761441c7a9f9c1f541d69c4b19a1ea52b7b0309c8574abf43aa419419b78a8be20ebf185593c37419d2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/bn/firefox-73.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "62330230a74acd2fc5103a9c34b0b475e22c267d03304e32ee9add9440f829c2d17e8d967b62d7140bc6f9329238c64009a68c1c7dad494c49ec7f56cf97880b"; + sha512 = "9df46adf97572c209937cda57014b5aa441d6f586e055e46f8331f3801061b784e609c2e249dc3efc9ede2b00e9d20014af0ffae05fd96655e18aaefad4b7d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/br/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/br/firefox-73.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "964698949b7a1e200a743e6d1c59db2a654238b1aa4122e5b3c29d47b4e35f098a362c359a6fcfa938c5189353a7942fe24ca0ffdb59498e50a2b92eb75907e3"; + sha512 = "bd1be4798b12b71f790ae42843a6b1aec3bef088275b5295f3ab202a5d26a31e67b2aa71279884b771e9f2aeb8c9e6dac55527761b8c788885f30432a60e1f81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/bs/firefox-73.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "8655234c81fb9099a41335ec71c3e78c790a3bcb40ed6d91f78f18e705e73bfb4eb77661f80c608e2970adac75752c798f163270c1a66c7cf92ad92f76481ac6"; + sha512 = "fbe0c761db5d7cce95c1d76d33d323a02fbe5b76959a6bca5a445d88571ca4d2ede0855a5c06daa16fcaa967afab8009ad66766afa241717ccdcc07017875907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ca-valencia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ca-valencia/firefox-73.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "a420b87ba65d4e99662788d3f5142cb96747334959bdba455a8a449cb984104cf2d2f2b0d21f216fd2194261b13acba2c7f28de901d95d402fc72b3ef85ee612"; + sha512 = "0c5a1930b891ea5f681c6d6538db0941bbdeea07ecb6185971fa9d38c752da5c1c1ee9055cef64174e3febb5748686c2f0babe29a15ff9bd0f49b0e72513298d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ca/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ca/firefox-73.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "53712c47a152259724ff339d1be1783cb8d0d38267c357c1e1b56396082c04f0204127301a865ad19b0072d02a7af42b904f1ac68e166875b59d50358a681fec"; + sha512 = "b1268753067fab824bc113b411ef2e2bfd9565743711c5bddcf9e86bf3697b0710f056bee03fff66512069cf5ba9c6fccfcc92a7fc834ded2969ec35c4122c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cak/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/cak/firefox-73.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "cfb06d98597d582132c0bafbc39384217da03024cacc80d92d29e489469180793d796edb2f78ecd717d2f25409757cf68eed46fd9d6f7b87cad01161dfe75d68"; + sha512 = "48d57f56fa9ca2834ac8355878da89a2eeea219906dae9093d213ade4e3aea65fffe2891ad84ba30bea07ab36d7f40f7bd04348ef37bd61419133f413debf2cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/cs/firefox-73.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "85bc90f95d2cd57a1f5a1c779317df3e651ef1930ec0c003aee89b353577792890db7a7ee853c4d93db802c28fa355ff4a35a56381fdd7b7742c554dddafcb21"; + sha512 = "6e8adbb7a8490ca5e0333959158cc12b2bedd0702948555c5cadab4b7af52521a0118f901767f9240970aceb66af89301e7c132bc723a703a1fe5b952fec72d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cy/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/cy/firefox-73.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "53e920d8d4418296b01d21b5e3c9c7788db7d9554e5c2b3c38b11a47a3ee2cf083a80d3e3a28fdb4bea262b3056cba4ae2dbd3a388252df7dc8a1fa35dd2173d"; + sha512 = "518a32d58b70a193268717ee071cc896d82fa3af9549bf76cc50eb75300e63d3acb766ca46d4a68208742faace69130d39bceacc711f67740681bc87eb7086e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/da/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/da/firefox-73.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "69f93fed3e51fef8fc47f581a9a4f1a7dd9bce949bf582dc27bd0f04356cc337d1f0c7156d1668a2d5c09a6afe53628503fea39a2ba79e564f4c2c4b13d49826"; + sha512 = "6f72f63f52299eee8c802f83ca2091366b0b820d5dfcdc079eecf366f49ce3508b26271f4cda091c0367ef979412e7a2a9b0824196660579d057dca93d790d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/de/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/de/firefox-73.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "72506755ca28f1f59aee4f39fc51eaf952b607eba97b6a1b80a6dc79db545aa5e8d5df94792ec0c3b93fd70bbce0bfcc25ca7b9b611690782a265a1581c15393"; + sha512 = "b339dae18b489015c225282798911587e459b5e9bea3146036426f3d5299ceec6761848b70aea4cdd927374c8105f18bbdecd19f5bc2e3543a20a2648c26de52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/dsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/dsb/firefox-73.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "17ae8a6c85ead04cac4fcb8c29a4842fe714cd2b3d143a3333595794ce51d8bdabe4a12038041d9da89932766a4b5508249a1d8ae0fc8efecfcea87672392d9e"; + sha512 = "cfe7206e9d8cd8ee88d477eb0cd0c3c5d948fa8343fae548241673dd872a8a4ce5edb80cf36bcca79f87f0e883cd8715cbba494e0cbd998c04dc9c570b589268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/el/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/el/firefox-73.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f7b80595318b84be3c3d5e9e30f09527c1ea135a817f3570c9d430c7f7334195f362d421cd0d8970e2fb32d6c967147ed44b0ab373c1dcdd79e6fcdb86be2a35"; + sha512 = "47dd6e9bd0c903cb37b3d15c9cf3fd252e0c8d6f3549c05576a21a0dab577667905fc45673e4d83277eefb68c1b7ac6d7b8b33e378d18371a5344ff0ef819a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-CA/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/en-CA/firefox-73.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "cb301703072041e12b10e5f24414dd16cfae57492f11f0d0bc6b68323f905bd075165dec03f7f59a5b75b9fa1cd0972b8106027130525ed917d3ed9d58a3730a"; + sha512 = "278be4ad1dcc050b5e9d1da5a243d5457f4c2f9ac60addff516539707fa6f1c19f7481b03db4ea19e5dfc8294a0624a0aa9d01f684e9be0a9897bf582b1b75ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-GB/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/en-GB/firefox-73.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "3d63756f7d6f9efcc7706f9d250385cd8b4e78edd60ad7e065c7ef513530ebcac143e21fc377eff1e434af536a1ce73235dfa7d5020aac2966986d9b8fcedd06"; + sha512 = "bac1afb3c5f7e83aae8243c85b6fcc63481fd8d1a520aee6747399d13947e836843878d98f11de111e58ceea9b6b8364da69bd00fb89fc1836456eea07ef40c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-US/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/en-US/firefox-73.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "7c7058529f1c7254b866c8c63e6b90b03ffd9212aeccfc1a6592e98fb730928b11c9b26c0a69615e87eece1db1054c10a3b9709f382c8d513c9d482b973b0b85"; + sha512 = "e33307bde573b8161129899cc118759380371f181fc13cded623687db34406f8893316fe19303b1ff6209c73fb87b4c3a4be9a925b63bc198eb8294c9c6ea1e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/eo/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/eo/firefox-73.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ee2beef6197f8f59603291e139beef9c33a8e3414bafa63faabc644fa05995e4f6e1670e58c1a8ecf6e2cf2026732f831dcdbe399640f1f6faaf180e260b979c"; + sha512 = "004457b990fc340bf13f055d71442c91dde14485ee8715e709b769b98d1844d24f6189571e50ba7d691ba149f5788cf0f770c80036951651e73f3bb0c373c5a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-AR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/es-AR/firefox-73.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4366394614cc037d6fe2485baf5cd0147952a8ffe9b2e1a28b8db65b3f0a9fead0823baced3211eece5bc3eb60fccd647195dfd184fca9a048730bc1cf0d9a51"; + sha512 = "0b5aa22d81858bf044782cf3d6639bfbd55dbec0bf34d89616885f35d144369dfa304306c488f9b0a874723b770d3a0327e873e54ac6ca5190461509cffdf7a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-CL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/es-CL/firefox-73.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ff0966573ec2ac21e886c57ec234bd1ee2f8d5c3e381eaeeeff3f0c11653c1fb4fef5f4fb68c24107a8f00b7f269848142ede7dea9ea095764f77dfaf1fd4521"; + sha512 = "7fe521ddcc65a53ba8a0d3c789a513182347e9d2f596003bf7a98f51291f913a93a37821b68cef7c3e3b638cdd1713384090d88ae5cfdf006e3c820f76ad47ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-ES/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/es-ES/firefox-73.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4fd607ae1da3920707135a7d68cf1f4fddc43eb92521cbfb178feba39b0d7d4b2dde85723e655cc32c247a012c35e9a9479390683550e39fa2e00be0b01c3ebb"; + sha512 = "ad6a4c28f6d52a74c67cd84023c85233c10f57e1112a9ef13887ba20e42f6aeb355633cda7f8957b8631a672ff9a7d0b1f0ee942496b560b760ec71afb9f2558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-MX/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/es-MX/firefox-73.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "54803af40f8bcd74bcbe667f07b6d818a76e2dd6980e32c43651df9c6e30e45edd45664b442e69e035ebd610bb7ad9a2a6f0247faa4918b2b3d8bc9f72665ef4"; + sha512 = "7738bcf7ec26dde64f2731eec7268faf064e8830e49f0c4ff93516102f464431936d1b957ac44b442309020edf7fd7e2387403e995c519d595c51197727c488a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/et/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/et/firefox-73.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "43034830cd0ca754c6047052e4df6105a77a6040fc5d5f592a7ca3ea94ad30e0c98952fdb8f30c15adbd8e6d0aef9fd374e5b32fbd5053a3cf6f1a6f267a73a7"; + sha512 = "dfba7f1bd5196714fb7431d834a9ff8e50291673e59ade50bafe28a97e2a4a8fdf747554545c99774b969d7504e69425190e271e1baa2832f14a8455d6091691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/eu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/eu/firefox-73.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "06ace3e3d34500a0871165dbf795704c9058f180ab23e9a94e458e9615475567df1970ac5f7c8a91279a38811d99ad5ad813dead9632b1abc8fadf75f1466040"; + sha512 = "b5b38c1b5b0fab731d119ac3b6b58ce92961a3d4097e673c5205bf51de8a82154147deaa58cc8d1812de91a676904fd7aa9a56031936135ea392583a4bce3b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fa/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/fa/firefox-73.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b70c5e0bdc41e14bb93e9b0eca3089402a7b2de2c105dc544991b0811398748a84c119da435b92a300876396ea47f36d1e4032fbf4e7c341357484362468f03f"; + sha512 = "411ddf46362d62518a524e99ce4a1044a606e0f8b770cf661099a0562cc0c797fe5c7d086df65d07d5f56829bc259f86b62e2c2b1a2ead593076edef3cd93dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ff/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ff/firefox-73.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ac9f9a2a4ae117e20659ab73949b8b7e8c6e9ec780e9b7abff38e242243919e262acd9b3945e0e4e9aba55256aa6304b2647204586d0400684c24f7633e18eba"; + sha512 = "df82f32dfbf318aa1725d1a1a90cbe14149735d7eaf485e5102081652b1364ec26f35f49d0ef5fd65fedc0ce433f25fafb40d55dbacd0e3c11f2ceac36bc175d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/fi/firefox-73.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "04dce53d546f03499b8691c6b621c0ed3cfc61e0177d506ab5eab7cf492e6fe11a50390da87f929f37014d235955b6c0747993824c3f8ffa6d04575ef407d69c"; + sha512 = "e46a29252140713af73ea97ea38ae47c253e02561517d5249c3ed3652bd2d992c2bcfb0808220c28ffbb797fa2f0c32003715df0dd51bf87f978da0c7c8f83cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/fr/firefox-73.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "43e55696a7634ca8f4422c47253b2cc231c6a7b142c2e3f13ecbcba053837fc4cfca1ca3c8270991e68fab2ef40fbe9dd21b54e278591e66578858ed15a7ef4c"; + sha512 = "3a3450462e6f043997e015a8c2fbb2a93d68d913b3a2225fa30c282dbd060f8aaa1180f548b31f8f3c0b9a0d0ffe3410a94480c05da439e8be7b897fea705ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fy-NL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/fy-NL/firefox-73.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "11b045a86b15552449ff2c75eea1bf4ab51cb5087934d03d9e994de041ef442bcc15c2f6858b8e895520f2c231f03c33f9d5ae51e306b90c25ee7bde3c410d21"; + sha512 = "cb442f4c19831de64b3499a4dee7b84f31c28d66542e790dfd721328ad56f200716eb78b7dcc5f4bbd2e26cdb2008a1b9a3ebb860e41a1b7dbf78d8010d37666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ga-IE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ga-IE/firefox-73.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "bbe8f473f775419f6ff6ee6e156b315eddd743ab7d8561d1b2f17b6d2185fd00d9507ff51de4001b66a7a80d07e7204cd7861daf4754c089c5a295a4f272b9e1"; + sha512 = "30d99ef3a5316cd5bf79bee2e0116ff30290ac541b0fd7d924ffe40141dfd676c780b44f5edbba3126f74045d38c05f36a0400fdb80514d4734731776db3c5c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gd/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/gd/firefox-73.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "5f996f1d58ae60a65142d4ea2c6a73698f8042c83cbd8d2073b0c9834b92c12d808c13ca91d792b9c8a3831bd5657171d103fd1d3a958903164a563e5c233639"; + sha512 = "376fd40603879c80859ca825cf28a67621c88cbae6b2f4a384192e53b0da398f52e1df1a6a655d7d5607a5efdd787d53b793599e85e4c1395e0bc5a11ec637f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/gl/firefox-73.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bb4f26c429437227b0d0d834d9bfdd0511f922606aa48f4cef2e6e98ff7cafc473c3f24add0bf223831b7710d92a109996317c001df5047dfad9e9c3cd7a31fb"; + sha512 = "f432edfefda30d3ba92963276377cf1ec921a40b3f395550d0aec42fe1364fb90091977c8db605042f166ec1f5af8bb355458016cc411a98e578864a15e988af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/gn/firefox-73.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "c065b74fd89313a8b54f19c551fee9e31dab35159fb0796b0a441aa7cd4f0daec8cfb8e1b2498accf18c99973d5377a986832fba8d907cd32b24a31ec86d3ca4"; + sha512 = "572f786359db0fd4f3607f7ab79c371c455a2c743674e8b784377e4e439209c09a147172e5b8e8c31478c9485643e82ee6389e9eb1a90cd61b1109f993021913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gu-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/gu-IN/firefox-73.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "aefacfc8db154d592121d8b9f7743653002705a00c1280f443b58e433defd40b6b296ccd82adbb402ef907bb97abd4f9bda043dd0a48400410332eaa44dec650"; + sha512 = "3ba6aace62c70a5495a488498e14adb130b05cd1c1b1c823a304520ef95030a218fc4ac1363bfa6534b5270517d7cc93a279bd9e8b61678279e40c048b734c73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/he/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/he/firefox-73.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "94419be7fc1c5ba72a30fcbc9ce83962efd294f9a33caa2067077cb6a3aa493c2ef4ced1b14e1fe9e6e3510dbeffa131b3d7d1de8c27703856601a855f68a6a2"; + sha512 = "d395302663dec706dd21d43ac24c34574168c17b2c3c72dda261fa835069569e8dd095ece9a4d2c83434cad4b422f478935fd488b5f6215727525a7e2f09570c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hi-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/hi-IN/firefox-73.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e11bbe3e9d1bb50f6462357444c1d0bd074e732f81217dbacc1936c7546f8f3913749c7ab2f2288e229a8bee4e5a43e5e86f0eebf8adf69b0cdedf31817109b8"; + sha512 = "91974648b9a07db383ce7e806e51c27b1fcbf4253cdf26dba281082c0d60ced40e2e04b4794aa462f82cff4a4ce41e174b05c4634203fb5f39d7bcbd3175a373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/hr/firefox-73.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "040b33546e3309cb562b4fee834529b6acbff828b4239017d0221b33ca4078841e4bb5283bce79cd5545f8b83d72ef9a26fe4c1bb8e1ce3592e9801ad7665a09"; + sha512 = "df121115a87fc3d5a47a024d3aeb6758868bda3d882a37bd7779282e6bf8c4170a945d5af7243aa41bf02af07683ea8e2159c933cfb6424cfce4e7b9b5f7f8c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/hsb/firefox-73.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "6cadef677c236dbf7140181644bf97bcf850ffd67e282ea69005400996f1ecc838971347c6e9bec6d4d1074e73e62af5ab91df146e7846892ab86bd802f47342"; + sha512 = "8afa767bd78aa6cf818af93f4b77cbd9e3980c47b2959e445c7e206146f639a8034bee0340e2dc27c70e6a85f9b2bab6adf4b1817fedb859bb5ad10df48b961f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/hu/firefox-73.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8a5cde0f6e8f42833bcc81a063225bb44366386c96428afce58425197eab833e3e2463e5ebdc7661675aab6566559004b9812f12f666ea1c329e049d106f7f6f"; + sha512 = "6871c713ef78261820f54c8bb43ab469d39a68d3f5ec4e521167fb70c0f9eb76cfecfa7679e1f92ba6698c5c20fa9bf6280864a308151924ca6bc4efb5af9d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hy-AM/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/hy-AM/firefox-73.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "61f01c79780003d7c0d8edcced7a698b37bf4cac7663b692bf7c4459dae4ccea9a11ca49d8fe5c03584eedffde10c4ad3826dfe3d96531922c38127e173f49fa"; + sha512 = "a277a0f8238946cbeb1b9b9f5169f05bf55145aaa9c85ba15a6534d5a1aaf1c28dbecc6c6dc131c777294b08383ff9cd88ef8f181e5cd908669dcb2e96a4d64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ia/firefox-73.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3c9d5a69a330e43efa981e79e9aa36dac937d434101c7088aee070e42e21f601b5f1e04d639c8e30c3db6b39f07f1dc00c261b5ec1f5794232a095e9ebd1549b"; + sha512 = "7776d8eefd8e947b3682c00027d2a2ce5f48365cb5dcc87e88f882943718901bc8ff3c88abce1ad8fefc8f5d504baab05f393186426b04e3a3caad44f6b8604c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/id/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/id/firefox-73.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4a40764f77e43ae21a242647ba70ee42fc86f6813c2cf77b28f446d13a73d2f64e9694bcacf28c17826a513b19f567f58ff1c52aa3c6be8f416f0a448c06b434"; + sha512 = "1d5a7910f3b55ca071cd5d0026cbbfc6d992209ff56a2c04ddbabb946214259968189ebadac6b38beb6c1f34a099668801b141e3884adff55709ca0b65d12fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/is/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/is/firefox-73.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0aba047ace0a41355637443a29a4a4be23b60bb6f327cbfe24377f9338b8ec65465e530da77b8815ea5f4268c69aa0e80e1a726090f440fc775dab3acd7e62fd"; + sha512 = "e0c7e6ade6be176163570b373ce2f2b24bdeaeea2eea49c70b2d1e991e6871d9b93c1ba141de7cb9cf3ac4fe2c6f1fb7b6e1a6d2ed1801b9bf7f73cb046e4fde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/it/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/it/firefox-73.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "6bcb740801a18d09a720f9c9e451005afaeddcad3df58c4e81d112805ff60f620412939a824484267af41f2b0cafdc55c2c72114662d3e3f8c38e82463e188f9"; + sha512 = "63504175d04ea54bbc5ccf1825d0d8e63fa6f8ac83c21a9581426a1eeaf4819a49f7a26cb4c3858247f53a0e66cf3ef6735f98312bff4d0fb98993b17838ae23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ja/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ja/firefox-73.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7b03ab90989de93cd765e56211d402d180a937513e114efe3afc35e4b654d14a3cb7cbec1a32b8ab864feba693d9a76e696e93746b27f66c8913853dc1367d5b"; + sha512 = "1097726ca8dac536fe0118d3a265df88c7456c2c25aa43e4afbdb01b414a5df6f2fd11ba692f43ddae3fa6f7d28286bcaad4322c82396c7399cd168b9e402e61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ka/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ka/firefox-73.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "14e720c676b10587f4947b135e45c37e496bfbd6366385c57ba010c90b424b7413348dfd9d65323dcffb7a186f2e8cdd72236e23b2ecfddffca0b923b462058a"; + sha512 = "0cc755e43a5f182bcf723da7ef1631952916233f84639251483e37b73abfd9d775d08c22a75fb60e74cfff58e820c7faf8db46a28702bd42569307c72f292b80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kab/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/kab/firefox-73.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "c4e7a7f07b2b9cd4ebbb51e3a45be2b3fbf952f8da0d756c9cd0cf63bade2815385b54bb0bcf9ec575397ade8d0b820ab2b565d4a60b8676824c0003ca3c5612"; + sha512 = "f933b42c7ef80035a019bd942e0debb65f0182ecd93e6bbf79019627d3a7577f7fd26323c7bb26c974b33ec16647908adbb20ecc7561531f76f23fdef1ef75f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/kk/firefox-73.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "cdb162428e73b2a3cf01c7bd8f97bbf90a097ea6ec3f83b1f648179d1cba85f4ccef167745e48e1327859857bd1389525f901b85934cf10a9005a14e0471cb6c"; + sha512 = "da8c4a28bccc2d4feaae2f5eaba43cab783fd3430f8f4466ee9d823d9dc3d97c182368828724d0d7f38119242ae0007386f04d0daeedcd288a38fc27c728eedc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/km/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/km/firefox-73.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c580b37169a3eb76c8fc692733b51ef0b78bacfd5351dd03ddb33ec055ca52b58edbc278d48e6984ed5b253c4572c7f802a3edfa362282a70f6dc28bef7380f2"; + sha512 = "ac35dd212033750b3dc35e5a2214781c3bfe0bb6afea376521a7a4d607a4b9dace1aeb4ecf2c4c0c8f5ab6bb49261719d0b4e760dbd93848caac9e90609672db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/kn/firefox-73.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "79800119334a7c86d7c9698b9cdef025c733eb0afdd12767eb3d6d6a8537709ed553200445a9c2c40b41dcc349ebca408ab2b1e0a412d1aa92f0fa9db6249da7"; + sha512 = "3b56d42ce9fa87a8a4fffde8e70f9dacc47212d3853ace9e594d2cfcdbd03e630b81933d500bcbb02270f4c80e2cae7710698de938adca4452b2ad525863f965"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ko/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ko/firefox-73.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "5118069f0a73bdb0055954658e33ff82a8e017c9ecb414126c1c3604f6e9867f2932b0b45a5ea2e0ad08ee12adbd60c6319f711ccb54e8eda226c92999b0ff0d"; + sha512 = "5387935b0127df5b19dc0529bca9435f14d05e5870ee03848d0d9fbc13763c8ae4c181134b081d4131e67c652bc2afcc5c54e504ee5232679e0b2c825103e1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lij/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/lij/firefox-73.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d040d130da5e90d83f3b08b6977fea5ae4f4dc16e4a93db9402a8b61e68088a13ad83acbde39215175167dd157ceccd3a1324f89d938b9ff6646dec2582f01a4"; + sha512 = "d4bad5e6a988cfbfd8de4fc834cad836e413f572e30e954c5711aaeb3816aef62c4411cd0c5a79b0c5ce19405ea2cd2d4c4603993ee2d4e48af7329afbd9341f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lt/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/lt/firefox-73.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1bc305d8e73184a1dc5968a9e8f05a804a79e0d447d09fb5d20991897f9b6cc913c29b2eac5032f62279184e81a55577f75a54b3d54340f31b0f66b681655ccc"; + sha512 = "140f65faeea5e226c474b4d6e62d02b16f132f8328c6bdc6c3b6f1ff7333f77f093222c11cfaebd1453537c2a89f91cbe2797d892f0ed438d102f2a1cbf38a43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lv/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/lv/firefox-73.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "33a9e821ba8c8756ac07b6df0b786354caedb627b031fe7ba6716518369fdbe8877f0165d60c71087fe20874c8a0e4cbbcfd5f8a60ec90760df451b59722bc5c"; + sha512 = "21e71c6bfcbe5374c0826485a914db71a71fb7c38f022cc78a953267c168626631fbb5270032500973b25f53c568ef5f355db0d2a34e179d809ebe5b5fa6e6a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/mk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/mk/firefox-73.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "dd99b0f7dbee332b3012f524ea3de6cdfba6fa8c906855bd09145cf5d271af189f27e4fb84bb5acddf92f6930c9f885b772d97b94f90a99da7be01a581ca9e25"; + sha512 = "3853af01d8b0931b0e9b00e2c30b38fd48c92e4ee3227a4036a99e9d55295deed68bf9ad14aa2edd997be166f5f7a5099826863ab6a9b643bcc27293582ab4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/mr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/mr/firefox-73.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "ee1dbc95b187ef9bd7d2f727e66b9b36d8ab67bb0f3e5dc2f987b903e08de7c4173d97cf7684b28d67250fca27acdbc9b843b084e0c2f29ddd77814efcd3452b"; + sha512 = "7ad9e2552008f6b6a3436453c479b55e1ecf7144f9f5d3fb8211bc7fc5f15412d0aa4dd07e0cd24c83834d325fdbf289e3795c4e03e02bf63e179fc466fc6360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ms/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ms/firefox-73.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a2dcfdede6ebebeb5c994e4d609cc0a48f1100087ead6d0a219c65d204796a9898c8dc2c4df09479448aeafdae2099787c3d838c41baee12c9285a4e96b6ff19"; + sha512 = "26d510bf79c4a0cded72f5b227b4ae1b31afa0c2e2ae71e29e6c72f557c4968b8462abee358931c4c220a81d2ea3044a2e49f8c603841df3df0b601ecb3ef91b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/my/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/my/firefox-73.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f8bdc2bb60f34d434b529f3231301f97dee662fe1e3ad856467568d4195cd879e34a08c1a687911a66cecb208993cb59f827ca8351ab6deb66e2bfeec905a765"; + sha512 = "325506dc7ee5c0c93078c919daa10efa39f43a703abacb10f6a7d3bdd8b878a4ad8f931233b4f6eec9228a426c9792716bffc9ccbd49c5f37124b134b8658d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nb-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/nb-NO/firefox-73.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f1694d443574316768dd5af6a3d1aa25ee2e20d78d125b95f15ca72fb5dcf696737c9ec6ed3809aea0252edd082a26453c6a7c98423c9fac91ebacccfcbc2c97"; + sha512 = "510e08f98258ac4b0b7c39e7f00e1bc046b7b8b0cab3f6cb36f102e6df51c8c25224bfb1b4f9699f9828313f1afae0c40863d4733c0965ff99c8fce59c53f905"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ne-NP/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ne-NP/firefox-73.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "eefc58ecefa9d48e6fe61ac16dddecb51549cf9f3ced1efb36843e48eae85d899dd3abc704d33147e6700492d6a4fb3cdf39d3730cece739bd3a795bca53f54c"; + sha512 = "d5257909d2fb47ef1dfc3d407a9b371448aaf090bcfdfbf38f4a92337cc006723eb04e4a2f14f56111df7805f50d202ce600f737b4888460d0c4db4c8eca83bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/nl/firefox-73.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "cfc4a918fb314e7838c69dbeb8fc5c9a4fdaa08e890bb79e886510ccf7cae672be608e3b47bfde9001afc05194d97939868e7e0d7a2f16821a4e458b62c57948"; + sha512 = "8a7c6ce306299ae530481c26b4ee5a57969a6892b7abb1950dc774e07cdc0c9f0c306474866f181336ffa05ca3960a7997454e57fcaa2d84799d1ccdf95b8407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nn-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/nn-NO/firefox-73.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "06fdc085b0dbbee22ff89a3f155796a98e9e5e8721d25c5abfaf123f7d315b86b4e00747990bbca949861398eb58a0c4c147b7e2452ed602efc39c4788bcf082"; + sha512 = "bb857e173932a172ffa7a42ac6f9fcb3de383664adc20b99e5ba0e743a09072831e24c3916b04b840d83c242d8c1a46081abd38ab5349a6871d61b053309f3ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/oc/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/oc/firefox-73.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "b6534944fe1efe4f844935fde48b4397dabe181a6facd65110dc5512abcdfc83fd389e387dbd619d63857b456542553b74963d1e970c5136d51c6203f49c942e"; + sha512 = "f5792406be24960e68368fbd363488829e5f63a4313b52bbd42ffd6a68f2d7a8bb838c80e150cd87d7a6d0299b0dc7ed6dca3ad5a5fd32934b452f00d64212b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pa-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/pa-IN/firefox-73.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "f351f9dc860a096b260e23e8fbeefd7529608a6ebaa05510cb4b6f5b78872b6cf7920a0df3fc5d6c02c02e982d3967d626def031932892df1e3e1176297b9152"; + sha512 = "3c34408c3d7937135e624c130347dcc3b47f75a78024c000cb58a15b1d2f37eb748e4c4ab1e63c3ab164e13a399686583fce69a4b74daddcefc349d79c67f121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/pl/firefox-73.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "eb1a8cf7549f377cfcde8cda89c8353d41ed729ceb591ae79fe45a4bb78a70f7705e834d3a4234089ebcc1220320bbaa473d77fd955232b7f354660b946fd263"; + sha512 = "f897afe9be7918a3ac39db33c8862e06185128212c4411b4767e2806b57e735be485b9242971d6aa9804c1fa469e46bb2d42b78be002c341222cfc3ed37c198c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pt-BR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/pt-BR/firefox-73.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "4c106cebf217be7fb68d38e1058f145b8e62dbe719f53cf8d8d08138ac43ccf07d5506f53383900b1b7978e85c7e05bee1c29d83738ac5172e4034b38f4e507c"; + sha512 = "a23e60f918c6508e05b49fa1a50f0f3c7280a6b9983f40165f632957736a8a8ccbd9b301ffa7c4e08ca42077507fe12b105d1f0b428e0e6f3b7e04c598342821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pt-PT/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/pt-PT/firefox-73.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "dbb5634292b35b1a5fd8ca634b794ed5f7932882b8be60c18c97015c770bb36aedac93022eedfcf231867b28ba53ee4078820df3b2f6782f14d8c2f6fcf3187e"; + sha512 = "24216a8b229c35f9a0aa39411bbcde6f765279f2c7abe5c817f9b1704a9102e8a97f4f0ebe0901dbe68a28ca07be63eef1b694d511c335a46b9d0edb74b8e03a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/rm/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/rm/firefox-73.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dde472ae454af6b12729db749c9675d73045bfb881811ba34647ead42f39b5fef23dd9c505af01e40538163363a4076f681cd16b738cfa7235933ca65fed8651"; + sha512 = "ef9823b863ef69115fdba5f9a3f17f3d50ae0dbb8eadc74569d27fc5beb6637a18374bd3ee151df74bef96825c708df708db62b791d8dfdf4cfe069b936060ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ro/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ro/firefox-73.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7af78cc786a786ab230b801a41dfc493a40202758d3df3f8792db4db798d036a65aa50f1d764b22cbda82eb798e895247ba625cd79461b72c780a8f2f742f709"; + sha512 = "b32e2d66f225a9b12941c9359e8319a33d652beda0cb3d6ddf6fc8c4d0adfab1b967014814923271c0194303d93587f500b74e352b8f0ecb5781e80182d4aef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ru/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ru/firefox-73.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "ed1dd6fc52b61e83ef31975d25c569c33aab2fed13a11b74fa4bac37e464bbeded80394bdb7793d45471a0608fcefa8b9c94778a77d7fc39c7e39762f96ee260"; + sha512 = "8edcf2c1ed391de63e0b6d74c6e94fd1088ab8f8e6f8433c94779cff0ce20150c46e71d48b657cfec1112ad3b123a39da794ec38088d5990757c53807b483cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/si/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/si/firefox-73.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "6581646a8e2cb2a3fa168274d2df643df03771d4a2a99a874db3c6c32ccd27fe31e06d9d3c86a0c190b21854453bd330656fbb4a69868b3024b39b20c908822e"; + sha512 = "0ba714e6c9ce5198e1608767a9d4ab70bf3de3f766c213bddbf1c7e5114b8dd5e6599b153c0547926b58529b67cb0892285691b2cee5adabb8b237edeeab17f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/sk/firefox-73.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "d18ae82fd81b0face79f98320b74f7ed49a0eddfb64e6012279da3cac230688d2ada3d7c5dcbdbd89819db0735eefdb4a50f8929c12b9dedc10a1e40c97ff133"; + sha512 = "47b7ea379904c6425dfb584465938e853bf54194d0228e5c65b695fde4a0d53b952086f3f93df89be620e6ae3333de63a0fb15398fc6a5f93bf8671c6ee14f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/sl/firefox-73.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "2c630dfd44c0574b2354cbc089191d6745dcd9f3e7d8e1891a11d7b11a70734c86787ca820cf7ba46b1124c244366cf09e3a7a21eeb729e7512cd508eaa11aab"; + sha512 = "e949ace722d148362a990c51f4c335c01df675cff49d68dc9a41fa1db8ee98f1c200101b2ad4934fba10564dfdac2fa586c0be568c19aa1691544f90fc841674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/son/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/son/firefox-73.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "fc50ca49ef1f58b93b41d9fb3ff81be8a17b9e80a49e83578b9cc152417b643b246eb21965391b870b7b281f8d77c2d73c3beaba94548f1d638927272a45f10e"; + sha512 = "3ccd1c37f7320e28a84f05ab5ce7da01be567eb3f5951aab214df658b23990b0e8442eb20bc8cad9ed58ae70685ad7d0cde37fc7c8047097db86b23b44ecac09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sq/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/sq/firefox-73.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2d48a8217cfc1fd4210529596df73ae695efceaa4aca41da5db51962a81758dd1be4a15f30313e49f2f5fb33095408e146a16a7bac72d267704a8709c52601f4"; + sha512 = "3775220d5847efdd802c97f26cae513fc3900753e9f1bb7169eec1e47bf3fca57b4b4be85b3c419b4a428e601d1c97700c77a69318ac264267eba3a45f35e102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/sr/firefox-73.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c8213dc5c02f72efd7be29d08c127033920ad0471942131787c396b05c6a6443dd803fc46268eab556571040a4bcd16870dd3d94b9612b9391489728d21c43c5"; + sha512 = "9892aae7376314b586e7d2e888b5b8bcf7f8f934c91d493209a34c7059f521c06037704dad830909306cf7745cde6d4684499371f5369b924f4d326192bae160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sv-SE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/sv-SE/firefox-73.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e654d3cc2d7ab45323077389c14860d294c3cd355408197f5bd8562b49f6f214f7c2271155ac9971ff3ec76a1075ec528ecec2887db41cdef02ef88cec40c4fb"; + sha512 = "c0b2a327b45d0a0ca31e33e22a070100495c215bb4f095e3d1f1ea4a6a32b5400fb5aea30cac18e9ff9c8f879bcd533c0002eb824ecfa1917c317a8610f3c2fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ta/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ta/firefox-73.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d6ec73ad1cc93112dbcc7fa2b7a0d4da0ace0e16b7352a3e348e1ad8ae451351dba94b98fafb504c1066640787a7413080c536e99a93e2039cf4a7261971b53a"; + sha512 = "b72b0e4cde98f9dd0245b727efcf34a01d1561314b7e609f96e531f55118e357cb78f7ca340036f8a613fcfeb88d6517a3e33ede010473ad52943ed766a6037a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/te/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/te/firefox-73.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "edfdc524360181210cc1f8a09a9506299af5f693492237901b3460d6e8c5f5cbbbe3857c063b682d79a2222077dac5225124ce179eb16884b1374788560f0ae6"; + sha512 = "48275d13325f22939ec806c68f63f03e243ff1fc6b28102e2dc85dcb38d761d55330cef7b732ceea6d9632e7ec40db2d7861fcec7ee518623702da01873a8d9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/th/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/th/firefox-73.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9875113f966d2cef50df360f3a2c1d2e21100131cf334a7b293cc859ab3c4146d56fd9e63544e35a90aba8edcf321044d233b04fc38025c926cc1b125a165651"; + sha512 = "bb6f530f5cf9ec84c9185b16ead438482d729bd152c111072ab950b70fc8cabeac95409e097930529deb31fcebb1a0b1a3a827574dc4e6c98005119a3c2568bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/tl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/tl/firefox-73.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "a69699faf3f7c67bba77e1ecc661f9e1986324ecb7c35ce8f5137363a9c6d9270d0f6bd7fdb6ecaf20e34588ac57493ff5c1b04cb26adcf06af43e989f565b69"; + sha512 = "cc5d116983830444acb57b99e2f6049fd396cfea7aada57983885a2d545148bbf9d33352fa110fa1448e81f15ba9141bcf4201bd20ed3778d7b9acfc5ddc50a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/tr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/tr/firefox-73.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "6b922577000343bd72fbfe0e624e85cba5a03a93d2134e6ecb4990795b6f078eed7efacec1b3d2f890e68e14a4f372c45b67ba0a310fd160378da922c08e5154"; + sha512 = "5d849a133844f8d09f2fd0c903c46a02bd2d0670177b8776711ddaf4d85dade71379d0dcb22b99566301355261ddecb2dbcdb344bb624c9333a2024213fee429"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/trs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/trs/firefox-73.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "502b72962788b471e0d85a4b36cec4b4cd5c9278858a646782e01881f9c84b26b32f9642a475fd6e6ebe5b7adf6375040f86d43cc50f47a873585dcc64d4a599"; + sha512 = "eba7e46b423445b6d39f618175b67f2145e737044384fca1e92e20fc4d2ff849b9bc6b674af918c3255b35f5cd270cf1fbb64f0b1c794facac74fabad6c90ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/uk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/uk/firefox-73.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2e09bc938ff3fa1d583288da6a9d17af40aaed184100b1de54c6532ea4cb5ad8904b724ce06f2a61ed9d71f1128beeb478218e213b5a6f868fbc9f355b83a1b6"; + sha512 = "c8239acbdca6246f56f709f178010d08ead92280392f35c96686e7f9217f49bc1447482637dfbd5a93e8c421da93dfb1d40d0d0de24f8959707047029245acc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ur/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/ur/firefox-73.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "2dfd92b3d024034b8abcbe6aa2ad12adc75fe8ebdbeeb914ca1847eb8fcb5b7cd20fbe80a4c8ebd87991ee46931e49bf8d7fefc95eb5df9f6a84813ffa99de7f"; + sha512 = "e154aa305554ee29aff8b176727bfec49c860058951287b5c8063ea90adefa361ed7175c07726d681376d50dc2311e872e704f19e349a6125eaff01eeaf228e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/uz/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/uz/firefox-73.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2b3c0c758814806cbd9db8d1861a309b6b040bb12ba9981fe13d59d7edaa38a801a093da45db63ce8b3d1430e2cad11a2807d0d193423bd5df227b1db32803c4"; + sha512 = "057c7577af0c11e7ee26992b17d31f8cf33014c3c8290a33541576b6c86b41de93d54c9e905f4aa3ba0d12afbde741a5b7b45a1514ffd8e19c36b012becea3fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/vi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/vi/firefox-73.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "09e0b0bd2ff7c917b770110b4922c4d0549b0610b50e453521e92776e36f08f161fb419807c6e04bfd64ad36433a82e19767e249c3796cc3ed1a3efa72db44d3"; + sha512 = "38c9787aa863827210cb97b5dab8aaaba7a84935ac314ba9e1c0e40721fe290f9bde23c51a37c9c7e5ffb1b0262faed22242bfab9bd7081aebba14b6a7eb4405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/xh/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/xh/firefox-73.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6014a55dcfb521c18fc0988bdadfcb6e6af840278a53f61704f775e40b2f271411f8b382d1e3d128f63792f862c5f7971c3c62c45f611124017695c94aa90ec9"; + sha512 = "77516a3bd2685841fd162b45ee4f23f6dd47d433080059455fc8543f71e6de3d6eb655381c694d930efed38381f4112b089b835f9c29aff401e1c90720f11f99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/zh-CN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/zh-CN/firefox-73.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "e04c44841d5e9390e7535b4824cacf587cd23aa7b2e5ce0ceef532b6a3e9ff0e7ae8cbfca381e5f2f1cd17d484f02258b85e37917f863fcf16d4141812b5ffc1"; + sha512 = "e307ab6caa0f6a7529fb7900d0e3d3ac79bf0f0ad3d86e928b52abdddc5e754cb235caab531fb06d350779b40ef5617a6bda67c2a23ff8a7bfab79bbd50eadda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/zh-TW/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b2/linux-i686/zh-TW/firefox-73.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d265ef9a7883702fc6a834afe04eaf0c420fbee25824e41ed8293a275e98e2aaa2c34bddd32587af4b91ba7acf0e56f295091f21c034d304d081f2045267c839"; + sha512 = "55be1023238a12f4901b701590bb041f31482668995ec18af9c5aaa2efd464d2cc4557e3d43ebe6f2295468193e69fce9ced405feac27ff6940af1c31ced15c3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a362045451a..bd5c2cd595f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "72.0b4"; + version = "73.0b2"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ach/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ach/firefox-73.0b2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6cbeb3067c7213d3b675c0d932fd77ba068af1713d7d7f4367f470ccf4767427a9239f2cdcfc3d1e33e1b71e02578743e0bccbca2320a9271663d2ad76b4012f"; + sha512 = "635122516342c6a6e94600d80ef86fe452c38d855df54d8e6006a97287267c25db8b9c899384fee6ed999c1ba077557d95f5fe0b0c5bbbb9ea2797c74bd5af82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/af/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/af/firefox-73.0b2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e15a5faee8be48117493171ff2d04abdf8011b4cf40d68d65ead419bd6619b8a1386ee9867a1229879ef75bf5b36379ed3bb04f6de289dfb2b5c07fa5874711f"; + sha512 = "29791295b3aeb04dc8dd60365ad725c2733556235f20d68e90032376edddb64ea91bede00a2ca89cb1db19a02fee266ef7ca8fa8e188a09726ef6c9d56112c0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/an/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/an/firefox-73.0b2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "c96a0c3f4b6a29347642e5583980f70affe1c84de4a2a6b5a304062c0ebe173e22af5fef1c775b76afa4ff8cadc02b7df7fd2cc8838af2c10fb94c34c8282521"; + sha512 = "d77b3d0043bb5a09e0d9dd3a14c06368279ef73c5a2b85656354832c522181d01d8fbe56349fa2b0482df5b49406318ee5f4ee32df88eb412d661c9310ae3083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ar/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ar/firefox-73.0b2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "08b69e38444a7666b6aadf8b3533030c91c23d53771daa0f975cd09b6c9726845258aed8c06de80a38f1fa47fd57b36d0f21ad7eda6e28824a7574d371d6235a"; + sha512 = "d29dc6ffdd5411f60126bed7266d74e150afc432b736b7c41d14cdc69df5ccf313f555bd5035db94d4f4721fad0d757eb53f01f602f3f97eee75bfe7aafad901"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ast/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ast/firefox-73.0b2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "419c8ccb281b16ef69b55a13eaf891ca230ab43b28dda65048b617584b84bcc899ed47368da764413b89f5b004bf3f69393214d0e30611ee4545c8a581af35a3"; + sha512 = "1e04df48e65b0b654f7b89293981b258a8de20852e7cef7bb541f9475647c870224a63a64d96eb778d715d5f8cb5b327ac0ee1a3ec537b221adef30c06030f73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/az/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/az/firefox-73.0b2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "0acd28ab7e03c31fa84c0783259241515c0e7283afd586ce81007700eb6de7deab5e6d9f6775a60b1d2238d5ede5f56d2765bcf08592d9cec4e3dbf04bf000f8"; + sha512 = "3949ac1ef210bbb593b9ffc237dcaeb0d1220c728ee65bea1eebee8fa450cba3186f31880794cd11bc26331f8188c4df4c440a2f19cf9cddbd4aacf6a034b468"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/be/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/be/firefox-73.0b2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "7b3af40c4046173d5f28d8ee7e1487c244ba7e979625105d2521b91df7f1ecad7a0ec597eae8c95103aa43ab977bf1f9236ca7ecac1903d436d5b21a275ba26b"; + sha512 = "cd9014015dc801211e9f033500213d253032c68e74280cdb5c983640b7a41bf36d12f0a4301c5744a1cfc505cebf2be592fd5943451da66a3423e7df62fa7fd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bg/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/bg/firefox-73.0b2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "e4a28f963e056e4217998dc2359582d8e2d0c08658db18e2add0023084632046f9853536b5b59af0eec9ac3b222a54f75433a9094dca4e61433da13a0d3cd45d"; + sha512 = "aec5f5c4e8258734def07ee3d2cd434ec1a948e58d4fc1419f57f38a1cc267b460197f2af79df6942b823181045d3b44460905e1175e2984169e4db93c84948d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/bn/firefox-73.0b2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "5300264897397a070375bc07338fe75cde2496a25a44badbf59376eb2eae339f3e5280ff281310e3d6c3bfe9fd2f6005f2b3f35ec815c238bc10146756e43009"; + sha512 = "efeae6dce9918ef269a21c8203ab86016f04fa38364b90080ddf7907c830f93e537285639acf4e868f73175c489742a725e451ce8d9129c60ff6694f73f110ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/br/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/br/firefox-73.0b2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "656041367d9b742a1b7b178ddb2c5567b94dbb69631884c50bbfd439d4e8ee08c7c83b85a81dcb24ac202c8d4b42cce9c7bb33c707bc274bcb01d100e173add8"; + sha512 = "b256fac7e6cbbf41ccb3baa69b660efbd34cce95ca1fa01bbcb0474ab963ff089bbe478e3bbf4f66eb1f36942560f0d77448524c9a836d3685ef4709593b389f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/bs/firefox-73.0b2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "dfa09428514aebf5282da86b6088f9d789be478e90ed8322794b2a7e3ab7db63fdfd2f437fa32cf17847a720fb968684b3428139ec9fa7a74dbcbbd5c1221969"; + sha512 = "bf40a25c2afa88ee9e0a161e362e958549c008baa6a298f663d5da530679a62406b22632b59b821b6939df25d409d40722f02c05c0a780aa3e4c6e329e515d4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ca-valencia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ca-valencia/firefox-73.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "282e55df900d832d2f22faa65e90d241a1edf471a19fd973c66f950796e3d82b4505bb35c13a8f502e19eb67d0f54dc4a9b7574f94ee448835706c6d7a66a608"; + sha512 = "b74684646621bab8116b0f14a8392b12e6a268f0e333af2a67af67be1a41bce90c06bb24e20f481800407acc3dc6e13c1dcc6023e25541a1f85a4fa578ecca3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ca/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ca/firefox-73.0b2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44e71ee6ea38f7cac766eec9d344d74391eb850b80f0bd8b4b71eb2b95588910f2610af3b3e365e57e9c7211c272dea81899a9bb8e1fbecdacd3f2c3db76561c"; + sha512 = "984df57bb31685a55670fd00eafef0ee35346d81bf283d1b1ef01a431d8da332b07c0e89f6fe2f1a02550e0d63f0f51c9c60fdd57cc33ddcc1f2be9942e496cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cak/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/cak/firefox-73.0b2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "92b0dc18e82e3e48ea48457a86d5f4fea673f6ce1f63b0d326fa1abc818d2794e67c10696fbda1b095efe3cf661f8426cc17839d5f72dfd4ce63a6ce683981ba"; + sha512 = "7d7e4d39738728397d02d26926295b19493cad3bfd30596d477be1cc1f02d0496a4b19d7fb741361cfd01feeb32c3783791bebd4628ec83cb99f12f8a9554951"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/cs/firefox-73.0b2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c6ef644d3d78f2e53579c063934e596b70147556bb74de7c31fa2592a1f06e6c84343d5efc8ec14a9789ec340688d02cfefdacd4abc4183d0850ea79c48a6d59"; + sha512 = "9de93ae204b910d5c67cbf7b8658e06c09a12d2badbc40e64ba011d986ed144657ee49f75ff27014d7fc0c09f03de6df10762ca816f34872fff84ac53d6783ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cy/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/cy/firefox-73.0b2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "77971dca0c2457ff1d938e79bb74ad94d1c6b988408f62150a17a7c25fda6c84cf9226b4ae6a6903a4ae3ce20e16d27e68964e18650243c347e2b9b6c4022773"; + sha512 = "145bf6b1e36015e4b5931335c862daf758378be251f161a7c3fa6aaba72df63802adf876dd8aa65cc61c12aec2c281f9cd8c70763fe9e3f47e50b4429647d29e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/da/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/da/firefox-73.0b2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "3245ed636bf8556fdad23ce1f01582b1c06ec71a0cd30fd5d343cd79de205427ab7c4e194fb85f20bdcb69a06b06c13b7aeb9fcd9c69131bc0a38a0f7cbddd66"; + sha512 = "5984ac55a4b840dcaa60a03e49be16e24786ec6d918f66f3d3ff90c510978b4fb484aede3d597c0646026aa85e4d2905daefae02780cb83b1cf39ff72c204051"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/de/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/de/firefox-73.0b2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fe3ea14f2a3f3ebcda6c34f5699302631fcc69843fa6d825ce75c28687d11c49202a455d5627e8bb65927d9e45f201cfd8f4a2409bac46a6cbb88d998b3d66e9"; + sha512 = "ecc7c1e0eead238d8d2e9cd40a282fbf39d0713b712d4d1ec9683f2859c134b55f2abfd0ce8249b1f329898e1cedca58561b68813aec018dfb10df160652fe12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/dsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/dsb/firefox-73.0b2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "34074627334449991fbc2f907dc1b93b03ad7163fd8773d0a44043810eeaece19af574ea52b42ececf35debea347ead75baeda0e323d13aa6c80764f5b83eaf6"; + sha512 = "1ed8ad5655cd8bcfc3de7c5a79ffc7b1c885ce423ded158770ebe5b49a1730e49b7d48a87f8e71842be5b667fe975b302f739a2b4690e9ded5ab599df9713944"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/el/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/el/firefox-73.0b2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "2d50aca82f7b6d97fbc3905b08efadaba7f0ba0dba72ef11012feee5ddc19001fe782241eecdf9445bb528ecb16f8ca2cf8df8de5641cfa8455df915948e410d"; + sha512 = "b08611679c4148c0964832f8f96f49c0ccd7f37ee2cc441d652a7534087144c13fbfc61e4e710c53d4a00a4ccf264208c35579bad55adda4a612ad965245df78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-CA/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/en-CA/firefox-73.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "6467da4e9af4c1214f33701e4b8105c6e0c6660ad1d1bb527592772488a8fba9272026cc1dcb090e7869ac9ef17e45ed0e97347a6ddfce778030f2f77c6cdecd"; + sha512 = "278d43e1d83f1e43b5ce461c7a3cf1e6a50eafe4f1ec6b587837820dada13e06fc5bc9eeb5a42a1e34ac086b5cc2d03a28bcd73328ac3f65c315cd39e97015e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-GB/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/en-GB/firefox-73.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "94857e1cf4c9f041439c1258b4481aeda8a28584afcec8d1f279586b31e1941ac9a2c847c50e1722e1e83a9156586f582cd7a45a5377f8bf1ba8e24e6fca099b"; + sha512 = "15b14dc1f043e28983c9f7270d49d1d34b5bd4c309d6e100f6c6cc34b2fe24c5473280bc03957fbd8e1eca4535b13d9249d0557b7fd1a3ee1759e3df2d2b76a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-US/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/en-US/firefox-73.0b2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6b5b0d3af32275cca8f8ff8d308fc4982988bfa2ec74168d6b13b3d8e962b799ade9c4ca39acd412ff281ff9e9b5505b001d888c7121a602c40f914b79dfa7e3"; + sha512 = "21c3b4c2b0eddd56f92a5d708fb2d39082aeff554fe185689662c44bcbc21db7a425b2866f0037aa617b880ad92b9790b5f3a1eb5ea22cdc5d589b0b50d6d99d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/eo/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/eo/firefox-73.0b2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "027cb71a76bfb08e54a3a92e2129244b7aaeb40ec0a809ff57666326e0e3e037b7c2b1d35c796e0d9fe415fb95483a6d7836f7f71b5e24e872b35fe31b809ded"; + sha512 = "d350c139bad0f649e31e56e5b16c9796874fec25a0a859e3f4a6cd3dee2fc8f60ebaf382104c3e44f970d8174a05e3a26998c7d2d57e4caf440496ae72cbc9ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-AR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/es-AR/firefox-73.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "bceca49673a5744247678cf939f9c78b04f120c075c94158375d363fadefd8965a52db9f9129fc5e3463c5e8a35055477ccba652e8a32ac5be63b90b43a8ba6c"; + sha512 = "50635d8d9689c0afb5b93ffce5151216f6dd7427a01ecc3fc593c9f1874e809ef9f555589b3b85fca1c73a553181b392259066dc3866fb37902500191e638fff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-CL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/es-CL/firefox-73.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "54172883b1878dcdd5e035fe41cc097e3d336c53d3a0b3452e07e1066be3386fe942892695d73f41423c9fd2927bac8c3cd8c9f8317e1c62489510d2779f10a2"; + sha512 = "acc1e4c8f9edd91379faf483384aae5c3e1ae5aab335f6e5bc68b4405ea209174598d1b5be9dd9c60f4fa85ad715ff34c23b20d59b979ac92ef9059b3bea268c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-ES/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/es-ES/firefox-73.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ad698bcf55a8c938ac57c9681bba92fe9b52b09a2fc23d3dbfe34348878c2f7dac8722d6d1621cb7f0c32b4d8fbbe438fab67c5bc085ef34efb8c3b3f91b24d2"; + sha512 = "8efdf14be0cb5c25d12dd70db18321662879b7dbda1e92eac9e0bd8b8dce8176f4334c52d8c8b8c0c5939fb07141063d73838b313236d404a484a8c537b9e1d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-MX/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/es-MX/firefox-73.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "6b913ce655f43d70ba794ed722e39bd64baa242dcda5a8e9841e072164c441a6776c257145f697123d06c11d0c22fadac8bc6fe83e79b658ab3c05bb9260a66e"; + sha512 = "e7979706020a50e8864a87fceb30d72da20289de8358a0c977d7d081835dd4f6d84d6fe2fd6271bc4e73344b49039d5687e01a202b1071b157af6d82d2146b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/et/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/et/firefox-73.0b2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e6e30e3fbda582034abd3a654a1bec8135245e1ef97b75917d23d52ff85d97ef8d3a9d16f34c887ffe497ac6ceae6460f07a28e440b489d461d391ae6fcb5edd"; + sha512 = "461dd2166f8cd46bbf13114339eceea8eecf047d38318ed6f3a651c451b94bb68145289837862a68db95efa1c10ea211ef34d35c55128ac288b9f9e82750d86b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/eu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/eu/firefox-73.0b2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "75e75402f548f38672cf1ea490095861f95312aa85446eb01bdc519ae1e6cf8f716020d235885a572c472ee25281b351e4b6f9473da1a95cb21b53bcf364c903"; + sha512 = "ba3be0b8114a8da2362802ac1be367d25c644d9228e633429ca13defb41055cb6528a2d803ee1ccfcec2f81496f95db49adb0b71de7692cddb29752cd9f16ba9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fa/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/fa/firefox-73.0b2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f7331d511797a1e500420b9f7749f57570fa2eea2f68c9c0afc59165c0f6a257fc5920483cdc7a1f591fadd93c04878ebe04698b7491881907d9dc61d598e926"; + sha512 = "e9090ebea574da446ae98f4bdcf1c13c4a30d562a630c2b697b98573638d280c90fd48b3abdce05a5140a517b924ac9afd1c7667d999971da09e611bc126d601"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ff/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ff/firefox-73.0b2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "361c9e1e1c59b876499409b8ff1de96b1db67a0b28acebe88e212e32d9a4bf8b12bf0a9713e7cc443eb9d1010a633b6f973e029f261d12eda6b31ac2abc98227"; + sha512 = "b2a9a747f3441a302df9e15013b720e8c16204231cd498315dfbba4c73748d7eaff7c6f2970fdc7b622bac73bcd33660e894d98791cfba1e2ea05ef9460a1d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/fi/firefox-73.0b2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "cdeb40d6762725d0489f2118e2e14e278794f57ec1fd4c5121b291b56a260e0c853b81824a611fd4dc2bacfe60a909f9ec9c2fd983767e91dcecd5f34309c16f"; + sha512 = "01e22f4492676590b89f3572bea5010161c6d701ce2bbe0b7f42343b96318b572593a495cd33ba423782d8fb00ed4dbf5d06ddb40c1d4037c0cdd4dc559935f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/fr/firefox-73.0b2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c812114b2f3ca5306acd33d643edaa482d3c706851bd1a58dcb2487dd5a3ba7ee437415f2aaed99e47962d3b66b6c566c3d7489869d9c10cd5ce1eb30d35fcbb"; + sha512 = "b9addd90f7e609b465352f8200d411abb79a557b81c561fb1b2c735e765fa50556e6267af25271dd990e7cb875e0c772af566d956970a1cf97dbc8efc3228412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fy-NL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/fy-NL/firefox-73.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "2d02c41fe7f3dcc195e08a52874380996a49e5767cfe78ee19269a8c3bca57f75bb256e4dc7a24b008d25ff698cbe522bb2db665b3ada33f89fc2738540b7650"; + sha512 = "30b1094f5efba65709f40a9465d57d6f1f79ecdd42862c33e3ccf713efc4f45412de595f7f6a9966653dc4293753bb93572686182ab60429a4c972679c009ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ga-IE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ga-IE/firefox-73.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "cd234d2f8498fa191b68bd61348cbaae5e6785a2cdca4529f8eee10f19869ee6dd62d08dbb90512a6761c3b812d09581b43154d4a66037abd5460d989607e3ec"; + sha512 = "50af2ae7f44bc660134cda8b750eecc1d058addc98b9a0c192ed3043b8e326f7b472d33688c1c9d3ed96a84e0a4e520e90b1984149291e8ee9e5a9533491ed1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gd/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/gd/firefox-73.0b2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4999fea1af785cbccaecc63efc3e87e9b3a08afeb243d79175241a84da57c86f57c2a24b5ac097ba960f780fb90b65011c950a620d46100ca57b92f346570012"; + sha512 = "a690dbe5cda0e281fd1e027d38dce93be4f441d8b7846e24ce9eb4c1572c9b2391265cae1d3e0172454d9960bc21c9a31a43848345a2f7170e7a1422af55b67e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/gl/firefox-73.0b2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e5d1080fcac102f98148b6477192eed748318147ef2bdad81941872d81343ab04516d3c39db00fdf34950936389a4b02f4367ca33fbb23913a09c59a547f37da"; + sha512 = "42bbafb82784aafa3cf336c7643d93a0581717390555e94d725cd98121fe75b3ee817e6d53fe357fc1f7f279be4d388b30fc409837654d01e0066efa0a4f8160"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/gn/firefox-73.0b2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "13a72b84a30ef450ac12a3a1b42b9f8702ad560b251541aa2d3515a4c8aa06a8e3c942d3380e692783e8c8f0b4e0f6a4a25e57c87321953f42bbdf451fa58757"; + sha512 = "b24a4dbb15051ece9da333c4ded8bb4e909a8655e00ab3a1a3fe86c7fa68646d99a21ae0711a86705df6288eb92b7af059512c9dda602dadcbbf846c46475c33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gu-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/gu-IN/firefox-73.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "1e930682bea71326a73c7523eea8e7dc3d50c15899232660d8df17aaaedeca09aae6ec780ededc36d5f4c15d271297d2c6b6095821b20b5ddafe41cede0d42a2"; + sha512 = "c857da5209acd8c8fec5798fe9ea82e144563d7f1517d6140c29cef66e40cc667017004594b6bb724c3d6b3b6dd7a98599ec0515260ad70fb12047a05466c6c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/he/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/he/firefox-73.0b2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c6ad6aa8108dc7eeb85dbf5ebeef93db16306ae96a1f5d8c2ec1f6a895e20f9c1fa8b7ebaa0c12c0b95e4ccb5f00939c2495a4adcfac642b0071b3c81748acdd"; + sha512 = "16e674e7f2c99c272f924fa43773553893aec23d8ad312b1d175670f37522ad340b3a4b97440b7f3006f6ff1b186897545c252bb55d3ccbb74f4e01994747146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hi-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/hi-IN/firefox-73.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "ca8a2b3cca71cd56ba469dd9465e779566fac77537803b6273ffdeec7c5b968fbc14e79f2c75cc7dfe809bac57c1fa8d52bc6408bd070d8409c7b575ab2147ba"; + sha512 = "057979ea03d9d39b2b2a1c8bd65b0def0374efb171c7eddce54bb02d9b4e92fc07811dffe58c234e1461fc85a9c39971a3b6d00f06ec1e53ce38b825db4aacc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/hr/firefox-73.0b2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c7ef8b4d58d5cfbb0d3ed1d76371c8dfc2cdcca35f701cf8cc72d3452d09da9aa673f85d27c54c63d856d6ed1381b7e2ee8b7b493d2de954489d5aacd9976ab6"; + sha512 = "92b16b74eef2c34846fe62b020a398e433b95d45689ba51181933920f91b76bdd9bde145eca60c1a6f3ae1393dc637445099e6a20cb1cc61f07371a6d496a135"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/hsb/firefox-73.0b2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ff3c870f4f520ca28ed55cbe2b27fea748c6c72c44e949cf5c4130c783b4c63a4bcfacd66a03cb245bc999239e14332eac58b4f6693a20f975a1d3883b1a0590"; + sha512 = "b2d72f3878306a7fb9aaf7a6325fd952580c064e23cc1a28de2ec64812fa6ef18126f2288d68c929e0863432595a7f6c03c312379b7324941d2116f9551ce457"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/hu/firefox-73.0b2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "42c643c90d1dc81564bbd9cba8968085ab3672e442b9ed2c479aa2c1ce05c13abef81e2010acf95b9a9061dd0d7fae1cd2eea1be3fb5b71e6b219d04b508f95e"; + sha512 = "3236bdabd9d0d00113a2d1c76733d8ad36a8df51f20ba313cf0164a58f11e21f856120adb6203ce18b6798ecf7f2125950b3a3a77050bb40f3c2803f55aa7f01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hy-AM/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/hy-AM/firefox-73.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "821dcea6cadc785196d0575edc9d5959237eded2593d87be7228aa90acf1c606e186a7c3d2839d0fb637cd4a456e5b79e7d7276adb6fb85c0d436af5af6269b8"; + sha512 = "6c8e13f928dbe9defe954463eb2c4f341429ef66554bea6974c87fe7dada2ea124f4c0215a9d6f78a4f275456c330a7b181c6b6ba6a9d33779454b48226c02b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ia/firefox-73.0b2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5245ef106cc45f351dec5060d1e9a300917cf71dd128761b6e27da9e807bd309bdf271afb6ddf249677cc223557a98a4611ab3679c78c00e65eb212fbf77c04b"; + sha512 = "4b69cf3c7e4692698c03e60078f297df997850c9c7e5e44f4f3d3d174d410823e325f6b9439430d49fe7ecdf9f7fcd0c8a4828c303d13dc27295afaac0b878e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/id/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/id/firefox-73.0b2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a18d6d9122373d914beba1d3b15281e09989752ad123356bb74f8a93458873ec3516b476f9d46af2931e90f06202730c4cb38a4e042b19fcaee1a7af0a7bd3ad"; + sha512 = "771694f6a896ff8ce8ce994ae2c85312296a7ac663fad75865f6235321b1df0d0792769566e378a396d6dcbc754bdc0a1ebdebe1a61035518d0cd1ecbebbe3c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/is/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/is/firefox-73.0b2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "bccbd4588ed806b3ec02b8c872f82925629139a0513d46a6dd06b6b9f3818c98084a3a3bd99cd1ce987e7abdb249aeebbabc54ea1531d33e80bf945aa8666558"; + sha512 = "227026642bdd275cc1d985f2c8043c29afc3c3eac203de51c15b6a6fb86ef54ea693b8588bbaa34552c834a264f4e410c2b543fe017115a7031e617ee6ef139a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/it/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/it/firefox-73.0b2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e90424148507f0623b8830e45e1d6e532c3886b2e5f6b75a945265b922e8d7df94a84b691ebca2d5b533cef2eee3c627e762df3cc83750e3f5b1e5c6562fadd4"; + sha512 = "ab5cb050d540afc90f98b2d86e20eee4bb0f3d5ed2bd4ed5bb366935155bfb74349648ce78c68d5c829d6554c6ddd1040eaa33115e857dff37fb2ee403292373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ja/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ja/firefox-73.0b2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "8e4e99b2108826897ab62265d9979afa72ffd4db52cbd313376572f75bb4379b972aa4aadb26084f9f0ca0eff38f6e03d3b8caaa5c28c8dc602050c13eb57c3f"; + sha512 = "8bce95825aad807dedd304971a9984f4ef70325425c2fe3830f852eb3d1b10fa3a5aa5cbe107c4c5b7ca904e6e24c62bf55999cd3e52fea9e00fd67d92e0066f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ka/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ka/firefox-73.0b2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a07a19cfa9a854b65842e869600033000eccd9cc989bbd74c1eb816ed53b02df0b66b48b16ea9e912ff6714865855ae910f30913d331854db891c4fbb27cb91e"; + sha512 = "6c42abc1f5e97493f161c5dc5e319a7718ff4bf9bbb724276b70911b1e813185f4265c6596e8a38141abce820a028c13c2d1bdc94e7b509c007150279fb9e563"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kab/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/kab/firefox-73.0b2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "be1a256ac3d4731697dddae8fcdc81523ff098f4c2ad06745d64b0a010bb83a2a9e952796edbf96da8b853694c345835ae41c87de4277944d95cde05b0e57efa"; + sha512 = "324712e569981ab2b6e58c71d0d7136b099d0af6a9a8caf41191f44267044708f0e2139e1826595d7f772405d3e79938212bd4c3590d331d0bcce2f21899ad85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/kk/firefox-73.0b2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4ea0605b2bd0669171639217347b8ae60c22166d21638be4a4a4e1db37b43c7c350607846e6d89b90f171d05248c8aaa75d417263165cb993ab0ce93252b99a7"; + sha512 = "c343e2fd02f2152e0642fc616c91e6b2dad1501483abc0f6f878838f7d3dbfec42c51120297f9d39d6d5a668fcb8b1260889d008e1fd8c1d384c63c523a37697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/km/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/km/firefox-73.0b2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "613c836baff82172a72aaaa194478fc5b116593d9fbe4fe63811bad5fb64710d96468a91d7c0d73d72a3af11e2254303fdb8db7ae1931a39841da7caf7e22229"; + sha512 = "ab51e99d7fe5ab230ade6015b356976e3e3eef4c9fc8224acbb6a88f3be6ad5ab5b8eafb97e9b258979a771f28b033e846cda1cce1ce58fc2805f0b32af0e6a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/kn/firefox-73.0b2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dd19beb8ae0422d0a54cd1f5f627119bbd13abb1cb723e490a1306f609bd9ac7cc8a6bef1b72e7d299ad5270472bffff4dcfccc7ef8a33137c8ab17d67cbbed4"; + sha512 = "33b306cb378aa2baeb8afb5bfc2c6fe0ff20abac0515de8057ee747c979ed8c2fbf128f2c199eaf4aea90c7a28aa4fc848ea83839b42383c729c04876295ba87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ko/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ko/firefox-73.0b2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e9180e11b37d361f7dfa8e6bf8a907d58f2424373922b65f06638060578d3871076a69f326d96590850b1f4bdbcd260bf9bc3e3b5748895e86ae953c8f529818"; + sha512 = "d48dee07c5fcf3c6b3b82a59059836d5fb45b21c56194b094de3f01daf49e194294600c5dee93c318cbd0ba740fe49a623d60593fe9155767932f278c5cf0b32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lij/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/lij/firefox-73.0b2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c14c338e9ac17b0200c00b40e8c45743baa5c279107aab0d2ab5f45330d2b7a513444f126dab999421b704790be00e2cdb4783236c41091b2f8e1973e2ff4be8"; + sha512 = "ab80587c20097c3f5ccfe91661f76b9893a4b8498e8b4fc6040fcddf99aeaaf44d7e3f2c46e31421f54c574d9c678431d3a73f29443fb45aaa465fb7e75c55bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lt/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/lt/firefox-73.0b2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "aab19d2dd90576b91a154106674fee1e05d46d331810a33d28205048c0c67451dc3fc30ea70d2233e6139c7968ed0d535490538556a288d5c331ec88bfa0a90b"; + sha512 = "97770f69feae1c1003f53e2dfb18b240547f808b72736cd073098a62d0e3165a4a29087277990b905432ab52f5a1cfe5630beb9daf16612ad33df00d0ad7f9a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lv/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/lv/firefox-73.0b2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d2fca320d8aec84cc718cd40b24a7cd18ac23e98619b69666c330e84fe8078be522deb58b2575d2eda1d823aa413ccfdfb68a4ab83fc99f9b74054b887f81fe8"; + sha512 = "798c5a3c7165a0cc503af3f4d8744625bf73f6f5ad873cd37c9b1068c7e7e769b30f222db041e96877ed6375731d0f199468d3fbd30322a299e8a5450c55a4a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/mk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/mk/firefox-73.0b2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4079ef459d6f1164023afc07b4736a186f45af41ea9e76783832f1d8431b9de7a4dd8a425b4c203669417fdaff1fc6bd88d65d3f6b9aba5d0d0394f707321746"; + sha512 = "74b59ace7bff5728348e8cadc85409e72ef90f60285f61deb92527996f24c34398ad3a3f5c99a9366bc0a0d5a38a020ebe7c865047cfefee65c3d8e6b0d547a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/mr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/mr/firefox-73.0b2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3c4929d49fbd0d20c6cc03e5c2d3935ba291c99bd955ff56e10fe75ed872082754bd27cd9a8d6c92a7ce3c180302465ab6e6d77f1b230b208ebfc53083e78064"; + sha512 = "416545c7b787832dbd653790e56be685bf47eff307766c83c31e221eac0745140ba71c160d3e4eb95ad3a0dc5930161ccc0b6d54797ebe076151c26bd0579fe2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ms/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ms/firefox-73.0b2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "fbe861070bd7ef6d2a00bd6ebe8bfce566d4d771a0882f932ec1705bdf06eddd571eec1681b4cd70b204aac5559cbecd89b3cca5e6dcbbbc0cd1d0ffba51d51a"; + sha512 = "8f05521707e0b04f0d1aa0a28084540a0a1dd65d33e6b8bc1038473ebd701da3cba6ee390531fa1c1c168529841002f6c44681864e121ff56317d646363813da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/my/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/my/firefox-73.0b2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "6c7223ec1b5f02bbf47fbe2649d954f3603795b137ef23e7b89a6b43851bb6ea020c5760c3e78c15188e0a2a794c44936f208aa13a64133d0275fc45a19cbf5a"; + sha512 = "3ff9d270b5bc76037b80a47070ffe1d3e2d5c9548a9f82612ffef886e46e81d27c0114a51e65cd67bbaf2aeb6d724afd5b0d26abedfd278f193e0ac31e31dab3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nb-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/nb-NO/firefox-73.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "bfab99dec528554cd87d1fe6c1be92697c1505c8e0925dcc4cbca3b010c55c0790e9aa4d189c99e2f92ca4e1dff446fc3be1e5409ed1ca91b315c798a9aa8f0a"; + sha512 = "f8c9f5e3c0b21c2eea84ed9ad200439e94fd10edd66de2c0a6c1c95eeb88ddaca7220f8591e29e342dec11197fb16d0dd9e9fb314caa31b92d748216ca7b4e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ne-NP/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ne-NP/firefox-73.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9b8916623c93b78855c13d1d6b1fcd65935a23d43b5477bc385f2afefa2bac083b581b7eb8595359be907315083e1744f3f338b7f058a8a291a8925d83021cff"; + sha512 = "de1a661bbe2b19fa39133c9c59ab6dc203f39f9d33feab4c0e24a7c8400b0245d0932ffea54a49d0d4add5570f9e72d5a37b055d6b3ba485a1a3f746db9b5946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/nl/firefox-73.0b2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c4150d0649385264413f61825c29cc187eab2b91b6522f03108eaf73b0fbc197d1004e422e759dab34d3780630de531e265eafa5b3ffcdd6c601909c9a9dcf5c"; + sha512 = "78f50b286b9d9a16cc6c984904a69447d8905ce831ebd7e76cc4a2338681373b5a03e8034df38f1f3f893d7656164e4eb8be07167c9aaf1f109ef876ebca0c6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nn-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/nn-NO/firefox-73.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1eec2afb9d67c6d6ffff3d94585b05fe96ffd011b99912ab20b4dc4bc0a7a4336080a03f58ddb48cca8575c94f7e312a6da620cc25c75222941d8503c3a5934f"; + sha512 = "b3fe5a63f493ae8fd67b4705a9975dbf32ba73ae74c54881707c6801e779134e40f8646deb6d5008efb9f730e707e007f829976c3693141d527074806abc5584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/oc/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/oc/firefox-73.0b2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "c5cd7d444c3ed35a49cc66553eee0187c97e867d2917bba2b490fea3272374d48ac235b313a8e9e7583a6e20c1f4430562ab7b428aa8a9e1aa280b0a357ba470"; + sha512 = "cb36c1aea15d36c93e0c7fff425294afdbef700ffc11541cdab02368668b743a129345084bf7db764f4704d6d9661297faba7ca700a3ab681a2ebf014eea6f7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pa-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/pa-IN/firefox-73.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fec801cf39e9d00a06e7147469f886cc6014498b13b6c010e3ba73c09ba95dd142f262dcc0aa84fff9ff462e2b0a7823957f41248545cdbff6e56e085cc21afd"; + sha512 = "bdb7be064ba9ec1fd0664ded529b14fdeca91e823e1a48768b59bf849fbc9a60fa9699e7e92c66acf8eb754700073b109ee64320797047a9887465e9efd9b7bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/pl/firefox-73.0b2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "abaeeda6ea0c61a7fb325362dec9fc1639a272b144e0f5a534aa41bb56add7a33c1baf2b339945f1fdcd469a1727e1fc4d0ff954d9920a460081b41519f43ac1"; + sha512 = "d3fdf2112d5752f8a7445d0b9e6201228b90a85233c0314e7f19c0f87535f1680720392eced3e9ebbfedea9a4f3482b1e098c5eb9a4e95b9adbcc96f1b0a3aaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pt-BR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/pt-BR/firefox-73.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "d07b9827b4f570307361df5e04662b8325047432e8016b810b0898b71535356c472e937e5d3fdfd58001b68b10eb1d9dcca42113c759522dda8925f468571f81"; + sha512 = "809e2a5f1839b28fc0667958c915d933b4ef2256ffec8520bf863c1714d575ef54d90c2bf23b97b3cdad668e8dddbc30585dfb1a3940832ffb6672990e225f2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pt-PT/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/pt-PT/firefox-73.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "787565d44ae9a44c09e0a342d53b395466cd4bb82939cb6f0d1177659441c24402a7837b92e9a1036b18faf91714925274ebb3a5062bd4e7895099ff1ed65b26"; + sha512 = "97045af947534561ef72412d59932a2a777e9d5afd6439a73de34cc39ccb9f394b4bffb131d9c4ba8f0dae8ae0308291292df15333fe5ce1d5cba013021c7c54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/rm/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/rm/firefox-73.0b2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "5bc7abf66de4bc4f98b020141dacf4bf1949549f3967211f2542a5148535994fba4df11d054a1439f4b80e04ac180fc6b88e5fad634838dc27447d6a9de7ba62"; + sha512 = "d0eda89dd90463c4d3af4b9ae946dbe72695fb3c76bce4756ed24991726935e917d2484132826e03858b53d85b7b694292b4ebe5ac1c0dfbb9dd8e9c453410c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ro/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ro/firefox-73.0b2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "20ffba73c479aee7e2413ee1eb10aa37adae41ad26c0cb2747242366847c5771a707c008d7163f9ca11fc32626f67b468168ef746cfca8ac0c7ad801f9751a69"; + sha512 = "305495a3b2440d29f23b22f97039fb57d1f5501852f533c03066e6c367e6dd51aa869155e4b0bac5c1ea3fd23754cae434b5f8190b6db0d3e686b777124f1076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ru/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ru/firefox-73.0b2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "bdef494dd866170c693f13f715a7b931069bf8b025ad729ad898354ea168289ff7947707310eacbd8a4059b59faedac3bab845116b6e6af8bb1af22f36bee17d"; + sha512 = "f4d87e9609a5c1028beec87a6cca52908dfdd1db56fca1808245d73665186209abde26c16b5c41d1dcb7e0eeef65231e6eb62388601f42e24de69ffa1cd4fab0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/si/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/si/firefox-73.0b2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "51cb393536e620c83c725736d1f4cc6744a10453dd430163dd6826566694a728aa3ec7bc15b5ce92c01b1a09b451d8fd4750c4a838e0c0993476e0dc0b8c064d"; + sha512 = "948865b6e79b167539796a75c465b1b1b6ff8721ac95adf6e8e7716d41baf90bbe5d7eb9a5900928936263b67be973e77660758361a8cf2c05cf2d120118d488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/sk/firefox-73.0b2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c39f1527d1238f78c24e1b1c2ade7808f70be6ffbceac3367bd252ef5f333273c8b35bb9ff5434cbf2191fe26c80f63c141900a9292ebabb6a51d9bd70b8acf3"; + sha512 = "034763795af1763f6b26cc1103288b4fa34e19eda0b78e01a220aad9279f774ddeac58cb8ac60886b9d78d611305fc32a7f390cb9b7f93239a462fd41a566ba7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/sl/firefox-73.0b2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "67ec9894f56de39ca324325add1ac92423611d1d158353cc1c90050275e792706b0cdd3ed1a911870c431f96e73bac15d8a2a542af2271ad2d17a445b3f51ed9"; + sha512 = "ee7d2038ab0469e257db37f9a1190f5b77df2b04d32cc631dea9d0f76c36a2ce14c9687f6f3e4e5279418bc8c16694ca197fc739abc534de4435e9b5b8273841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/son/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/son/firefox-73.0b2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "41af46b52cee6d283a1908987366950584720322401884c9b10cb24bf3a1f897ffdc8805a63e42aa084600c638b31f985cff3e9ebb504f66573b757690d00254"; + sha512 = "fb4befe20f46bac34ef87694c092e7f2edd58a3a54545db329fba1b49e9a9f69af11ec144bc55ece5852e9dcbf9565fc5c385ff37d99c8a988baa98391ff2c39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sq/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/sq/firefox-73.0b2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8b8dfe1b1370c7d20981688d069df16d1e04cd215cf183955ee41b6428de75f58479db8aab0313f80a108b3591997dfa9120632a7e11edf6df2a970eea18d03f"; + sha512 = "180ba1b6140fb29bfce8c2a3811104050ab70883f58a4e286f5a08412247935b8d288810381fb0c246940752660c037388fd38f35ded52201b094b1307148019"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/sr/firefox-73.0b2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a85fa87b55516c137433b5f9f196e2148a273f5dc1d6a76eb4f4d43fe9a868e13e0fb9c53b0b6ddc601552f7cc82450dd972b1da0be80ec196f9f0b9e1049329"; + sha512 = "33cf786a57d0507cc9c10a2fd8042767b072ba9e42001a35e5934018a2b849a531165ae8d2e2a6c430414d7ddf3c5363fd9ec222b3a50428ce6570ed03f9b678"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sv-SE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/sv-SE/firefox-73.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "39c67d5532df355157fd6472a6a7be26fed7356afc02b1be41da402f7864d39966bdaa4cf2cab5e5970d40ae047a0d0ba1db2c3d683855808114a916a55b959e"; + sha512 = "c3639c89d604ea2ec0e0f3000edb0e292de42644d0d77b93e10a42f1895c20e69d3997762e0234843fe6ba7a487cfb70c7fcf0b8f1dac0a862d631e2734ecdd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ta/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ta/firefox-73.0b2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "2927aff859647cb79334b0d39d76e3a78aea8556ba976abe895412016cdb86119b65fc9ab63e4e89c9f69b0c50f5c3eb6cd700da38e1570e6cdab385c4eb0a52"; + sha512 = "7bba0bb69fd1721ef1931a3abb47d4e30aabef574c9d03c63c326349f5b8871eb89ca2b7915666a371b82b2c169075e0f966d60673abe65ea9e57cf95dea0b85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/te/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/te/firefox-73.0b2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d0a33df588d51fa495234b7e2c443acfbbd2d21bb50616445b35cb7d7272774228cb1c7986ac1169527e691cb6b57009ee9ed06d9040546a57807bad3c06d229"; + sha512 = "daf3b0d74e0f5979867c5bcf0660c8945eeddd98c39caf5c128556fd813368d6f31e249c71086e250c858907da676ca36a9d6fdcab4d4d33aeed89ec872a1063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/th/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/th/firefox-73.0b2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9aeb8046db34e354b4e52b56cbf3829aab909a8330012025b52e62fd4d73f2052057d4a0611a3aff96c5e8e67e547f1a266a1c35fb1b9384e8ac20ae32306cd2"; + sha512 = "98427d651b0bca789aab3017382e02b89760e1999ad8954a12192eaec7a6f9c926c4a3008709c9b7dcd336a3c60252c4aa940ab53afe04dcc99b7354dda56414"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/tl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/tl/firefox-73.0b2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "07c9a44489ee171aa930d0cc5acb1ee6773af6226f57593ef62e85163c941dde3f10d2f3cb0debdeb6762ed91834f9fc3882b0ee971c7ea73f26e1d85a14444c"; + sha512 = "120a8fe2a10d9ff59c9335d9a03f9e1cd9dd6615b33357b3be45fb250353bcdc3e9236c0d4eaa8662bd01059b52c658bb1bc0ae264106393e8ec003ada7403e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/tr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/tr/firefox-73.0b2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3a77e7f1a51d2ba6c0d249f57c06332adbe50da384e46bbb88947ea5d6afd32b09758e47a9e658aff193bcbe73f5c4513e1cd15c0eedc2671bc9d49b4b910232"; + sha512 = "d2e849ff6f72d36fde0edc7b4ad4b1ee88a78cb7325dc917a1f268ee4137c8b37fee948322735ac7226767f605022418114763331207fe004a20ab603d519bcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/trs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/trs/firefox-73.0b2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "0ee6aae966087407b48d74ad29a77d428cf3cbdaf17baf9972954a6a256d4ec029e3d8ce4bfae8908ac55bebbf99b4523e23d3b7fa40fcae25749eab6709db5c"; + sha512 = "80d2406e23dfd63b589dd37b082617c05665b870e02dd19bd3eb2e80e7d7b57250149c7b90e3601a043dca5eeeaf257fde452138c50e97d34c83650128f29f5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/uk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/uk/firefox-73.0b2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "6f270bd929a336fcc519158fced67a62b6763bfc77a11ea53b60baac75bfa91c63127bcba6f2bef032a37d54fea4153d7121dce61adc0b1c183a4cd93e80da59"; + sha512 = "ed14817aac214d646490abdb364ddf4d101a114550f6ea6b28317b470115e77be5f22d90e7328c2af20f258d563741cf8fe405f7756a180f68cabaf6568d1dd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ur/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/ur/firefox-73.0b2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "02f2f5205aae0245833b48ff9241aa5130821633ee3f74be367b90536a85e33d41dafe9a585f531a550e0e795dafff74e3e0cae7050593de0d32489301559131"; + sha512 = "45b676e56ae0b221bc0a34cc1bac067d87a6f772d4fc6ac7aa05dfb3d8e3d3466f91158e91ae7a216804ced667968c66892aa9ea966cc9b3e90e95030212f745"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/uz/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/uz/firefox-73.0b2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "642652955f0cd1882b213dcc62a3931c90043a98d711136743f73aef3f325e1c09683849267d774a070bc474dc3332c5d1fb1678c8616842085fcd895dfaeebd"; + sha512 = "73612fcd59e8b3f85076756ea9b16519bab6c5d01b1b8167c708f8317f0d2e2f7100ea88949521c1e963b8329602a34ee8ed0d4203d58c27582acae81b2f3f93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/vi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/vi/firefox-73.0b2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "37d26761b42c676dda8f6007b95f2c598c9d340958b86474c9dd655415fbe41fd6d4dad9e7205aaf5039c7e5746a6c71bd5459e0660b1429977d99c881803d8b"; + sha512 = "49a6080aff2a14c7ed7b41e6153eb1324791a4a9052dcabfc3347458d1087f418f4fdaf29d31d18ff571f569f9959277c83776c7fe0f96ecdde50b1807f01568"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/xh/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/xh/firefox-73.0b2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "35013aa94ca7b4bc02db1d6bd953d23f789576f29f3cc8ae10ab1ac11aa9db4c633e21d73d49221f2ada74569d3c732a02ef21b23eef3e977ee9f46e2b3fc90b"; + sha512 = "918ed1dc54dec5e135f146602163410d73b681b1dd30388d2b7bc3beb1801b1753651d9eb29a431889965cb0a41a77594083c7bdafcae84dc809bf33613454d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/zh-CN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/zh-CN/firefox-73.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "150a697bd5a24edbabd999a1f4a538d1937caea035a9e50e55aec6b40a1c20bef94b5d8bfab368711af84b59f94604be0c8b74cb37d0248597a5f5c10092a81c"; + sha512 = "a4de972355647c1f6eb3a72eb01b81b68aac21131d652c4efcaf47039579f02d5e232e515051f5a217b6a650d657092d6bb831acb7bf2adc6b66a14ead29d29e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/zh-TW/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-x86_64/zh-TW/firefox-73.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "003065b656337da643933c173d7bd8dbebd74cc203832206ca5d9bbb63d60a0b44b002d003951aa810458df19a74f45148cb81489e7f059a07c14082a9a61dca"; + sha512 = "893e7b5334538ea26af2466096f886917913de874505a1a3f70b3c6bcda098c09bde0fccd4b439e98f980fcb74240f36fa82a96667b3284abd35a5de9e5c5806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ach/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ach/firefox-73.0b2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "5b9ab917b51a25bb9b0f640c842f550e720f23a4afd1c6bcf089ad7d09453599df63e364d74f2caef63baffbd3ffcafdc9ec46dbf5da4f88100a8958eef0b763"; + sha512 = "ca585114e01a994b0e01b366686334cf9b3d7f92cf3f0cc3162b8ff4381fad0fcb1d44041c82b10ad2cbac33240649a7612006d132fb5322c19094fe42699f97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/af/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/af/firefox-73.0b2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "797dbaa4cb4dfb2f02b20215131efb4f24c4b6424e330c7f185f8f208e872ce8104325b6fc1e03bd86bc52b865072c75868c12e74cfe724f551ff3496eb1a1ba"; + sha512 = "d81e711663f375e5f2cec36d26b331bacce5500776aeb2dd1c40c3b37e258c0f20ee79a42e2f16525e4edec1b3077ad46ad54d1929e352df43151f10c3b943c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/an/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/an/firefox-73.0b2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e1d9a378e0d7810483e9f9848ff6e765f5c10ea2c6305dbed31e4cca576c780dd3c51154352d2de047af820c9ddb6ab4b1209385ca25440415539a7ff1061bcc"; + sha512 = "545f6acf05a87e643f597d4b81dc2f9b53c90fd55aa36052008be32a692e1db244fd40884f517ca076bb262c974f8603b1e6bf041e3502e7133cb189d8308c62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ar/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ar/firefox-73.0b2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "aab04ed5df3ab564b503f13b13021a32f4c93a80b3b3243b1402ed67ab1e5fbb7015895b57e25d07914e4b9394cab92aa6fc929f36c4b92d2c973d2b08a33f71"; + sha512 = "12142db3f05268d9b25435b260aa408ea3f637677c5749a1c6d0721f6df501bfd9c393f3cafe13409ab89b3bf9493d918600bf5a432899d0e62595946ae0637a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ast/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ast/firefox-73.0b2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9eadf148b729adc3e3bd1f8d9624634a05d2f11207f16bef3023cc264720044ec08f6699e386e54692a95925a6a72749941ca7a3d5022e7b6341db7369ddb460"; + sha512 = "22e278e5431b3777f277300d32258e464c8bdf8ead7dbeb357cd65a059cde2a80a602aa41bb80141e8eee429c0bab1301eac01c2d725343447cf3b39db300493"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/az/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/az/firefox-73.0b2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4b172bbf812bce8efc001bcd113fc2314225c4ed3661f907e40bc4dafc39b7c15b6909e3b1e406cebbb7d5b0b353d8398a9a177c6f1c39e893612d9e8512b918"; + sha512 = "0cde75de52a77f39410fbe84327b095c4e92b921f0ade76409361c53749576ac004aca36996d1994fd9a427974e87dc8a94e152aa79a7e8d4be5c5083511ced9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/be/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/be/firefox-73.0b2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ca921d8abdd24d7eb85e3cf32984db6009d74d402d0b0f48557afc42037700a47ec40855ba5b4aa85c3a79b4437b5235ceee3889411325276c8ade11adf788ea"; + sha512 = "d4fcd494f5b49725ed3a3bb54ba5bacc14858c7ad2de5d16c2d0bb1a33800e0518c88f32817d40342d90f86b092e84b98ec7fd3126f0161ff76fcda8237c2f7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bg/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/bg/firefox-73.0b2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "acd98884f4299bb95ef3dc46331a0257a83e80094b4e6ccd9ed1f82fc7c2b11e3915cee83af7cd38d73d7dc3383d1b9b241f82a075a106b58d9beca7103fca12"; + sha512 = "14790c5d31b68a71fe127d31488ab102f0319edec38104978ba96d2f1ed691c6bca44cc97d9c05e1c199314974c71af39618403bf35eb725ac704f7bc0d28ea7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/bn/firefox-73.0b2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "598c5269ef854f0121cfc425df329fd7a97c1bceffd3ca8f68d9b1dabd653a74621a410b7ba6490efb5881b9074889fa11d55552933b3a58d467d920cc09067d"; + sha512 = "661e097808b1acd1b5d146993b6c58b845d04bcea8db663e95c1ced6b8f7c6f5173340394d673a00c73e95e6181c0685dddb82967fe759f02792faf568c2b787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/br/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/br/firefox-73.0b2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b2c2d3a51286daf2ce41e076c79c466aaf631cf3aa51a6d824260a228e4b160f7366ddfdca75c87e7f4502be8306a985fa23a5d7e923767514e127ccb76cf9ff"; + sha512 = "e99628473f831ae8efbf812f6fabbc186a0e76af19a19b8e284894f4118d8a5664919d8c44528625f27bd47f7f9f5deac76987d7a7a10490fba0163f8da42c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/bs/firefox-73.0b2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5b972334c648b9b90add5f92b96d3385a677b56722c0b7340299fb81a5ce16169de3339407d2327b4f440df2c137e486fa73307fbe8e595fae47a64ce4bce59e"; + sha512 = "5d87e35510b8fa0ed0890b3fc36e4ecaf412a4e60ba8586e064bb6753fb84c219b6278d4d49868de6941c490f67214bdb22def1a83e4d9da76969cdb44e72406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ca-valencia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ca-valencia/firefox-73.0b2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "7e038cef24ae848c304286a9c59cfaa70ac300720cc03decb8253b1986606419171217fcd117ba5f9e201a198ba0685e34f9edb88584559b1879badcc642534d"; + sha512 = "918a91b0e98aff1404945398f4303fd96afb0eeba16e0feef385f95477148727f100c64e8cd658e42cdc79fe2b38e67502c2a1ce6822c9fc8fbb4c3957652492"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ca/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ca/firefox-73.0b2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e2a880226f67636a0c60409e48e48c858d9fd4c539df91005009598b92da1310302f3d6f097f475385904a354754e5128d4049dd369eb0ebc49f4269860f0e05"; + sha512 = "b27d325d85142950ea02dfba2b5bca7d7289a52a2b68449b77b48b72dc5c42097cdf55781c17d8e1e062d51974b9422ac0ca90fd0632cabecfe535390dae6869"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cak/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/cak/firefox-73.0b2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5cdd469ab037f891bc09b42bc53f62eb46183a4865d060388d73f386d4f57702123400ff1ec3a831b98e98b6d67cdfd3ad021e336c54fdc531f414bd23658f57"; + sha512 = "4a69be70819192b2de859df79232a8420bf314e1916e35fab6e95414766b283cdc123ed0c486518577d4133c3133422bb19e2fa2550c652e6b79b368eafc3f52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/cs/firefox-73.0b2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a36ad27e7288448dcb3b36080cd2b92652c8d579f551a903a92ecc55cd82b0a1d33d6549cf183c95a0e6f3aeb567c378d2900243839ff703341f81ea1abe51cd"; + sha512 = "03dc006937532e6cf9c8ac01e95be6a6e9b8ea76dac8a2b9d6da6e6141794fe656fe03af1a52fbb892a9d0a99efe75c34daa538f559d852f8356e49ed74e95ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cy/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/cy/firefox-73.0b2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "eb869584c63ba72e24ac53b0c3bfa972ca80eada99b88454a2311ed9583cf90af9e2744f15486d68741a3912cc8cf4208b4b93b445362aedae58606f7e6725ba"; + sha512 = "2089e639baa654327ddbe5aaee04d6dfff64304478567859b605dabc84d553c5f35568fb103a8b9ef2e94640f31e79a2071aaacf56527f84311a5a6207321654"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/da/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/da/firefox-73.0b2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7fb996c0ffd07e5a9e1f76754dea4c4f18e93299a036bea2293609d06da5b2902fe40513c386f41612c5b2878fd24ab41c7e73d568364dbd3ec9fb57f55f7a9d"; + sha512 = "500243a917ddc3dd618ea34de4e15967dfa796e6b6efc852700fdacef72928ee56b3602029707ddbe2bbc7653318f0079f976b9f51435dfc8f9359eacd8af57e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/de/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/de/firefox-73.0b2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d80152df53b9f43cdd85639c3d7c2dbb2f35262e737d4893ead4d526f1259e2971011f75b58e415901734de41ae72244085f7cf57ba2f17b9dbf7b64db2c5be8"; + sha512 = "50f1dd624fbac9595b022bf0853700a60fc29e9d5475857ee4db89c334886920ddc9c85f1243df20871528fd42316eb9b1fa887c77b65be120c81ac75d6fd2d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/dsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/dsb/firefox-73.0b2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "cfd2384c1b1ff24d9976efab37c2492bf70ab8ce86b873497e91378bcfcdc09e9a6ac1b8f3993adca57f86ce697a9a5869708114c7ad5b58531093eabe991255"; + sha512 = "bdb5a0eb162634e557e511fd4d6b9802b993aabd34dd12c42da6f6b742b2574945e9be01f61d7cd1ccbe01e1122f06475ac916b36002539c32e38ed8e341a1f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/el/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/el/firefox-73.0b2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "fbfbf0acca8c0d27b11572b2744b70ef22143dcc1788fbfa864052ab66fc68c2d9bb3a7cd774b54cc0f41324e6335cea3f9c259f6bcfbe4b9bf2925b17b54320"; + sha512 = "cd9d04407e7e2549268529007cd9f0af18b91d404a537c9ba2138c4c125e68f7c7fbe2d2c94acfa711d6528903bf5c8622d07949fda301f6741242d2aef40ac3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-CA/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/en-CA/firefox-73.0b2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "1388f7b672da7ea79a01b15f3d356aa7120be45a9c473e996a7d4caee4f0879e9ca702c1da6cd55447076d7ef4e2aa46f1038170a2f9433fd533166fe80e14d6"; + sha512 = "7f13e10cb2948b2289af28e92dbf2677b93d6f9aa0b72790fd5965eb1e02cb5457325acdabc3c385b09175d9a3afc56f4799870ebeec964441720f804ff69cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-GB/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/en-GB/firefox-73.0b2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4e0ee5b0689771d715e4a381e72a79ef8a3457560500f06101c7d9f0563c81913778743877f63c37c4c74314248fb88585c503dc57b893f78c09277c39eb0c4c"; + sha512 = "aae87e398bd0f2b38b89dd68bbb044c61f651ceb80eee630289319ca2b0d0a834b4ce69b4ea7e5444f209b4a3d7591fbf77a0e101a1fa73c02e5dcf6af7f2f44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-US/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/en-US/firefox-73.0b2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f054b7ea2361c3eb933405362fce21e311b77d121a80bb24ea09f41d47231582715f3cb160182161fa63b5028163bd5cd35bab5fc2cca8729c5aee15d2aab981"; + sha512 = "b114ae95a5cd219364a876a7224b57a05eca57d156bbb351c332796dd7c1f2ac4d41a0b9fe2b25f8cdcd006be7c2b35e4fe4de700c003a18d3643de0aae04ae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/eo/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/eo/firefox-73.0b2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "6c84e22823ae465c5346f29b8729e36dee1d3846affa60be87ae2b479f114ca1e911a2bf2d6ffcecb2a8097d3e4689810c5afea27b419b0f0dd1ca830a83f79f"; + sha512 = "c03d32a31280e8a6cc3e2160fb9aa36ccfe7850c96c8da517ba9964e721489da5d1ff5beabeeca3ebc669725d0ed67de9b9223360fcd0bf67cdc31b6199040fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-AR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/es-AR/firefox-73.0b2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "65e37a5cc802e4677344f4b2ecd2451cf55656d3bcbf7d155ea7e404090c5c2375d68ef5c13e30817bbe56c2d4a9de6c1d82db2b1533ce4861295bcc39451585"; + sha512 = "8d13617b21baffb7bcdfbeba911de41e8aec53aa123cb8e9233c74f27e33ffd69a0b905aac9e56f8a9d1eaebc25cc0ae1d4951ca57d788948c1e793543aaf681"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-CL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/es-CL/firefox-73.0b2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cab5c05b8711973844b7deaff638abb9d52aa3fe1e533d318d0f48b2ca77434e6e7295531087f9def4bb25babd21c6fb2b94fcb4ca586f6cb5a37851c31559c7"; + sha512 = "69706d1e4efbac4aed32b0d789252c2cc8da810ac336898698f1f835ab78694dc1ef7819726ffe0645e71a4b5a366222a575ca29963b94c3c17fac5eb7773689"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-ES/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/es-ES/firefox-73.0b2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "eb8b9e1a261a2bb89faa4225bfb2edc5d28b2268030adfc7d9ca67a8ddc27b850a99907e6cefb522a92ad399d3faf177a17ce10453f2d0a01aaf647d13c32641"; + sha512 = "2398e2506755fdb00e94ebdeabfe04b6a308d5e4a342eb12921b053fdee66946f622d251c875f2f0908f60dc173c598bde1764ab99a35318d72dadaae3c16dcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-MX/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/es-MX/firefox-73.0b2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d2d3505d8860032e396bda2ae1039987d8567b90c2a79e2614a47e97fcbcf3715078f1de078e43231100dd567b85023f36f269ea97a0badebc1418f70812a437"; + sha512 = "0c291fabe0a9e3ccb4cb9cb618cb61d095a98dc89bbc76fe2de20d9b733361d70f8acc5d2e520f1d4b584f7f5fc0a3c6b53274d5337f0571269f2f7a3aa0b25d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/et/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/et/firefox-73.0b2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "288608642ba84b0247db4ea2772645975f1257a79df51c979fbafa07afc554d76432afbfaa77104dd9a25f0d418b4bc5a69c1660b76debe58b18fa68297e5490"; + sha512 = "f6bab80b0b7ef36179f8ccd2c0eedf0fe475a5a65b06dbb48ecf491449c4041678b79fc5619b8cb06f9f3f13c49d0ba1cf4d107b2389237835bac3716fe759ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/eu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/eu/firefox-73.0b2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "cef1f54aeb82de57be4c3cd96153d4535c64722d26084919237e67957bc140b66d1ae014129d8e4ebb28d37f0c322b59f71a64b0be4093e2a90c1f5d7fb65deb"; + sha512 = "3afd1f3d82112e20950962489d9667165cdf4b3dac4ee9406e0f82f700c2b2df90ad5d8f5d9da2c5bbb61c9d3b87afeea97b1235ee004316d3046cd0f5949644"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fa/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/fa/firefox-73.0b2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "2302fd2b64b841e7a952423a1d3efd34bc1b4234fc736983042fb06a602b57ff45b7f549cba0fbdc0442183df091ccb04e83276e08d89aa492fc4c1d49d952e0"; + sha512 = "5ab09e6089a80a2056b42fef512ce09897ba7e30a2a2bf335c71b3d039098f032b6fef393429969fdb9ec7db084de922507b655f59a6cfedbbcf73b84a47b7cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ff/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ff/firefox-73.0b2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "518c83964718c98893b16310caa044506713257f0321b5131fe4a8741409489a047566f4215d8df50824debbb53594d24072aa6a167285210b392ff1f8e081c6"; + sha512 = "975495a5a746331bed7d6e66f0203564be6a69890338ae43298e004e75873fab537169500cd4aa65590c47a532d36e0f8d7357d838839453f10747cb16308de0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/fi/firefox-73.0b2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "34c2ad202a616067e298a983bddc76087d387160bf67f9d2ca7c2aa54b3eb245e968055b15f57309217e1a5ea164b6af93d0c3467600a5d1d689e6f78a4bb067"; + sha512 = "ddcb0b6b07f692bbc02ce529f8d69e3bb9ee943f054e52d4a4b4e80b1afda4d297e2e0758df71c6d9dcd9d732fb8c1775e7d725b1ac4486e2e1942cdda9313ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/fr/firefox-73.0b2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3fa9dedd958b9f3cd70fee85d0034b8663e863b18b411122d3fb1f6beb1566efd92c63a38560972425afeefc4480b2c4dd86dabeb197ee7c30694b8e9c3ace51"; + sha512 = "d5cdc4caf65c02a45bc6ba5b84a952a061e29249ce14df9608c2a6bf99461fbf23e04a1ecacf0cafd230213ab2528b5314e28733283c4a4b0f5dbafb90765e74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fy-NL/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/fy-NL/firefox-73.0b2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1b8a346081dcf59d42140edce2e35dd4008c0aa6be326274aa2cda612bd9161bde5f5339a06af747b9f1f0eb5dd0e77113543d948c5b102ca4428cfd9c30970a"; + sha512 = "3ba77e4ce3c8eb7d38498dba424f5cace67a9b1f304b784dbf42dfa0f276e492b4d7829dc4b63191c6fc249522968e8b2d795d79f397ed3d8081fe84093caa07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ga-IE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ga-IE/firefox-73.0b2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7cb658cbf2d33d9ae42724de85e609e6afa2417666625e1baf26017a6e5225a1dc240c457c16f8c612699eb39a8243518061418729c9d5c18daa4bfe1561ae79"; + sha512 = "b26760d435a565c19618ef764b4f2d1b507688081c9a5820f71ed14e703b81e6c07a8ce3eda05f1ca73d389839555e70e3e30bc9d2ed854795afb0e22bc64fbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gd/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/gd/firefox-73.0b2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "31928201e871c33c31521d8df74dd41e35860754389abcd130a5f8aaf63d8e24975217a09ba074405e092cb603a8b69b18ba89fbacd041a1aa553c4eb37401dc"; + sha512 = "3d1218dccf616d1b735889f56b14a1d3751ceacd9f67c3ed06bc7df6b52b6433f1a5dcfedd25dd13818ba1bf153848ce538d3b7aaa7289b5f5b2b90b523a4aa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/gl/firefox-73.0b2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "6a92b3b1ad9bf08c20ca5599812141d32372ac15841c9c4fa0758c4d566b60d2e583fb43c65029a6ab85325a7efc77e03fd42c407ae4857e39aa0f486419c52e"; + sha512 = "5f6a89721259f028d580f0509c9264d078c5c1dfc974020f6547aa0dec42c48e0175779a28faa3ea9ea29f9ed31743f9df88ff17a86787ac29c4159b858ad3ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/gn/firefox-73.0b2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "38fd36c04d627574f2dbb4f42169687f5ac96f838137074aad44de247830acc9d750489956917d8c7c0736e49dd15a9fadebdee0775926812860800d6a6ac2f9"; + sha512 = "ffb3cdea7c6de1465bf94691fa3f4c7a04b9754e0e954d4666df212d7e1a5aaf95c5754ec8c1b037f27291c9c11039caa55684f12e502a0e2da125ce0bffe950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gu-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/gu-IN/firefox-73.0b2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5fefefff9fb2a99f5627dbf3be38ca6787bd46731f273499702698c1ae626b7a9d986883762557269b89d2385a70f83b73b3f40107b39ae9e761a80a79100363"; + sha512 = "bfcd12f25be70ea1a97f4cf9accb5959828e88e0a96e0b7330b133f0b5fb0c4f9cffcc9a09904bd093bd4dc3d98cdbd89754bbb3300cc53f77e097338b11a8b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/he/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/he/firefox-73.0b2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "4d9a0aa5108a3bb649a762be28946256021c76f83e450229a79ea00de01dea54f2571c3774cfea35cfd9c574c7b97676a8c6a97eef83ccdc8ed37cec9b0e8449"; + sha512 = "900bb06ae030abb119da7b44cda63289a6b0b0dda21ff28be29038f829d33fa3fcdb5c0c617a362280d12cc274ca5fa2f3308d5c1a07cf3fcaf858f7640b1332"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hi-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/hi-IN/firefox-73.0b2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ab556799360fb9e93921084d05401057a22e897d49c01b277369c66b7954657521cc1abf9bbfe2fa2b9eeb200c7e5a8dda37278d90a2bba4b33ce20adce32621"; + sha512 = "e45a014b0cb924db4a3fb4e075b8b703e197aa5d739d46f088cb2f0f99466441ef487e07189bcfd271d9376842474856657d929878ce4ff8523245d0de73c2c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/hr/firefox-73.0b2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "96c1ebccfdf96eb8961a4e40ff7e9ad8e810e58b6fc9315a0ef6c0cff0cb6e8f7b94e22738f81deaff17d0f61c86a121ed50002a0b2e5507d1084c6c1b3d1ad0"; + sha512 = "957da6b386b27821d8b2e3f167eb69c6d92e01dcef22e315b6a2e26f4b4a87cad3a98db273adc6267df36d163ffe5806592857f263f13ac2241fef93dc3eb444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hsb/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/hsb/firefox-73.0b2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "03655bfc8c04229f525712ed9c23cdb481d41e7300d5c6bf983851968e9d7d249962cc73f54972f80c71a12fdceeea1209ad33180276c94948e0df9b996649d3"; + sha512 = "c33c447d1a1bb837a562a92a2ea2761d92baa9fa74750000af8434687c5c0194c95339ae8695e6c005401862cfd3b90043da38f1a55e80c8823d026957c20cfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hu/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/hu/firefox-73.0b2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1fecc903e4e3cc90cdeac3629362b7399b5902dbb66e8e91157721c5ee1cb862d71b1456c1688dae6b43afe8990508a12fc3cf1ec8ca708cd53ef36f86ba9772"; + sha512 = "94a9db9b944e008079e901d4b2d03cdc9b01160e4c49e32b7f3ed6988aa69c95b60f266d7b06d6a2d5561c98698832d09b85fce3a93a50ada406ad80f26177ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hy-AM/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/hy-AM/firefox-73.0b2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "37d59c6006abb270cc3df2911ef460160f73a3013ee66412787340372b4d09d0ce30b91b2f733cd9e27a338e5dd79137109a7c3aad5f0e6119e4dd31f3d3e42b"; + sha512 = "37685298f06f991ef0c1e9d05da79be6fa9d6172c8d4193cecee215a8b7c6fdeb6043c5bc5a8e0695d14e039a49d692fa3d9ec8b843414cc4ddd3f9507ea63ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ia/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ia/firefox-73.0b2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "64050b10a3a530e5eac3b5696eaa5896d061774d65de695bae4fee58043bedb57e63e707bd738433f719812909f754932e19488f53bcf4ba6f424dcf15b9a805"; + sha512 = "30923169773de0b25868ede401d1b18ad54183bf052f1e42d9ea6fdb3119b2c3e15f285bb24f40a56ab4edfdbd5c00eb56d8a9e7c27f155e4100b0028a24f7cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/id/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/id/firefox-73.0b2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "7a24e788ebd46bd9ba8ff6ecd5821b59cf3c0ff0bfa4776ebf97f422f56c2fbc33d20314a7c44cfdc9ebe6ffd4ff4289c21bd5c363998a84dd40034caaffbfc0"; + sha512 = "721a1dff4cd79578ec8c4b8d8e66bd57f8c7e70e4cc2daf9aadb42a38e6300e992a7baba34201e0cfdd6f7b185f720a2ef0d32bb6e473c203459dc2126f7531a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/is/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/is/firefox-73.0b2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1b4135eddf550da0b871f54093b3c1e888d2705a370220e14b07ef93215485878d6e38ca11559bb09e8acddc27fdaa3d105d5ddd121f2f9220c32d138eb74fc4"; + sha512 = "d55b5378eaeb6d39d0bffcd7d82f4bdf16d892ac33c6ab69a41de9dada2e1bebe2dd1630355d2250b2194c41294f89fac507c42754a3bc7b075b129db153eef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/it/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/it/firefox-73.0b2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "cdeb4786246bdab4b585d8172f5c8b5446746a5e6283b8e5deb58a03742c03b46ec0a3220550bc6dd96d314b29d50495b2d00764de2f3aa9f9accbf397a22c63"; + sha512 = "1a054ef4a0eaa388588a0eacd6648660d5135e1d248dd2a4f303ef3b8ad22bd7b1f56dfa2b1998474ee4f6301659d5d62b1e387d41d0ee991d59bc679bf8c957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ja/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ja/firefox-73.0b2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "78e336ccd4697a6e5a136b453c5fb26c560315426b7c3151fbf432ecb1eee5dc26dfefbb8924087d9cf197334cf1aa233b0f125019ecd864ff5b394b42903648"; + sha512 = "c62799e8d3d4c8b8bdd4b8d814aa3aee89ad3d7088a50420171ce1b4056ac4f33214ecb52ba7c7ec192f53cc426104f73a4951efe44829932c832a8f4b971624"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ka/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ka/firefox-73.0b2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "44a973994dc3141f6810471e928fc8e516afe3f6998322cf431783d2abfcf42bf8fbef783d92e436445e6827a259c4db42a0e08b35ae76827007ba1df40226f9"; + sha512 = "c13eb0751f1a37e0b43f5b70d1be6b12f1c12f02b528e78ab5fb33386c6ccd692920000a31075cad6d7ea9c4093d3481bb9a2574ba63dce69c3a158ea704fdda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kab/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/kab/firefox-73.0b2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "758a861ae3bb91a79ca967787f41b24c84945e0cfea162633a6be2f105974c34a8f8270c32f76c4d754612641fdfa11261de74fd629c7877eec385789abfbcd2"; + sha512 = "3d9251e5786799e5c6493f22e3339ffd480af1b5aa2c6444e6501f14d1ae7a325abd4c039d99efd046311fa7db5d04810173ca316429ee059b977a4bee53b5ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/kk/firefox-73.0b2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "28a18c3a9476a90d38795f52767f33b4ef95d62f427788ce4f163526d96be48dc1dab1c01a443250a2773903a4a443be58a629de53e229ad8ebdc3f4efcecec5"; + sha512 = "ff93602fab3c54e3cac28b2dc4534ed25032d2d785586bb7483304ed2326b75ba12058e709d23a6d3735017c32921352274081d17828d9a5788b4cddf90d3748"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/km/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/km/firefox-73.0b2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "08320bc047430a28ce092f39b2836a3e1691394ba04310088857ac2db7478e2d44b2cec450171944e890a31a152483b0bd1900f2fec802cea7b9267ed6bd4941"; + sha512 = "bec57f2477fe8bc098cd42aff6b68db83bf1681c18ef185e4f8c677fffcf033d8e35018a0a7fee0af3bd46298c9a93f48ec74537e2bd71ea00272085e3319065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kn/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/kn/firefox-73.0b2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "578edc5e24e6e825a60f1e9164e1d6fd8af7880c2af5bede481447b247f62f3331040976e9a273e4d484ecce2c7506285db1fe98b6f20e395a1f3f1e251688a9"; + sha512 = "256003768df5f83b39a8364c7a953e2489f951cef080c5c7ae4cd8f368123d2b781cc1a53fe59071030910eaa39cd96bdc02f8014bfc04fcb030fb586faa305f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ko/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ko/firefox-73.0b2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "750f7060432b48ed206643e8212489a753d35ab184a6e40f2a6105c1ea4ebf07b93251c0f06770dde66c62eb7659e7778f784828dc8d7f6b994232c862f39330"; + sha512 = "3c83aa41e7728074dce7f5c496a3cdddcd6889009f6874b4f9fec596ff30048f0ca64f2d511561b93316fc42e2bdfd1e70f340399d732db5c1fe7550a5475955"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lij/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/lij/firefox-73.0b2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "3e7f88af83912c3fc62c9ded0b90f805c5b28852432ac99e1216a7443b2c1c659b4615d94a97a3b825abd17bd3236ee111428df697f091e3b1f0b04c3e70543e"; + sha512 = "90b1fdb4d2b28001cf2362737b80e7412056dddf0b66fab9f79a3fd78c93d5b9df8f0f9cfefe96c282fda428aab9f3b37375ea7b9d337f6907ff06bc10db5f19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lt/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/lt/firefox-73.0b2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d7a41e5dbae8d742793c741c5c084581b3c5ea13238e00a39df8451f2639c48e22d42a490a212d151694bfab600aebc7fe40aed9b0ee06f953838b93bdb366e5"; + sha512 = "1e8aad573f960c0260fba0186deecfc96786f9e7b9424cadab195c9011eb4db32656d957afec432c0e09339aad209a1f58fb8e9e17fc58053f6736890f3b7eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lv/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/lv/firefox-73.0b2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "53a2010eda06c84bc1b8e0b495823301fb48f3580ee6430684d9f9180f1af95ebe15988e6a224f9116e96881805b4d927a8e95920e149f10562e7d549a477808"; + sha512 = "1248de9d4c4a8a346dc4855ce77e3042d0d46030ee80c40bf78880cbdf789259b28fc92d296df34443a68fe4c570acbb159d103cdbc107424e23b1ec8f1c2bd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/mk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/mk/firefox-73.0b2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "83f89a83d8662161d6f997957c8facdf268157f089291833f18a201ea7a0d32e36183259dc943d86e5d934cd90c96cece0862700494385fc1a40d2bca962599a"; + sha512 = "989e75efaf4b7d684b136f968d87f87c2f99cdb14e028e14c3867c9f05518ca23d8feff5e08a20e8bb6c906a8f75cabb2c737c637ae49b7a264cb054fc3d55a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/mr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/mr/firefox-73.0b2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "bc1b20c159ec013df6d2aecab283ea23198527427e2410e25b36f68369f373951c69284f90bb9f04775216ab65cc6a972dc36992d18248170a2f277c83d54a58"; + sha512 = "badc17f4a3e908dd70e8eda671f134fea18691900f8f90c82e136772cab51c36ff1f9a2ab22af22f851c9aa202de948ac44406d992f1be42b8d723c0189b6cd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ms/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ms/firefox-73.0b2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "18e9e3d764377a00a534efd06d657655d99e8375ce307bb92fb4f0c60e00f759a658be8c04229ef523d3d329b5a816e5dec5c3fb70d561da4acc37dd0fcf24c0"; + sha512 = "b258591119bff460f9571ca0ddf7b98fd5e0dfe0531504a8dcfae3636acef6bfe5f84b6b6bee50db6f12759a0b466b6311118f748e5b718f270b1c5ef6affac0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/my/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/my/firefox-73.0b2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "54f1765cd2944071ddb39b6446dd5908f0ff8ad856952830d1ceb3b552e6c79e22ac771e47a3fa87b2c1a225fefad0e4e039ef4fa2142d24a78c7c6784ffa4b7"; + sha512 = "8bb984fdfe04971f830e50f0f8ca2d9233f9a1895ac819f48bdd8348658e1d265d1c896295e0e4333e2506f28747fc05993da46d67d6bc186b053391664ca09e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nb-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/nb-NO/firefox-73.0b2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "8510fc6e7c7e343866eb6d9607b22c287e4bfb60690b8700da48e28c1045c4b02f4e9611f3b72bcbf7747cc24790406543fdc50078773d7d0e60731623844bcc"; + sha512 = "615b0411abbed2ef0dbd4e91d7c70659d71b9778c202bc84097db2977dc794180ba8099264c825827e53f85109fdba0104e22cc7cfb497b47345be2ceb7cc4ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ne-NP/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ne-NP/firefox-73.0b2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ab1a43e207a9bf653d6aac56df361980926fb45c0643644915b5e5a582a77f06169910154788ca86e9520ba1a2f10d4d5736abdfa12dafccb71e0b7b6aecc87e"; + sha512 = "062e093255269bb39663e570bdd10d3ea044555172fd8b8a9db052465563ddb286cf796f3ca35ee9e159cd0a7b6ce282bc8e9397da3f0a29845dd6f4d61a5889"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/nl/firefox-73.0b2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b1cde7378cee2bf1d9918fafe2254293fd3305bcca8817f94882c21448e6bdb5171d1534adc019a45538564f6286d4272a9955bd8b9ce48c1d2f778f7be6de42"; + sha512 = "53261de3a2290e1046ac8bd181b9fd8784503c191761c9a424641a03e41f9709af88a815f02662f4856b4609a09771df2e0900a90b4908c9e7a9487008509b37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nn-NO/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/nn-NO/firefox-73.0b2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "bd08e3b542b6da35edcf7d91f18a7cc6a0ed6d2f12c747a36cffcfbd1856d1075dc0d0fc00e3724a2b43e09e08167110020a8618c66211f0b55934cdf3aac757"; + sha512 = "b4283a60fbc40789105fd660ff1e20e896d74f5b5dc18bface979f1d0f6db09f1e6e40a82e6b8d283eeaeeaacc93ba42d40a289eae2e5082048442ae2fdeb948"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/oc/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/oc/firefox-73.0b2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "74ad86151e8d493e4eb3c5cfa4199946f279c071c527b912a270562a73daff67219eb2f970efb8ec942f0ea53a89c868add213c8b98a51155420aafdb85970f8"; + sha512 = "9fdb44e34b427610e33d232e88f96e3c185f77ac57fd6b3e541977305089cd719cd8682f21be3316c5d3f7cee4ea4f40917bb2449aa8a481bb89889f7ac50757"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pa-IN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/pa-IN/firefox-73.0b2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fd5e002903e6a16d982e063a9644b1261f45b9bfdc75c615dc29fa9ffcb49c7f024d8d9a9879ffdd5fdb78718711e5b44de8173283496a68beac5efa1a8c3bf2"; + sha512 = "00387977b971ad63e85c60fa014b402d7ae4aece63708ec79a3a030f0bf75035cf869f0a5d17bd665c5cdd92d1dadeb719962029e03f3f5d42f7c17ad67f6ec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/pl/firefox-73.0b2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1602cc2a17598747cf22b85e7fb0594c670bea4b1dec4dd5bc44f1c03cb25624d2e67479fd07fbe048565dcd79989fdf90236f677c56cef225944d7fbd5945f0"; + sha512 = "6ac59497ff2cc645bf8714bd87b94a5b08c88f6068bea02361a9188c571ab3c89241e9810c2f9a4f97ba03edd9e3a5a4ee384b826513423c4f3e7d25fd9fd183"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pt-BR/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/pt-BR/firefox-73.0b2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "213665953981892fff05313811c450355545ba78629f123324f20e3f11d7fea88a09a90c063a1f923ec2e9015d4456c70ce0ba15764c1fc01fb04fb67fce8341"; + sha512 = "b7b5ced18eda661e084b27b1c78341dc2e6b4104a447dca670721b937b1a8eb3b5763f86e807c183b83d513219152624ab3a61f6bb1b7ae51f0c3444498046b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pt-PT/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/pt-PT/firefox-73.0b2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f4a08d2e1d07fda7abd2c23e0cba842faf09bbd21e86766435a623b52453ce4fd55fe616dffd12685bc65aa0a621d8ac3e2d568bbc6d3803fa76862e3647db70"; + sha512 = "5e53eb87cd025c47397296141d3e6393d1444ec5bfc91afc2aa314986e7e7db16e72a30768bfaa370c0fc48fd1bd372cd075c7c930dc10ff1fb47701db674dd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/rm/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/rm/firefox-73.0b2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "d1b8ae6ad4ec05b5ac5b6c8900e42d42d64b74a9ea98822d6f8725c52e4ffd7e259fc11e171cb9b51b4dd18d5aa3beb7f20d6ddd33bff7b3dd34f3eb066a6f5e"; + sha512 = "b7a67ea7b3829dda6491d22c42da3bb1220ed9a9585e2c54159428025159e53f531d7102b3c55e532353cd9583ce2b814fab69cf53709b0491719331caf80101"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ro/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ro/firefox-73.0b2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "ed3d824640ea0ce7aac6ed383b654673d2534342ef0d1e605d8693e3cb55f0d8029518b7cfefd9509c6e9a2243af4803c32d19be15e2906fa31e4d33e18ba6fb"; + sha512 = "282cb275621ea2a78d7cae24c761f7b66a949cba0d6272156ef6584f2ba63117da5c842060ad3213f485609287a156b863abbd2b1e2c93ecdb63d2c3c790fb5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ru/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ru/firefox-73.0b2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "90fc22cb96e466d2f556d070621c2de06bf792eaf1979d5ed29e1259d5702992d1f0635ec7fa2bab7ae7fdbfc360e60668352cac895b1756c7e9d528e6f8482d"; + sha512 = "48f06652e41da835588d82fa93c59b77b3c21cf900f269a0ad50eb89e69167d921cfc0a981f6ecc23cf9d3b20a21875bbc783b8a0affad71a6b6b0e56ffa38dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/si/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/si/firefox-73.0b2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "fc35d29b1a7dc4d6c82a49cb23f194f0856feda444b434a77f6f1e2af346171a8a976218604e2fdf1f041b9edcec4f3eef20a22950f32273192acb9d9cce0041"; + sha512 = "4f023ee0745acbf7209904a606e56d4fb2c7b278123b49ec5e93e2008591114f0593d1c5b07f3821337d0eff826e71e840bc6bfdf565d3971b8d41d58a34f71c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/sk/firefox-73.0b2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "8f5f5a33839c68c278c7f128c3c11d9466f6b40d73f169266b38268f7ac9dc909611bcfa7d02f63748e8d8ceb1d1d331f2bfe560900679658d0f5c7421b89938"; + sha512 = "8f10dc4153d94181509fad6656f37c5889f5369dc7c8fa2ef960dbd939ebfa00ae1e5c239ffc4a032d709e9be614307c641c4e19f72a10a7d03a6e7b6522e71e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/sl/firefox-73.0b2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f62801fbb70ec7b5f2b10b2d846cfc1da28f69ab3b041042961844fbce0acaf75cb99f93e42d805dc1e18ffe25ac88831e8e3f08680022ae3e6b10a8923122f8"; + sha512 = "ec01ad790773ea05a49bba9e549cc44c6515a4c0bb97d0579106e58df7dc18d6cfec986a5be47efa0e3498cbfea2cb9370cdc32c1146610abb1c0ec2c40f4c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/son/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/son/firefox-73.0b2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "8326c8cecb491ee51e46c69b392fb042bc13fd141e5f0aa96e2d6138527e96a3277863cb616b7b88c03e18b29f781f2798cf4884bbdd0d434e9f75f00549e670"; + sha512 = "d65c95afc743fa2b0ac86cf71514655f0d2b75316458093fec007f8e034b9705907894bc2789439f01b9a484d0d278e486d1fa3ca8f0abe0533d34804d12daed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sq/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/sq/firefox-73.0b2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "d3388c7cc6496315423a00bca80544fb7eec4d2fe8231b344075503a8813b1d25c1aec7c99f71e1bd1eadfb47edde93dd6b68e04f00dd56f414c77bf77b880fa"; + sha512 = "bef3ad971564a4ec2b6ad2f5e666a000d7079573dee9a8bb40b7b43afe030ce35194fddece80d2eca535809cd010911be61af6789d5bd9aa8b18c88b89877ee6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/sr/firefox-73.0b2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a646209ae9671ff23ee4c72eb40808802e23b7e87febdf2ef58623e2005889cfb38741b9345acf55fb103f327ed39f3847f21801a6493453d4d0392b7d5894f2"; + sha512 = "73ab3b4169d672b0a54e46710c11cf652423918c67e7bf5df78de17a1e5d8437d82c8326580d779648a5e522000bd239f73303c2aa363acb71c2ffd1f558c4e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sv-SE/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/sv-SE/firefox-73.0b2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9440cad4da1aee56ff25b1d2b7f1f9597d475fc1fb4c91ea4c2df10356a16e2f48c147d93dcd387b35c5633fe0027a6879b0a730d97a07e40e1d5158f54a8006"; + sha512 = "501b7e444168a10a1e3641ed6c5a222e33c1560996e7b4f103a5e32bb7167bfb774d4e51723cda39bc91b4e4c59ae112f85744ab7c750d422466d0fe9939da2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ta/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ta/firefox-73.0b2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c3b1c100f22eec6de008028b6d7be3ccac5c856b1ae914962baf13e5ac1fd149598676ada5cac02efabc586c8c23742a33670292ebbb774e27c69bee5a943d11"; + sha512 = "441d9021c8be46880e6a71916a19158532f00f64c4e3ae18697c0c17380bf355c28b8a349f7234d0ac31a6147f0b1e6949a7c8a9bfce7815c01aed75577e5d2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/te/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/te/firefox-73.0b2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "3d73e89551abb41f8aa94012edd7fe132b7e3b61bcd00622ee84647eeda32f612ec3ac57c439500e94cd46c5bd3615843ff55e0b9dc9fa13b92d0260fd483c8c"; + sha512 = "f5f27e43f9f3caee4b095fdd7f1511bdaecf1dba5260b4bfab6eafa1c1fe1c68c72a6b660442da504032e8ff5c6be225e26d523de7aaaabd03a988c14bf3bf56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/th/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/th/firefox-73.0b2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0359d465e62c5efac6f8b23d12549450562bf4eaec6cf185c5d6d29c9ec2a48c41b5b0cac090b135faccdc8ecadf0198a7b4b9df1d9f7bf5ff1662ba5c0d8148"; + sha512 = "86d4a5e45097388570ad333c52498a9926900decc6795c376588515ac1de2a414d7cec69258e5021d57f0be5a60b3f52a7c7089e093d105d80f6a297e9777ebc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/tl/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/tl/firefox-73.0b2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "1d80077c7ac5a4173b273a44d1a164b39a46dae384a977bc79d2f5d9669395843e20945fb5b799e7fee678568a8ffa3b821d4603515aeac6eca7e725a7ab716c"; + sha512 = "fd99afa1461455f8ea169db761124315b4b1cfd8ef7c8a817cef020df9134f27d88651466f5d78cb6479f78e0ba6ab6155a8f9507cfa5256fda65b94f59cec5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/tr/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/tr/firefox-73.0b2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fb5f1e93b017d3f3f9a1008923686a6acea170618ebd3cc52e1e0ec5ba369c6cf5406126689d3bbc05bee63c52b086617925ebe33ade0363d138eb200b52d5f1"; + sha512 = "03547bc0edca8b01d93153abadd94bf0776b5fa9c78a2a2b4bd8871da44c11fa8687848e8353b14434d11ddcbaa659b25171df293fecf518df14be729c73ff87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/trs/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/trs/firefox-73.0b2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "a5935de8cde85d6ec031e312bbe55c39d43db206b981b7513dbd78d9e344692226ee439c548b4e26cd73db49e0b5d57d77c4928995aea326fe1e94c3fb17af99"; + sha512 = "bd77d9afe59707ca6a6399c90b5b780028de744cc471134cf45fb605c7e8fd518e0cb23a503215c1b8844250c7d746960b837e35637cd6d0893abab8d173c2c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/uk/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/uk/firefox-73.0b2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8fb43aa7e90323fd51bd2e281b5fe80c213502fe092844606cc7a3e49edf05a5d4382fd84bfe0223406da453361f869663616f33c9e16f5667cd06aca6c82874"; + sha512 = "b6862986d77dd2a95519b6a6bb0d45cdc98f56659230a104939bad85a5827ddd99a46f59fb09250f8bbcbdfdc28aed3dbf527b23060011ccdf56b2d4983daec4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ur/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/ur/firefox-73.0b2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "f25d7482bc707e7b780f30ead9156a76ed89710e47a971ad66f456794158a7d003515c5c7a70146448cccfcec4f7d920781d334096a1b27dbcf68b91dda80374"; + sha512 = "584213ceeb2afb8d00e7fc26f498b5cd0723b4087f2a7282541b7b471bd49379d65a1ef0f64b915950e262d34ce54bebec79798d0cc8252872eb7416c8bf41a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/uz/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/uz/firefox-73.0b2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "e6b64ba6bd3d137272a0a4b5674080c35f6fb84c6c2988ce0827165112278d1c1213a15175e3c98ab032087abc721c7c95fbdf905d2e4585150a9cbdfec3e604"; + sha512 = "42c28444365bbe5824e89ff658ff8a6754eada96063b925bdf4b7deae74c60f635622ed9f112d8ef3ca28b0cabd0b8217ce8cc72af80685b45a438dd92d46c87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/vi/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/vi/firefox-73.0b2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "60df754b0f8d5a7c1fbb30552f7528de11413aaa712386815fe1f575514e5ea36421f7cd4f264d60949ffc29409ab509b9425258f9eb1c6a014f1e5d2ab30bea"; + sha512 = "a6b1771264ab40f9bd900f05727c2b484192e72503f20ba3ba92b6a36d73083d1126dad526b0168d5cbd0e376001418cc2e37662ed3bfccb2cb2bc28a566c233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/xh/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/xh/firefox-73.0b2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "24ce3035237d6e62ad6e01746c969ddc75e95013b5033d343145fbe1aec0735e588e2a964dbb074f554611a04de112b029d50139ac1a8d7c34834ac78251ebe7"; + sha512 = "35d06d6c31b6cd00377326c895ab7f7be7d0fac2b728174d46b9b02ef1cbbb81faffc9fca16af2e2bc35ca7ac0dde69019e47f00b921fd94e2ffa7a4d086d99b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/zh-CN/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/zh-CN/firefox-73.0b2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4bc556547c3d1b37c0073a255832527a8c4bd2c86c103051913c14fbeb25c9175a4b7809778a936cbcd6cad02540af914f42ebe28884474ce623f2e6f42b53db"; + sha512 = "877d29497eedad0da7bf48c9fcbb93ab5b5852daf764030ea9afe5337ae0599cb0a960a0001c92b52e1c2e32beace0eaf59ce318e5ea48ed8345ffc842e67240"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/zh-TW/firefox-72.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b2/linux-i686/zh-TW/firefox-73.0b2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d4dd040838eb37652e4e049a0ba2bd0f09f8ec239769b79009e290693abd12d2aedb621829033698b193324c17754950c0481caf3f68830e9f1e138a62d58f94"; + sha512 = "be9d6ceb28b866d6831b6d0dba01406e5f89313af8081112618416eada51b623efc8eb1afa65d458ec7b4e12f7f12c05d29a58821ac17cbef7f01f1cbf9230a9"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0a819fac91b..8025e2258d2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "71.0"; + version = "72.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ach/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ach/firefox-72.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "61b15c19839b16659129746561c8da055ac7e7761384511466937892bcfc34aa06aca613e6786b7415926192ea587d8d2d49efe156238fa63a30013f6feb4d41"; + sha512 = "95cb21e58f87a0c056a5aa1cad679fc2427f70a927c657c1cda064d920e0cae374b871a82edabf9e98f81c93f108d72483d0d67bc13c87951dfc2bd2cc6edc17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/af/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/af/firefox-72.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e8d62ea2f03a330178f6cf6316b87343d76ca99acff5d67d9d45be813eb9ab7969466ea30c2759f4ed0e55e33b743cbc96c6524d4a856abdf54723ec7839d803"; + sha512 = "97fc1f47823fe3ff0f44b23d3b8f7b307c2d6e280519180d7b9b432e96263317f277c88ae81e0f033f13cef466e15d14b4a5e9eb954bed4905f92be153d226cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/an/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/an/firefox-72.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "613f8424d32fb9c7946716e39e4ed6964d7e5c398f7885a86ba36318dc1276228026aa196dff4c04058630ed537818719c0d56e501c010c650d4a4c8a3da32bf"; + sha512 = "7e887b166a5c98c46566ce0d317246d0e33fc17b19a6dbb2db992088f0b5d8dd53661d8a32702df23904c1602b773ade8c4f77649a5e6213dc45b2008e26cff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ar/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ar/firefox-72.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "fb240bfd506da1d2c5197c684419b8d8be15847e9516c915856816073de46f7694ebed8256799d06f57ed77a0417124cac277cc8cfa2ee9395affab2ba956f5d"; + sha512 = "4263d4e2d100aeadf08b1b8844feb0caa4e35a46283c5e9d235fdd26baabcb3c3c0117e28c81a94bda2f8d2154a44a45ad81f30894dfa1fd0882a3b2373eff6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ast/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ast/firefox-72.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e87a750ea3d27008c986ec58b104b32214d50dc0362e4a92d0359b990fb39f8ce3af63d7d96e84893804cf1e87c7c319aa3973f22eb32776c812ea2599b8a5b1"; + sha512 = "0b3ebb112e8e4a83a1db901f18def4a001aae1123b48c054c56feb4bc84f4cd0804d4bf92b5977bb264ea786e200f7819a278c160e2ab2aa5fbbf0220b13cbf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/az/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/az/firefox-72.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5789390585336b88e0ff14c32da9136b8c40e1ee7e6290796fabb01060dd295a07ae76dd78223b2a73cf0f59ca6dec40ff1d31a7f73956ac852314266b4b47a1"; + sha512 = "90d4229192d22d88e0f65d80664e5f7e08a573baa585c50c881c787c32515ab7890835481b5ac6e5b2829491c9352779904c3ce3f7edff59a2c4c51479fe4c09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/be/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/be/firefox-72.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5dc9e7e7c8ba973f477318103015e425c7de61bf803a41e06c9774b4ed5894deacd4abf389ff40395a0269a06ac2ffdddc737bcc2e26dc8760adee2c6e58bdf0"; + sha512 = "67b19de91993ac41c8ad57f4247295666b588affb84750a9a81e94a356de06e72f73c895810b9061251732d769dfe5ad056f767b373f7b52788e63fc48fd3daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bg/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/bg/firefox-72.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "12d7e7c285ac69d35ad7726babab8b50f42846931545123fb61741bfa635a2eb7b3f1829bb92f5d5a9d07dfe3dc0c685f49eb5b7c1baa388788b697477b5ec65"; + sha512 = "531af84f5186faf3c82f9456401fa66de17a4032af085ad109a1810685a2d65078e45756eab8403a67caccd0564b68f2be560f7f52451796690a98f5e385fda4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/bn/firefox-72.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "45431252333b7ccad98bd79a708b5ca25f7cbb49330cd3287dad259d9db0ad4d19671e12cd9d71d82f8ab2b1d8cfca34e7cae14a8299300166fc33fd2946718e"; + sha512 = "d810802e7cb03ee8a93a629d631006a9820a1288b2ece3d3117e741160db3ec67dadb29e4b4442435762b5a60ce34f57809709b297e1f08a56a0066034ef4450"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/br/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/br/firefox-72.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c4a3a7e197864f52525270a11ae7979772d0eaff9fa623edd5f3bca143c7fe2f9788ffcc8407934a2b7370edbd94fb0009f8b6188b0755903178fe18235a9247"; + sha512 = "71acd5ee0e38bae9b695a918037bf295341f59aea86740210aa20d3ea796f20f630c3aa92f42c4103f680aa125df34a4da581eac355d34d52e426f3ed2bffbcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/bs/firefox-72.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "17e7e8a7c74d413a90e0b7e0da7a88455a1411f2d08f081285ececb162625912302560ddfddea7efb466c9cb4c679978d4ad90685db65faf6bf847f3ac1d2bc3"; + sha512 = "86fa8c163c95c5a7107c541e44e7336daab2b5b776896f04b1c4ed9b8256b040d3206575c214a4ff740e617310150bdac6d299f96cdf2958e4986ccf0fb87c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ca-valencia/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ca-valencia/firefox-72.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "4ed7af69a5f4b5e82886b787cb7feab2df19ccabbb4e9e2fa9ddbc6677e0d11a4c94ffeb0517c35a14a51b257769c3157b21ee661d0b086fa0bc951407885af4"; + sha512 = "dd602e5ce40082c54bb01af2be5b0508d2c2b26e2ec4ec6152df25468596a3ef3fb7e67bdef75f8e6c3dbec4d3d94b69284c5e2e9a7fe02808fe9aee8a81703a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ca/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ca/firefox-72.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8a0688a40f263bc6775f6bd23edbe3fcf3f9b725e37e9b94b23bbef65aab273e503bc67c03fdcf820395acbf59a5578f5638a3277bdc14e961b18c6a68a443cd"; + sha512 = "14dc691a245649bb4efeaf2ea51db090495034b9deea98a158429fc9982a75238a08e1faff5f31aaf3460f00382045210d89d38d7ae98f9446f5577a11d1a7a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cak/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/cak/firefox-72.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4b25ad5ceec5d55fc2f3c1be875e75237c2c32d3ebab725018bc04c6b5d43ff182818d95d73d816479d87a6a2994330fce894d87573852f79e43b56e0b7fd6a7"; + sha512 = "3febce8210fb0f49b3e510ef244b6265085f423d1ac19baa4ab929214524b9ec4993a34296a10f969f85d3bf26fb4cba4d8f0b2500a658328152aa0554693248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/cs/firefox-72.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "ae2f6386819caa9917ba26e7b404cd8f4b6f4d390faea57a333ac555a6860dcc7b92993224ec54f5bbcb547b91cc99a5b9008bba33dc39b38ce5eaf9468c3f50"; + sha512 = "00966d84edb543271e826833060ef2e5636d09eb51c7f380e34a1e3e27e15b73bcde67cfc6e678f93b9f5a2f4108a8008ad7f7ee7cc38db6abc3c670b95458d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cy/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/cy/firefox-72.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "fd6093384954f1a0deb7435229fe92196db1a3ba80ce651f1be20a420701a8b5ff417ee7f1d3c8f5f703d732e3b89ef87e49d164785bf32c326c66ecb9afe165"; + sha512 = "f657b814afc8fe69fc5513c32dd2784cb4f18fa4e71cc6f9b61b9e5f4b606a50f70fb74fa4264a2d6ea06aed8ea581403187fb3e8f836397dc1e55754941a76d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/da/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/da/firefox-72.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "52c63938d5f6fb85ec5fd24289eb2dad43a00ec38cdd59c0c44cc06d3884ec203195e4dd1a6b26f990b819fe58f6638f97d8d2dfb597d2cc01a27ba019d0cf03"; + sha512 = "2f82e8f4f89626788c0c695a7d8f5355c1ca8fb7b450a51bcd3ab954c602bf219e5a9d165652c24e161a4f332ecf6883fbbe900cd7a080f31f48d8154df0ae43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/de/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/de/firefox-72.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e10824056a96d5d7e5b671d6bb37f607d36b92412c01baee8e493b90fd3b9613be2bd7854d0aba3e97cd560345ecba19b880e9beac82bcc5c850217a397f7f20"; + sha512 = "48471023c49df05c5c0103551e089408393ac3169cf2dca86e43fcf92736d85d94ebeda2f6bf902f606ebe45411f6d2b7a81f0a6ed81c01cbba66cdf455d122e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/dsb/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/dsb/firefox-72.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d1ebe6e9b14d1fbc63a45f6cecae206ec7479851aed80819f7cce78e7cb3a043efd0eb367c2a2561cd6d668497e5337aab3a0f5579dd5291587d36c22890849b"; + sha512 = "9d4ceb07bc30ba4b3592443d901afaa2153a5169809c57e541a47db4e00aad0593633212881d61698bd8806554eafbb67f47602cc244c5d5ffb13b0e4274aa28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/el/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/el/firefox-72.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f1468f8d0d2838df928a209330ae6fc7c1a03b9b16168ed5777db7763c56227031414150a5b01c4ad35ac6e4cf7f1eb24ed644896cc6bf3745aa2de7029b0d1d"; + sha512 = "8a5523393d2c10f1b073fdfa60c1a75775d5317447bfd5ac543bf89708d149614c528a275c6daa9793967a03f3fa9929ba14dc9a446c4e668c4461c119f2ea89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-CA/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/en-CA/firefox-72.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "a78d91bcf51fc963328d38e7681b573d7d2f751bd27f881d80e43cdf40452ccd71207bdc7d0fb7b8f209e9ea336236752aadeac33b51bf1e129df46840a4f72f"; + sha512 = "3e3afadebd8b45cfc498dd60df3466cc2544af84e3465a973911d02ac629ad43f7a81b579956c4621e13ecd301434bf5dee71f236f0a971bbd49c9a25c9144bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-GB/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/en-GB/firefox-72.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5fdf613e662d3d3e709d6b0c13371e58542dd61a04c52abccca06dacd58c0327e49241603b12e940bb79fa4f80055f919136bbad597b1727ca067bfc54fdcb0a"; + sha512 = "03e6a39693057a278610f01163a08581b03eeb62ecfd54a737412269bf5d914cd5da64dc64c1ed73d4caebbac3e1656457079b441d52937c27f6a2a63bf445a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-US/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/en-US/firefox-72.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f835ace8d5ea8bf920c1065a2dcf4cd0c4fefbe675311b9768e864446570bf8bea289703dc2cd5d1295f027cf93ce5aa34ca28a722f64549b388a50fe4c87e96"; + sha512 = "feedf659b4d1a0be5089ea113aab32a83f50d41b1eb64a48c4b4af7f0f9ec98bed5185cf1f4ed3c6f7bce7b98476e45afeb4fdd90aced26e3730cd0de36af55f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/eo/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/eo/firefox-72.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "86d403a9193b35dec9e71e434e5e998d1f7f5ce14bc47218bc50454bc623652d704f5dab27cd4759e2c90fc85bdc8f016f799080dadebf0d31c0e5be2173a63a"; + sha512 = "7f1052fc24776637c818bb860543112e1a4f62935f4e0849b888b65b4a2af7270acf6ae5ba42febee0b0dc21c5029e6a1958e5045567ef4cce31b0cc1fe923ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-AR/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/es-AR/firefox-72.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f4d9b5d87c334111897cd91b16433122a391f491efe420ffdf63e0638d07348c6a2017f1175f246d2f93b030781043ca7a1bf4d3248412363d6fef7048125c74"; + sha512 = "542ae8c13f81d89c526f8ce6baaa536e95505a6a0ec6f72bdd1a92246904c8368a596c4a96c2e5abc7dbe1c66e2ed42584ce8e649f0784c18585a42db61b2731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-CL/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/es-CL/firefox-72.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b2c5ad1d7b51fc072bb451dd1a63af4d9c90f9d2091e02bf8d8b4d39d9918b9abf20beada85058d05aa57ac447ba2b480d12d7916666caed5be853427061589e"; + sha512 = "142e143ffe28794f6384f8693f38e7ab649019e1259f7bfb1fea72acc5b84b1d36c407bb071ef760e044e70187e6d0885dde40d0dd56796bceda7c00cdc53462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-ES/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/es-ES/firefox-72.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e85e9dc61bb8f4319544fe0bc2430c03a813f4f4da1cabf7d7ae03738cf7b5f2f8d39656058c4a447c3890e1b98c6e558cee17ad528119aff516eb17be39c879"; + sha512 = "e5063ea051a9b3e0cb3bec2c5ed079d3af1289c5eddaa35fa998630b4c861a3b3e6a1ea13f4cd5386ffb3a9760e69eb2303970ee889e12d691334928ea2565a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-MX/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/es-MX/firefox-72.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "7d73e3687f822e8ab41f8b4e04ab04eb7d0a4c8f3584ddfc43dd154b760866d26e28f85c62ef6ab55777c842e3eab61ff9372232f2788b254133d3ad7a84775a"; + sha512 = "f62710fbf2289c713fb778550f8acf67a8b3810e76a7b1ca93ad9a1e1bec50dc0184891a9cdc10a0e305581217ea8c490d602b7ff804889077a091e98c75487e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/et/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/et/firefox-72.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d9f2d99d7195d64d3aec9faaa07469d99f9fb9ff1f83b38cf8ec7ebfa2cec91a0f8242548a794d1ae5858623730d0f616ecdca5c25288b7bbf378bf7677173ff"; + sha512 = "6180f0856cdcf0e704ce9f10f75295fadd2da0c7cfecb427f4039cec4e329b351d4f45293b852bedcbd007179fabb31d23e15c46ca6db6cc9f53083ef9c9ad8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/eu/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/eu/firefox-72.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a0a8c7af075f4fc4814c571e9aa4eb889326b92815b9fbe3c79c69ccc78012e278386b1f2b2e1d6957e8b97ae65c044322e3792df6d6f66f42552270883f2dfe"; + sha512 = "b7f99f155bab4b6511ca948195b8701534ca3d35d327fa800a23307c1cb0238d403813d21ca141f8f89cc35d101b6aea6f14eee091f8dcf93cd738a50ffba619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fa/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/fa/firefox-72.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f8274fef2412c541f1548afac3e3ce7d0ef758ce133669c18a4737e05464b94b2bbbea966325cfe89064b4acf3f79725613101e5428b9032d75c73acf6b8ba6e"; + sha512 = "73a5bc4252a668032d079fe988a8237653adc3c47ca009c2b97a29b1c8997f53ca0895c4a8699504a6c80764d1b2fcf0fbde04b4176434e9ba01c063e0a08d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ff/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ff/firefox-72.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "cfe678f59a4a468710c1c9d17d8ecabcf491c2a9bde03ee7ffe4b73f426632587a546913538449606bcab4c945e5cded2fc3c81ebd9797a4791c097455dd6689"; + sha512 = "8e574257abfb6ee738c17aa26798220badb0a92fd41ccac1a47dcc3343c71798c7dd4ea633e788610d59a7ba61ff8ac428aa37f18f459e2e626a737d8d72ea39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fi/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/fi/firefox-72.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9c9c0c1040f451068bc244c5dd194e799b64ac5f1e80f71ea4ea84cfdc1f3eee2916cd2dcf24d3eb8bc70bdf80957201472eb8346d2ca605e97e8f70eb3433fe"; + sha512 = "8888db2b4262f273d3d5dc478b358899052de3569bd84cdf1f0355c4a646b890c029a1895ad3ddc0f9dd2e2cee165c4e6195484769c52c00b52d7e6568a2350b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/fr/firefox-72.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "9b395558437f41b75f709ac046c482a0bfd5aa68336b2d0b53fb8896abe2f7e37965885c70bac24026cf5d3a9cd774da03dbea896c13b95bfaa70502164eb5b6"; + sha512 = "9a476ca5be7120b582e53accd1122c6dec8bb4e100eadb6ae047a8a6d171b3cece0044d84d05c448fedf7be45e003074b6557dfd5d31ce082f1ed9322eb5bb4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fy-NL/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/fy-NL/firefox-72.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c15e43a16c3d3ead9eeaebf774caec691fb4307c49d3d96b587b217b46a9ad3de8ba6e474a4cd1fa493b3f873e3041bb11c0b807c022182e08dc4d841b2e0a72"; + sha512 = "8d51ef2267c882d6c390d413c25285fc30c374db0e5e5fcead084fd6288d0ef880ca4d567b589fb7c8d8c06019bf27b6c6ed0a82d766582f73bbcca4305e2326"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ga-IE/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ga-IE/firefox-72.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "6092293fafe763688f810cfba2c34abca1a2d4b0c086febb048386a04bbcc6ffd62ef210b679c0d29dec3cb343be8264daa332fe710d2b681094fc7209b9c679"; + sha512 = "995559a18eef5089a1e2c33ba823968a79209e54a0271094b229855538d6f1f6a782191d64554d2ee8bf28e72bfe9237455d97757d0d2f17733fab8ff5d5ae9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gd/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/gd/firefox-72.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "67218bb7dd860e92ae5b2c6ee4234b58c65cc3c458f8604751782f629f3fc23f523ae18093e141f19cabd93619db0f283db797c4c4f01a8e860aeec7976c0fd5"; + sha512 = "dfe4ed310c6b291f1a1f05ee427728e42f283ec0ea4c96c5b4f337a3ec3af3fa859a86ab801e63c03f1e9a803285c0b620da3453f75bc6839e5f79d8c625b018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/gl/firefox-72.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ddfffb5e6927a9edd8ea448148524dba075f1e9ffcfaaa5d56b04af06a3107095b910034022e2c9af298d2d2cc7a8612c8544af8ae0418c4d2ed0b1cd83d6e4a"; + sha512 = "bac382c79ca5bda84c9daf76370eee5bf29999e3ffb71ac8e5cee04b3b4d7ffab8f9308a443032fb702f8f96b4c8b0a1fc7c347c78b839d4708ed81fc5284af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/gn/firefox-72.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "54f2893fb78260240c6b9f0fb9989d1dff7f4f5d493fb1baac6711821fe61e38afacc52cd7608543f5d9d8999a716163c65604c442279f929f35eb0e8f892d7a"; + sha512 = "d130a96eafdc5fa5bd47ad298b1636e8031198a083e426785f5fc09bed5af6a5240ba585399475ee616beaa460cf6e7590bd19d34e5e143e34df8b125b3c552a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gu-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/gu-IN/firefox-72.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "91e04c877173c730ac0bafc3e51fc47ddfadf3bc6858c8e4ac52454d4ce1fbcd965da53e8adf9c6276c7f7fdc353e52463875976bff4e01b932d348ee0f961bd"; + sha512 = "8b72a64bbce5c6cfe68e522ea3b2ef3decf91c3decaf55f96ec1ed3a9872dbfe2557e8a3628f75d74de2e4cb1a07358e349c73a853e8470ab625b5436770eba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/he/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/he/firefox-72.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f9a142dfc33af2f28671c5cb62007ca307a5156c9e97e1ef48e2e709faa89e2ce8ef40f98886b1b7595e6cd3ddb86e19c9795296bbb1fc07afc1cce933e7ac62"; + sha512 = "9077b6a926a775b45d38668c8b6b31d37fe7a696b46046612a71f90ad74ddb88d2d12bf5f8880d1632ddf567cf09e997a7194d69f3901bbe724a7fee8ee77c53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hi-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/hi-IN/firefox-72.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "545bade79a71a9a7e6c62f74d027705a7c60ad1303f8e1795e7809355368dd5709121baeebee16c7ee36b7f9913edab8fdde4555278a08e58981df2dc3ca897d"; + sha512 = "c9f72d30d19f08d08866ebcf0adb5772d972cae7467ad691ccec5fc712fb903409795d341b0819b8be1503b8f99ae9bbe7bdb3b5b0ed2b4a324d8956ef045f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/hr/firefox-72.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "08a92ebb33b0658c4242ffbf46245839842a16355b5c61b7c4c41f84daf306645c4945b96cc954e8121f3e9c27227427e322b8a38a209a6d7945a047ebdefb1a"; + sha512 = "8563a1e1908a2213babf20b594441e237f3c0cc7326aa1dc8f9a5a1ccb766a329e7c4feccd4a1bbe59991f0dc716fca35b579cc270a12c2c1ad2ceb155183ac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hsb/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/hsb/firefox-72.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "3cd0a9bd9ff3c3662a4dd64cac378dec948ab2d518b41adc0a5836ff42a502afcbef0307bfd04af728e7065e3bcd791d64470f2602e358c78f51b7f41912cffc"; + sha512 = "7c84583e18fcf8b6038283b40005c72df33a946cb3a8c839b8354b3f67cf2275b8184f56b9bec772eeb856674cb1952118c4f18d1aea8ef547c7308b72674ddc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hu/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/hu/firefox-72.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "96b625cd3fec5578a646ec1668cde58c59b381fd2b58d84cd904c67c89b19fbed05d9ee70ea7f114be5041a00bd074e00eebcc424cc7715734a88bd3a15fa32d"; + sha512 = "c09f52c9dbe329f093014b893ad24a30f2ec79582161dafb9025abeeb691e8b7286ee046f92dd32253f78aba76f3ad1de8dd6fbf6143431553f38219e8b20d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hy-AM/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/hy-AM/firefox-72.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d67115a96bc9e1f225de788570e28b96ad867435afd94ee849dfd7c27f40aadfcf6213e2c2a8f6a237752a1241464e48c9bee373d5563506577cf0bdf6f9d290"; + sha512 = "b149f6026b0da2ecbb58e7e28f4d8430fb9335f542042e254c35f95d4c6e12e6b006093c486f78f68499e02162d166e8a02b391f28b48990407893851d20c291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ia/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ia/firefox-72.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "09334b96781f1ca1343766d3a78a82b9fbd60d6c2d267bdc25a5e0c4b3fa4df785e6eb839291585adc08ba9a1f707d3ab066da326a34d72a750dcb9fe10b1f96"; + sha512 = "6fb4c62d5e929893190d5f71cb8466a04d38fcc2e9ac96d32fd06ef8e3658a3324da9361d05a558e052d23a94cf4e505d5ca81152a7f586a3fc0185e397f4068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/id/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/id/firefox-72.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5b01cd3f4395a7747d27c49038f82887ede4b5fd396d96f6ba085d26dbeb2bb7c722bbd53fc0872ad0070de0817e6e67f065e4e0054d52f0a76d4813e60b3b68"; + sha512 = "406a2c7520ed7b5d93f8d7f81bce1c3032e9f0968c8d5aff6d40cffb1393d15827b7f1be29f62e4751c851cbba19fa23660fd4985a9098018196b6ee7b1744a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/is/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/is/firefox-72.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "bee1004c51fb2c6a45689b29d8ef1aedf91eaa22d153d4d85eda87c79c3d063bef8ba0cc985c5b9cd808aecfc22b1654fbe7baf0f9c96cfc188a1ab101405c5f"; + sha512 = "8c2b4693ff525f7c2274bdbf7e1fdd0b8075e697e3a032f5e46282cc63a4c6bc972d734135f31022911c25ef257b8f2d9f183e97ffbb78db49a2283181f2ac3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/it/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/it/firefox-72.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "7aa5568131a47d3bff820bfd3c7e8f5dff8d79d2f039510d73964b302f2b6f63e41cd2232e4d17e766ce52d89c9aad5118092152472ee7080b8505a4352b30a4"; + sha512 = "6a4738c720555af98af251ad440da1bdb30803723990b50d237b07f7a851f0ddb54a794637ed840c7aa31aa1b787dca36b78234a25d14709e613a5340206be2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ja/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ja/firefox-72.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "92e13e266b2da5b200cbb2d09b1bae3ba6963069357656a2dec89d2ca239bbfa799bb7356d5935bdd38a0d4ed5d503bcd69de67d3caf79f8118f0884b9b7fe6e"; + sha512 = "9073ccf1b19f4689b0730024c15d40b88f4912d8d8b4dfe779c79b34956cf186d175c6534e5938ca776880b75cbd31d220563fac72c3e19d8b99bcc5186b4843"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ka/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ka/firefox-72.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fdd066469146eea0e0dec12d5dd98f8801e7a8910b5662e71ad480be337d9481939e7d4d19eb0a34e19e929ccdea97681a9d0da2d9fb96a6caf36f842426f32b"; + sha512 = "2c8e252f9b038d1117dd9caa9d34100e33ebf1756ad1c13cca5beb4b7df977b69ae8db4e923df51f485f71bd75802693e02bb16aa043998d4c4b69ff6504817b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kab/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/kab/firefox-72.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "0a62bac221250b7ebe55beab4acbf58d90ef522a82f4f98ed1cfda19ff4bcb02e59587cace7251691aa5545d02b7b9ddb7a8fa99eabe65ae867a4405e24b851a"; + sha512 = "a50aeb79c59448b55a6555f01762e1c0c69646f55c0fd02590a5e6195edbf5ac571c6efda16f4a79bcd4a9457843108875298076332b8a958b11da5916b3140c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/kk/firefox-72.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "cd611b845802e59ac292cb6e487a68319544130d6a39f4ce3f37dd5fa73094ae89e9504d7bba846c55dbc16747caf988c1a45691e7fdffcd601b50546e15ea54"; + sha512 = "f849ec823cbe572e9cf054092e097f6548fda308e65cce8fa8f3979b19576ab18af77255b814725c37d527f2e4efa54c3e7ea54b47626f311041e312f819098a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/km/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/km/firefox-72.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "27b0d8750bfcf10813c35910eabe87f4294b033d1044b0fb35ba82a5870748de2f10b03b4f39c5857b6f42efee796ae9f8d3ccb9b920fb6b6544a0bbc86cae9f"; + sha512 = "99b39494fda8aea90cf3843c9354733103a3fc9f4be9267eeef643955ba1709bcff879994d52deff79c4807739437f863e34cb1add2f112bd22c6b0d16e1e14d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/kn/firefox-72.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "5b292220e41ad296d2230650810beea85f038dd7d16fe24f08d7424ad2927424c088d8fa1c5c670aa95f0457d9d8259d4ad228cde09d2195dcb94a452a56b6b4"; + sha512 = "cf91f3a0373565ff239a7fa866f3f177b2a67bc74f9f2f5c85b5cc0537985db3100cc49ca607f37550e26990723235829f2122ced96ab4b35b49ac3c5de99639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ko/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ko/firefox-72.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "784a362e0a28233e7453948cf2e8a6d6752d5a702164f913dae01e58f7aa837fd976f5641f6786fc58799b2b3a66255317a52714ae09b3f346a9814eb5445c4d"; + sha512 = "950913217f0e849b99d8e7d2138e7c476df643d7bdc6919bd62644858ba851a9ae5069ae39b9772ae423033d677555fad56136f09d944658a307d87a0b61588a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lij/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/lij/firefox-72.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6ddc8ebfb7a469636054ce2b5606cb2601398dbec59221e81cdbb3fcde33be0d6e2c2f47a7bd80a84c3a1d0a1c8e68827d72d57041319aca59c89a1b03eb9510"; + sha512 = "028324fa449c72a9cf49a99b80c0c50964f6ec11f87ebec4e6b0ae07a7de41cf2f72f00d3577cc762c8061adef02416c906ca318dd5c8bae310f8909ec1b242e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lt/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/lt/firefox-72.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "57f61620c306445154585623ee4b8d2e915371429f669c426d0b99916a6eef39888c32d304420146250ea4d2c4696f287b7dab1187e341ccdd728d5cfc181b11"; + sha512 = "cae27721cd3195c2c081d7208af46fb664427243c07e2d48ad41693abdc72724ad273545e86fd29ecea725433e1194c9434c61f724328787bc4e9708bf0d1990"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lv/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/lv/firefox-72.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6d7ef84ca7d5cf92fe671ef5372b602983b25a035e110bd92f25c461fc8a86fe0b14965aa3426c90febe1b311cbe67d901122cd54191162957ee0bc1e1d01a44"; + sha512 = "02f1456d4da72f97b1537b767b5a5366810071081ffb48cbc4cc1180eb1983bbfbf8b363a39cb7f0e492c8ceda35b4b1d04288e75cd9a821f3a2c25aca394ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/mk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/mk/firefox-72.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "680752f83f68c0a2c6f929016c610e671bef0ae44b84e976b0839a19f1947429a5a2e8e60149791fa2454a85772132dc87db1979adf327bf6d36da92b50a5924"; + sha512 = "8b719ca218ddfe9cdd1a5f88afe8f20d5373f2d90d0678d239cfe6f4541d0ff288d076d11b7e6d59dc9472523eea26537bfae972e4c7086aa73c601ed7a3c175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/mr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/mr/firefox-72.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "1950ebfb23bf825b2f8711ff85c53db29781e52a9684b515373c2591c458d897a7a4445cbe3ade9a891c52104a7651ced306885639495bed76690a305b22fea5"; + sha512 = "d28a4aa87313100a13fe5eb3b340d9351e99a3345507f11473ecec59444e65871d112c359e8c2ce293a4188afc0392fe98cc50bc45da8e26d172ac4bf7f3b9ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ms/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ms/firefox-72.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1dacb30753cc4c65bda54af6dc886b1a8abd6c6320cbf208163aa83d874449aadac64c5f5559e5dcfb366d4b0ebece323ba46b2eb41f03e908b6aef08bb46a03"; + sha512 = "f861b0aa1b2348eb36c5ae33e8b4912efbd951f2efcd91d94e71edc22398dbdc6bf07045b0e98d062799ffd449aef57431482c26355ea89040a7c68a64ccee03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/my/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/my/firefox-72.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "708813ef947b1bdc8f0459c3ac908ca1fe3862525c59d51ccdc1e7c2d91c1e45693b109faa3d0302e7a2a0acabc3c84543b8ebe98ba9d97215505074ce9169b2"; + sha512 = "797cac8fe910f4021a8193edabe23e44b19b6afd43ff2c6d75bae68da92a9eaf684f24de97ad8e92aa5e82e494dd47754e07e2482d56befcd020f2d530de498e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nb-NO/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/nb-NO/firefox-72.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "6511ea81a9eb6f552c260821bfbaefa7153a59f5078d7ab5676aca313ee27cf75617cae1cb569df400ed491ed31e172f51fb4c4da4ad672ec76e3faaa31825d5"; + sha512 = "1fa42319d60ca00b0aadc154bbc835000aa91cdce6cc3d0585820d3fc332c6258f2c484510fa468fe28e6db261aa2c3e2c875e9c733c008b1cf9fcfc11cf7201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ne-NP/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ne-NP/firefox-72.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "088adcab8954c67db9715047bda7c91034b7068593334ebd2b0dd5941ca7ca3d3c22c959baeb5222e041ca50e93f4032b2fd509e305a666af0f772f89a56faff"; + sha512 = "3a061a0f7d58a1ab497d93ea226a2c1944c960e65e5f2f071db649bbe36547c062fcde923c9300cb084141ae7c9a901d8f62b7c4bf8f203aaad312b547c71368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/nl/firefox-72.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a9d569d5032bd5e7aa5a54815b01d21f8aa55188144a0e19299cfd2e9f39f931bbd86bb9e05b9c2fc67e2749f82ef4d14c9bdc08044fceef8710b3eb67d3a4b1"; + sha512 = "4ece5fe89f0137582136e44c4db57e3d842b9b9cff164518ce41bdc6f9bfe96e55ad7227b93b76f228e380364529e7081ff8990a794cae031728d27bb1d6cde3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nn-NO/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/nn-NO/firefox-72.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "dadc75699db6c309262855754cd8f3849a5f51aa62ccb2071322cc54f8193ac5b6ddd642677ab277871c4ffb90000bd49a01bff23557d387e7d902b74150d4da"; + sha512 = "6ec9fd8c3ec363a82bd21994d742d69ff06e2fa4743b4bf11734bd525282e93fb76dd4940a0809a46f9bd5cf2d1c5596280602d067fa2462e0f727adec3dcc9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/oc/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/oc/firefox-72.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "52850cb096bf7c2539c048f935c434101f3e66e7c24d4fe05147de018aadb357c4fb7b582d4e43b3948575b3d0a8166a97cef58ebe159585e8a0065bbbf30727"; + sha512 = "aac7f6f0ec2d32ee6fa7acb730ad5901fb70d1dc06ef98772a5899f1e5d6b4c605e232ec393146685e2a5b68fc3aee6a5001cd7080bbe90db4f5dd3ff1d8cf5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pa-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/pa-IN/firefox-72.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "ac1832d4c105b3b401cf029bf95dacff3afda8cc63de51b35d4b847177bf4ef48e415294c91c7a7c095725c52413ca17eab051d3a50c5f8c7346e480d85b2de7"; + sha512 = "fe81289246146959e4abe939ddf7ab7c07c6cb27495ed1a966ae74db9f89e05cc50fc8c333e3b9850fa90514d19af896afc8b1d8e0a2acb1a358715a009e1eca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/pl/firefox-72.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6925686d241ab63e882b0679c93ea2ba73db84037593f098912fbd23a5bc0b93492bec3114e7e42a87f1ab72696f9c9d80caecee31b0d06c949a55238c0cb8a9"; + sha512 = "13cd8c2f1b54c30b060373097ac8de38a685c11868044dc8756605b8bcf22230886b85f5e9beffc5f4ad6729b6e9ea3c1a070ec93a6fed17fbb9ba5c3f7b271d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pt-BR/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/pt-BR/firefox-72.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "a3aa486f7d41f77e090d56047aa72dc9d40e8d8b27ec8203c85d77bd108443201940239fa16bbbbb007d8093429d810db0ce0ff6309c29763ee0b424b8df977e"; + sha512 = "0f3cea229a7af58c692c0510d49132e6d0f854d6c9ed7f234c74b15638be00143a382a2d0ca04b7b5baf1936bd9fff7f83364912f5a6fd398cbed4399f23a03b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pt-PT/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/pt-PT/firefox-72.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e8730652a48e737840f8bfef348d357d18d642e01aa91518fc88d0142fe45d5ec5f7902506e5e6a0c49c0fdcb74009a5fab96d9f6097b0cbe07c4df05599d79d"; + sha512 = "13e50ecbdc2173e4b24b18da71f75f98cb5167202744975bc7bf8687a9e6d537aac9881d71188e51316d806254bea77dcf5c7139cb6f7fa2ca95b22b2f87200c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/rm/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/rm/firefox-72.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8555b604d00fa7f5efa6a2d3f6fed95e18c2256bc67dc311499b160dd634e9529e0e7f641d66c46ce3a269119a7e4af65461c8315d130eb46af3f43762f89d8d"; + sha512 = "674349a501e282fda85488a0e4d0f28ed0230b3baafc371815a5895dbc8f2fcae73cecd22f05daaf972501d008bae6c92eba6a8e6c39af1658b77a604847374a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ro/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ro/firefox-72.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "65e2b57e2e9aa7226989181fd5cf7d76b54f3be66460fb587d35f27689551ec326ee77da5dd6e4a60b61f39c5c789c399c8164377f6fc03324e65653112d07be"; + sha512 = "32ec2f86fde1c5a11cbf3c2854c3844eb06bce401728a205a55925bb1c2cb54becf26f14debc546e244384e15d841d577eafbb164a87b55a6999567128c991b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ru/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ru/firefox-72.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "b2c52373652a8340e4425a101bb8a9c5bca8f2db6093e54f5983a1a62d4aec0b10252d678b91dcd8bbb23a844215545b1f9d627ed1dd1bbd1488fc07027aba47"; + sha512 = "767496cb6cac35d546c0ea093b9100ca2618772d49f20bf87866ddde7e8db2ce308fcc1d4ab588ae8f1b00f6a62663ff08b160dee97d8077358d1322e5fe07f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/si/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/si/firefox-72.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "47fe8efd423579a99e480c906cd7af5a249c01103558c5a0dd41008ab701f60cec817bb691636985fb5ccd2c5c4d0628fe13e892db377d8400cf24b40b513aea"; + sha512 = "ecc2d30f37ed35d94b522b836255d7942a27d72acb382bb0af0e588f8d5a8dcbf0d604ce78a0b99185cb44b24bdedab5b2499bccc90e2aa42b82c261f200dd53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/sk/firefox-72.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3d8cd6aedd3ae96be8ddc7a8cf44a3185731803a1a413e3cc582aa17d3bd7280aa1001f7ec89360a95bdb8c01c0bb51b144921a72b9869e17fc83f6801aa3438"; + sha512 = "dc544f6aa6daf1064e21f69baf1fbf0498d8bdb2cd9dbd7218f4e3065c470565a44d8792ade81cec7a4b622acb63c94b2f4a51277b8e09d03f342b18dd225a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/sl/firefox-72.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "79137e5e42391dda48e521b44cd7d6f951886b1473bd517689c04b74a0d4a9ceef5733e128a5180653a9ef9c3546d4d1a591e0343292e4eb7b9310ba77ebad5e"; + sha512 = "7ce61a838a6b44265ee02ae39685a9275b23c0831c069cf496b034f54024b555c35049fa7158bc84f7e74cf2022c4dd7fc4191c4352a55f460784266056bc47f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/son/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/son/firefox-72.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d782f24ba3ebc4882e4e5cdb9668d35b9dbdd614d31102efe85aae6d39e2890dee2e667534c1ec82f7e010463c5628975d5a9f06df2b84a2c0322bc0ad22cdab"; + sha512 = "788028be89ebd5fd615693b3187f65a8553eeef17730592946231fdc4d78024f62993b4184ab2c8047f79ea7102aaac14735ca177cacaee7af0c9b1576f965fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sq/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/sq/firefox-72.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "6423c1957d7d3f80f8a00e9e04b4dad3143f0404136e4d8c695030da3acc261827c7d3c001a97b8ec6e451cef753819a3846e576c4cd6812cd45cd78e7700a9e"; + sha512 = "9a8eabc3064390fc96a7f13939189f032df7116b30c79ab7e2c13596e14df8b543e47eda433f219cb3018ddc2227c30c71626eaaeeb14631cd069975fea3c191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/sr/firefox-72.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "cf4de0253aca5994569925b5b5a2a80d560ad8d0bf6cfb9ec3b0f2944d542faa4065deb89375e8497f272349a10a4eb1db048631040e422dd7b37098fe912b4a"; + sha512 = "0e1d5a3b368698b094ab0757f9c9593b09b1ba3133a488f67dd095cb07a4d1d124733f3a09502b45f62a37bd8ff0faf9fb06391aa9890ca64406b30df237b483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sv-SE/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/sv-SE/firefox-72.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "83b0203af53d660dcfe801891a7409d8b3715ffd24ec1ea5ae526c712ed97b61470d23f656b196e8b8165eda8043eaba47475860ebc07f6fb28548d6a5a74e81"; + sha512 = "d55aa18e6f1c45e295b4b254120253a71c4619311278234d2fb97e78272c742f74cd6c3fe529614cb359183eeaf80654383cb9190163991a84daef247cab3f19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ta/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ta/firefox-72.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c559e6f5fa0d7040f4b15567c24c9dc20d4f8fa1862985b3b4aec465e83734868fa9235d8e9718837d543b6ab8a74655f01dddec0be9d70740f728697043a612"; + sha512 = "37382be25d5d8b847a10893ba17bbe0897dd1e0a77a781177db2a64ff3e0fb5e040b3372f1d79958b53ed80110deddbf41f19397fb5114552b1afe62b3262d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/te/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/te/firefox-72.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "6cc85a388d5c88a6ad74bfd1a411b9cc33d573e15ab04889753b8e9c006b94c6cb654ccdc72b90609e3a1eb79ffdecaafede306f80c7fe811fd8c583b7299311"; + sha512 = "03e2e13b2792842a2120196e7505583a9404d31da6e9cc747e5179e9a635ae6ec95bfe187569398193854384549c7a6c30866eb900bc4a19c593ebbca8db7a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/th/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/th/firefox-72.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "601e0c5ccf1b3725c399035ac2bc7d1440de7084c7a2ac1f12c883a7088154b3d83de7c0167a556599c3c896c57540b57a927f5c89cbef8d7cb74941aa76ced6"; + sha512 = "0aabfdca862adaceeed388f43de22ca02ae92a683f51a8b71ae7186fa6fad4a77bdb1fc1766b9dd2c1c5e00abfd022dbae15c67e0d8f148cfc0db2ad5e249d86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/tl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/tl/firefox-72.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "1023604de1e1fbce835511e50b0807c6e1dba76461b86c7e8506b640f26f9cbc854109b14a8872e6350899afbbc868f3b4427cfba32fffc6e6585f65fbb95dcf"; + sha512 = "d9df0fde1388d15ebc043492bcba91f107c3f9ce2f95501aa83da5d206657262fcc93e44a6d0b2752e21be0cdf110c4f119bcc223ad3fc87f2b57bce813905a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/tr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/tr/firefox-72.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "56a4755be67d6d764c62b8e226a14aa0f18741ab71d3d6b7dfcaf45dde124d821dcae75c3e251024dfd44d99b904538eaf4dd4a56c728af651a8c4a2c9533a3b"; + sha512 = "baf14f79686299e9240ff8c68a754d33a1867b3f44beba1298d79da3df7d5188a3fdddc30fdc8865edc7dc6afbc22ebfc4ff8205e6bb6a6103d9c36439185ae1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/trs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/trs/firefox-72.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "bb4cffcba83698fc3dd8edfcce361d58503ba4c890f2d906690d7036a3b36a338e379019df9129e2b509394737b716bc70ec7afdd485b12adbf7bf804a13e8d4"; + sha512 = "2aa1412106aee1d7b15510149e2f5ba42e9129e9588106e0d187e00bf6e7e078d8d6dc9ad8a38c3279a6a4f02d96af2f2be7f916c8e84d38ac64d50ddab494f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/uk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/uk/firefox-72.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d406c99bb37bfadae4a43195be37f52023835ec9d771bcb824b2714552929def1d3888236dd9aecd9624ff1cbc13d24ea1ad0ac99b2d7f05d738f81eb0817ea8"; + sha512 = "41cac3c4c923219b2f981b25cd1b3dd49252e10d234ce2e2dd25f949b68a86bdd72c757143c236bb22276d33841245bea7c8107a2abeba430a68e093ddeca286"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ur/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/ur/firefox-72.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "18c84f48270a12173fe93505d35f2a0abfd9400714b23ab28282efc38f9fef358dfdd3a182b57f8de9f8635624e85b735276db913ab102a5ba27d9cab94ce352"; + sha512 = "aab56439ade5616f0d88ac50386ae488843c49538f5a447299ec6ab9633173e247848c7d24347c9552c2360723249dbfb0a5a58c6b9727832173ebb79d0b970a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/uz/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/uz/firefox-72.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "8c918babd17af9b44a3fd3fd1473b4a55e29a8b8907269ec7e4ddad82fa60babeec557f206a6c8a1deedf1536927cc94d5d397992dc3f7353a131110a73f7d9c"; + sha512 = "9342e5d56527a5dd660f2ab603f37a19fddc95228d86754461533128f9d3312583606dbbe201bc826fff3aece5f10c1f34e735386828b49d6a506ff91eff1949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/vi/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/vi/firefox-72.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "bc00562535fb5555b5ec00b28f477d78fff09248bf6b3cc8fa6c54bc4d3ee304ed0787c17b18b699e693bfa1f40eec2875962b02df7a0beabb5a30f0a926bb54"; + sha512 = "16d13ddb008d98726f665ce0e7ba9d064e5559817894e063d7f380572a44aceb26dbb8695b9bb33a32054944c66481c098823ffe4309ec2f1359c1a7fef71d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/xh/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/xh/firefox-72.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "8fa553f431e350c85aef0b31f99c2c02d6acb2ee1c78d353304b6030740c959b6cd5d536c62a0611306a9e2a927568ce91a6e43294462e8166221511632a5452"; + sha512 = "221dfd9001e5be59aaeb68b84aea643d63cbe510e88765c4f67014eeb1c5d8ef61f1b73d012f896b0b08b8563f6bf41af59fa40b55e28260e799a18209cca101"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/zh-CN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/zh-CN/firefox-72.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "4a58da292a7453566e903612d2d8ec9af07e2c9f35346bdc4c1be4a9f586bd0d95236a300bd544a6f50bafe3ba582edbeabe3a18de925a85323e53999785e3fe"; + sha512 = "a6cbb4a8bf4367145896edeed4093e1cef3bf689f9a455b0e7c8b437545d4ff2c5afdacabac098dbf5eb1c68b58535872936c9bdbab251d8663f06940d5b8f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/zh-TW/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-x86_64/zh-TW/firefox-72.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "9cd943600d1464d3116b9d141d58f06177886ebb6a41f491af8004ea46713b56e93da56b1187f96e4f6ac6a304a5f1ef00bc0f7c74fc333cfe3a7a094cd907dc"; + sha512 = "836ee564d5ae1c4c0ef176718be1872f4f79eee36f77dab2905cc1fd70aefbf86028862b13f80066bbfd7f165088424a91d33937d7a9ff90ec694e155e50a564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ach/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ach/firefox-72.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "4b8e6c0a9617f35af6484a45781aea888693d89b87e73693cc4d39ac5dc8a4b5ade221efc2c8367f799f19b86d8cc23994c28adb519f472f0552487c6279e0b6"; + sha512 = "f10933a0eb7fa8039d736a807134f75dcbcda81190284bdedfec99fd24464185a0c6b9ec91012ebee5aebcf315c07792834c42da93bb7262766e796b20cd6edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/af/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/af/firefox-72.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cfb071be89b5c5d4943402f545a001717aeb46df6210a7c5efa58ec73f192799cb0b5e1d4cc61cd13b072a9a320560f6592700e9cb0df1fbea4cdc8d24c8a286"; + sha512 = "9c7d38d0715a30f2f7db4ede6051ea45a88d1dee862366af586257da75fb238b3954282eb85e5bdcc058d4c5ebb68a60a39ad3ca7b76d6045810bd632678b3de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/an/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/an/firefox-72.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "ea87ac0ea1048dbb50ef76b93d1027d78fbd9fb18acd7e77121954ebdfc2bc8fbedd2e3b61461ea884e265be744ebe7d300b4416f7e3ba1ac6cdc86710e34b33"; + sha512 = "2215d7287e74529ef354adbbf4cd5c96ce710ba38bf0b814a51c0fa51999e078fd4057f96f9c2604df548595366446524dc675bbe2adf59d6b0309f33d5ca828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ar/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ar/firefox-72.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "2301d1d7c3029829585442a8cb49a8fdb862044fb9329304d9fbf13e3359e60b452fab822d57743a7fb9b037ebe45607a251581b22dd682ef56c73a934c4cede"; + sha512 = "4f2836f79221f99feb66ab9b01643acc97d38cf9beaad3d2be41d5983bc7d86f5133de8d30d69769df55d02e98d1a8dbe0fad871d727c74ec62671b33fc916a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ast/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ast/firefox-72.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4b1a6377f4cce9f16955b045eec886352dde9377b4ac4349ba544bf5554cc8d8b4406afedfdca53ffc2a3417eef6deed74def9e7d370c9800187d589a19a5c1c"; + sha512 = "8b30a4a7b314ce4afcfcbf59ea535dfa256705720b0693c8e1f5fff9fef6b0e692703a9c6d587aaa2a220a0d5dd98ac379622476fc77d2467b59163544f84a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/az/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/az/firefox-72.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "dd1a23b3a2a6ff1359953c2e4208e3e2eca32194ae8b48cce9654ffab680749b0a9cf9d9f13ca589b61d91f947df33ab2dfbbe559cd90c470ac2ab7ecff46a63"; + sha512 = "c7dd0c8fe828cc8f321f679aa5a857a86f254b19ee91a953414ce168aadb29f572454049d1d0c564ba36e1307a807d0d1036f16315ed9c0baddcc7806c11f2ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/be/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/be/firefox-72.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "052bb1c0411c0d1fe997a394ef4dadfeafc4b01d80b4f7b5c80cc9281d1cd7affe65560fd19c085ffa1305314a86e2963f5baa814ea4ca285fa2e151af92a257"; + sha512 = "2f698760ad00ae126e9959aab095d396c0cbdb55109ef2334ca3ba12a5a6df0eec72695b3d38bc615e4c52c77d2c600f5837eb18f711469b7ba761431c8e8710"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bg/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/bg/firefox-72.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bd12158f7faee488c820853c6911f9c6e5ad92be9918669814761d2974e85be6242fc7b0e4f531a73692ec2d4724ac8f0a3371ff8b308012a4c899bfc1325444"; + sha512 = "cd3502b8e1a86c51e61af234c30cfc89e1dcc1b938b7bf977fe29e6ae10c9d8b7d5dede0432fa3df1efe241c1cd6e0b572a49fa441de515c38299e02865cb633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/bn/firefox-72.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ea9081d4dee23cf6ffc1c2ad7e7d7228cf615336f83725f46d53db5924fa09cf948344f95f8ff6ef57b19799327648ac9d1d6a0bf104727e85c76ceabeef1596"; + sha512 = "1691f07e098e92a91b1a89d854235a8ed1119c8b843ebfd5f5dcac1d63996b20d3514e5d7d2ba2a60ddb460b8fb896d5ba9d22207675e604e200211be3c86e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/br/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/br/firefox-72.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "67accbfd323a94fdd8daeb3fccdd6ef294c501f0a796cff9274be0b71583841f15e918781aeb30c903a5d58554caad4d4ad2d1dba7dffd983c642661a22cfa79"; + sha512 = "2dbfaae93deefc0b65e5fab616dfaa631afda2a4a26cc1ef46591561bc802b213a826a1405b2faa8c18dac0f7b580bc8724791186c28ce4413075f04ca184f76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/bs/firefox-72.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "72e33a58d27615dcf2ac407983f324cda4dcd127f4f6a7149552822578520abb9cf15c28aabc3a09a8873b392b0d7fe6976fceb2d89197c34a17fb4d4d1b5612"; + sha512 = "0a4a0e503f5549bdd38b7ceb1073d3a911a544416d7843f6f1577091aa160df5e51f1616b9ac74ffc4c591a5691f980da17545ff0d54bd61a0f31c3d24c23dbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ca-valencia/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ca-valencia/firefox-72.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3cecb8d3401838ad7c8668cbd424a6fc3f141aefdcacd28733301db651d31dd3ab996bd41a9dfd3249c4ebcb48c6d5eec464698bb6dc7fe9269dfd045e5eec08"; + sha512 = "36b6f4c4fd3af05a995134bbd4f7f86ea9f28e00cfe332c06c02e4996c66ce5739d8014cada8346107a08f330c2484643a560602bcdb593c5da10a9301bc3cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ca/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ca/firefox-72.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "545cf4e37c7946b0fc4b92cefdfc0e61e9fb77f01b886e82a4c2e9a348b720b45f6df84828fa8cd8e3a1827e47bd112d94d1513b68a96c1e1b2909729418535d"; + sha512 = "b075114e054db086ed358f2390cf9f885e5d759568aa1995640412f3ba782ca01a5986c650e787ef1286dba8126750aeba664dca6e7738eaa3fc1ef4c56d9592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cak/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/cak/firefox-72.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6fa83191685c96c860fd5b9ff8a27fa809c3595f2fe5ccadabc510e84e77da7210b192e589a7835bad8c6e5c46b7866124f66c419e58d0386a9bf8dd1d2d6583"; + sha512 = "501e164363c121df70ca7e4fa298c79a29ee3c57e07a01ef36f38ea20b17fafaab7beebbd29b146bd988838288f629c482b203c8f3547ee762ade7b91c61d390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/cs/firefox-72.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "50c22882418acac3f95a57691a5b1752ae51f209a50b60d7ad29b8e1b22b0aa372c1bc104dfa5563b6de14f6a09a03a85a595434f4bdc45a3ee932390249165e"; + sha512 = "9304b170bcd67e55ae6a2f669487d2f56b024be76f4c22f988ae6a4504da31c071a84c1fe5cf3e836dbf100d72a43fea788f6be2649455c8ede39377645aa69d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cy/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/cy/firefox-72.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0475351728c3dc6afcf1e816edd5737f6aca15848da790616cc2fc3d7efe253ac2358a5b7226bf4ab9c3caaa07e91329e77622e6a022d81dee3cd7dc09532a5a"; + sha512 = "8316d12e3d8ec3789daf2415683a991d721b3707c959fbbae23d625ffaa242a312b385fc302fe55dc14660562bc22785c23a27ce3dd70d4fea806e98a3c2b306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/da/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/da/firefox-72.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "5a078e0be9d67fedca8951fb471838a54972d25a53d95c132b439028c20276a8a43183d249878fbb706f6b5d7d244bfcbc14cdad43ee2616eefefcbbc7876b5e"; + sha512 = "325e3ebc078a2b49c3b7b3754b167e359e9cdd23fcf0545577078942777f01d16a9351600ff39f23b27fe3a32303ae4ea6b10e0cb612fffbbbd6ebb37a0f093c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/de/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/de/firefox-72.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8348b5d882ecc1fe9c4632b6644d756578d29f1ea1938b3953c6c2f7ae70cd02e00299bb4b5384775ba5e45f43ebb0d79a5b976385da4ad6cfc192edef0bd1fd"; + sha512 = "92d6c4e49d14f1aee7e4cd1ce479e1c671b9b11f91bd240abd4f5f78408f511671ba18278aabe486bc45fd4a2887d976ebf4a9ba0e6ee99524a21c9ff010f23f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/dsb/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/dsb/firefox-72.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "63b9fb904d0040d9ff626eb970e00fa58288527a9068c234f02d41af6cb33ec9575595b5d3661c78abafe4b2472d3e8b8f5d3c8b92d8121f564fc9f71883195c"; + sha512 = "f811ce9168d1dd1614e127f91c7e8486489f8817dc1de70d836b14a0971749f6a09eab6246ab221e104aa4f5a66e8258dbca86c4c182145f5930e17694f33dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/el/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/el/firefox-72.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1de78be4c89017cc39c19e6196bd2327bd24a4c7cbfdf1a77aa87b0b0395e9791443d034edc48afacf1fc20b785369e48e91c203edaca5c33cab10c9a5f098f7"; + sha512 = "f1fabd5ac5201c6f13c8e2e55597564e0a24dff7b21ded547ea6c581e616372e99ee094f68dda49e1d34122c4502a6786fc9dc53e2119c73d78a21a165005bdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-CA/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/en-CA/firefox-72.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "1a78bdc245161bfbe2cb7d6488f750d53524feb1fd9e04b519136bd0797f8ac5e60b1d9b905e27f98512e4d898498823768de0b51a8fcc682a807f690df3458e"; + sha512 = "91e50340ff5b797ad044e654a31e7fed1412dd4f367171ce753aac646d2585a81cf30ddb0f421154dae675030e0407b0ce8387f0d50e99d74e96da5ab8837aab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-GB/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/en-GB/firefox-72.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c12442798aa2a5e3a1f31f934876b281abe0c956558cbb5042cb5c94bdc062bf7659d19f0ed67b7208243cb42244aa7685f76da08df6a4b8d2013cc6ffeae392"; + sha512 = "c1505280ce051ddd715572ca5bf4c4f6199f25636ab0c99a8e4c758874ca7a7acc780281b5244d16779afcfbc3442a92052c602f8e4f7a94fad7622b5b534bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-US/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/en-US/firefox-72.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "558ae4312ef18493d69c7504f10baa3598fd6e47289f316346b6df16dac97ef25894d6d2c776ed2a8f1ce0546e9b4c6086fb58b0cfd5018424b81068a6fbb7a3"; + sha512 = "5839b3bbe872111bfaa26e76264f7aaf614afa581c393df92ea5ffbb931bcd62754b0b7c6f7d19a2fe7a5cf092b1c40a414f353c5ebf1872b42b6d6714798b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/eo/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/eo/firefox-72.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "ec05a1cb0573e27b5c848dc67ca6346ec43c7ea25d0854a84a8d61804946e970ef45995140b04271239d70c8d737c144d629384d221ab7167b581ea7f3982370"; + sha512 = "200657183a14f9ff665037e67aa64c71fb3dab0692d8d07db9a45b0815720e95ef9db49fd7c67e9fa726961338cd93811fd6a77aedc95083b7c73b3e1a62e7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-AR/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/es-AR/firefox-72.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "aa2064be8753c26359cc14a2d6c4aeb342cc14876a9565ea214fec0378b17074f811ae948bbb970371b67ab95cec1b68a0393c758874d8af43863b485801ef4d"; + sha512 = "801e3320f25a50e7f1329d0a711c2bc243f67f632cc8d19e19fe33bee62c0147313a96c54e6de9e9310c82b8c8325e91ab473d1bf4fd51bf58da4ea49859ccb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-CL/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/es-CL/firefox-72.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c4a3ff9543e50cfb200c21c80935133cbd8016da162bf8379817e86516ed23b6caa096228f1ff3a889f401f0ffbdec4d06015a81fcc0f5bf10c28e9097d61886"; + sha512 = "386e4498ab22af5e07bbd525fc66797d50099fb1eb1b31e947345942cd4aea0442715d0e97c47e492836605c3c4afabc8982c0ea5e1c34e7ee4831944b48edfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-ES/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/es-ES/firefox-72.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "12f955890bc274d52d3a6ef81440c85d8b6b13332c2b3bfbad377cdba0fe8f64ed5dfc8f1ba576e9a8d0a5bd425b10e034a46b761ec86e7c2a5228bc2fbd98a8"; + sha512 = "3cc559796396f7100ecd6e4ae7200b0d11dbb93c46f44d53c7779e6a850fc06b423889b7479d7b71292de3b587975af9634c0f22e77cd5575d3ed62637e1ac09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-MX/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/es-MX/firefox-72.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e38bead8333f3f29319e045aee1612dcaf4091d8cd543c9345b0fc78a563ee0fccd936a24416cdc91ebd184b479a504f2ffb72648e9d6521a0f8a1cd68e1ba79"; + sha512 = "20af9052346253387aa739613578c415787cea1c5783ee84846fe7fa83229b9a8cf6c9b1b57ad59bfe427cb5e4d8e23c3e419973abf472fc388cf195e010be64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/et/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/et/firefox-72.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "5437345a4ef6179898f7084c81fac8926f4d44dfa92c7875f7ffab5dd02538fd3e434db50abc486b460cf43a95162f5c38525c20d4872ff6300e182a6a3f2ae3"; + sha512 = "5eed1d59de3df589bc243110afd6377f9a25ac6cc4e18ac6e82857a3346954fff3032e52be11b18758e63ae00287d975f81e75b594c37ede92d8aec4d32bf7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/eu/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/eu/firefox-72.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "9265ae811f7e78c7078ef2cacbaf82356a37ce4ccf1528c72303a7b70ff04c59a43173e3ce0930fdd5d0bacf75267703965e8e99ed06f58f7444a0ddc9988a84"; + sha512 = "0a493901da18642443c46681054876c0cf904a8a500eaf9aec67eb157e7b92e2274d5ed38f517e3de71b523b1518ad25ee96a675996fba897530ca241ef96bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fa/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/fa/firefox-72.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "a1ef3b8d4547dd186bc66425da0b8e92a3d1bb30e05ef3ff0bb6ab303758f3a743ae6167024e290a409a4c1381aa8b20f126fe3c8b057a3b15c2a6393affdf84"; + sha512 = "8fca3002f011000160c50e45d89e2e4cd76ac5b797a20ea547807ee1fbb6bfa1f7b31fc3dd0900fe0ef932daf721a17d36fcf7089e84ce876a4cf983299cb0ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ff/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ff/firefox-72.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "05e3660ec39408afdf19dfa57b0538d69a87de58885569538f9786c27d7177666c0d24b9e7c92f013b603aa5f7a873b3be84771016de50216b3d2093e9ab2d6f"; + sha512 = "610d0664acf8878f84967903b842d516bcc4a0194fb1f831facfe434eb707bf7ba573ae99866a0b0999888eef95359d61012e41c5b58eb64be8513d830d33096"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fi/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/fi/firefox-72.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "a540afebb39f0a0fd0013635d54a4026007b2134293e669dafccec91f0c19045a1ac1c4983d1acf4c68daaaefef5d2b6e05a2c817759e32d738d71542145af9c"; + sha512 = "3fcb2cbe228e83ac21db7c1af980f1e1113e1d8d3651dc2d51578f09b8b1dda7d6ffaa03e507e9172d89401b90bfc8ce2b699c02e86293a577f3604d265ec3be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/fr/firefox-72.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9f6007b920b23b345f78dcf372186c7b6f99fcf1b14f20405dc3b524cc057bc5d5acd9092f41d7f7729f5afdc8a973613ce0617c93e98ea2448154dd968ad344"; + sha512 = "ce764df3b48923dcbec652fefb52119487e69bcb48ee4ac199a69e212cb4c1462c076ba619bbb9c5237f57dfa9188de10e37b59ab9d3f70c45c2393590ab0cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fy-NL/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/fy-NL/firefox-72.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "962fa9beac2152188f415f64418747d1fb8331f7abeb451f4fc10580fe3b35531f7be7d3a79428e1bca476e162701f879f7392e8c1fcf75f67b9af9ad09491af"; + sha512 = "d6e6861d94201182f4d19a0e104813fb47abbbe008dc420d8e7ead80e4a32830ea4e2d522f036ec7a4b687801ec3e43d21fe641a0569bcc10db9a2efb414b526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ga-IE/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ga-IE/firefox-72.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "cef86c78031b5f5ed53e5c11cf9c2fc87b95ee7dfbd4fb4c60c4934c6dc2cace1576b657e947a185067c4faf1cf52c641f720d8859eef822d4d727ab4c51f9fd"; + sha512 = "5f739a6bf5ca34301688f361a2a5d12f921eb4d86b2119dc04ea300c26abcb7f6780726f9f475481277802477f57413809b6491fba24c080f78375e2630a4832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gd/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/gd/firefox-72.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "fe845325b5314e786653000fe99b9a2645036d7058e09e68dfc6a6b1d67e0686c03fe69fcdeb017e96b1ba3eebbfe49f66e1abb01f0da343218597616adf3a28"; + sha512 = "a6d892e5168312ca1a7de1abf2ea6e6c1049b930c15f9817356c0177de4b0c69e30ad49344603f83883c3de28556e35f9f6421649b4cab6ca68ae92917106a21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/gl/firefox-72.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "75313fc9c8e0146668293f7689c1655835fa5bb13e87caafdb6bdbcbdfb356459ed7b181daa2de37d7a74740d2ced4edc34886bbd3d44ff39086a24ffdc2f81c"; + sha512 = "443165c14bdbd2c7a78550e783d8f4c76caff2d2731f82714286c83ebb9051ac196c0ae7df0ef2dd02ce293e36b4ce5dbdaef4ec18f488397d52f3630b99daa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/gn/firefox-72.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "2b1f1b34bb99cc412a00c74a60dc8964700b8d99d76f96a095f19cfab9c55ced8c3f1fedbe54e62c74401d8fd777cb1c6ab0f4954a553ad4898d03a05653bfc8"; + sha512 = "baa53a0d9c8896bfd49cafe0f918a0dcb5444b7749e9c38e5d2116ad9f8e3ee7c1dc96f73775e3c5df62c9a93d4e665a25dd987d56203506daf7fb4e1a2fdc53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gu-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/gu-IN/firefox-72.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fef942f3ef14a660a0bb1420fd3c7af454ed330e01b41834b7a919927880a3c8f266339a5d95eea9c9d4fc9eeafb7e38d243726fe8fc5a2d0d88871c99c37c8e"; + sha512 = "2bba6b81c2d56e4f2b2b60f28ace4fde8bec36ffa9edd05daad64ac923925729d4e808168451a0d57fada3406748ba1dd0aa76bd34c7d4c86f61cbda1aecf478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/he/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/he/firefox-72.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "509d12bfd4708b9836b9817573c06533a81c9704f8660a1cce12d28398c91cfe52a22e3f139ee34b3f5c762d122e68ba92e725f41dceaf0b0ae5bce40ccd05e7"; + sha512 = "e168b9001f91358e897a9fb9ef614d3286279f0150f513f2bd54b6dad123b1f03c672a312fde4e29c711c831e6d666d8382e341e3749a0ee7d52a1db964bdf06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hi-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/hi-IN/firefox-72.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "6157cb4b53c2c190f9473b8086505fb0b12de5e9e902edcd259f5748cc462507fd5603fb08b0c19ac8e64a63ae3552244b61a08904a40860d9210debccdd3edf"; + sha512 = "2cc357c8e932ea094964e8b3aafb87afc7ad563610b987bf8e569f0f7b2ce3b1b898bd9e7274260c9054527c7bd5f648b17223922fb6121bf1ee196eb73d3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/hr/firefox-72.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7e3fe339fa2d1a1d7258cc3b3e05397be74792ff7295d5a391b723ed491e5aa5768c66231935e9e69c864b2914e29c3bce8439346d23ec6e075645ae15dc4111"; + sha512 = "b124f367bd0d5d6c827e0766748d28eaa188f901cfefb1f157fa2e1689be69b850bc6d65350cb4c43ec052c2b60bc11dce925b14908043ec9ebecf030036764f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hsb/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/hsb/firefox-72.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d7e3dfd311e12c6a84b4d9dc064c25b9a8ab32aef063306dbee9c8da6a057af358bf37cb2c6ae3c4c6f1a9f4512d6fc1cfab2e60bdbc0aeda530a2cce3085561"; + sha512 = "ef1afafc5d488235f80c8da2bb8605e73e6a6255ecefa46a3b1837c5e4e707902a7675954a382089a93199b435acb8a8e45627d7a251be2472c160afe11fe809"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hu/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/hu/firefox-72.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "807905640f123592a56d3343bff129ac35f44ddf60ab04ab719f17ceca5dcf8cb21b1f24dad35580a6ec50bc11bd4f0243a28aae62800154f4d98be0d290e402"; + sha512 = "fa5e1a0cf2a165acfd582d89de92b3ad8b066b8574afe9bc6ed4f48b0bace98f302d9da9b728d6eb512477e443de4e120e5ead97fdbb2d685601df80f1f695c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hy-AM/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/hy-AM/firefox-72.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2839c3ef418a083e5ee8ce563a4f06b5f1edfcd9c86ae90ceb75a6decb1ef587b9b855055fd1fd7e0b1e25431c7e67999c69278339ed94d86744002f4d954a07"; + sha512 = "0b5bb6f729e0b9430fd431c9f0674c73e4a00ca7641dcdd8d88ccc8d598d4f345fdb843c661f46bd7770298e4cb5ece9bbe928d26c4d159c71098b735c261a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ia/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ia/firefox-72.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "900e8931df0bd992a22556f8796b59accab53593824ce5928cb69fcee5f28ada5a4640a25edce54aa2f81c59547b8072cb09fedf852202d4407d5e4983a3599c"; + sha512 = "db8ff0dd27c75f1653cf3b4f6c616d1aa291bcf1dfccea392fbb2c2f60b66f1a4fa73cad5012f1ae5315d5d12a97a8e9a19b8b78d826c2ccd056becdf4894a23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/id/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/id/firefox-72.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dbfc727dd69a3799c2c2350f3f79b01b1b83e011cc5e0f38acb1c632324f8de90a7d70dd32a7c5c91dce5b0becfc530563ab290ab9176a632ec9da80a3ca6a66"; + sha512 = "cbccf0615e54e1c48cdec89fb0d49ae6c353012dbe1e7954146790186ba759d326ade3fa23acef514401882c35635c0641696d458272c7104a42cda3b8e13c3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/is/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/is/firefox-72.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "209e319507b34b35820a28835aacd4f910a00d0edcab29c30a3a3e1278ee3a5934d5237f4b3ee8df90abddb278cf497790169ee52266f965e368746f9f8ee326"; + sha512 = "0d8654526a590575a3156591409c340bc00bf0799b279c7a1755e4de7963200e8694c08fb3a5c3b746fdaf3b2a4a2ff99fcb21f2a1e4dcc4581d3e97fb13c7c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/it/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/it/firefox-72.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "419da43d9c9a3048fa8552f0e3080ee2bdcc2a95b8c88958dea0ca898cecb45d6fb634db31af827b2f8842275f88dabf0b940078b08f2d91aeed5640bafdb00a"; + sha512 = "67071b4d767a8794e0c682a9c2c58de31bd1404acf98042e1472d3a61402edb0f0a4da917e3d721f9f1b46efdec630eec9117d2b388651b71732ed226cef9c3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ja/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ja/firefox-72.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "492b7f8f53b905c8e5b9cd9e16553ecd96f6fa0c063939e5e1b655a89f78b1b16b4ed29d219710d4bb3ff8335904cec4b494b850a735697bdb68cc9ef9a1f202"; + sha512 = "0c9ce834ce447b2d18371cb398193abc691a62716b165e8cbd336a6b91e2da126950e1a6f34dfdcfb27c07c021930483b04d4f9e05b62464016bfe464427da32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ka/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ka/firefox-72.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "8c0d6457a97f9bafcf902e718d5ca85f8fcbc09d8be19ba702bf76a9eabbd607b41411db242302f1a6d100e541805bb4050e48510b562191e0ea2794dd2d5bcf"; + sha512 = "dc447dd3c5b8102d678973eef7d1c9bdd1799bad88c697fdf8b0606837042ce661ca9731f5064674aec9a5606f9c7bfb12ad0c52dc542530857bff9f6d0e1683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kab/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/kab/firefox-72.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d5b85445c45dbd9ebc9d16bbdeca374aaabbb6adeb34f661d329995156ae2a71cff6ccc473380cfee1822c1f3f71d4fc2b00721d674499ec31d278f486f57031"; + sha512 = "426647fddc5951ad248c178d3b271b365893af1849d9c4b9620e138cf9d51e7986831140343332c5707b727a302c11be6291b938d8cb2826133e280aa3baea3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/kk/firefox-72.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c1da7ff1e1102fa8c51f8e5e268aeaff7e735d90608ae8a07efca5e88b00534da1962f963a51fa8a03917b8ed7b598d7f4ef7500528227fff1da87b77571241a"; + sha512 = "a211cef00c26eaa0239408ad3c982be4f17484653ab956148c81129b335f0b8c8425c976bf265d8a5019687fe5e16a8927e616a22fbd1bea3657911e4e080d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/km/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/km/firefox-72.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "939b3072f867f6a6a4e8d2ae5dc7e49e351216ab0f767235ba82939ead1071c4d33eca4e4ced8f39715b12884765db17970a9bd88518c9e499e3b0abc0b8b9d1"; + sha512 = "8ca91e7f055ac53c7dd016dc7f607f2fd0db74b021feb1cec1d125f5f1eadc5b6db2f599ca771bbaa7d62eeadac0115510842ea13654f9dfafab64ed6fc9551b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kn/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/kn/firefox-72.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b86414a3698ec62ec5f92a818c6f00460d246a5baa3a24f33da5b64b122ff6393e9e14a45e3778a45982df73c276e19efddae95a5ef41171ce5b7a995bbe9413"; + sha512 = "6f2bcb96f831fcc762b924bc829c9bb1a64ed16e5a22c9370efe8ced8244c932c8159d235b010688711d0b1b921d8af111d622726f7a863919751d8004b4ea2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ko/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ko/firefox-72.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b1f8e57c9147d834dd610391a908599cef69d30f61c9075b6fc85c641a6bd4e74b54823cabd09d2d391d0734024ab2d699010b7fcc8755d687cf7b6ef1f250f0"; + sha512 = "305776f2918ddb4fcb35643f2395840abaab8595b680ddaa831392a0be67a25794edd1422bad48d7f0f52f13f9f60c06f3b3ff5b5c7b6dc3f4a7a575f6caad5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lij/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/lij/firefox-72.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "256dda3e0cb8eb52dc7f778c0c9bbf38ebec313afe0f24e8d00a823d1eab4cbd30cc7fe9637eadae355e9494d0993f3060113b502a2daa4c2aa40154337c50a2"; + sha512 = "05321443749e7ee4654cfdb98af87c8bd92d9825b4caac047ac3103c16960cf77cc9b55bc60ea83080ba9a2c8415138a455e1832cfd59c3ea7e557b459fd55d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lt/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/lt/firefox-72.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7d57c55f2b3c3d19efba46424eaeaca350c70087100e8954bc85cb0c74fc65d3c47a3319d2aab5353d2298922da8fcb007f84469b61e2f9f6c69e5121212d9c7"; + sha512 = "5d264cc785e92e8aff007f6dc2f3688cd06be8df868b59620ff79340b5602c34602bc1d2573fd37ff5fabd2bca2a432705f1610eb5dcbcff708d64cf7234dd53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lv/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/lv/firefox-72.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "abaf628da902218ab6394b547b1e4d318091b0fdbec2bfaecc75a8365df56a668fc7ddc21241497af7710317676a055c2850bf74960204f1160adf1d00c81461"; + sha512 = "d377002ba17e211d126181b557e0d5c668f8ec5d410a28e9eb633e9d61468a84a7ffc3f82ff8138dd5a4c389577ee0bcb373c3b31476d37d55d3a57f22682886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/mk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/mk/firefox-72.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "0bc74823a7ce8654f366949144c2876e7a3a526b96dac37452be4ba387234a302ef786a38e3828514c5164d609014c15181472cc2d3e0f75e8871b8af859adcb"; + sha512 = "2620d1c1f23bb4c252c138962ec1cadae61f3e519baff90f3a9f61c5fbd4b2fe01bd7db00a297bffae2eca77e9041d30a98216c35643c09260a8b20174f4b491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/mr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/mr/firefox-72.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d1d6e6bd41ef63424eefdd4a8fca9b8b20d4d452117eaf6abff22f9b42f7a22a4182fb826cecc4c38975caf6fbecd43fca35f818053c2360ed723250c7e95fc8"; + sha512 = "d3801dd21eae5c079ebc72faef737f9a963d585e7919ae8c82dd76b0a41d90e1fa54200e96382d6e37cd0e93f537b48ccb1f750709436574f3e4d3485b72dd0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ms/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ms/firefox-72.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "e3161b2ea8bab3d720b04d69e966cb1265cc0649241081127ab5ce31d4036699a63231b8342a07c215d53ceaf5af2567da1aa1e71a46439a797aaae979bd17cd"; + sha512 = "deec2d8bffff7ac0f8c718b675b04fab4fe03a1dfc85e5b6d4ab3fd75b1e9eab1ea2880c1eb81bdebca6356ccb1ce7f627dc68177cf76ae3a468b3d57c5e7255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/my/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/my/firefox-72.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "ae7830a149522f0ed9bfd3e53e1c692534cd7c2f43d6eece8d3789764fd8ff7ccaacd6ac2efc9fe0f45c7cd0ea8b612208f330ffd0daffe9243ee9e1b5169a31"; + sha512 = "7f2cc61e9decda374ab11c62dd3e3688317cac585716b54b10c90334014675788b59f0ea6df801278ac4194ff877ba2029f92c9ff068b25cc8e55fe750dfd0b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nb-NO/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/nb-NO/firefox-72.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c25803b43b21a2ebbdf16a8a9825cbfb7442358a6791ec6f268d12874e35f24ef48e8dee55e6ed5cd46d193fe59b902890b6b718fa8a6e121ef6fdc359dc903a"; + sha512 = "489eb60bee5bf59c6c868ce141d53b8c16e387c8dde223cf48f431bc0b0a1d0877d171ef4925111235a4e7ec625acb0b95587ef379038e92420e47e8d00e3bcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ne-NP/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ne-NP/firefox-72.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "b363fcfb531981dc423d0b134cbda0dd5c07f95631cc3b7644a7f3701d52ea20f5e62036d1e845ffa2a4f65e9b4a295bf9645ade31f59f3af864ec7d83f82240"; + sha512 = "9e44e0f34cbf84c07afea80d90861d5317e6c70da109dab7f019ec147ac981d596a1c27949ea9fe0e51fc92cdffef492dfcbb8d0742d68a6bac0828ee5b3bd69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/nl/firefox-72.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "7ffa10349f0705a751f4e29775b43b81f2e23af764774c27a5bfaca90656650090076fdf3c11fd29dbbf4af9cf4d39b3389b885eaeb3e5abc0a5bb9cb9b85aef"; + sha512 = "e6a27534d7c82a79bdb0bad18a0776bbf0acda216671ff77cd9fd5ccc75c8969dfe474173d30ee903418f51a051cccc1eddd89322184cf8027756adcd299c124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nn-NO/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/nn-NO/firefox-72.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4df5c67cb0fe6f0ab70bb885d601ca0beffe3bc8cf8d652e47d9d01a503bb2b33e47fd45b8c1cf47919607da4a6f144fccb15f8fd39dc9d1e395fbc607314a6e"; + sha512 = "45fdd26603f6186258b58bbaf390bcb1d90ea363d888b886d6c9f4f95fb9aac39b2041d3a2675cd5b9dd0228f7af3c373903f6794b3fb6692abf8fcac18fd548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/oc/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/oc/firefox-72.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "386e9eeb00e63d9ed24befa757b8fce2dcdaf6c9cab69000ff23ef89e9f65ebba0128b69202db34852f2149fae91df05694f6957eca7ed1f82a25e14c0123ea7"; + sha512 = "02058511896d80a6918e8d05253efb619a3425e91f2ec2a6663785be9e722104d56b0d11b1a175eba2d2508696b618e032ca2432aceea43dca6bb45e9b478456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pa-IN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/pa-IN/firefox-72.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "213e984eb4e62d058198b71e72b8c814f203e2f0d2c2bbab2fbf22f7cece52186beb44b1f23ed19ac1638b027781c1e7b4f2e68770180bbb9b7b27d401eeeb21"; + sha512 = "addf6041a7d9778871edf822c7835b7bdaa22c00b14f0b34a0dd4a8fea09c705c7fe07355321363595d0e7aa7819520cd662ebb2f6c55f68ecc6ef3a49ed836c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/pl/firefox-72.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f7828a1a31face974561441e4347fe17f6fd925e41430dfa9f5b39d4fe8a691aeae9691b6703a29f798b68caa53e1ab17cc5ec6d3948240fddd6a78854c74bb0"; + sha512 = "144130bc1053c08ac86b02a0a58f605a5891c296372d8f1e7267b14b42c0684992f8c5a168bdaa8e2724c4dd6964a30520c051e3e6bf7ec8dffdbcbe0d9824e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pt-BR/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/pt-BR/firefox-72.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "bf780d5934d67009c38f980fe82fb299cf52e76652066e057b38b88ff113825e3f34d7ad7667c3617e8304464a66082e8dffa0a6e6d9fa607504558e89f5b13b"; + sha512 = "d58ef9389b27ca5ffaff1d7d126f807098085bce15071e75e63720505de905f845af82a8b9c20cf6d3a182dc742a6012262c42d4077239dfdfb61f4310da6b4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pt-PT/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/pt-PT/firefox-72.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "4923899c4ad5dc1364d8aa15bc8089eed80b06595b96a85b219478ce92e86fd8d3ff2423150dab09a357f3e68b380d267dcf32f75368e6c49df521cd651f8d55"; + sha512 = "e45e8b3389db673d6914388faca5ab744afe8d3c154159240da6dab0110beee222a468e354713334b63f7ec094a22fbf30a2dda4433f60c9bac79521f31dc143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/rm/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/rm/firefox-72.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b4386b2b482c85663de59faa3a068713459dbf70cdc7d8cab8477b1e53c499e6e3438e4cd53233954d7170d12e9e598b5dead5def0669d01bce597c8a6b84725"; + sha512 = "3d309c6973d3677264decbc80bc0b09b4769f3fa13348c3474aeeefe04a3588c8724b073aa7ffdf5f0fce4bd87f0e7c723f2d111e29f59a79c9d16c344455926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ro/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ro/firefox-72.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9b033b547508da32ab23b477c4b4589d1b12515b3341dc39a13106748d8e93a48dceb8ed6d9a95da455ea1101eb6e9643cc5d676bb59922bdb64a0526b778221"; + sha512 = "200848b945bc24d7eed24ff3bd14264b3f4ed7761ae1573aab78c7778f3d7d22aa42fbe4b4b0600d195535cc75482e0c75738af4f0c03335e6e8ac09cee78c3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ru/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ru/firefox-72.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "595d7ce551c846511f691de9dac90d5b15f46b6b00590a41d4ba1d7471f55b7f32dcd1e392bcc54ab2d1cffdcaf2ccff8fbfc3c084d3f74cca869bf570c515e8"; + sha512 = "b6955065df4ba324f3c4b28aeacd083a4f7425f795ced51238ffe641a2c87e9e052db42fc42da448d77aa7faf1ed683b74bd2fd7f5c6ec7b3fda3ecfdf57bbf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/si/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/si/firefox-72.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c10dd55008408cee98aaf4e6aacf03a4770a20220732e8d5318441bc163730753edcba8691017906b3cf2c28d5f9cdd0606ee812a1d01b40ef24d3d9d0239d08"; + sha512 = "5f1fdda685fe951fba56f0dc070dbcbd90d47346a9b4b6b081a03a22349b128977d7514c1247a513ad97f8b21a0d62b482ef5dc512d7a008d27ae278d1c0c00a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/sk/firefox-72.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "a439c2edda86c81911a61334ba747eba8619eaaf09b9f089a462f54bc93f413207b4db20a96b85ce8b0df58472bac450be1d8ab8e3bcad482ce653837d981ce2"; + sha512 = "7aa1c16bdb7f018ef6f984b8bd8b3cb7aef661266c39687563d2fd355a223c30c279cf9494bf0c395a86be03fa51a5ab1da0820c72c0894cf1a90e0cd944ba51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/sl/firefox-72.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1bcf899acd6e722ddecb6f776cf185e71d758e7974c2b9e693f1295b2a9007dbca7cbea9b1c2e540857f748c24daa8631ad1857798742b1496a8553412e7b0be"; + sha512 = "bf96b0169a0552b1a431b88d09237984a52bf61b25df3c2231faa6ed1f073a625e33d3e44ad62d6b71bce95089a5782d89a8994925de10859f7f1c17559df2ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/son/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/son/firefox-72.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "0f43632a15edf48efb18089daab3f2f45c54ff1cdf288a8ab456bc36019aae9109bef1017b01481625b8d225fe78494be8323ced159bc4ecc9aebfaed1c46e75"; + sha512 = "8d81214c06d17d0080bf8d5ae017e54cfb107200fa8b1e7f5a8cd82efc8f15efe5433c237c5dad9d33edb46841136d095c06584705f42d9e59dea3139f2f8a81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sq/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/sq/firefox-72.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "0ce0d354aee7c3e2bfdab5a3cc13c64d9967620fc710d52d0ce46cc54d15149d52e6d35749f5eaa3889c8ce1399a08477d5a1e7079c012d5280765c5688d3894"; + sha512 = "bee8361d6c95626983c64f91928f6e97a720d07ff5ebb3fbc674b6870d944feb187f0ce2650760724c3aca22af4bf52a3e1fba035ce7ddbd6384b4559f62f5a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/sr/firefox-72.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "218ad778d5f8421081f0a6c42232513dd7fb6f4b946cffc4a36278d37457d68e78674f5deac839c500ab7708f79bdaffebefbb14777103af2f01b105d7de54d6"; + sha512 = "7df4905b03370f4f0ad261197dd7fabcf5c95c5f4a49f1b771d85257c122697475f1fb604725e7ea1fecbad0f91a91fc3a9acb69b22c99da048d43afec0ddd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sv-SE/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/sv-SE/firefox-72.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8c3bea33cedd039db2af5c0203a36c375d65d83d4d914a43b9ed9f83e5f7783e7cb2072259bb14642ff9ef8463d6af521d242c1d9f6dab10f9621d499dc6d7f2"; + sha512 = "b250d2bcf919aa16187f1b84d87527e82b0d2d92237e2b8dc66f0066fca1e19d27a8c7306c9e3cd313821a770cf170d75263db092f2f1e6c72f46b3c73aba336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ta/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ta/firefox-72.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0a0eb3e83e897bcc21a610b235e923344d8f3a09c0de83f78c5b240c84254e2684654608d004be82896c485f004b9fb9f93a6039f51a780610ea5f6a7eeb1d59"; + sha512 = "09d6f91cb18c0682f9fb1470ac414f5ea08f4b83c9bb7343264e6d1648aab5a9d1842926ae21da9c6b9a78a16a392a25378a6ca22896fc379c0b1701ace13c94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/te/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/te/firefox-72.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "b39b47e236fa80771414f92b8d9898d0f316e4f4807abd9ca59ffba822166a11ff79f79b819600a1b3a24afccbc7ccbd740dbef89516b1ea031c1364ec6bc7ec"; + sha512 = "22ac1b85c437b4c87bf3aa16e4d7e4e42d91fc84b5fa9b74ec076a1371b3334fa21110b49d452fd3b17519a7e6ad1734f8a7ea0bf0e436dade8ecf0961372793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/th/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/th/firefox-72.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ff6c0a8d6ad2b1971af4fcd5d96ed2422e6fc6a820d43f2177d49740ee2a87a52a393ac323c65901907303741d7b228cb547093419dff474cde3837b3f9d4679"; + sha512 = "8ba6e7c0cabc7f0852d5046d9a6d933a7ad7f5b17ba69bbb28e971251775266e1926652d2dee1b2962c9e2b1c69db5ee07fe26759b9899266998198d21dc40e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/tl/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/tl/firefox-72.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "ac603fc901fb513266bf3d9ee7c1e088fa09fd403ca264539b586879303f27987c4eb1432a8b9d3a3c4fa3abe874d1d1be76cb9993cf0bfb675df3815f9b6b81"; + sha512 = "253df7bad5ed6e7d28464a94502f0c72c9a8493b08c7d2ecb451938556d8214826af57a349270295ef18eafb989907be983c0238758e04e42674efc3c4ff76ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/tr/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/tr/firefox-72.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "5a222bf901572528f058d2f6bf2d449fe93dfc9a7555c91ba6a19844674e3ef43a3d53258840cf37dcd3cb2100d68cf0a6407f2934ee07345faca2423f0c7a04"; + sha512 = "ac06243589584046822a3a8f9065989817730b6f64be18c177bc15410bda3f32cbdc49f7a6ee7610a5bf41355599548993897cac5056b8b3051118ca36be21ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/trs/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/trs/firefox-72.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "d0530d17fd9aba0046ddc677326c17301603f1929d3c7fde6590278af43c9ec2b3ec8951efb184c9ff89085311cfb4b5738e732203d8ec6e7f8be61428fc4f87"; + sha512 = "2cdf0c2d1fd45e12843ee2cd00a12456ae183af74064ae63243a8f4f43f4fe85753ec7ad79f2f64394cc9833445541b6ad4207abd7831841abea0775da1ad625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/uk/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/uk/firefox-72.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fcee0ec3a5821c7539aab0414a48b2647aa88b66b99b079259f811c91afdda4ccd4f073ca06f9f8b87173427d07f0390705fcca66fbd100a917205bc4703201c"; + sha512 = "296a403df2bd162da7557fe494af3c0b2b4ffffefe1acda9a5f738c1b97f59b5e92d0d62996e8c24fee22664baf1f1e709748370eb6404ce97d63a3f642eec63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ur/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/ur/firefox-72.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8bf47e2b5eca734580ca0958d0f86a4807a1753996da13f57c2a3c6f6f3d1297de7fdc02e8db649ef7108313c415a8a82baa5772f35f7dc94fd5bd1927558e8d"; + sha512 = "616812944f748280e22f015c7fc40801442a066416fd96f9b3c2044febef4eebce2be4676392c1d3f8f96250f012bc1c225e6fe12bf8d444d2ded08d6eebc0c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/uz/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/uz/firefox-72.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "50bf9e63e73387c4740f5978e8eae93d7212775cffc62cd9f2d7da24dde2558180d59cec5c19d78475cfbc7451f82263ae3b9ed53c765f6621ec456b0eca03e4"; + sha512 = "53447c7e6ce5812abb98b8976e0d7deb70e60e6734dd3733f9f35a24746899eb772c0a9c9dff85c7515cedc845a1881d2b629d176f2aa6671c73f4c0b5976416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/vi/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/vi/firefox-72.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "887878ae122299374d1eccfade722837cdd7df0122e2790749909543d6ce9a5fa83919a7ceea1864ab3b9b71408c38b4e3e72d2abbe485dfb66b378e103d9719"; + sha512 = "61b4af6f21e5f951bd79449fbd52972771f1d9a730ca6962e7957101b505780e926c2b90365156a5c4105d038f63b3828edea0f0dccb3f25f6a684054646ce62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xh/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/xh/firefox-72.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4521638a80908805b13faddf28098b7186704b50b1da6ea9999aefba0202263e6e8650445b6b6b635d4290f96a95173c5aa0db9a4ac066b4e4baeab3c67bfd79"; + sha512 = "4a3c6bc3b8fe36e7c76b7f16ac04937bdc7add9cfffd0a60f3265acbc49d6930b2b285331bd4a1d737f2d3b5c0cd0cbde9c387f372c6a8988a000a28b590081e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/zh-CN/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/zh-CN/firefox-72.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "65830ec45c63074cd4494805af5fd40b7fe6b061025f00d16df53ea3a51892b1e7eabc2fae8000b08a7d4c6eb4a8648eec2f3c86e105d8cb383e6dc20a3a3114"; + sha512 = "d09c659abac6a8ead9025716dc86f67b4d761c5184cf650e99e4163b6a5ef4374e291c4f9fe87f6d3a6c7bb8469dc9d36ad946239b643b2f9fbfca908bd31029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/zh-TW/firefox-71.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/72.0/linux-i686/zh-TW/firefox-72.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ae776f0593c0ab0dfa360a76e1465fe64de9f751ffc906019168af18467731670fedb2449d159d4978351e39da01eb6553444eba0c5884111d14a8f280c92462"; + sha512 = "e25f47293563e5ffd30c1d293d41e6224bfde9e95f166de6e1871bbbdac98526875bcf49222a123ff00a79be2e9ce39985d89e2a4f55ff0c43859f266f484fa6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c6dcd20d62f..740d05ba046 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -110,12 +110,16 @@ let url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch"; sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; }) - ] ++ lib.optional (lib.versionAtLeast ffversion "71") ./fix-ff71-lto.patch + ] + ++ lib.optional (lib.versionAtLeast ffversion "71") (fetchpatch { + url = "https://phabricator.services.mozilla.com/D56873?download=true"; + sha256 = "183949phd2n27nhiq85a04j4fjn0jxmldic6wcjrczsd8g2rrr5k"; + }) ++ patches; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "${pname}-unwrapped-${version}"; version = browserVersion; @@ -156,12 +160,15 @@ stdenv.mkDerivation rec { AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-I${glib.dev}/include/gio-unix-2.0" ] ++ lib.optionals (!isTorBrowserLike) [ "-I${nss.dev}/include/nss" - ]; + ] + ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68" + && lib.versionOlder ffversion "69") + "-Wno-error=format-security"); postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' @@ -173,7 +180,7 @@ stdenv.mkDerivation rec { [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] - ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") python3 ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; @@ -360,4 +367,18 @@ stdenv.mkDerivation rec { inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; -} +} // +# the build system verifies checksums of the bundled rust sources +# ./third_party/rust is be patched by our libtool fixup code in stdenv +# unfortunately we can't just set this to `false` when we do not want it. +# See https://github.com/NixOS/nixpkgs/issues/77289 for more details +lib.optionalAttrs (lib.versionAtLeast ffversion "72") { + # Ideally we would figure out how to tell the build system to not + # care about changed hashes as we are already doing that when we + # fetch the sources. Any further modifications of the source tree + # is on purpose by some of our tool (or by accident and a bug?). + dontFixLibtool = true; + + # on aarch64 this is also required + dontUpdateAutotoolsGnuConfigScripts = true; +}) diff --git a/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch b/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch deleted file mode 100644 index f48cad9e67a..00000000000 --- a/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch +++ /dev/null @@ -1,100 +0,0 @@ -Original Patch: https://bugzilla.mozilla.org/show_bug.cgi?id=1601707#c6 - -Also fixes the issues with dom localstorage. - ---- a/dom/indexedDB/ActorsParent.cpp -+++ b/dom/indexedDB/ActorsParent.cpp -@@ -24311,11 +24311,11 @@ nsresult ObjectStoreAddOrPutRequestOp::DoDatabaseWork( - // if we allow overwrite or not. By not allowing overwrite we raise - // detectable errors rather than corrupting data. - DatabaseConnection::CachedStatement stmt; -- const auto& optReplaceDirective = (!mOverwrite || keyUnset) -- ? NS_LITERAL_CSTRING("") -- : NS_LITERAL_CSTRING("OR REPLACE "); - rv = aConnection->GetCachedStatement( -- NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective + -+ NS_LITERAL_CSTRING("INSERT ") + -+ ((!mOverwrite || keyUnset) -+ ? NS_LITERAL_CSTRING("") -+ : NS_LITERAL_CSTRING("OR REPLACE ")) + - NS_LITERAL_CSTRING("INTO object_data " - "(object_store_id, key, file_ids, data) " - "VALUES (:") + -@@ -26076,9 +26076,6 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) { - - const bool usingKeyRange = mOptionalKeyRange.isSome(); - -- const auto& indexTable = mCursor->mUniqueIndex -- ? NS_LITERAL_CSTRING("unique_index_data") -- : NS_LITERAL_CSTRING("index_data"); - - NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); - -@@ -26099,7 +26096,9 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) { - "object_data.file_ids, " - "object_data.data " - "FROM ") + -- indexTable + -+ (mCursor->mUniqueIndex -+ ? NS_LITERAL_CSTRING("unique_index_data") -+ : NS_LITERAL_CSTRING("index_data")) + - NS_LITERAL_CSTRING( - " AS index_table " - "JOIN object_data " -@@ -26198,9 +26197,6 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork( - - const bool usingKeyRange = mOptionalKeyRange.isSome(); - -- const auto& table = mCursor->mUniqueIndex -- ? NS_LITERAL_CSTRING("unique_index_data") -- : NS_LITERAL_CSTRING("index_data"); - - NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column"); - -@@ -26218,7 +26214,10 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork( - NS_LITERAL_CSTRING( - "object_data_key " - " FROM ") + -- table + NS_LITERAL_CSTRING(" WHERE index_id = :") + -+ (mCursor->mUniqueIndex -+ ? NS_LITERAL_CSTRING("unique_index_data") -+ : NS_LITERAL_CSTRING("index_data")) + -+ NS_LITERAL_CSTRING(" WHERE index_id = :") + - kStmtParamNameId; - - const auto keyRangeClause = -diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp -index 9c46c20670..642cef1701 100644 ---- a/dom/localstorage/ActorsParent.cpp -+++ b/dom/localstorage/ActorsParent.cpp -@@ -6959,13 +6959,10 @@ nsresult PrepareDatastoreOp::Start() { - MOZ_ASSERT(!QuotaClient::IsShuttingDownOnBackgroundThread()); - MOZ_ASSERT(MayProceed()); - -- const LSRequestCommonParams& commonParams = -- mForPreload -- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams() -- : mParams.get_LSRequestPrepareDatastoreParams().commonParams(); -- - const PrincipalInfo& storagePrincipalInfo = -- commonParams.storagePrincipalInfo(); -+ mForPreload -+ ? mParams.get_LSRequestPreloadDatastoreParams().commonParams().storagePrincipalInfo() -+ : mParams.get_LSRequestPrepareDatastoreParams().commonParams().storagePrincipalInfo(); - - if (storagePrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) { - QuotaManager::GetInfoForChrome(&mSuffix, &mGroup, &mOrigin); -@@ -6996,10 +6993,9 @@ nsresult PrepareDatastoreOp::CheckExistingOperations() { - return NS_ERROR_FAILURE; - } - -- const LSRequestCommonParams& commonParams = -- mForPreload -- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams() -- : mParams.get_LSRequestPrepareDatastoreParams().commonParams(); -+ const LSRequestCommonParams& preloadCommonParams = mParams.get_LSRequestPreloadDatastoreParams().commonParams(); -+ const LSRequestCommonParams& prepareCommonParams = mParams.get_LSRequestPrepareDatastoreParams().commonParams(); -+ const LSRequestCommonParams& commonParams = mForPreload ? preloadCommonParams : prepareCommonParams; - - const PrincipalInfo& storagePrincipalInfo = - commonParams.storagePrincipalInfo(); diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 105a0a18d6b..0032e607ec8 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -16,10 +16,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "71.0"; + ffversion = "72.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0hfjlhwdhfdfzd27d6p3h8ff5m2jphlaipv4zym48bn6g95if1x98q2lb87617bxfm31di4rckjvqb70g9sm3smil6p6bnw2dsvnq1g"; + sha512 = "37ryimi6yfpcha4c9mcv8gjk38kia1lr5xrj2lglwsr1jai7qxrcd8ljcry8bg87qfwwb9fa13prmn78f5pzpxr7jf8gnsbvr6adxld"; }; patches = [ @@ -99,10 +99,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.3.0esr"; + ffversion = "68.4.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "31zisy4l07hhm9yvxz7sx04kz1f5rl20z1w072jxaabi42sw07xr6lcflv88gwl21y902n7vwd1q1zfavpnipn65wap4i0vm8c4m6pr"; + sha512 = "3nqchvyr95c9xvz23z0kcqqyx8lskw0lxa3rahiagc7b71pnrk8l40c7327q1wd4y5g16lix0fg04xiy6lqjfycjsrjlfr2y6b51n4d"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 585b7426eb6..7e3705a3b0b 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.293"; + version = "32.0.0.303"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0lz1na68gdi9n23hfj5c731dbskm9684cwar7ji8yjfhfryfg5yn" + "05hfc5ywmcvp6zf8aqmzjp3qy3byp0zdl0ssrv9gvzcskdqkhsj2" else - "10gm2ynndlyk66fndfbh7ah5ssqpyw8415i10n3lpw940x201dk0" + "12hl8lvxz648ha70gi3v85mwf0nnayjiaslr669vjan3ww94jymv" else if arch == "x86_64" then - "0hmlv0v9lbgxrmz0n7czfnrbrwjwxhy99gsr5g1m0aqgw0y61clc" + "0x0mabgswly2v8z13832pkbjsv404aq61pback6sgmp2lyycdg6w" else - "0qdw4f48xhnkzdly3jz63v14nmzd0gg49az5wxb08ghs8laaqlik"; + "16kbpf1i3aqlrfbfh5ncg1n46ncl9hp6qdp36s5j3ivbc68pj81z"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 0f7ded95f40..28b4c8a36c9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.293"; + version = "32.0.0.303"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "13mrknvl3yd8vrcs7mp6szz6f9ssfs72apzvc60f9qfwkhiwlg87" + "0xkzlv90lpyy54j6pllknrp1l9vjyh6dsl63l4c8cgh4i830gi14" else - "0isvmzyi4isxvxxc5ksplcqc5cafpvbrln3dddpms8zps2dxpyzi"; + "0mi3ggv6zhzmdd1h68cgl87n6izhp0pbkhnidd2gl2cp95f23c2d"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index 97c65fc12ef..4aabb84393f 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -61,6 +61,9 @@ stdenv.mkDerivation rec { unix-opts ]; + # This reference is unfortunately not detected by Nix + propagatedBuildInputs = [ next-gtk-webkit ]; + prePatch = '' substituteInPlace source/ports/gtk-webkit.lisp \ --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 05262b0cf50..21dd04610cd 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.7.2"; + version = "28.8.0"; src = fetchFromGitHub { owner = "MoonchildProductions"; repo = "UXP"; rev = "PM${version}_Release"; - sha256 = "08w90269mwcqsdhx4vvp18c5iccvzqhaaw6aw7w0nppf2f2k8lri"; + sha256 = "0swmwall8pyg905jnw6x1b6vcv92zb7ph3zqcymh4ay2liikh8c0"; }; desktopItem = makeDesktopItem { @@ -55,6 +55,7 @@ in stdenv.mkDerivation rec { configurePhase = '' export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZCONFIG=$(pwd)/mozconfig + export MOZ_NOSPAM=1 export builddir=$(pwd)/pmbuild echo > $MOZCONFIG " diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index a8e7bed5ede..0b14a15f5da 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.9.1705.41-1"; + version = "2.10.1745.23-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0c6cvhh05scmgpjy7f5wps62arhf5nsdnw9dllzqxpbsii1p6rv5"; + sha256 = "1dkyanasycarka6zikrk0pn6n0xin7hrnysm67rs7pam4lzpq0vh"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c2751ac270a..f852c3ac0a3 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0s2k7ik2aa7knh25r0qki7ldr3g9h87dgi8nm64j8n0yy4xvg2h3"; + sha256 = "05rpwmzkxhbvckcs7hspy6krdfskd8jnsn9g43fhidjvqhxyh6n3"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix new file mode 100644 index 00000000000..2180d8d3048 --- /dev/null +++ b/pkgs/applications/networking/cluster/spacegun/default.nix @@ -0,0 +1,27 @@ +{ pkgs, nodejs, stdenv, lib, ... }: + +let + + packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json)); + + nodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages."${packageName}".override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + + postInstall = '' + # Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems + patchShebangs --build "$out/lib/node_modules/spacegun/node_modules/" + # compile Typescript sources + npm run build + ''; + + meta = with lib; { + description = "Version controlled multi-cluster deployment manager for kubernetes"; + maintainers = with maintainers; [ kampka ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh new file mode 100644 index 00000000000..293a72a1623 --- /dev/null +++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +node2nix \ + --nodejs-10 \ + --node-env ../../../../development/node-packages/node-env.nix \ + --development \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 66560873b4c..6a5283528fc 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -2,16 +2,16 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let - nodeEnv = import ../../../development/node-packages/node-env.nix { + nodeEnv = import ../../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in -import ./node-packages-generated.nix { +import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; } \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix new file mode 100644 index 00000000000..a69352a9c21 --- /dev/null +++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix @@ -0,0 +1,11420 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@babel/code-frame-7.5.5" = { + name = "_at_babel_slash_code-frame"; + packageName = "@babel/code-frame"; + version = "7.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; + }; + }; + "@babel/core-7.6.2" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz"; + sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ=="; + }; + }; + "@babel/generator-7.6.2" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz"; + sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ=="; + }; + }; + "@babel/helper-function-name-7.1.0" = { + name = "_at_babel_slash_helper-function-name"; + packageName = "@babel/helper-function-name"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; + }; + }; + "@babel/helper-get-function-arity-7.0.0" = { + name = "_at_babel_slash_helper-get-function-arity"; + packageName = "@babel/helper-get-function-arity"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; + }; + }; + "@babel/helper-plugin-utils-7.0.0" = { + name = "_at_babel_slash_helper-plugin-utils"; + packageName = "@babel/helper-plugin-utils"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; + sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="; + }; + }; + "@babel/helper-split-export-declaration-7.4.4" = { + name = "_at_babel_slash_helper-split-export-declaration"; + packageName = "@babel/helper-split-export-declaration"; + version = "7.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; + }; + }; + "@babel/helpers-7.6.2" = { + name = "_at_babel_slash_helpers"; + packageName = "@babel/helpers"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz"; + sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA=="; + }; + }; + "@babel/highlight-7.5.0" = { + name = "_at_babel_slash_highlight"; + packageName = "@babel/highlight"; + version = "7.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz"; + sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; + }; + }; + "@babel/parser-7.6.2" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz"; + sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="; + }; + }; + "@babel/plugin-syntax-object-rest-spread-7.2.0" = { + name = "_at_babel_slash_plugin-syntax-object-rest-spread"; + packageName = "@babel/plugin-syntax-object-rest-spread"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; + sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA=="; + }; + }; + "@babel/template-7.6.0" = { + name = "_at_babel_slash_template"; + packageName = "@babel/template"; + version = "7.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz"; + sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ=="; + }; + }; + "@babel/traverse-7.6.2" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz"; + sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ=="; + }; + }; + "@babel/types-7.6.1" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz"; + sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g=="; + }; + }; + "@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=="; + }; + }; + "@jest/console-24.9.0" = { + name = "_at_jest_slash_console"; + packageName = "@jest/console"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz"; + sha512 = "Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ=="; + }; + }; + "@jest/core-24.9.0" = { + name = "_at_jest_slash_core"; + packageName = "@jest/core"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz"; + sha512 = "Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A=="; + }; + }; + "@jest/environment-24.9.0" = { + name = "_at_jest_slash_environment"; + packageName = "@jest/environment"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz"; + sha512 = "5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ=="; + }; + }; + "@jest/fake-timers-24.9.0" = { + name = "_at_jest_slash_fake-timers"; + packageName = "@jest/fake-timers"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz"; + sha512 = "eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A=="; + }; + }; + "@jest/reporters-24.9.0" = { + name = "_at_jest_slash_reporters"; + packageName = "@jest/reporters"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz"; + sha512 = "mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw=="; + }; + }; + "@jest/source-map-24.9.0" = { + name = "_at_jest_slash_source-map"; + packageName = "@jest/source-map"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz"; + sha512 = "/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg=="; + }; + }; + "@jest/test-result-24.9.0" = { + name = "_at_jest_slash_test-result"; + packageName = "@jest/test-result"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz"; + sha512 = "XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA=="; + }; + }; + "@jest/test-sequencer-24.9.0" = { + name = "_at_jest_slash_test-sequencer"; + packageName = "@jest/test-sequencer"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz"; + sha512 = "6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A=="; + }; + }; + "@jest/transform-24.9.0" = { + name = "_at_jest_slash_transform"; + packageName = "@jest/transform"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz"; + sha512 = "TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ=="; + }; + }; + "@jest/types-24.9.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; + sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; + }; + }; + "@kubernetes/client-node-0.10.3" = { + name = "_at_kubernetes_slash_client-node"; + packageName = "@kubernetes/client-node"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz"; + sha512 = "mw+1zdKfMW4QN2ns82SKFhAvqC4SVUAiItto4oFg3Me+a510h3h9N5O7ad6m4efAmlQBlMc6Y5FHz70dAwuiMg=="; + }; + }; + "@sindresorhus/is-0.7.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; + sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; + }; + }; + "@types/accepts-1.3.5" = { + name = "_at_types_slash_accepts"; + packageName = "@types/accepts"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz"; + sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ=="; + }; + }; + "@types/axios-0.14.0" = { + name = "_at_types_slash_axios"; + packageName = "@types/axios"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz"; + sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46"; + }; + }; + "@types/babel-types-7.0.7" = { + name = "_at_types_slash_babel-types"; + packageName = "@types/babel-types"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz"; + sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ=="; + }; + }; + "@types/babel__core-7.1.3" = { + name = "_at_types_slash_babel__core"; + packageName = "@types/babel__core"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz"; + sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA=="; + }; + }; + "@types/babel__generator-7.6.0" = { + name = "_at_types_slash_babel__generator"; + packageName = "@types/babel__generator"; + version = "7.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz"; + sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw=="; + }; + }; + "@types/babel__template-7.0.2" = { + name = "_at_types_slash_babel__template"; + packageName = "@types/babel__template"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz"; + sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; + }; + }; + "@types/babel__traverse-7.0.7" = { + name = "_at_types_slash_babel__traverse"; + packageName = "@types/babel__traverse"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; + sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw=="; + }; + }; + "@types/babylon-6.16.5" = { + name = "_at_types_slash_babylon"; + packageName = "@types/babylon"; + version = "6.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz"; + sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; + }; + }; + "@types/body-parser-1.17.1" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz"; + sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w=="; + }; + }; + "@types/caseless-0.12.2" = { + name = "_at_types_slash_caseless"; + packageName = "@types/caseless"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz"; + sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; + }; + }; + "@types/command-line-args-5.0.0" = { + name = "_at_types_slash_command-line-args"; + packageName = "@types/command-line-args"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz"; + sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg=="; + }; + }; + "@types/connect-3.4.32" = { + name = "_at_types_slash_connect"; + packageName = "@types/connect"; + version = "3.4.32"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz"; + sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg=="; + }; + }; + "@types/cookies-0.7.4" = { + name = "_at_types_slash_cookies"; + packageName = "@types/cookies"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz"; + sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw=="; + }; + }; + "@types/cron-1.7.1" = { + name = "_at_types_slash_cron"; + packageName = "@types/cron"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz"; + sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A=="; + }; + }; + "@types/events-3.0.0" = { + name = "_at_types_slash_events"; + packageName = "@types/events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; + sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; + }; + }; + "@types/express-4.17.1" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz"; + sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w=="; + }; + }; + "@types/express-serve-static-core-4.16.9" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.16.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz"; + sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ=="; + }; + }; + "@types/formidable-1.0.31" = { + name = "_at_types_slash_formidable"; + packageName = "@types/formidable"; + version = "1.0.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz"; + sha512 = "dIhM5t8lRP0oWe2HF8MuPvdd1TpPTjhDMAqemcq6oIZQCBQTovhBAdTQ5L5veJB4pdQChadmHuxtB0YzqvfU3Q=="; + }; + }; + "@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/glob/-/glob-7.1.1.tgz"; + sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + }; + }; + "@types/http-assert-1.5.1" = { + name = "_at_types_slash_http-assert"; + packageName = "@types/http-assert"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz"; + sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ=="; + }; + }; + "@types/istanbul-lib-coverage-2.0.1" = { + name = "_at_types_slash_istanbul-lib-coverage"; + packageName = "@types/istanbul-lib-coverage"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; + sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg=="; + }; + }; + "@types/istanbul-lib-report-1.1.1" = { + name = "_at_types_slash_istanbul-lib-report"; + packageName = "@types/istanbul-lib-report"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; + sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg=="; + }; + }; + "@types/istanbul-reports-1.1.1" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; + sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; + }; + }; + "@types/jest-24.0.18" = { + name = "_at_types_slash_jest"; + packageName = "@types/jest"; + version = "24.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.18.tgz"; + sha512 = "jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ=="; + }; + }; + "@types/jest-diff-20.0.1" = { + name = "_at_types_slash_jest-diff"; + packageName = "@types/jest-diff"; + version = "20.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz"; + sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA=="; + }; + }; + "@types/js-yaml-3.12.1" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "3.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz"; + sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA=="; + }; + }; + "@types/keygrip-1.0.1" = { + name = "_at_types_slash_keygrip"; + packageName = "@types/keygrip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz"; + sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878"; + }; + }; + "@types/koa-2.0.50" = { + name = "_at_types_slash_koa"; + packageName = "@types/koa"; + version = "2.0.50"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.50.tgz"; + sha512 = "TcgOD2lh0EISSadAk1DOBYw7kNoY9XdeB3vEMOKiDDaTMYm+V54nyPsU7Ulb/htb5OBIR79RgTeCWntCcophLw=="; + }; + }; + "@types/koa-compose-3.2.4" = { + name = "_at_types_slash_koa-compose"; + packageName = "@types/koa-compose"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz"; + sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA=="; + }; + }; + "@types/koa-router-7.0.42" = { + name = "_at_types_slash_koa-router"; + packageName = "@types/koa-router"; + version = "7.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.42.tgz"; + sha512 = "mggrNY7Ywwjt7QjaMAlbb1ixE+v7AFskOeyKdmZT/NvPVEAo48gYUxIcF8ILlMc3eg1bo6SxNoUcbxhTv7edrA=="; + }; + }; + "@types/koa-send-4.1.2" = { + name = "_at_types_slash_koa-send"; + packageName = "@types/koa-send"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa-send/-/koa-send-4.1.2.tgz"; + sha512 = "rfqKIv9bFds39Jxvsp8o3YJLnEQVPVriYA14AuO2OY65IHh/4UX4U/iMs5L0wATpcRmm1bbe0BNk23TRwx3VQQ=="; + }; + }; + "@types/koa-static-4.0.1" = { + name = "_at_types_slash_koa-static"; + packageName = "@types/koa-static"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa-static/-/koa-static-4.0.1.tgz"; + sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w=="; + }; + }; + "@types/koa-views-2.0.3" = { + name = "_at_types_slash_koa-views"; + packageName = "@types/koa-views"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz"; + sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw=="; + }; + }; + "@types/lodash-4.14.141" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.141"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.141.tgz"; + sha512 = "v5NYIi9qEbFEUpCyikmnOYe4YlP8BMUdTcNCAquAKzu+FA7rZ1onj9x80mbnDdOW/K5bFf3Tv5kJplP33+gAbQ=="; + }; + }; + "@types/lodash.clonedeep-4.5.6" = { + name = "_at_types_slash_lodash.clonedeep"; + packageName = "@types/lodash.clonedeep"; + version = "4.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz"; + sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA=="; + }; + }; + "@types/mime-2.0.1" = { + name = "_at_types_slash_mime"; + packageName = "@types/mime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz"; + sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; + }; + }; + "@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/mkdirp-0.5.2" = { + name = "_at_types_slash_mkdirp"; + packageName = "@types/mkdirp"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz"; + sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; + }; + }; + "@types/node-10.14.20" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.14.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.14.20.tgz"; + sha512 = "An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ=="; + }; + }; + "@types/node-12.7.11" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.7.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.7.11.tgz"; + sha512 = "Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw=="; + }; + }; + "@types/ora-3.2.0" = { + name = "_at_types_slash_ora"; + packageName = "@types/ora"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz"; + sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w=="; + }; + }; + "@types/range-parser-1.2.3" = { + name = "_at_types_slash_range-parser"; + packageName = "@types/range-parser"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + }; + }; + "@types/request-2.48.3" = { + name = "_at_types_slash_request"; + packageName = "@types/request"; + version = "2.48.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz"; + sha512 = "3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w=="; + }; + }; + "@types/serve-static-1.13.3" = { + name = "_at_types_slash_serve-static"; + packageName = "@types/serve-static"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz"; + sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; + }; + }; + "@types/stack-utils-1.0.1" = { + name = "_at_types_slash_stack-utils"; + packageName = "@types/stack-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz"; + sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw=="; + }; + }; + "@types/tough-cookie-2.3.5" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz"; + sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg=="; + }; + }; + "@types/underscore-1.9.3" = { + name = "_at_types_slash_underscore"; + packageName = "@types/underscore"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz"; + sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug=="; + }; + }; + "@types/websocket-0.0.40" = { + name = "_at_types_slash_websocket"; + packageName = "@types/websocket"; + version = "0.0.40"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz"; + sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ=="; + }; + }; + "@types/ws-6.0.3" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz"; + sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w=="; + }; + }; + "@types/yargs-13.0.3" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "13.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz"; + sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ=="; + }; + }; + "@types/yargs-parser-13.1.0" = { + name = "_at_types_slash_yargs-parser"; + packageName = "@types/yargs-parser"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; + sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg=="; + }; + }; + "@webassemblyjs/ast-1.8.5" = { + name = "_at_webassemblyjs_slash_ast"; + packageName = "@webassemblyjs/ast"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz"; + sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ=="; + }; + }; + "@webassemblyjs/floating-point-hex-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_floating-point-hex-parser"; + packageName = "@webassemblyjs/floating-point-hex-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; + sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ=="; + }; + }; + "@webassemblyjs/helper-api-error-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-api-error"; + packageName = "@webassemblyjs/helper-api-error"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; + sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA=="; + }; + }; + "@webassemblyjs/helper-buffer-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-buffer"; + packageName = "@webassemblyjs/helper-buffer"; + version = "1.8.5"; + src = fetchurl { + 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.5" = { + name = "_at_webassemblyjs_slash_helper-code-frame"; + packageName = "@webassemblyjs/helper-code-frame"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; + sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ=="; + }; + }; + "@webassemblyjs/helper-fsm-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-fsm"; + packageName = "@webassemblyjs/helper-fsm"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; + sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow=="; + }; + }; + "@webassemblyjs/helper-module-context-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-module-context"; + packageName = "@webassemblyjs/helper-module-context"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; + sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g=="; + }; + }; + "@webassemblyjs/helper-wasm-bytecode-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; + packageName = "@webassemblyjs/helper-wasm-bytecode"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; + sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ=="; + }; + }; + "@webassemblyjs/helper-wasm-section-1.8.5" = { + name = "_at_webassemblyjs_slash_helper-wasm-section"; + packageName = "@webassemblyjs/helper-wasm-section"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; + sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA=="; + }; + }; + "@webassemblyjs/ieee754-1.8.5" = { + name = "_at_webassemblyjs_slash_ieee754"; + packageName = "@webassemblyjs/ieee754"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; + sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g=="; + }; + }; + "@webassemblyjs/leb128-1.8.5" = { + name = "_at_webassemblyjs_slash_leb128"; + packageName = "@webassemblyjs/leb128"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; + sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A=="; + }; + }; + "@webassemblyjs/utf8-1.8.5" = { + name = "_at_webassemblyjs_slash_utf8"; + packageName = "@webassemblyjs/utf8"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; + sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw=="; + }; + }; + "@webassemblyjs/wasm-edit-1.8.5" = { + name = "_at_webassemblyjs_slash_wasm-edit"; + packageName = "@webassemblyjs/wasm-edit"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; + sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q=="; + }; + }; + "@webassemblyjs/wasm-gen-1.8.5" = { + name = "_at_webassemblyjs_slash_wasm-gen"; + packageName = "@webassemblyjs/wasm-gen"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; + sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg=="; + }; + }; + "@webassemblyjs/wasm-opt-1.8.5" = { + name = "_at_webassemblyjs_slash_wasm-opt"; + packageName = "@webassemblyjs/wasm-opt"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; + sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q=="; + }; + }; + "@webassemblyjs/wasm-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_wasm-parser"; + packageName = "@webassemblyjs/wasm-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; + sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw=="; + }; + }; + "@webassemblyjs/wast-parser-1.8.5" = { + name = "_at_webassemblyjs_slash_wast-parser"; + packageName = "@webassemblyjs/wast-parser"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; + sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg=="; + }; + }; + "@webassemblyjs/wast-printer-1.8.5" = { + name = "_at_webassemblyjs_slash_wast-printer"; + packageName = "@webassemblyjs/wast-printer"; + version = "1.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; + sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg=="; + }; + }; + "@xtuc/ieee754-1.2.0" = { + name = "_at_xtuc_slash_ieee754"; + packageName = "@xtuc/ieee754"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; + }; + }; + "@xtuc/long-4.2.2" = { + name = "_at_xtuc_slash_long"; + packageName = "@xtuc/long"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; + sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; + }; + }; + "abab-2.0.2" = { + name = "abab"; + packageName = "abab"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz"; + sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; + "acorn-4.0.13" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.13"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"; + sha1 = "105495ae5361d697bd195c825192e1ad7f253787"; + }; + }; + "acorn-5.7.3" = { + name = "acorn"; + packageName = "acorn"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz"; + sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; + }; + }; + "acorn-6.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz"; + sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="; + }; + }; + "acorn-globals-3.1.0" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz"; + sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf"; + }; + }; + "acorn-globals-4.3.4" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; + }; + }; + "acorn-walk-6.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; + sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; + }; + }; + "aggregate-error-1.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz"; + sha1 = "888344dad0220a72e3af50906117f48771925fac"; + }; + }; + "ajv-6.10.2" = { + name = "ajv"; + packageName = "ajv"; + version = "6.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; + sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + }; + }; + "ajv-errors-1.0.1" = { + name = "ajv-errors"; + packageName = "ajv-errors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="; + }; + }; + "ajv-keywords-3.4.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; + sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "ansi-colors-3.2.4" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA=="; + }; + }; + "ansi-escapes-3.2.0" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; + }; + }; + "ansi-html-0.0.7" = { + name = "ansi-html"; + packageName = "ansi-html"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "anymatch-2.0.0" = { + name = "anymatch"; + packageName = "anymatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"; + sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "arr-diff-4.0.0" = { + name = "arr-diff"; + packageName = "arr-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + }; + "arr-flatten-1.1.0" = { + name = "arr-flatten"; + packageName = "arr-flatten"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; + }; + }; + "arr-union-3.1.0" = { + name = "arr-union"; + packageName = "arr-union"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + }; + "array-back-3.1.0" = { + name = "array-back"; + packageName = "array-back"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz"; + sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; + }; + }; + "array-equal-1.0.0" = { + name = "array-equal"; + packageName = "array-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-flatten-2.1.2" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"; + sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="; + }; + }; + "array-union-1.0.2" = { + name = "array-union"; + packageName = "array-union"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + }; + "array-uniq-1.0.3" = { + name = "array-uniq"; + packageName = "array-uniq"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + }; + "array-unique-0.3.2" = { + name = "array-unique"; + packageName = "array-unique"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "asn1.js-4.10.1" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; + sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; + }; + }; + "assert-1.5.0" = { + name = "assert"; + packageName = "assert"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz"; + sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "assign-symbols-1.0.0" = { + name = "assign-symbols"; + packageName = "assign-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + }; + "astral-regex-1.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"; + sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "async-each-1.0.3" = { + name = "async-each"; + packageName = "async-each"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; + sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + }; + }; + "async-limiter-1.0.1" = { + name = "async-limiter"; + packageName = "async-limiter"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; + sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "atob-2.1.2" = { + name = "atob"; + packageName = "atob"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; + sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; + }; + }; + "awesome-typescript-loader-5.2.1" = { + name = "awesome-typescript-loader"; + packageName = "awesome-typescript-loader"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz"; + sha512 = "slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g=="; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.8.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; + sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + }; + }; + "axios-0.19.0" = { + name = "axios"; + packageName = "axios"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz"; + sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ=="; + }; + }; + "babel-6.23.0" = { + name = "babel"; + packageName = "babel"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz"; + sha1 = "d0d1e7d803e974765beea3232d4e153c0efb90f4"; + }; + }; + "babel-code-frame-6.26.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + }; + "babel-core-6.26.3" = { + name = "babel-core"; + packageName = "babel-core"; + version = "6.26.3"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz"; + sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA=="; + }; + }; + "babel-generator-6.26.1" = { + name = "babel-generator"; + packageName = "babel-generator"; + version = "6.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz"; + sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA=="; + }; + }; + "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = { + name = "babel-helper-builder-binary-assignment-operator-visitor"; + packageName = "babel-helper-builder-binary-assignment-operator-visitor"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz"; + sha1 = "cce4517ada356f4220bcae8a02c2b346f9a56664"; + }; + }; + "babel-helper-call-delegate-6.24.1" = { + name = "babel-helper-call-delegate"; + packageName = "babel-helper-call-delegate"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz"; + sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d"; + }; + }; + "babel-helper-define-map-6.26.0" = { + name = "babel-helper-define-map"; + packageName = "babel-helper-define-map"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz"; + sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f"; + }; + }; + "babel-helper-explode-assignable-expression-6.24.1" = { + name = "babel-helper-explode-assignable-expression"; + packageName = "babel-helper-explode-assignable-expression"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz"; + sha1 = "f25b82cf7dc10433c55f70592d5746400ac22caa"; + }; + }; + "babel-helper-function-name-6.24.1" = { + name = "babel-helper-function-name"; + packageName = "babel-helper-function-name"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz"; + sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9"; + }; + }; + "babel-helper-get-function-arity-6.24.1" = { + name = "babel-helper-get-function-arity"; + packageName = "babel-helper-get-function-arity"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz"; + sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d"; + }; + }; + "babel-helper-hoist-variables-6.24.1" = { + name = "babel-helper-hoist-variables"; + packageName = "babel-helper-hoist-variables"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz"; + sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76"; + }; + }; + "babel-helper-optimise-call-expression-6.24.1" = { + name = "babel-helper-optimise-call-expression"; + packageName = "babel-helper-optimise-call-expression"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz"; + sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257"; + }; + }; + "babel-helper-regex-6.26.0" = { + name = "babel-helper-regex"; + packageName = "babel-helper-regex"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz"; + sha1 = "325c59f902f82f24b74faceed0363954f6495e72"; + }; + }; + "babel-helper-remap-async-to-generator-6.24.1" = { + name = "babel-helper-remap-async-to-generator"; + packageName = "babel-helper-remap-async-to-generator"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz"; + sha1 = "5ec581827ad723fecdd381f1c928390676e4551b"; + }; + }; + "babel-helper-replace-supers-6.24.1" = { + name = "babel-helper-replace-supers"; + packageName = "babel-helper-replace-supers"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz"; + sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"; + }; + }; + "babel-helpers-6.24.1" = { + name = "babel-helpers"; + packageName = "babel-helpers"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; + sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; + }; + }; + "babel-jest-24.9.0" = { + name = "babel-jest"; + packageName = "babel-jest"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz"; + sha512 = "ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw=="; + }; + }; + "babel-messages-6.23.0" = { + name = "babel-messages"; + packageName = "babel-messages"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; + sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; + }; + }; + "babel-plugin-check-es2015-constants-6.22.0" = { + name = "babel-plugin-check-es2015-constants"; + packageName = "babel-plugin-check-es2015-constants"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz"; + sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a"; + }; + }; + "babel-plugin-istanbul-5.2.0" = { + name = "babel-plugin-istanbul"; + packageName = "babel-plugin-istanbul"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz"; + sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw=="; + }; + }; + "babel-plugin-jest-hoist-24.9.0" = { + name = "babel-plugin-jest-hoist"; + packageName = "babel-plugin-jest-hoist"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz"; + sha512 = "2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw=="; + }; + }; + "babel-plugin-syntax-async-functions-6.13.0" = { + name = "babel-plugin-syntax-async-functions"; + packageName = "babel-plugin-syntax-async-functions"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz"; + sha1 = "cad9cad1191b5ad634bf30ae0872391e0647be95"; + }; + }; + "babel-plugin-syntax-exponentiation-operator-6.13.0" = { + name = "babel-plugin-syntax-exponentiation-operator"; + packageName = "babel-plugin-syntax-exponentiation-operator"; + version = "6.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz"; + sha1 = "9ee7e8337290da95288201a6a57f4170317830de"; + }; + }; + "babel-plugin-syntax-trailing-function-commas-6.22.0" = { + name = "babel-plugin-syntax-trailing-function-commas"; + packageName = "babel-plugin-syntax-trailing-function-commas"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz"; + sha1 = "ba0360937f8d06e40180a43fe0d5616fff532cf3"; + }; + }; + "babel-plugin-transform-async-to-generator-6.24.1" = { + name = "babel-plugin-transform-async-to-generator"; + packageName = "babel-plugin-transform-async-to-generator"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz"; + sha1 = "6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"; + }; + }; + "babel-plugin-transform-es2015-arrow-functions-6.22.0" = { + name = "babel-plugin-transform-es2015-arrow-functions"; + packageName = "babel-plugin-transform-es2015-arrow-functions"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz"; + sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221"; + }; + }; + "babel-plugin-transform-es2015-block-scoped-functions-6.22.0" = { + name = "babel-plugin-transform-es2015-block-scoped-functions"; + packageName = "babel-plugin-transform-es2015-block-scoped-functions"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz"; + sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141"; + }; + }; + "babel-plugin-transform-es2015-block-scoping-6.26.0" = { + name = "babel-plugin-transform-es2015-block-scoping"; + packageName = "babel-plugin-transform-es2015-block-scoping"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz"; + sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f"; + }; + }; + "babel-plugin-transform-es2015-classes-6.24.1" = { + name = "babel-plugin-transform-es2015-classes"; + packageName = "babel-plugin-transform-es2015-classes"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz"; + sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"; + }; + }; + "babel-plugin-transform-es2015-computed-properties-6.24.1" = { + name = "babel-plugin-transform-es2015-computed-properties"; + packageName = "babel-plugin-transform-es2015-computed-properties"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz"; + sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3"; + }; + }; + "babel-plugin-transform-es2015-destructuring-6.23.0" = { + name = "babel-plugin-transform-es2015-destructuring"; + packageName = "babel-plugin-transform-es2015-destructuring"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"; + sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d"; + }; + }; + "babel-plugin-transform-es2015-duplicate-keys-6.24.1" = { + name = "babel-plugin-transform-es2015-duplicate-keys"; + packageName = "babel-plugin-transform-es2015-duplicate-keys"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz"; + sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e"; + }; + }; + "babel-plugin-transform-es2015-for-of-6.23.0" = { + name = "babel-plugin-transform-es2015-for-of"; + packageName = "babel-plugin-transform-es2015-for-of"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz"; + sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691"; + }; + }; + "babel-plugin-transform-es2015-function-name-6.24.1" = { + name = "babel-plugin-transform-es2015-function-name"; + packageName = "babel-plugin-transform-es2015-function-name"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz"; + sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"; + }; + }; + "babel-plugin-transform-es2015-literals-6.22.0" = { + name = "babel-plugin-transform-es2015-literals"; + packageName = "babel-plugin-transform-es2015-literals"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz"; + sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e"; + }; + }; + "babel-plugin-transform-es2015-modules-amd-6.24.1" = { + name = "babel-plugin-transform-es2015-modules-amd"; + packageName = "babel-plugin-transform-es2015-modules-amd"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz"; + sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154"; + }; + }; + "babel-plugin-transform-es2015-modules-commonjs-6.26.2" = { + name = "babel-plugin-transform-es2015-modules-commonjs"; + packageName = "babel-plugin-transform-es2015-modules-commonjs"; + version = "6.26.2"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz"; + sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q=="; + }; + }; + "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = { + name = "babel-plugin-transform-es2015-modules-systemjs"; + packageName = "babel-plugin-transform-es2015-modules-systemjs"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz"; + sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23"; + }; + }; + "babel-plugin-transform-es2015-modules-umd-6.24.1" = { + name = "babel-plugin-transform-es2015-modules-umd"; + packageName = "babel-plugin-transform-es2015-modules-umd"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz"; + sha1 = "ac997e6285cd18ed6176adb607d602344ad38468"; + }; + }; + "babel-plugin-transform-es2015-object-super-6.24.1" = { + name = "babel-plugin-transform-es2015-object-super"; + packageName = "babel-plugin-transform-es2015-object-super"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz"; + sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d"; + }; + }; + "babel-plugin-transform-es2015-parameters-6.24.1" = { + name = "babel-plugin-transform-es2015-parameters"; + packageName = "babel-plugin-transform-es2015-parameters"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz"; + sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b"; + }; + }; + "babel-plugin-transform-es2015-shorthand-properties-6.24.1" = { + name = "babel-plugin-transform-es2015-shorthand-properties"; + packageName = "babel-plugin-transform-es2015-shorthand-properties"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz"; + sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0"; + }; + }; + "babel-plugin-transform-es2015-spread-6.22.0" = { + name = "babel-plugin-transform-es2015-spread"; + packageName = "babel-plugin-transform-es2015-spread"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz"; + sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"; + }; + }; + "babel-plugin-transform-es2015-sticky-regex-6.24.1" = { + name = "babel-plugin-transform-es2015-sticky-regex"; + packageName = "babel-plugin-transform-es2015-sticky-regex"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz"; + sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"; + }; + }; + "babel-plugin-transform-es2015-template-literals-6.22.0" = { + name = "babel-plugin-transform-es2015-template-literals"; + packageName = "babel-plugin-transform-es2015-template-literals"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz"; + sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"; + }; + }; + "babel-plugin-transform-es2015-typeof-symbol-6.23.0" = { + name = "babel-plugin-transform-es2015-typeof-symbol"; + packageName = "babel-plugin-transform-es2015-typeof-symbol"; + version = "6.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz"; + sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372"; + }; + }; + "babel-plugin-transform-es2015-unicode-regex-6.24.1" = { + name = "babel-plugin-transform-es2015-unicode-regex"; + packageName = "babel-plugin-transform-es2015-unicode-regex"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz"; + sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9"; + }; + }; + "babel-plugin-transform-exponentiation-operator-6.24.1" = { + name = "babel-plugin-transform-exponentiation-operator"; + packageName = "babel-plugin-transform-exponentiation-operator"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz"; + sha1 = "2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"; + }; + }; + "babel-plugin-transform-regenerator-6.26.0" = { + name = "babel-plugin-transform-regenerator"; + packageName = "babel-plugin-transform-regenerator"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz"; + sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"; + }; + }; + "babel-plugin-transform-strict-mode-6.24.1" = { + name = "babel-plugin-transform-strict-mode"; + packageName = "babel-plugin-transform-strict-mode"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz"; + sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758"; + }; + }; + "babel-preset-env-1.7.0" = { + name = "babel-preset-env"; + packageName = "babel-preset-env"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz"; + sha512 = "9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg=="; + }; + }; + "babel-preset-jest-24.9.0" = { + name = "babel-preset-jest"; + packageName = "babel-preset-jest"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz"; + sha512 = "izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg=="; + }; + }; + "babel-register-6.26.0" = { + name = "babel-register"; + packageName = "babel-register"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"; + sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071"; + }; + }; + "babel-runtime-6.26.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; + sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; + }; + }; + "babel-template-6.26.0" = { + name = "babel-template"; + packageName = "babel-template"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz"; + sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; + }; + }; + "babel-traverse-6.26.0" = { + name = "babel-traverse"; + packageName = "babel-traverse"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz"; + sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"; + }; + }; + "babel-types-6.26.0" = { + name = "babel-types"; + packageName = "babel-types"; + version = "6.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz"; + sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497"; + }; + }; + "babylon-6.18.0" = { + name = "babylon"; + packageName = "babylon"; + version = "6.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"; + sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base-0.11.2" = { + name = "base"; + packageName = "base"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; + sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; + }; + }; + "base64-js-1.3.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; + sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + }; + }; + "base64url-3.0.1" = { + name = "base64url"; + packageName = "base64url"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz"; + sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="; + }; + }; + "batch-0.6.1" = { + name = "batch"; + packageName = "batch"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bfj-6.1.2" = { + name = "bfj"; + packageName = "bfj"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz"; + sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw=="; + }; + }; + "big.js-5.2.2" = { + name = "big.js"; + packageName = "big.js"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; + sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; + }; + }; + "binary-extensions-1.13.1" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "1.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"; + sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; + }; + }; + "bluebird-3.7.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz"; + sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="; + }; + }; + "bn.js-4.11.8" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.8"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz"; + sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "bonjour-3.5.0" = { + name = "bonjour"; + packageName = "bonjour"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-2.3.2" = { + name = "braces"; + packageName = "braces"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; + sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; + }; + }; + "brorand-1.1.0" = { + name = "brorand"; + packageName = "brorand"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + }; + "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"; + version = "1.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz"; + sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; + }; + }; + "browserify-aes-1.2.0" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; + sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; + }; + }; + "browserify-cipher-1.0.1" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; + sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; + }; + }; + "browserify-des-1.0.2" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; + sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "browserify-sign-4.0.4" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + }; + }; + "browserify-zlib-0.2.0" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; + }; + }; + "browserslist-3.2.8" = { + name = "browserslist"; + packageName = "browserslist"; + version = "3.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz"; + sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ=="; + }; + }; + "bs-logger-0.2.6" = { + name = "bs-logger"; + packageName = "bs-logger"; + version = "0.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"; + sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="; + }; + }; + "bser-2.1.0" = { + name = "bser"; + packageName = "bser"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz"; + sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg=="; + }; + }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "buffer-indexof-1.1.1" = { + name = "buffer-indexof"; + packageName = "buffer-indexof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; + "builtin-status-codes-3.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + }; + "byline-5.0.0" = { + name = "byline"; + packageName = "byline"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "cacache-10.0.4" = { + name = "cacache"; + packageName = "cacache"; + version = "10.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz"; + sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA=="; + }; + }; + "cacache-12.0.3" = { + name = "cacache"; + packageName = "cacache"; + version = "12.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz"; + sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; + }; + }; + "cache-base-1.0.1" = { + name = "cache-base"; + packageName = "cache-base"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; + sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; + }; + }; + "cache-content-type-1.0.1" = { + name = "cache-content-type"; + packageName = "cache-content-type"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz"; + sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA=="; + }; + }; + "cacheable-request-2.1.4" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + }; + }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "caniuse-lite-1.0.30000999" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30000999"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz"; + sha512 = "1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg=="; + }; + }; + "capture-exit-2.0.0" = { + name = "capture-exit"; + packageName = "capture-exit"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz"; + sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "character-parser-2.2.0" = { + name = "character-parser"; + packageName = "character-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; + sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; + }; + }; + "check-types-8.0.3" = { + name = "check-types"; + packageName = "check-types"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz"; + sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ=="; + }; + }; + "chokidar-2.1.8" = { + name = "chokidar"; + packageName = "chokidar"; + version = "2.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"; + sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; + }; + }; + "chownr-1.1.3" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz"; + sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="; + }; + }; + "chrome-trace-event-1.0.2" = { + name = "chrome-trace-event"; + packageName = "chrome-trace-event"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; + sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; + }; + }; + "ci-info-2.0.0" = { + name = "ci-info"; + packageName = "ci-info"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + }; + "cipher-base-1.0.4" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; + }; + }; + "class-utils-0.3.6" = { + name = "class-utils"; + packageName = "class-utils"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; + sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; + }; + }; + "clean-css-4.2.1" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; + sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; + }; + }; + "clean-stack-1.3.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; + sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; + }; + }; + "cli-cursor-2.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + }; + "cli-spinners-2.2.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz"; + sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ=="; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "cliui-4.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz"; + sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "clone-1.0.4" = { + name = "clone"; + packageName = "clone"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + }; + "clone-response-1.0.2" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "co-body-5.2.0" = { + name = "co-body"; + packageName = "co-body"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz"; + sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "collection-visit-1.0.0" = { + name = "collection-visit"; + packageName = "collection-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "command-line-args-5.1.1" = { + name = "command-line-args"; + packageName = "command-line-args"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz"; + sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg=="; + }; + }; + "commander-2.20.1" = { + name = "commander"; + packageName = "commander"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz"; + sha512 = "cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg=="; + }; + }; + "commondir-1.0.1" = { + name = "commondir"; + packageName = "commondir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + }; + "component-emitter-1.3.0" = { + name = "component-emitter"; + packageName = "component-emitter"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; + sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + }; + }; + "compressible-2.0.17" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz"; + sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="; + }; + }; + "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"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "condense-newlines-0.2.1" = { + name = "condense-newlines"; + packageName = "condense-newlines"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz"; + sha1 = "3de985553139475d32502c83b02f60684d24c55f"; + }; + }; + "config-chain-1.1.12" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; + sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + }; + }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; + "constantinople-3.1.2" = { + name = "constantinople"; + packageName = "constantinople"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz"; + sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw=="; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "convert-source-map-1.6.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz"; + sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "cookies-0.7.3" = { + name = "cookies"; + packageName = "cookies"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz"; + sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A=="; + }; + }; + "copy-concurrently-1.0.5" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A=="; + }; + }; + "copy-descriptor-0.1.1" = { + name = "copy-descriptor"; + packageName = "copy-descriptor"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + }; + "copy-webpack-plugin-4.6.0" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz"; + sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA=="; + }; + }; + "core-js-2.6.9" = { + name = "core-js"; + packageName = "core-js"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz"; + sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A=="; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "create-ecdh-4.0.3" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz"; + sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw=="; + }; + }; + "create-hash-1.2.0" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; + sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; + }; + }; + "create-hmac-1.1.7" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; + sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + }; + }; + "cron-1.7.2" = { + name = "cron"; + packageName = "cron"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; + }; + }; + "cross-spawn-6.0.5" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "6.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; + }; + }; + "crypto-browserify-3.12.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; + }; + }; + "cssom-0.3.8" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; + }; + }; + "cssstyle-1.4.0" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz"; + sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; + }; + }; + "cyclist-1.0.1" = { + name = "cyclist"; + packageName = "cyclist"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "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-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "decode-uri-component-0.2.0" = { + name = "decode-uri-component"; + packageName = "decode-uri-component"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + }; + "decompress-response-3.3.0" = { + name = "decompress-response"; + packageName = "decompress-response"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "default-gateway-4.2.0" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz"; + sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; + }; + }; + "defaults-1.0.3" = { + name = "defaults"; + packageName = "defaults"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + }; + "define-properties-1.1.3" = { + name = "define-properties"; + packageName = "define-properties"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + }; + "define-property-0.2.5" = { + name = "define-property"; + packageName = "define-property"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + }; + "define-property-1.0.0" = { + name = "define-property"; + packageName = "define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + }; + "define-property-2.0.2" = { + name = "define-property"; + packageName = "define-property"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; + sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; + }; + }; + "del-4.1.1" = { + name = "del"; + packageName = "del"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz"; + sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-file-1.0.0" = { + name = "detect-file"; + packageName = "detect-file"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + }; + "detect-indent-4.0.0" = { + name = "detect-indent"; + packageName = "detect-indent"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; + sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; + }; + }; + "detect-newline-2.1.0" = { + name = "detect-newline"; + packageName = "detect-newline"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + }; + "detect-node-2.0.4" = { + name = "detect-node"; + packageName = "detect-node"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; + sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + }; + }; + "diff-sequences-24.9.0" = { + name = "diff-sequences"; + packageName = "diff-sequences"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz"; + sha512 = "Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew=="; + }; + }; + "diffie-hellman-5.0.3" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; + sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; + }; + }; + "dir-glob-2.2.2" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz"; + sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw=="; + }; + }; + "dns-equal-1.0.0" = { + name = "dns-equal"; + packageName = "dns-equal"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + }; + "dns-packet-1.3.1" = { + name = "dns-packet"; + packageName = "dns-packet"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; + sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + }; + }; + "dns-txt-2.0.2" = { + name = "dns-txt"; + packageName = "dns-txt"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + }; + "doctypes-1.1.0" = { + name = "doctypes"; + packageName = "doctypes"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; + sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; + }; + }; + "domain-browser-1.2.0" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz"; + sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="; + }; + }; + "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=="; + }; + }; + "duplexer-0.1.1" = { + name = "duplexer"; + packageName = "duplexer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "duplexify-3.7.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "editorconfig-0.15.3" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; + sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "ejs-2.7.1" = { + name = "ejs"; + packageName = "ejs"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz"; + sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; + }; + }; + "electron-to-chromium-1.3.275" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.3.275"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.275.tgz"; + sha512 = "/YWtW/VapMnuYA1lNOaa1F4GhR1LBf+CUTp60lzDPEEh0XOzyOAyULyYZVF9vziZ3qSbTqCwmKwsyRXp66STbw=="; + }; + }; + "elliptic-6.5.1" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz"; + sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg=="; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emojis-list-2.1.0" = { + name = "emojis-list"; + packageName = "emojis-list"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "enhanced-resolve-4.1.0" = { + name = "enhanced-resolve"; + packageName = "enhanced-resolve"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; + sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng=="; + }; + }; + "errno-0.1.7" = { + name = "errno"; + packageName = "errno"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz"; + sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg=="; + }; + }; + "error-ex-1.3.2" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + }; + "error-inject-1.0.0" = { + name = "error-inject"; + packageName = "error-inject"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz"; + sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37"; + }; + }; + "es-abstract-1.15.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz"; + sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ=="; + }; + }; + "es-to-primitive-1.2.0" = { + name = "es-to-primitive"; + packageName = "es-to-primitive"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + }; + }; + "es5-ext-0.10.51" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.51"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz"; + sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-promise-4.2.8" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; + sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; + }; + }; + "es6-symbol-3.1.2" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz"; + sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escodegen-1.12.0" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz"; + sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg=="; + }; + }; + "eslint-scope-4.0.3" = { + name = "eslint-scope"; + packageName = "eslint-scope"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg=="; + }; + }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "esrecurse-4.2.1" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; + sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + }; + }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "eventemitter3-4.0.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="; + }; + }; + "events-3.0.0" = { + name = "events"; + packageName = "events"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz"; + sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="; + }; + }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; + "evp_bytestokey-1.0.3" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + }; + }; + "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-1.0.0" = { + name = "execa"; + packageName = "execa"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + }; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + }; + "expand-brackets-2.1.4" = { + name = "expand-brackets"; + packageName = "expand-brackets"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + }; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + }; + "expect-24.9.0" = { + name = "expect"; + packageName = "expect"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz"; + sha512 = "wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q=="; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + }; + "extend-shallow-3.0.2" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + }; + "extglob-2.0.4" = { + name = "extglob"; + packageName = "extglob"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; + sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-2.0.1" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + }; + "fast-json-stable-stringify-2.0.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; + "faye-websocket-0.11.3" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + }; + }; + "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"; + }; + }; + "figgy-pudding-3.5.1" = { + name = "figgy-pudding"; + packageName = "figgy-pudding"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; + sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w=="; + }; + }; + "filesize-3.6.1" = { + name = "filesize"; + packageName = "filesize"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz"; + sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; + }; + }; + "fill-range-4.0.0" = { + name = "fill-range"; + packageName = "fill-range"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-cache-dir-1.0.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; + sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; + }; + }; + "find-cache-dir-2.1.0" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; + }; + }; + "find-replace-3.0.0" = { + name = "find-replace"; + packageName = "find-replace"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz"; + sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ=="; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "findup-sync-3.0.0" = { + name = "findup-sync"; + packageName = "findup-sync"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"; + sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg=="; + }; + }; + "flush-write-stream-1.1.1" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; + }; + }; + "follow-redirects-1.5.10" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + }; + }; + "for-in-1.0.2" = { + name = "for-in"; + packageName = "for-in"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "form-data-2.5.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; + }; + }; + "formidable-1.2.1" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz"; + sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "fragment-cache-0.2.1" = { + name = "fragment-cache"; + packageName = "fragment-cache"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "from2-2.3.0" = { + name = "from2"; + packageName = "from2"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + }; + "fs-write-stream-atomic-1.0.10" = { + name = "fs-write-stream-atomic"; + packageName = "fs-write-stream-atomic"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "fsevents-1.2.9" = { + name = "fsevents"; + packageName = "fsevents"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; + sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-paths-0.0.7" = { + name = "get-paths"; + packageName = "get-paths"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz"; + sha512 = "0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA=="; + }; + }; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + }; + "get-stream-4.1.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + }; + "get-value-2.0.6" = { + name = "get-value"; + packageName = "get-value"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "global-modules-1.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"; + sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="; + }; + }; + "global-modules-2.0.0" = { + name = "global-modules"; + packageName = "global-modules"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz"; + sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; + }; + }; + "global-prefix-1.0.2" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + }; + "global-prefix-3.0.0" = { + name = "global-prefix"; + packageName = "global-prefix"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz"; + sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; + }; + }; + "globals-11.12.0" = { + name = "globals"; + packageName = "globals"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; + }; + }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; + }; + }; + "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-7.1.1" = { + name = "globby"; + packageName = "globby"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + }; + "got-8.3.2" = { + name = "got"; + packageName = "got"; + version = "8.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; + }; + }; + "graceful-fs-4.2.2" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz"; + sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="; + }; + }; + "growly-1.3.0" = { + name = "growly"; + packageName = "growly"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + }; + "gzip-size-5.1.1" = { + name = "gzip-size"; + packageName = "gzip-size"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz"; + sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA=="; + }; + }; + "handle-thing-2.0.0" = { + name = "handle-thing"; + packageName = "handle-thing"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz"; + sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ=="; + }; + }; + "handlebars-4.4.2" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.4.2.tgz"; + sha512 = "cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-symbol-support-x-1.4.2" = { + name = "has-symbol-support-x"; + packageName = "has-symbol-support-x"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz"; + sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; + }; + }; + "has-symbols-1.0.0" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + }; + "has-to-string-tag-x-1.4.1" = { + name = "has-to-string-tag-x"; + packageName = "has-to-string-tag-x"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz"; + sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; + }; + }; + "has-value-0.3.1" = { + name = "has-value"; + packageName = "has-value"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + }; + "has-value-1.0.0" = { + name = "has-value"; + packageName = "has-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + }; + "has-values-0.1.4" = { + name = "has-values"; + packageName = "has-values"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + }; + "has-values-1.0.0" = { + name = "has-values"; + packageName = "has-values"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + }; + "hash-base-3.0.4" = { + name = "hash-base"; + packageName = "hash-base"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + }; + "hash.js-1.1.7" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; + sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; + }; + }; + "hmac-drbg-1.0.1" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + }; + "home-or-tmp-2.0.0" = { + name = "home-or-tmp"; + packageName = "home-or-tmp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; + sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; + }; + }; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; + }; + }; + "hoopy-0.1.4" = { + name = "hoopy"; + packageName = "hoopy"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz"; + sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="; + }; + }; + "hosted-git-info-2.8.4" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; + sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ=="; + }; + }; + "hpack.js-2.1.6" = { + name = "hpack.js"; + packageName = "hpack.js"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + }; + "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"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; + sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + }; + }; + "http-assert-1.4.1" = { + name = "http-assert"; + packageName = "http-assert"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz"; + sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw=="; + }; + }; + "http-cache-semantics-3.8.1" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "3.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; + }; + }; + "http-deceiver-1.2.7" = { + name = "http-deceiver"; + packageName = "http-deceiver"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + }; + "http-errors-1.6.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; + "http-parser-js-0.4.10" = { + name = "http-parser-js"; + packageName = "http-parser-js"; + version = "0.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz"; + sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + }; + }; + "http-proxy-1.18.0" = { + name = "http-proxy"; + packageName = "http-proxy"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz"; + sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ=="; + }; + }; + "http-proxy-middleware-0.19.1" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; + sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "https-browserify-1.0.0" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ieee754-1.1.13" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + }; + }; + "iferr-0.1.5" = { + name = "iferr"; + packageName = "iferr"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + }; + "ignore-3.3.10" = { + name = "ignore"; + packageName = "ignore"; + version = "3.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz"; + sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; + }; + }; + "import-local-2.0.0" = { + name = "import-local"; + packageName = "import-local"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz"; + sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ=="; + }; + }; + "imurmurhash-0.1.4" = { + name = "imurmurhash"; + packageName = "imurmurhash"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + }; + "indent-string-3.2.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + }; + "infer-owner-1.0.4" = { + name = "infer-owner"; + packageName = "infer-owner"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; + sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; + }; + }; + "inflation-2.0.0" = { + name = "inflation"; + packageName = "inflation"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"; + sha1 = "8b417e47c28f925a45133d914ca1fd389107f30f"; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "internal-ip-4.3.0" = { + name = "internal-ip"; + packageName = "internal-ip"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz"; + sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; + }; + }; + "interpret-1.2.0" = { + name = "interpret"; + packageName = "interpret"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; + sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + }; + }; + "into-stream-3.1.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + }; + }; + "invariant-2.2.4" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"; + sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; + }; + }; + "invert-kv-2.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz"; + sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="; + }; + }; + "ip-1.1.5" = { + name = "ip"; + packageName = "ip"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "ipaddr.js-1.9.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; + sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="; + }; + }; + "is-absolute-url-3.0.3" = { + name = "is-absolute-url"; + packageName = "is-absolute-url"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; + }; + }; + "is-accessor-descriptor-0.1.6" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + }; + "is-accessor-descriptor-1.0.0" = { + name = "is-accessor-descriptor"; + packageName = "is-accessor-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-binary-path-1.0.1" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-buffer-2.0.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; + sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; + }; + }; + "is-callable-1.1.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; + sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + }; + }; + "is-ci-2.0.0" = { + name = "is-ci"; + packageName = "is-ci"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + }; + "is-data-descriptor-0.1.4" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + }; + "is-data-descriptor-1.0.0" = { + name = "is-data-descriptor"; + packageName = "is-data-descriptor"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; + }; + }; + "is-date-object-1.0.1" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + }; + "is-descriptor-0.1.6" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + }; + }; + "is-descriptor-1.0.2" = { + name = "is-descriptor"; + packageName = "is-descriptor"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + }; + }; + "is-expression-3.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz"; + sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; + }; + }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + }; + "is-extendable-1.0.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; + sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-generator-fn-2.1.0" = { + name = "is-generator-fn"; + packageName = "is-generator-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; + sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; + }; + }; + "is-generator-function-1.0.7" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz"; + sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw=="; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-number-3.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + }; + "is-object-1.0.1" = { + name = "is-object"; + packageName = "is-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + }; + "is-path-cwd-2.2.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; + }; + }; + "is-path-in-cwd-2.1.0" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ=="; + }; + }; + "is-path-inside-2.1.0" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg=="; + }; + }; + "is-plain-obj-1.1.0" = { + name = "is-plain-obj"; + packageName = "is-plain-obj"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + }; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + }; + }; + "is-promise-2.1.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + }; + "is-regex-1.0.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + }; + "is-retry-allowed-1.2.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "is-symbol-1.0.2" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; + sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-whitespace-0.3.0" = { + name = "is-whitespace"; + packageName = "is-whitespace"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz"; + sha1 = "1639ecb1be036aec69a54cbb401cfbed7114ab7f"; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-wsl-1.1.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "isobject-2.1.0" = { + name = "isobject"; + packageName = "isobject"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "isomorphic-ws-4.0.1" = { + name = "isomorphic-ws"; + packageName = "isomorphic-ws"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz"; + sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "istanbul-lib-coverage-2.0.5" = { + name = "istanbul-lib-coverage"; + packageName = "istanbul-lib-coverage"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; + sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA=="; + }; + }; + "istanbul-lib-instrument-3.3.0" = { + name = "istanbul-lib-instrument"; + packageName = "istanbul-lib-instrument"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; + sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA=="; + }; + }; + "istanbul-lib-report-2.0.8" = { + name = "istanbul-lib-report"; + packageName = "istanbul-lib-report"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; + sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ=="; + }; + }; + "istanbul-lib-source-maps-3.0.6" = { + name = "istanbul-lib-source-maps"; + packageName = "istanbul-lib-source-maps"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; + sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw=="; + }; + }; + "istanbul-reports-2.2.6" = { + name = "istanbul-reports"; + packageName = "istanbul-reports"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; + sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA=="; + }; + }; + "isurl-1.0.0" = { + name = "isurl"; + packageName = "isurl"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz"; + sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; + }; + }; + "jest-24.9.0" = { + name = "jest"; + packageName = "jest"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz"; + sha512 = "YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw=="; + }; + }; + "jest-changed-files-24.9.0" = { + name = "jest-changed-files"; + packageName = "jest-changed-files"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz"; + sha512 = "6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg=="; + }; + }; + "jest-cli-24.9.0" = { + name = "jest-cli"; + packageName = "jest-cli"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz"; + sha512 = "+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg=="; + }; + }; + "jest-config-24.9.0" = { + name = "jest-config"; + packageName = "jest-config"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz"; + sha512 = "RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ=="; + }; + }; + "jest-diff-24.9.0" = { + name = "jest-diff"; + packageName = "jest-diff"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz"; + sha512 = "qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ=="; + }; + }; + "jest-docblock-24.9.0" = { + name = "jest-docblock"; + packageName = "jest-docblock"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz"; + sha512 = "F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA=="; + }; + }; + "jest-each-24.9.0" = { + name = "jest-each"; + packageName = "jest-each"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz"; + sha512 = "ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog=="; + }; + }; + "jest-environment-jsdom-24.9.0" = { + name = "jest-environment-jsdom"; + packageName = "jest-environment-jsdom"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz"; + sha512 = "Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA=="; + }; + }; + "jest-environment-node-24.9.0" = { + name = "jest-environment-node"; + packageName = "jest-environment-node"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz"; + sha512 = "6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA=="; + }; + }; + "jest-get-type-24.9.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; + sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; + }; + }; + "jest-haste-map-24.9.0" = { + name = "jest-haste-map"; + packageName = "jest-haste-map"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz"; + sha512 = "kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ=="; + }; + }; + "jest-jasmine2-24.9.0" = { + name = "jest-jasmine2"; + packageName = "jest-jasmine2"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz"; + sha512 = "Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw=="; + }; + }; + "jest-leak-detector-24.9.0" = { + name = "jest-leak-detector"; + packageName = "jest-leak-detector"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz"; + sha512 = "tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA=="; + }; + }; + "jest-matcher-utils-24.9.0" = { + name = "jest-matcher-utils"; + packageName = "jest-matcher-utils"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz"; + sha512 = "OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA=="; + }; + }; + "jest-message-util-24.9.0" = { + name = "jest-message-util"; + packageName = "jest-message-util"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz"; + sha512 = "oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw=="; + }; + }; + "jest-mock-24.9.0" = { + name = "jest-mock"; + packageName = "jest-mock"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz"; + sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w=="; + }; + }; + "jest-pnp-resolver-1.2.1" = { + name = "jest-pnp-resolver"; + packageName = "jest-pnp-resolver"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; + sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ=="; + }; + }; + "jest-regex-util-24.9.0" = { + name = "jest-regex-util"; + packageName = "jest-regex-util"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz"; + sha512 = "05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA=="; + }; + }; + "jest-resolve-24.9.0" = { + name = "jest-resolve"; + packageName = "jest-resolve"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz"; + sha512 = "TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ=="; + }; + }; + "jest-resolve-dependencies-24.9.0" = { + name = "jest-resolve-dependencies"; + packageName = "jest-resolve-dependencies"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz"; + sha512 = "Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g=="; + }; + }; + "jest-runner-24.9.0" = { + name = "jest-runner"; + packageName = "jest-runner"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz"; + sha512 = "KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg=="; + }; + }; + "jest-runtime-24.9.0" = { + name = "jest-runtime"; + packageName = "jest-runtime"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz"; + sha512 = "8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw=="; + }; + }; + "jest-serializer-24.9.0" = { + name = "jest-serializer"; + packageName = "jest-serializer"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz"; + sha512 = "DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ=="; + }; + }; + "jest-snapshot-24.9.0" = { + name = "jest-snapshot"; + packageName = "jest-snapshot"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz"; + sha512 = "uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew=="; + }; + }; + "jest-util-24.9.0" = { + name = "jest-util"; + packageName = "jest-util"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz"; + sha512 = "x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg=="; + }; + }; + "jest-validate-24.9.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; + sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; + }; + }; + "jest-watcher-24.9.0" = { + name = "jest-watcher"; + packageName = "jest-watcher"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz"; + sha512 = "+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw=="; + }; + }; + "jest-worker-24.9.0" = { + name = "jest-worker"; + packageName = "jest-worker"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz"; + sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw=="; + }; + }; + "js-beautify-1.10.2" = { + name = "js-beautify"; + packageName = "js-beautify"; + version = "1.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz"; + sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ=="; + }; + }; + "js-stringify-1.0.2" = { + name = "js-stringify"; + packageName = "js-stringify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; + sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "js-tokens-4.0.0" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "jsdom-11.12.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "11.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz"; + sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; + }; + }; + "jsesc-0.5.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + }; + "jsesc-1.3.0" = { + name = "jsesc"; + packageName = "jsesc"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; + sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; + }; + }; + "jsesc-2.5.2" = { + name = "jsesc"; + packageName = "jsesc"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; + }; + }; + "json-buffer-3.0.0" = { + name = "json-buffer"; + packageName = "json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + }; + "json-parse-better-errors-1.0.2" = { + name = "json-parse-better-errors"; + packageName = "json-parse-better-errors"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "json3-3.3.3" = { + name = "json3"; + packageName = "json3"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; + sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; + }; + }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; + "json5-1.0.1" = { + name = "json5"; + packageName = "json5"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; + sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; + }; + }; + "json5-2.1.1" = { + name = "json5"; + packageName = "json5"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz"; + sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ=="; + }; + }; + "jsonpath-plus-0.19.0" = { + name = "jsonpath-plus"; + packageName = "jsonpath-plus"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz"; + sha512 = "GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg=="; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "jstransformer-1.0.0" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; + sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + }; + }; + "keygrip-1.0.3" = { + name = "keygrip"; + packageName = "keygrip"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz"; + sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g=="; + }; + }; + "keyv-3.0.0" = { + name = "keyv"; + packageName = "keyv"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; + sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; + }; + }; + "killable-1.0.1" = { + name = "killable"; + packageName = "killable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz"; + sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "kind-of-4.0.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + }; + "kind-of-5.1.0" = { + name = "kind-of"; + packageName = "kind-of"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; + sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; + }; + }; + "kind-of-6.0.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz"; + sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; + }; + }; + "kleur-3.0.3" = { + name = "kleur"; + packageName = "kleur"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; + }; + }; + "koa-2.8.2" = { + name = "koa"; + packageName = "koa"; + version = "2.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/koa/-/koa-2.8.2.tgz"; + sha512 = "q1uZOgpl3wjr5FS/tjbABJ8lA5+NeKa9eq7QyBP5xxgOBwJN4iBrMEgO3LroE51lrIw3BsO0WZZ0Yi6giSiMDw=="; + }; + }; + "koa-body-4.1.1" = { + name = "koa-body"; + packageName = "koa-body"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.1.tgz"; + sha512 = "rLb/KVD8qplEcK8Qsu6F4Xw+uHkmx3MWogDVmMX07DpjXizhw3pOEp1ja1MqqAcl0ei75AsrbGVDlySmsUrreA=="; + }; + }; + "koa-compose-3.2.1" = { + name = "koa-compose"; + packageName = "koa-compose"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz"; + sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"; + }; + }; + "koa-compose-4.1.0" = { + name = "koa-compose"; + packageName = "koa-compose"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz"; + sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw=="; + }; + }; + "koa-convert-1.2.0" = { + name = "koa-convert"; + packageName = "koa-convert"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz"; + sha1 = "da40875df49de0539098d1700b50820cebcd21d0"; + }; + }; + "koa-is-json-1.0.0" = { + name = "koa-is-json"; + packageName = "koa-is-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; + sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14"; + }; + }; + "koa-router-7.4.0" = { + name = "koa-router"; + packageName = "koa-router"; + version = "7.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-router/-/koa-router-7.4.0.tgz"; + sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g=="; + }; + }; + "koa-send-5.0.0" = { + name = "koa-send"; + packageName = "koa-send"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz"; + sha512 = "90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ=="; + }; + }; + "koa-static-5.0.0" = { + name = "koa-static"; + packageName = "koa-static"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz"; + sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ=="; + }; + }; + "koa-views-6.2.1" = { + name = "koa-views"; + packageName = "koa-views"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.1.tgz"; + sha512 = "wU3tw48KuskaJg0x1JZmC73UWGgVmh6B54HuHDzTrkavig+dBI0NbFeGiWsaOCZREQkaTfIVXSPSByDant71ew=="; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "lcid-2.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz"; + sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA=="; + }; + }; + "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=="; + }; + }; + "leven-3.1.0" = { + name = "leven"; + packageName = "leven"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "load-json-file-4.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + }; + "loader-runner-2.4.0" = { + name = "loader-runner"; + packageName = "loader-runner"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz"; + sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="; + }; + }; + "loader-utils-1.2.3" = { + name = "loader-utils"; + packageName = "loader-utils"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; + sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "lodash-4.17.15" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.15"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; + sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + }; + }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.memoize-4.1.2" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + }; + "lodash.sortby-4.7.0" = { + name = "lodash.sortby"; + packageName = "lodash.sortby"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + }; + "log-symbols-2.2.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; + sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + }; + }; + "loglevel-1.6.4" = { + name = "loglevel"; + packageName = "loglevel"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz"; + sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="; + }; + }; + "loglevelnext-1.0.5" = { + name = "loglevelnext"; + packageName = "loglevelnext"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz"; + sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A=="; + }; + }; + "long-4.0.0" = { + name = "long"; + packageName = "long"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "loose-envify-1.4.0" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; + }; + }; + "lowercase-keys-1.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + }; + "lowercase-keys-1.0.1" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "make-dir-1.3.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz"; + 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"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz"; + sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="; + }; + }; + "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"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz"; + sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA=="; + }; + }; + "map-age-cleaner-0.1.3" = { + name = "map-age-cleaner"; + packageName = "map-age-cleaner"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w=="; + }; + }; + "map-cache-0.2.2" = { + name = "map-cache"; + packageName = "map-cache"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + }; + "map-visit-1.0.0" = { + name = "map-visit"; + packageName = "map-visit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + }; + "md5.js-1.3.5" = { + name = "md5.js"; + packageName = "md5.js"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; + sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "mem-4.3.0" = { + name = "mem"; + packageName = "mem"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz"; + sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w=="; + }; + }; + "memory-fs-0.4.1" = { + name = "memory-fs"; + packageName = "memory-fs"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "merge-stream-2.0.0" = { + name = "merge-stream"; + packageName = "merge-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "micromatch-3.1.10" = { + name = "micromatch"; + packageName = "micromatch"; + version = "3.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; + sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; + }; + }; + "miller-rabin-4.0.1" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-2.4.4" = { + name = "mime"; + packageName = "mime"; + version = "2.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; + sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; + }; + }; + "mime-db-1.40.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.40.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; + sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + }; + }; + "mime-types-2.1.24" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.24"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; + sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + }; + }; + "mimic-fn-1.2.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "mimic-response-1.0.1" = { + name = "mimic-response"; + packageName = "mimic-response"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + }; + "minimalistic-assert-1.0.1" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "mississippi-2.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz"; + sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw=="; + }; + }; + "mississippi-3.0.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz"; + sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA=="; + }; + }; + "mixin-deep-1.3.2" = { + name = "mixin-deep"; + packageName = "mixin-deep"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "moment-2.24.0" = { + name = "moment"; + packageName = "moment"; + version = "2.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + }; + }; + "moment-timezone-0.5.26" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.26"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz"; + sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g=="; + }; + }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "multicast-dns-6.2.3" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g=="; + }; + }; + "multicast-dns-service-types-1.1.0" = { + name = "multicast-dns-service-types"; + packageName = "multicast-dns-service-types"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "nan-2.14.0" = { + name = "nan"; + packageName = "nan"; + version = "2.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; + sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + }; + }; + "nanomatch-1.2.13" = { + name = "nanomatch"; + packageName = "nanomatch"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; + sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; + }; + }; + "natural-compare-1.4.0" = { + name = "natural-compare"; + packageName = "natural-compare"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "neo-async-2.6.1" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; + sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + }; + }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; + "nice-try-1.0.5" = { + name = "nice-try"; + packageName = "nice-try"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + }; + "node-forge-0.8.5" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz"; + sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q=="; + }; + }; + "node-forge-0.9.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; + sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; + }; + }; + "node-int64-0.4.0" = { + name = "node-int64"; + packageName = "node-int64"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + }; + "node-jose-1.1.3" = { + name = "node-jose"; + packageName = "node-jose"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.3.tgz"; + sha512 = "kupfi4uGWhRjnOmtie2T64cLge5a1TZyalEa8uWWWBgtKBcu41A4IGKpI9twZAxRnmviamEUQRK7LSyfFb2w8A=="; + }; + }; + "node-libs-browser-2.2.1" = { + name = "node-libs-browser"; + packageName = "node-libs-browser"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; + sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; + }; + }; + "node-modules-regexp-1.0.0" = { + name = "node-modules-regexp"; + packageName = "node-modules-regexp"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + }; + "node-notifier-5.4.3" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "5.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz"; + sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q=="; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "normalize-package-data-2.5.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + }; + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "normalize-url-2.0.1" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; + sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "nwsapi-2.1.4" = { + name = "nwsapi"; + packageName = "nwsapi"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz"; + sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "object-copy-0.1.0" = { + name = "object-copy"; + packageName = "object-copy"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + }; + "object-hash-1.3.1" = { + name = "object-hash"; + packageName = "object-hash"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz"; + sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; + }; + }; + "object-inspect-1.6.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; + sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + }; + }; + "object-keys-1.1.1" = { + name = "object-keys"; + packageName = "object-keys"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + }; + "object-visit-1.0.1" = { + name = "object-visit"; + packageName = "object-visit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + }; + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.getownpropertydescriptors-2.0.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + }; + "object.pick-1.3.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + }; + "obuf-1.1.2" = { + name = "obuf"; + packageName = "obuf"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"; + sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="; + }; + }; + "oidc-token-hash-3.0.2" = { + name = "oidc-token-hash"; + packageName = "oidc-token-hash"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz"; + sha512 = "dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA=="; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-2.0.1" = { + name = "onetime"; + packageName = "onetime"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + }; + "only-0.0.2" = { + name = "only"; + packageName = "only"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz"; + sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4"; + }; + }; + "opener-1.5.1" = { + name = "opener"; + packageName = "opener"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; + sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; + }; + }; + "openid-client-2.5.0" = { + name = "openid-client"; + packageName = "openid-client"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz"; + sha512 = "t3hFD7xEoW1U25RyBcRFaL19fGGs6hNVTysq9pgmiltH0IVUPzH/bQV9w24pM5Q7MunnGv2/5XjIru6BQcWdxg=="; + }; + }; + "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=="; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "optionator-0.8.2" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + }; + "ora-3.4.0" = { + name = "ora"; + packageName = "ora"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz"; + sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; + }; + }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; + "os-browserify-0.3.0" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-locale-3.1.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz"; + sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "p-any-1.1.0" = { + name = "p-any"; + packageName = "p-any"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; + sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g=="; + }; + }; + "p-cancelable-0.4.1" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; + }; + }; + "p-defer-1.0.0" = { + name = "p-defer"; + packageName = "p-defer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + }; + "p-each-series-1.0.0" = { + name = "p-each-series"; + packageName = "p-each-series"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz"; + sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-is-promise-1.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; + }; + }; + "p-is-promise-2.1.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; + }; + }; + "p-limit-1.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; + sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; + }; + }; + "p-limit-2.2.1" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; + sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-reduce-1.0.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + }; + "p-retry-3.0.1" = { + name = "p-retry"; + packageName = "p-retry"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz"; + sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w=="; + }; + }; + "p-some-2.0.1" = { + name = "p-some"; + packageName = "p-some"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; + sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; + }; + }; + "p-timeout-2.0.1" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; + sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; + }; + }; + "p-try-1.0.0" = { + name = "p-try"; + packageName = "p-try"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "pako-1.0.10" = { + name = "pako"; + packageName = "pako"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz"; + sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; + }; + }; + "parallel-transform-1.2.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg=="; + }; + }; + "parse-asn1-5.1.5" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + }; + }; + "parse-json-4.0.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; + "parse5-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=="; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pascalcase-0.1.1" = { + name = "pascalcase"; + packageName = "pascalcase"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + }; + "path-browserify-0.0.1" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"; + sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-is-inside-1.0.2" = { + name = "path-is-inside"; + packageName = "path-is-inside"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "path-parse-1.0.6" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; + sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "path-type-3.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz"; + sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="; + }; + }; + "pbkdf2-3.0.17" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz"; + sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "pify-3.0.0" = { + name = "pify"; + packageName = "pify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + }; + "pify-4.0.1" = { + name = "pify"; + packageName = "pify"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; + sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pirates-4.0.1" = { + name = "pirates"; + packageName = "pirates"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz"; + sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; + }; + }; + "pkg-dir-2.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + }; + "pkg-dir-3.0.0" = { + name = "pkg-dir"; + packageName = "pkg-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="; + }; + }; + "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=="; + }; + }; + "portfinder-1.0.24" = { + name = "portfinder"; + packageName = "portfinder"; + version = "1.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz"; + sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg=="; + }; + }; + "posix-character-classes-0.1.1" = { + name = "posix-character-classes"; + packageName = "posix-character-classes"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "prepend-http-2.0.0" = { + name = "prepend-http"; + packageName = "prepend-http"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + }; + "prettier-1.18.2" = { + name = "prettier"; + packageName = "prettier"; + version = "1.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz"; + sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw=="; + }; + }; + "pretty-2.0.0" = { + name = "pretty"; + packageName = "pretty"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz"; + sha1 = "adbc7960b7bbfe289a557dc5f737619a220d06a5"; + }; + }; + "pretty-format-24.9.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; + sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; + }; + }; + "private-0.1.8" = { + name = "private"; + packageName = "private"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz"; + sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; + }; + }; + "promise-inflight-1.0.1" = { + name = "promise-inflight"; + packageName = "promise-inflight"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + }; + "prompts-2.2.1" = { + name = "prompts"; + packageName = "prompts"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz"; + sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw=="; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "proxy-addr-2.0.5" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz"; + sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="; + }; + }; + "prr-1.0.1" = { + name = "prr"; + packageName = "prr"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.4.0" = { + name = "psl"; + packageName = "psl"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; + sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + }; + }; + "public-encrypt-4.0.3" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; + sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; + }; + }; + "pug-2.0.4" = { + name = "pug"; + packageName = "pug"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pug/-/pug-2.0.4.tgz"; + sha512 = "XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw=="; + }; + }; + "pug-attrs-2.0.4" = { + name = "pug-attrs"; + packageName = "pug-attrs"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.4.tgz"; + sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ=="; + }; + }; + "pug-code-gen-2.0.2" = { + name = "pug-code-gen"; + packageName = "pug-code-gen"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz"; + sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw=="; + }; + }; + "pug-error-1.3.3" = { + name = "pug-error"; + packageName = "pug-error"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.3.tgz"; + sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ=="; + }; + }; + "pug-filters-3.1.1" = { + name = "pug-filters"; + packageName = "pug-filters"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.1.tgz"; + sha512 = "lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg=="; + }; + }; + "pug-lexer-4.1.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.1.0.tgz"; + sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA=="; + }; + }; + "pug-linker-3.0.6" = { + name = "pug-linker"; + packageName = "pug-linker"; + version = "3.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.6.tgz"; + sha512 = "bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg=="; + }; + }; + "pug-load-2.0.12" = { + name = "pug-load"; + packageName = "pug-load"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.12.tgz"; + sha512 = "UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg=="; + }; + }; + "pug-parser-5.0.1" = { + name = "pug-parser"; + packageName = "pug-parser"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.1.tgz"; + sha512 = "nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA=="; + }; + }; + "pug-runtime-2.0.5" = { + name = "pug-runtime"; + packageName = "pug-runtime"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.5.tgz"; + sha512 = "P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw=="; + }; + }; + "pug-strip-comments-1.0.4" = { + name = "pug-strip-comments"; + packageName = "pug-strip-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz"; + sha512 = "i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw=="; + }; + }; + "pug-walk-1.1.8" = { + name = "pug-walk"; + packageName = "pug-walk"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.8.tgz"; + sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "pumpify-1.5.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "query-string-5.1.1" = { + name = "query-string"; + packageName = "query-string"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz"; + sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "querystringify-2.1.1" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; + sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + }; + }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; + "randomfill-1.0.4" = { + name = "randomfill"; + packageName = "randomfill"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; + sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "raw-body-2.4.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; + sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; + }; + }; + "react-is-16.10.2" = { + name = "react-is"; + packageName = "react-is"; + version = "16.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz"; + sha512 = "INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA=="; + }; + }; + "read-pkg-3.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + }; + "read-pkg-up-4.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "readable-stream-3.4.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz"; + sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ=="; + }; + }; + "readdirp-2.2.1" = { + name = "readdirp"; + packageName = "readdirp"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"; + sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; + }; + }; + "realpath-native-1.1.0" = { + name = "realpath-native"; + packageName = "realpath-native"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz"; + sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA=="; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + "regenerate-1.4.0" = { + name = "regenerate"; + packageName = "regenerate"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz"; + sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; + }; + }; + "regenerator-runtime-0.11.1" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; + sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; + }; + }; + "regenerator-transform-0.10.1" = { + name = "regenerator-transform"; + packageName = "regenerator-transform"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz"; + sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q=="; + }; + }; + "regex-not-1.0.2" = { + name = "regex-not"; + packageName = "regex-not"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; + sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; + }; + }; + "regexpu-core-2.0.0" = { + name = "regexpu-core"; + packageName = "regexpu-core"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"; + sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "repeat-element-1.1.3" = { + name = "repeat-element"; + packageName = "repeat-element"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; + sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "request-2.88.0" = { + name = "request"; + packageName = "request"; + version = "2.88.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; + sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; + }; + }; + "request-promise-core-1.1.2" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; + sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; + }; + }; + "request-promise-native-1.0.7" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; + sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "requires-port-1.0.0" = { + name = "requires-port"; + packageName = "requires-port"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "resolve-1.12.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; + sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + }; + }; + "resolve-cwd-2.0.0" = { + name = "resolve-cwd"; + packageName = "resolve-cwd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + }; + "resolve-dir-1.0.1" = { + name = "resolve-dir"; + packageName = "resolve-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + }; + "resolve-from-3.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + }; + "resolve-path-1.4.0" = { + name = "resolve-path"; + packageName = "resolve-path"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz"; + sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7"; + }; + }; + "resolve-url-0.2.1" = { + name = "resolve-url"; + packageName = "resolve-url"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + }; + "responselike-1.0.2" = { + name = "responselike"; + packageName = "responselike"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + }; + "restore-cursor-2.0.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "ripemd160-2.0.2" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; + sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; + }; + }; + "rsvp-4.8.5" = { + name = "rsvp"; + packageName = "rsvp"; + version = "4.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz"; + sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA=="; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; + "rxjs-6.5.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; + sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; + "safe-regex-1.1.0" = { + name = "safe-regex"; + packageName = "safe-regex"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "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=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "schema-utils-1.0.0" = { + name = "schema-utils"; + packageName = "schema-utils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz"; + sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; + }; + }; + "select-hose-2.0.0" = { + name = "select-hose"; + packageName = "select-hose"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + }; + "selfsigned-1.10.7" = { + name = "selfsigned"; + packageName = "selfsigned"; + version = "1.10.7"; + src = fetchurl { + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; + sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serialize-javascript-1.9.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; + sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; + }; + }; + "serve-index-1.9.1" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "set-value-2.0.1" = { + name = "set-value"; + packageName = "set-value"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; + sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "setprototypeof-1.1.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + }; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + }; + "shelljs-0.8.3" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; + sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; + }; + }; + "shellwords-0.1.1" = { + name = "shellwords"; + packageName = "shellwords"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"; + sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="; + }; + }; + "sigmund-1.0.1" = { + name = "sigmund"; + packageName = "sigmund"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "simple-git-1.96.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.96.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz"; + sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ=="; + }; + }; + "sisteransi-1.0.3" = { + name = "sisteransi"; + packageName = "sisteransi"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz"; + sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="; + }; + }; + "slash-1.0.0" = { + name = "slash"; + packageName = "slash"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + }; + "slash-2.0.0" = { + name = "slash"; + packageName = "slash"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; + sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; + }; + }; + "snapdragon-0.8.2" = { + name = "snapdragon"; + packageName = "snapdragon"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; + sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; + }; + }; + "snapdragon-node-2.1.1" = { + name = "snapdragon-node"; + packageName = "snapdragon-node"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; + }; + }; + "snapdragon-util-3.0.1" = { + name = "snapdragon-util"; + packageName = "snapdragon-util"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; + }; + }; + "sockjs-0.3.19" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.19"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz"; + sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw=="; + }; + }; + "sockjs-client-1.4.0" = { + name = "sockjs-client"; + packageName = "sockjs-client"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; + }; + }; + "sort-keys-2.0.0" = { + name = "sort-keys"; + packageName = "sort-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + }; + "source-list-map-2.0.1" = { + name = "source-list-map"; + packageName = "source-list-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz"; + sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="; + }; + }; + "source-map-0.5.7" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + }; + "source-map-resolve-0.5.2" = { + name = "source-map-resolve"; + packageName = "source-map-resolve"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + }; + }; + "source-map-support-0.4.18" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.4.18"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; + sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; + }; + }; + "source-map-support-0.5.13" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"; + sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; + }; + }; + "source-map-url-0.4.0" = { + name = "source-map-url"; + packageName = "source-map-url"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + }; + "spdx-correct-3.1.0" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; + sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + }; + }; + "spdx-exceptions-2.2.0" = { + name = "spdx-exceptions"; + packageName = "spdx-exceptions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; + sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + }; + }; + "spdx-expression-parse-3.0.0" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; + sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + }; + }; + "spdx-license-ids-3.0.5" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + }; + }; + "spdy-4.0.1" = { + name = "spdy"; + packageName = "spdy"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz"; + sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA=="; + }; + }; + "spdy-transport-3.0.0" = { + name = "spdy-transport"; + packageName = "spdy-transport"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; + }; + }; + "split-string-3.1.0" = { + name = "split-string"; + packageName = "split-string"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; + sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "ssri-5.3.0" = { + name = "ssri"; + packageName = "ssri"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz"; + sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; + }; + }; + "ssri-6.0.1" = { + name = "ssri"; + packageName = "ssri"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; + sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; + }; + }; + "stack-utils-1.0.2" = { + name = "stack-utils"; + packageName = "stack-utils"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz"; + sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA=="; + }; + }; + "static-extend-0.1.2" = { + name = "static-extend"; + packageName = "static-extend"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; + "stream-browserify-2.0.2" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz"; + sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; + }; + }; + "stream-each-1.2.3" = { + name = "stream-each"; + packageName = "stream-each"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz"; + sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw=="; + }; + }; + "stream-http-2.8.3" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz"; + sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw=="; + }; + }; + "stream-shift-1.0.0" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + }; + }; + "strict-uri-encode-1.1.0" = { + name = "strict-uri-encode"; + packageName = "strict-uri-encode"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + }; + "string-length-2.0.0" = { + name = "string-length"; + packageName = "string-length"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz"; + sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string.prototype.trimleft-2.1.0" = { + name = "string.prototype.trimleft"; + packageName = "string.prototype.trimleft"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + }; + }; + "string.prototype.trimright-2.1.0" = { + name = "string.prototype.trimright"; + packageName = "string.prototype.trimright"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-6.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; + sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; + }; + }; + "symbol-tree-3.2.4" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; + }; + }; + "tapable-1.1.3" = { + name = "tapable"; + packageName = "tapable"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz"; + sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; + }; + }; + "terser-4.3.8" = { + name = "terser"; + packageName = "terser"; + version = "4.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz"; + sha512 = "otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ=="; + }; + }; + "terser-webpack-plugin-1.4.1" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; + sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg=="; + }; + }; + "test-exclude-5.2.3" = { + name = "test-exclude"; + packageName = "test-exclude"; + version = "5.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz"; + sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g=="; + }; + }; + "thenify-3.3.0" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz"; + sha1 = "e69e38a1babe969b0108207978b9f62b88604839"; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "throat-4.1.0" = { + name = "throat"; + packageName = "throat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz"; + sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a"; + }; + }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "thunky-1.0.3" = { + name = "thunky"; + packageName = "thunky"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz"; + sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow=="; + }; + }; + "timed-out-4.0.1" = { + name = "timed-out"; + packageName = "timed-out"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + }; + "timers-browserify-2.0.11" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; + sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + }; + }; + "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-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "to-fast-properties-1.0.3" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; + sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-object-path-0.3.0" = { + name = "to-object-path"; + packageName = "to-object-path"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + }; + "to-regex-3.0.2" = { + name = "to-regex"; + packageName = "to-regex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; + sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; + }; + }; + "to-regex-range-2.1.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "token-stream-0.0.1" = { + name = "token-stream"; + packageName = "token-stream"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz"; + sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a"; + }; + }; + "tough-cookie-2.4.3" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; + }; + }; + "tr46-1.0.1" = { + name = "tr46"; + packageName = "tr46"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + }; + "trim-right-1.0.1" = { + name = "trim-right"; + packageName = "trim-right"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + }; + "tryer-1.0.1" = { + name = "tryer"; + packageName = "tryer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz"; + sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; + }; + }; + "ts-jest-24.1.0" = { + name = "ts-jest"; + packageName = "ts-jest"; + version = "24.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.1.0.tgz"; + sha512 = "HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ=="; + }; + }; + "tslib-1.10.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; + sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; + }; + }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + }; + "typescript-3.6.3" = { + name = "typescript"; + packageName = "typescript"; + version = "3.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz"; + sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw=="; + }; + }; + "typical-4.0.0" = { + name = "typical"; + packageName = "typical"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz"; + sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw=="; + }; + }; + "uglify-js-2.8.29" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.8.29"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz"; + sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + }; + }; + "uglify-js-3.6.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; + sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "underscore-1.9.1" = { + name = "underscore"; + packageName = "underscore"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz"; + sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="; + }; + }; + "union-value-1.0.1" = { + name = "union-value"; + packageName = "union-value"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; + sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; + }; + }; + "unique-filename-1.1.1" = { + name = "unique-filename"; + packageName = "unique-filename"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; + }; + }; + "unique-slug-2.0.2" = { + name = "unique-slug"; + packageName = "unique-slug"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "unset-value-1.0.0" = { + name = "unset-value"; + packageName = "unset-value"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + }; + "upath-1.2.0" = { + name = "upath"; + packageName = "upath"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"; + sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; + }; + }; + "uri-js-4.2.2" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; + sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + }; + }; + "urijs-1.19.1" = { + name = "urijs"; + packageName = "urijs"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz"; + sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="; + }; + }; + "urix-0.1.0" = { + name = "urix"; + packageName = "urix"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "url-parse-1.4.7" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + }; + }; + "url-parse-lax-3.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + }; + "url-to-options-1.0.1" = { + name = "url-to-options"; + packageName = "url-to-options"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + }; + "use-3.1.1" = { + name = "use"; + packageName = "use"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; + sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "util-0.11.1" = { + name = "util"; + packageName = "util"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz"; + sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "util.promisify-1.0.0" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; + sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuid-3.3.3" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz"; + sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="; + }; + }; + "v8-compile-cache-2.0.3" = { + name = "v8-compile-cache"; + packageName = "v8-compile-cache"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; + sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="; + }; + }; + "validate-npm-package-license-3.0.4" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "vm-browserify-1.1.0" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz"; + sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="; + }; + }; + "void-elements-2.0.1" = { + name = "void-elements"; + packageName = "void-elements"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "watchpack-1.6.0" = { + name = "watchpack"; + packageName = "watchpack"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; + sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; + }; + }; + "wbuf-1.7.3" = { + name = "wbuf"; + packageName = "wbuf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"; + sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; + }; + }; + "wcwidth-1.0.1" = { + name = "wcwidth"; + packageName = "wcwidth"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + }; + "webidl-conversions-4.0.2" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + }; + }; + "webpack-4.41.0" = { + name = "webpack"; + packageName = "webpack"; + version = "4.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz"; + sha512 = "yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g=="; + }; + }; + "webpack-bundle-analyzer-3.5.2" = { + name = "webpack-bundle-analyzer"; + packageName = "webpack-bundle-analyzer"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz"; + sha512 = "g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A=="; + }; + }; + "webpack-cli-3.3.9" = { + name = "webpack-cli"; + packageName = "webpack-cli"; + version = "3.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz"; + sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A=="; + }; + }; + "webpack-dev-middleware-3.7.2" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw=="; + }; + }; + "webpack-dev-server-3.8.2" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz"; + sha512 = "0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ=="; + }; + }; + "webpack-log-1.2.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz"; + sha512 = "U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA=="; + }; + }; + "webpack-log-2.0.0" = { + name = "webpack-log"; + packageName = "webpack-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz"; + sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; + }; + }; + "webpack-sources-1.4.3" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"; + sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; + }; + }; + "websocket-1.0.30" = { + name = "websocket"; + packageName = "websocket"; + version = "1.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket/-/websocket-1.0.30.tgz"; + sha512 = "aO6klgaTdSMkhfl5VVJzD5fm+Srhh5jLYbS15+OiI1sN6h/RU/XW6WN9J1uVIpUKNmsTvT3Hs35XAFjn9NMfOw=="; + }; + }; + "websocket-driver-0.7.3" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz"; + sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg=="; + }; + }; + "websocket-extensions-0.1.3" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz"; + sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="; + }; + }; + "whatwg-encoding-1.0.5" = { + name = "whatwg-encoding"; + packageName = "whatwg-encoding"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; + }; + }; + "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 = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; + }; + }; + "whatwg-url-7.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "with-5.1.1" = { + name = "with"; + packageName = "with"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz"; + sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "worker-farm-1.7.0" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz"; + sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw=="; + }; + }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "write-file-atomic-2.4.1" = { + name = "write-file-atomic"; + packageName = "write-file-atomic"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz"; + sha512 = "TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg=="; + }; + }; + "ws-5.2.2" = { + name = "ws"; + packageName = "ws"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; + sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + }; + }; + "ws-6.2.1" = { + name = "ws"; + packageName = "ws"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; + sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + }; + }; + "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=="; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-4.0.0" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; + sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + }; + }; + "yaeti-0.0.6" = { + name = "yaeti"; + packageName = "yaeti"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz"; + sha1 = "f26f484d72684cf42bedfb76970aa1608fbf9577"; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + "yargs-12.0.5" = { + name = "yargs"; + packageName = "yargs"; + version = "12.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz"; + sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw=="; + }; + }; + "yargs-13.2.4" = { + name = "yargs"; + packageName = "yargs"; + version = "13.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz"; + sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg=="; + }; + }; + "yargs-13.3.0" = { + name = "yargs"; + packageName = "yargs"; + version = "13.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; + sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "yargs-parser-10.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; + }; + }; + "yargs-parser-11.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "11.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ=="; + }; + }; + "yargs-parser-13.1.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; + sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; + }; + }; + "ylru-1.2.1" = { + name = "ylru"; + packageName = "ylru"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz"; + sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="; + }; + }; + }; +in +{ + "spacegun-git+https://github.com/dvallin/spacegun.git#v0.3.3" = nodeEnv.buildNodePackage { + name = "spacegun"; + packageName = "spacegun"; + version = "0.3.3"; + src = fetchgit { + url = "https://github.com/dvallin/spacegun.git"; + rev = "d32d2df34362f6744e8cff34c2d2bf6ce8b4662a"; + sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931"; + }; + dependencies = [ + sources."@babel/code-frame-7.5.5" + (sources."@babel/core-7.6.2" // { + dependencies = [ + sources."debug-4.1.1" + sources."json5-2.1.1" + sources."minimist-1.2.0" + sources."ms-2.1.2" + sources."source-map-0.5.7" + ]; + }) + (sources."@babel/generator-7.6.2" // { + dependencies = [ + sources."jsesc-2.5.2" + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-function-name-7.1.0" + sources."@babel/helper-get-function-arity-7.0.0" + sources."@babel/helper-plugin-utils-7.0.0" + sources."@babel/helper-split-export-declaration-7.4.4" + sources."@babel/helpers-7.6.2" + (sources."@babel/highlight-7.5.0" // { + dependencies = [ + sources."js-tokens-4.0.0" + ]; + }) + sources."@babel/parser-7.6.2" + sources."@babel/plugin-syntax-object-rest-spread-7.2.0" + sources."@babel/template-7.6.0" + (sources."@babel/traverse-7.6.2" // { + dependencies = [ + sources."debug-4.1.1" + sources."globals-11.12.0" + sources."ms-2.1.2" + ]; + }) + (sources."@babel/types-7.6.1" // { + dependencies = [ + sources."to-fast-properties-2.0.0" + ]; + }) + (sources."@cnakazawa/watch-1.0.3" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."@jest/console-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + (sources."@jest/core-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + sources."@jest/environment-24.9.0" + sources."@jest/fake-timers-24.9.0" + (sources."@jest/reporters-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + sources."@jest/source-map-24.9.0" + sources."@jest/test-result-24.9.0" + sources."@jest/test-sequencer-24.9.0" + (sources."@jest/transform-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + sources."@jest/types-24.9.0" + (sources."@kubernetes/client-node-0.10.3" // { + dependencies = [ + sources."@types/node-10.14.20" + ]; + }) + sources."@sindresorhus/is-0.7.0" + sources."@types/accepts-1.3.5" + sources."@types/axios-0.14.0" + sources."@types/babel-types-7.0.7" + sources."@types/babel__core-7.1.3" + sources."@types/babel__generator-7.6.0" + sources."@types/babel__template-7.0.2" + sources."@types/babel__traverse-7.0.7" + sources."@types/babylon-6.16.5" + sources."@types/body-parser-1.17.1" + sources."@types/caseless-0.12.2" + sources."@types/command-line-args-5.0.0" + sources."@types/connect-3.4.32" + sources."@types/cookies-0.7.4" + sources."@types/cron-1.7.1" + sources."@types/events-3.0.0" + sources."@types/express-4.17.1" + sources."@types/express-serve-static-core-4.16.9" + sources."@types/formidable-1.0.31" + sources."@types/glob-7.1.1" + sources."@types/http-assert-1.5.1" + sources."@types/istanbul-lib-coverage-2.0.1" + sources."@types/istanbul-lib-report-1.1.1" + sources."@types/istanbul-reports-1.1.1" + sources."@types/jest-24.0.18" + sources."@types/jest-diff-20.0.1" + sources."@types/js-yaml-3.12.1" + sources."@types/keygrip-1.0.1" + sources."@types/koa-2.0.50" + sources."@types/koa-compose-3.2.4" + sources."@types/koa-router-7.0.42" + sources."@types/koa-send-4.1.2" + sources."@types/koa-static-4.0.1" + sources."@types/koa-views-2.0.3" + sources."@types/lodash-4.14.141" + sources."@types/lodash.clonedeep-4.5.6" + sources."@types/mime-2.0.1" + sources."@types/minimatch-3.0.3" + sources."@types/mkdirp-0.5.2" + sources."@types/node-12.7.11" + sources."@types/ora-3.2.0" + sources."@types/range-parser-1.2.3" + (sources."@types/request-2.48.3" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@types/serve-static-1.13.3" + sources."@types/stack-utils-1.0.1" + sources."@types/tough-cookie-2.3.5" + sources."@types/underscore-1.9.3" + sources."@types/websocket-0.0.40" + sources."@types/ws-6.0.3" + sources."@types/yargs-13.0.3" + sources."@types/yargs-parser-13.1.0" + 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."abab-2.0.2" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."acorn-3.3.0" + (sources."acorn-globals-3.1.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."acorn-walk-6.2.0" + sources."aggregate-error-1.0.0" + sources."ajv-6.10.2" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."align-text-0.1.4" + sources."ansi-colors-3.2.4" + sources."ansi-escapes-3.2.0" + sources."ansi-html-0.0.7" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-2.0.0" + sources."aproba-1.2.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-back-3.1.0" + sources."array-equal-1.0.0" + sources."array-flatten-1.1.1" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."asn1.js-4.10.1" + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-1.0.0" + sources."async-1.5.2" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."awesome-typescript-loader-5.2.1" + sources."aws-sign2-0.7.0" + sources."aws4-1.8.0" + sources."axios-0.19.0" + sources."babel-6.23.0" + (sources."babel-code-frame-6.26.0" // { + 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."babel-core-6.26.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."json5-0.5.1" + sources."source-map-0.5.7" + ]; + }) + (sources."babel-generator-6.26.1" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."babel-helper-builder-binary-assignment-operator-visitor-6.24.1" + sources."babel-helper-call-delegate-6.24.1" + sources."babel-helper-define-map-6.26.0" + sources."babel-helper-explode-assignable-expression-6.24.1" + sources."babel-helper-function-name-6.24.1" + sources."babel-helper-get-function-arity-6.24.1" + sources."babel-helper-hoist-variables-6.24.1" + sources."babel-helper-optimise-call-expression-6.24.1" + sources."babel-helper-regex-6.26.0" + sources."babel-helper-remap-async-to-generator-6.24.1" + sources."babel-helper-replace-supers-6.24.1" + sources."babel-helpers-6.24.1" + (sources."babel-jest-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + sources."babel-messages-6.23.0" + sources."babel-plugin-check-es2015-constants-6.22.0" + sources."babel-plugin-istanbul-5.2.0" + sources."babel-plugin-jest-hoist-24.9.0" + sources."babel-plugin-syntax-async-functions-6.13.0" + sources."babel-plugin-syntax-exponentiation-operator-6.13.0" + sources."babel-plugin-syntax-trailing-function-commas-6.22.0" + sources."babel-plugin-transform-async-to-generator-6.24.1" + sources."babel-plugin-transform-es2015-arrow-functions-6.22.0" + sources."babel-plugin-transform-es2015-block-scoped-functions-6.22.0" + sources."babel-plugin-transform-es2015-block-scoping-6.26.0" + sources."babel-plugin-transform-es2015-classes-6.24.1" + sources."babel-plugin-transform-es2015-computed-properties-6.24.1" + sources."babel-plugin-transform-es2015-destructuring-6.23.0" + sources."babel-plugin-transform-es2015-duplicate-keys-6.24.1" + sources."babel-plugin-transform-es2015-for-of-6.23.0" + sources."babel-plugin-transform-es2015-function-name-6.24.1" + sources."babel-plugin-transform-es2015-literals-6.22.0" + sources."babel-plugin-transform-es2015-modules-amd-6.24.1" + sources."babel-plugin-transform-es2015-modules-commonjs-6.26.2" + sources."babel-plugin-transform-es2015-modules-systemjs-6.24.1" + sources."babel-plugin-transform-es2015-modules-umd-6.24.1" + sources."babel-plugin-transform-es2015-object-super-6.24.1" + sources."babel-plugin-transform-es2015-parameters-6.24.1" + sources."babel-plugin-transform-es2015-shorthand-properties-6.24.1" + sources."babel-plugin-transform-es2015-spread-6.22.0" + sources."babel-plugin-transform-es2015-sticky-regex-6.24.1" + sources."babel-plugin-transform-es2015-template-literals-6.22.0" + sources."babel-plugin-transform-es2015-typeof-symbol-6.23.0" + sources."babel-plugin-transform-es2015-unicode-regex-6.24.1" + sources."babel-plugin-transform-exponentiation-operator-6.24.1" + sources."babel-plugin-transform-regenerator-6.26.0" + sources."babel-plugin-transform-strict-mode-6.24.1" + sources."babel-preset-env-1.7.0" + sources."babel-preset-jest-24.9.0" + (sources."babel-register-6.26.0" // { + dependencies = [ + sources."source-map-0.5.7" + sources."source-map-support-0.4.18" + ]; + }) + sources."babel-runtime-6.26.0" + sources."babel-template-6.26.0" + (sources."babel-traverse-6.26.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."base64url-3.0.1" + sources."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + sources."big.js-5.2.2" + sources."binary-extensions-1.13.1" + sources."bluebird-3.7.0" + sources."bn.js-4.11.8" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.7.2" + sources."inherits-2.0.3" + sources."qs-6.7.0" + sources."raw-body-2.4.0" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."brace-expansion-1.1.11" + sources."braces-2.3.2" + sources."brorand-1.1.0" + sources."browser-process-hrtime-0.1.3" + (sources."browser-resolve-1.11.3" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."browserslist-3.2.8" + sources."bs-logger-0.2.6" + sources."bser-2.1.0" + sources."buffer-4.9.1" + sources."buffer-from-1.1.1" + sources."buffer-indexof-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + sources."byline-5.0.0" + sources."bytes-3.1.0" + (sources."cacache-10.0.4" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."cache-base-1.0.1" + sources."cache-content-type-1.0.1" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."lowercase-keys-1.0.0" + ]; + }) + sources."callsites-3.1.0" + sources."camelcase-1.2.1" + sources."caniuse-lite-1.0.30000999" + sources."capture-exit-2.0.0" + sources."caseless-0.12.0" + sources."center-align-0.1.3" + sources."chalk-2.4.2" + sources."character-parser-2.2.0" + sources."check-types-8.0.3" + (sources."chokidar-2.1.8" // { + dependencies = [ + sources."normalize-path-3.0.0" + ]; + }) + sources."chownr-1.1.3" + sources."chrome-trace-event-1.0.2" + sources."ci-info-2.0.0" + sources."cipher-base-1.0.4" + (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-buffer-1.1.6" + (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."clean-css-4.2.1" + sources."clean-stack-1.3.0" + sources."cli-cursor-2.1.0" + sources."cli-spinners-2.2.0" + sources."cliui-2.1.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."co-4.6.0" + sources."co-body-5.2.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."command-line-args-5.1.1" + sources."commander-2.20.1" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.17" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."condense-newlines-0.2.1" + sources."config-chain-1.1.12" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.1.0" + sources."consolidate-0.15.1" + sources."constantinople-3.1.2" + sources."constants-browserify-1.0.0" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + (sources."convert-source-map-1.6.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."cookies-0.7.3" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-4.6.0" // { + dependencies = [ + sources."p-limit-1.3.0" + sources."p-try-1.0.0" + ]; + }) + sources."core-js-2.6.9" + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cron-1.7.2" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."cssom-0.3.8" + sources."cssstyle-1.4.0" + sources."cyclist-1.0.1" + sources."d-1.0.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."debug-3.1.0" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-equal-1.0.1" + sources."deep-is-0.1.3" + sources."default-gateway-4.2.0" + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + sources."pify-4.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.0" + sources."destroy-1.0.4" + sources."detect-file-1.0.0" + sources."detect-indent-4.0.0" + sources."detect-newline-2.1.0" + sources."detect-node-2.0.4" + sources."diff-sequences-24.9.0" + sources."diffie-hellman-5.0.3" + sources."dir-glob-2.2.2" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.1" + sources."dns-txt-2.0.2" + sources."doctypes-1.1.0" + sources."domain-browser-1.2.0" + sources."domexception-1.0.1" + sources."duplexer-0.1.1" + sources."duplexer3-0.1.4" + sources."duplexify-3.7.1" + sources."ecc-jsbn-0.1.2" + (sources."editorconfig-0.15.3" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."ee-first-1.1.1" + sources."ejs-2.7.1" + sources."electron-to-chromium-1.3.275" + sources."elliptic-6.5.1" + sources."emoji-regex-7.0.3" + sources."emojis-list-2.1.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.1.0" + sources."errno-0.1.7" + sources."error-ex-1.3.2" + sources."error-inject-1.0.0" + sources."es-abstract-1.15.0" + sources."es-to-primitive-1.2.0" + sources."es5-ext-0.10.51" + sources."es6-iterator-2.0.3" + sources."es6-promise-4.2.8" + sources."es6-symbol-3.1.2" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.12.0" + sources."eslint-scope-4.0.3" + sources."esprima-3.1.3" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.0" + sources."events-3.0.0" + sources."eventsource-1.0.7" + sources."evp_bytestokey-1.0.3" + sources."exec-sh-0.3.2" + sources."execa-1.0.0" + sources."exit-0.1.2" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (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."expand-tilde-2.0.2" + sources."expect-24.9.0" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."path-to-regexp-0.1.7" + sources."qs-6.7.0" + sources."safe-buffer-5.1.2" + ]; + }) + 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."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."fast-levenshtein-2.0.6" + sources."faye-websocket-0.10.0" + sources."fb-watchman-2.0.0" + sources."figgy-pudding-3.5.1" + sources."filesize-3.6.1" + sources."fill-range-4.0.0" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-cache-dir-1.0.0" + sources."find-replace-3.0.0" + sources."find-up-3.0.0" + sources."findup-sync-3.0.0" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.5.10" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."formidable-1.2.1" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.9" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + (sources."get-paths-0.0.7" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.4" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."global-modules-2.0.0" // { + dependencies = [ + sources."global-prefix-3.0.0" + sources."kind-of-6.0.2" + ]; + }) + sources."global-prefix-1.0.2" + sources."globals-9.18.0" + sources."globby-7.1.1" + (sources."got-8.3.2" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) + sources."graceful-fs-4.2.2" + sources."growly-1.3.0" + (sources."gzip-size-5.1.1" // { + dependencies = [ + sources."pify-4.0.1" + ]; + }) + sources."handle-thing-2.0.0" + (sources."handlebars-4.4.2" // { + dependencies = [ + sources."uglify-js-3.6.0" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" + sources."has-to-string-tag-x-1.4.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.0.4" + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."home-or-tmp-2.0.0" + sources."homedir-polyfill-1.0.3" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.4" + sources."hpack.js-2.1.6" + sources."html-encoding-sniffer-1.0.2" + sources."html-entities-1.2.1" + sources."http-assert-1.4.1" + sources."http-cache-semantics-3.8.1" + sources."http-deceiver-1.2.7" + sources."http-errors-1.7.3" + sources."http-parser-js-0.4.10" + sources."http-proxy-1.18.0" + sources."http-proxy-middleware-0.19.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."ignore-3.3.10" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."infer-owner-1.0.4" + sources."inflation-2.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."internal-ip-4.3.0" + sources."interpret-1.2.0" + sources."into-stream-3.1.0" + sources."invariant-2.2.4" + sources."invert-kv-2.0.0" + sources."ip-1.1.5" + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.0" + sources."is-absolute-url-3.0.3" + (sources."is-accessor-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-1.0.1" + sources."is-buffer-2.0.4" + sources."is-callable-1.1.4" + sources."is-ci-2.0.0" + (sources."is-data-descriptor-1.0.0" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + sources."is-date-object-1.0.1" + (sources."is-descriptor-1.0.2" // { + dependencies = [ + sources."kind-of-6.0.2" + ]; + }) + (sources."is-expression-3.0.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-finite-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-generator-fn-2.1.0" + sources."is-generator-function-1.0.7" + sources."is-glob-4.0.1" + sources."is-number-3.0.0" + sources."is-object-1.0.1" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-promise-2.1.0" + sources."is-regex-1.0.4" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-typedarray-1.0.0" + sources."is-whitespace-0.3.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isomorphic-ws-4.0.1" + sources."isstream-0.1.2" + sources."istanbul-lib-coverage-2.0.5" + (sources."istanbul-lib-instrument-3.3.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."istanbul-lib-report-2.0.8" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."pify-4.0.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."istanbul-lib-source-maps-3.0.6" // { + dependencies = [ + sources."debug-4.1.1" + sources."make-dir-2.1.0" + sources."ms-2.1.2" + sources."pify-4.0.1" + ]; + }) + sources."istanbul-reports-2.2.6" + sources."isurl-1.0.0" + sources."jest-24.9.0" + sources."jest-changed-files-24.9.0" + (sources."jest-cli-24.9.0" // { + dependencies = [ + sources."cliui-5.0.0" + sources."yargs-13.3.0" + ]; + }) + sources."jest-config-24.9.0" + sources."jest-diff-24.9.0" + sources."jest-docblock-24.9.0" + sources."jest-each-24.9.0" + sources."jest-environment-jsdom-24.9.0" + sources."jest-environment-node-24.9.0" + sources."jest-get-type-24.9.0" + sources."jest-haste-map-24.9.0" + sources."jest-jasmine2-24.9.0" + sources."jest-leak-detector-24.9.0" + sources."jest-matcher-utils-24.9.0" + (sources."jest-message-util-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + sources."jest-mock-24.9.0" + sources."jest-pnp-resolver-1.2.1" + sources."jest-regex-util-24.9.0" + sources."jest-resolve-24.9.0" + sources."jest-resolve-dependencies-24.9.0" + sources."jest-runner-24.9.0" + (sources."jest-runtime-24.9.0" // { + dependencies = [ + sources."cliui-5.0.0" + sources."slash-2.0.0" + sources."yargs-13.3.0" + ]; + }) + sources."jest-serializer-24.9.0" + (sources."jest-snapshot-24.9.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."jest-util-24.9.0" // { + dependencies = [ + sources."slash-2.0.0" + ]; + }) + (sources."jest-validate-24.9.0" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."jest-watcher-24.9.0" + (sources."jest-worker-24.9.0" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."js-beautify-1.10.2" + sources."js-stringify-1.0.2" + sources."js-tokens-3.0.2" + (sources."js-yaml-3.13.1" // { + dependencies = [ + sources."esprima-4.0.1" + ]; + }) + sources."jsbn-0.1.1" + (sources."jsdom-11.12.0" // { + dependencies = [ + sources."acorn-5.7.3" + (sources."acorn-globals-4.3.4" // { + dependencies = [ + sources."acorn-6.3.0" + ]; + }) + sources."ws-5.2.2" + ]; + }) + sources."jsesc-1.3.0" + sources."json-buffer-3.0.0" + 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."json3-3.3.3" + (sources."json5-1.0.1" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."jsonpath-plus-0.19.0" + sources."jsprim-1.4.1" + sources."jstransformer-1.0.0" + sources."keygrip-1.0.3" + sources."keyv-3.0.0" + sources."killable-1.0.1" + (sources."kind-of-3.2.2" // { + dependencies = [ + sources."is-buffer-1.1.6" + ]; + }) + sources."kleur-3.0.3" + sources."koa-2.8.2" + sources."koa-body-4.1.1" + sources."koa-compose-4.1.0" + (sources."koa-convert-1.2.0" // { + dependencies = [ + sources."koa-compose-3.2.1" + ]; + }) + sources."koa-is-json-1.0.0" + (sources."koa-router-7.4.0" // { + dependencies = [ + sources."koa-compose-3.2.1" + ]; + }) + sources."koa-send-5.0.0" + sources."koa-static-5.0.0" + (sources."koa-views-6.2.1" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + sources."lazy-cache-1.0.4" + sources."lcid-2.0.0" + sources."left-pad-1.3.0" + sources."leven-3.1.0" + sources."levn-0.3.0" + sources."load-json-file-4.0.0" + sources."loader-runner-2.4.0" + sources."loader-utils-1.2.3" + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."lodash.camelcase-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.memoize-4.1.2" + sources."lodash.sortby-4.7.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.6.4" + sources."loglevelnext-1.0.5" + sources."long-4.0.0" + sources."longest-1.0.1" + sources."loose-envify-1.4.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-5.1.1" + sources."make-dir-1.3.0" + sources."make-error-1.3.5" + sources."makeerror-1.0.11" + sources."mamacro-0.0.3" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.5" + sources."media-typer-0.3.0" + (sources."mem-4.3.0" // { + dependencies = [ + sources."mimic-fn-2.1.0" + sources."p-is-promise-2.1.0" + ]; + }) + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."methods-1.1.2" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.2" + ]; + }) + sources."miller-rabin-4.0.1" + sources."mime-1.6.0" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-1.2.0" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + (sources."mississippi-2.0.0" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.1" + sources."moment-2.24.0" + sources."moment-timezone-0.5.26" + sources."move-concurrently-1.0.1" + sources."ms-2.0.0" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mz-2.7.0" + sources."nan-2.14.0" + (sources."nanomatch-1.2.13" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + sources."kind-of-6.0.2" + ]; + }) + sources."natural-compare-1.4.0" + sources."negotiator-0.6.2" + sources."neo-async-2.6.1" + sources."next-tick-1.0.0" + sources."nice-try-1.0.5" + sources."node-forge-0.8.5" + sources."node-int64-0.4.0" + sources."node-jose-1.1.3" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-modules-regexp-1.0.0" + sources."node-notifier-5.4.3" + sources."nopt-4.0.1" + sources."normalize-package-data-2.5.0" + sources."normalize-path-2.1.1" + sources."normalize-url-2.0.1" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."nwsapi-2.1.4" + sources."oauth-sign-0.9.0" + 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."object-hash-1.3.1" + sources."object-inspect-1.6.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" + sources."obuf-1.1.2" + sources."oidc-token-hash-3.0.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."only-0.0.2" + sources."opener-1.5.1" + sources."openid-client-2.5.0" + sources."opn-5.5.0" + sources."optimist-0.6.1" + (sources."optionator-0.8.2" // { + dependencies = [ + sources."wordwrap-1.0.0" + ]; + }) + sources."ora-3.4.0" + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-locale-3.1.0" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-any-1.1.0" + sources."p-cancelable-0.4.1" + sources."p-defer-1.0.0" + sources."p-each-series-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-reduce-1.0.0" + sources."p-retry-3.0.1" + sources."p-some-2.0.1" + sources."p-timeout-2.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.10" + sources."parallel-transform-1.2.0" + sources."parse-asn1-5.1.5" + sources."parse-json-4.0.0" + sources."parse-passwd-1.0.0" + sources."parse5-4.0.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + (sources."path-to-regexp-1.7.0" // { + dependencies = [ + sources."isarray-0.0.1" + ]; + }) + sources."path-type-3.0.0" + sources."pbkdf2-3.0.17" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pirates-4.0.1" + (sources."pkg-dir-2.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) + sources."pn-1.1.0" + (sources."portfinder-1.0.24" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."posix-character-classes-0.1.1" + sources."prelude-ls-1.1.2" + sources."prepend-http-2.0.0" + sources."prettier-1.18.2" + sources."pretty-2.0.0" + sources."pretty-format-24.9.0" + sources."private-0.1.8" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-7.3.1" + sources."promise-inflight-1.0.1" + sources."prompts-2.2.1" + sources."proto-list-1.2.4" + sources."proxy-addr-2.0.5" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.4.0" + sources."public-encrypt-4.0.3" + sources."pug-2.0.4" + sources."pug-attrs-2.0.4" + sources."pug-code-gen-2.0.2" + sources."pug-error-1.3.3" + sources."pug-filters-3.1.1" + sources."pug-lexer-4.1.0" + sources."pug-linker-3.0.6" + sources."pug-load-2.0.12" + sources."pug-parser-5.0.1" + sources."pug-runtime-2.0.5" + sources."pug-strip-comments-1.0.4" + sources."pug-walk-1.1.8" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."query-string-5.1.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.1.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.1" + sources."react-is-16.10.2" + sources."read-pkg-3.0.0" + sources."read-pkg-up-4.0.0" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-2.2.1" + sources."realpath-native-1.1.0" + sources."rechoir-0.6.2" + sources."regenerate-1.4.0" + sources."regenerator-runtime-0.11.1" + sources."regenerator-transform-0.10.1" + (sources."regex-not-1.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."regexpu-core-2.0.0" + sources."regjsgen-0.2.0" + (sources."regjsparser-0.1.5" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."repeating-2.0.1" + sources."request-2.88.0" + sources."request-promise-core-1.1.2" + sources."request-promise-native-1.0.7" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resolve-1.12.0" + sources."resolve-cwd-2.0.0" + (sources."resolve-dir-1.0.1" // { + dependencies = [ + sources."global-modules-1.0.0" + ]; + }) + sources."resolve-from-3.0.0" + (sources."resolve-path-1.4.0" // { + dependencies = [ + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."right-align-0.1.3" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."rsvp-4.8.5" + sources."run-queue-1.0.3" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + (sources."sane-4.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + (sources."selfsigned-1.10.7" // { + dependencies = [ + sources."node-forge-0.9.0" + ]; + }) + sources."semver-5.7.1" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + sources."serialize-javascript-1.9.1" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."set-value-2.0.1" + sources."setimmediate-1.0.5" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shelljs-0.8.3" + sources."shellwords-0.1.1" + sources."sigmund-1.0.1" + sources."signal-exit-3.0.2" + sources."simple-git-1.96.0" + sources."sisteransi-1.0.3" + sources."slash-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (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."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."snapdragon-util-3.0.1" + sources."sockjs-0.3.19" + (sources."sockjs-client-1.4.0" // { + dependencies = [ + sources."debug-3.2.6" + sources."faye-websocket-0.11.3" + sources."ms-2.1.2" + ]; + }) + sources."sort-keys-2.0.0" + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.2" + sources."source-map-support-0.5.13" + sources."source-map-url-0.4.0" + sources."spdx-correct-3.1.0" + sources."spdx-exceptions-2.2.0" + sources."spdx-expression-parse-3.0.0" + sources."spdx-license-ids-3.0.5" + (sources."spdy-4.0.1" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + ]; + }) + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.2" + sources."readable-stream-3.4.0" + ]; + }) + (sources."split-string-3.1.0" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."ssri-5.3.0" + sources."stack-utils-1.0.2" + (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-buffer-1.1.6" + (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.5.0" + sources."stealthy-require-1.1.1" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.0" + sources."strict-uri-encode-1.1.0" + (sources."string-length-2.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string-width-3.1.0" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-5.2.0" + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."symbol-tree-3.2.4" + sources."tapable-1.1.3" + sources."terser-4.3.8" + (sources."terser-webpack-plugin-1.4.1" // { + dependencies = [ + sources."cacache-12.0.3" + sources."find-cache-dir-2.1.0" + sources."make-dir-2.1.0" + sources."mississippi-3.0.0" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."ssri-6.0.1" + ]; + }) + sources."test-exclude-5.2.3" + sources."thenify-3.3.0" + sources."thenify-all-1.6.0" + sources."throat-4.1.0" + sources."through2-2.0.5" + sources."thunky-1.0.3" + sources."timed-out-4.0.1" + sources."timers-browserify-2.0.11" + sources."tmpl-1.0.4" + sources."to-arraybuffer-1.0.1" + sources."to-fast-properties-1.0.3" + sources."to-object-path-0.3.0" + (sources."to-regex-3.0.2" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."token-stream-0.0.1" + (sources."tough-cookie-2.4.3" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tr46-1.0.1" + sources."trim-right-1.0.1" + sources."tryer-1.0.1" + (sources."ts-jest-24.1.0" // { + dependencies = [ + sources."camelcase-4.1.0" + sources."json5-2.1.1" + sources."minimist-1.2.0" + sources."yargs-parser-10.1.0" + ]; + }) + sources."tslib-1.10.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-1.2.0" + sources."type-check-0.3.2" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."typescript-3.6.3" + sources."typical-4.0.0" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."underscore-1.9.1" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + 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."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urijs-1.19.1" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-1.4.7" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" + sources."utils-merge-1.0.1" + sources."uuid-3.3.3" + sources."v8-compile-cache-2.0.3" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vm-browserify-1.1.0" + sources."void-elements-2.0.1" + sources."w3c-hr-time-1.0.1" + sources."walker-1.0.7" + sources."watchpack-1.6.0" + sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" + sources."webidl-conversions-4.0.2" + (sources."webpack-4.41.0" // { + dependencies = [ + sources."acorn-6.3.0" + ]; + }) + (sources."webpack-bundle-analyzer-3.5.2" // { + dependencies = [ + sources."acorn-6.3.0" + ]; + }) + (sources."webpack-cli-3.3.9" // { + dependencies = [ + sources."cliui-5.0.0" + sources."supports-color-6.1.0" + sources."yargs-13.2.4" + ]; + }) + (sources."webpack-dev-middleware-3.7.2" // { + dependencies = [ + sources."mime-2.4.4" + sources."webpack-log-2.0.0" + ]; + }) + (sources."webpack-dev-server-3.8.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."camelcase-5.3.1" + (sources."cliui-4.1.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."debug-4.1.1" + sources."get-caller-file-1.0.3" + sources."is-fullwidth-code-point-1.0.0" + sources."ms-2.1.2" + sources."require-main-filename-1.0.1" + sources."semver-6.3.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."webpack-log-2.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + ]; + }) + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + ]; + }) + sources."webpack-log-1.2.0" + sources."webpack-sources-1.4.3" + (sources."websocket-1.0.30" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."websocket-driver-0.7.3" + sources."websocket-extensions-0.1.3" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-6.5.0" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."window-size-0.1.0" + sources."with-5.1.1" + sources."wordwrap-0.0.2" + sources."worker-farm-1.7.0" + sources."wrap-ansi-5.1.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.1" + sources."ws-6.2.1" + sources."xml-name-validator-3.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yaeti-0.0.6" + sources."yallist-3.1.1" + sources."yargs-3.10.0" + (sources."yargs-parser-13.1.1" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) + sources."ylru-1.2.1" + ]; + buildInputs = globalBuildInputs; + meta = { + license = "MIT"; + }; + production = false; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/spacegun/package.json b/pkgs/applications/networking/cluster/spacegun/package.json new file mode 100644 index 00000000000..7d419edb74a --- /dev/null +++ b/pkgs/applications/networking/cluster/spacegun/package.json @@ -0,0 +1,3 @@ +[ + { "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" } +] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index e7551c17ff9..b290f3b5f04 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.18"; - sha256 = "1p2rvs9dw2rzzggf3q2lifwbd82b7xb3jpb4yz5nmggn5g22qlc1"; + version = "0.12.19"; + sha256 = "067gzxysz8r2myj3rh0vwrs0pmbgb21jxlmawlf4v0lkjnhj6kwv"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 350e96a94a7..c336d2d0bba 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch -, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas +, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -40,6 +40,12 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 8ff8041e467..e01e4c4fc44 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,16 +1,18 @@ -{ stdenv, rustPlatform, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses +{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses , asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.17.1"; + version = "2.18"; - src = fetchurl { - url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; - sha256 = "15qr2y35yvl0hzsf34d863n8v042v78ks6ksh5p1awvi055x5sy1"; + src = fetchFromGitHub { + owner = "newsboat"; + repo = "newsboat"; + rev = "r${version}"; + sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; }; - cargoSha256 = "0db4j6y43gacazrvcmq823fzl5pdfdlg8mkjpysrw6h9fxisq83f"; + cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp"; postPatch = '' substituteInPlace Makefile --replace "|| true" "" @@ -29,8 +31,8 @@ rustPlatform.buildRustPackage rec { make ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ] - ++ stdenv.lib.optional stdenv.isDarwin "-Wno-error=format-security"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; doCheck = true; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d735c06a531..98d37fae911 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,34 +1,12 @@ -{ lib, python3 }: +{ lib, python3Packages }: -# Flexget have been a trouble maker in the past, -# if you see flexget breaking when updating packages, don't worry. -# The current state is that we have no active maintainers for this package. -# -- Mic92 - -let - python' = python3.override { inherit packageOverrides; }; - - packageOverrides = self: super: { - guessit = super.guessit.overridePythonAttrs (old: rec { - version = "3.0.3"; - src = old.src.override { - inherit version; - sha256 = "1q06b3k31bfb8cxjimpf1rkcrwnc596a9cppjw15minvdangl32r"; - }; - }); - }; - -in - -with python'.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.25"; + version = "3.0.31"; - src = fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0l77fgg0w5dca1bwk4fcc1yz1g7njb0x07yx4bazyg821gl15rc9"; + sha256 = "b9edd905556c77b40046b5d7a27151b76a1c9a8c43a4e4153279ad42a784844e"; }; postPatch = '' @@ -43,29 +21,42 @@ buildPythonApplication rec { # ~400 failures doCheck = false; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.in - feedparser sqlalchemy pyyaml - beautifulsoup4 html5lib - PyRSS2Gen pynzb rpyc jinja2 - requests dateutil jsonschema - pathpy guessit rebulk APScheduler - terminaltables colorclass - cherrypy flask flask-restful - flask-restplus flask-compress - flask_login flask-cors - pyparsing zxcvbn future + APScheduler + beautifulsoup4 + cherrypy + colorclass + feedparser + flask-compress + flask-cors + flask_login + flask-restful + flask-restplus + flask + guessit + html5lib + jinja2 + jsonschema + loguru progressbar - # Optional requirements - deluge-client - # Plugins - transmissionrpc - ] ++ lib.optional (pythonOlder "3.4") pathlib; + pynzb + pyparsing + PyRSS2Gen + dateutil + pyyaml + rebulk + requests + rpyc + sqlalchemy + terminaltables + zxcvbn + ]; meta = with lib; { - homepage = https://flexget.com/; - description = "Multipurpose automation tool for content like torrents"; + homepage = "https://flexget.com/"; + description = "Multipurpose automation tool for all of your media"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index b18809f21be..cb40c347e1c 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "The FTP Client that drives you anywhere"; homepage = https://github.com/Alecaddd/taxi; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 7f2a9d71fe5..d0829fd73a9 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "0qwav4qpvx3i5khkyvdvx42n8b9mza8c4cpxvrf7m4lnf51cqgba"; + sha256 = "034b0nl0hkh0v26gwbawi2wdv7mb9p54cfg8gc9b8hsw49k3c1wh"; }; nativeBuildInputs = [ @@ -109,12 +109,12 @@ stdenv.mkDerivation rec { "--with-libnet-includes=${libnet}/include" "--with-libnet-libraries=${libnet}/lib" ] - ++ lib.optional hyperscanSupport [ + ++ lib.optionals hyperscanSupport [ "--with-libhs-includes=${hyperscan.dev}/include/hs" "--with-libhs-libraries=${hyperscan}/lib" ] - ++ lib.optional redisSupport [ "--enable-hiredis" ] - ++ lib.optional rustSupport [ + ++ lib.optional redisSupport "--enable-hiredis" + ++ lib.optionals rustSupport [ "--enable-rust" "--enable-rust-experimental" ]; @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "sysconfdir=\${out}/etc" ]; - installTargets = "install install-conf"; + installTargets = [ "install" "install-conf" ]; postInstall = '' wrapProgram "$out/bin/suricatasc" \ diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index 4dadcb6ce23..6e4a914ecb0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation rec { inherit desktopName; genericName = meta.description; categories = "Network;InstantMessaging;"; + mimeType = "x-scheme-handler/discord"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix deleted file mode 100644 index 9886c2fa2ed..00000000000 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool -, perlPackages, evolution-data-server, gnome-doc-utils, avahi, autoreconfHook -, libsigcxx, gtk2, dbus-glib, libnotify, libXext, xorgproto, gnome3, boost, libsecret -, pkgconfig, libxml2, unixODBC, db, nspr, nss, zlib -, libXrandr, which, libxslt, libtasn1, gmp, nettle, sqlite, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "ekiga"; - version = "4.0.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b"; - }; - - buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool - evolution-data-server gnome-doc-utils avahi - libsigcxx gtk2 dbus-glib libnotify libXext xorgproto sqlite - gnome3.libsoup glib gnome3.adwaita-icon-theme boost - autoreconfHook pkgconfig libxml2 unixODBC db nspr - nss zlib libsecret libXrandr which libxslt libtasn1 - gmp nettle makeWrapper ] - ++ (with perlPackages; [ perl XMLParser ]); - - preAutoreconf = '' - substituteInPlace configure.ac --replace AM_GCONF_SOURCE_2 "" - substituteInPlace configure.ac --replace gnome-icon-theme adwaita-icon-theme - ''; - - configureFlags = [ - "--with-ldap-dir=${openldap.dev}" - "--with-libsasl2-dir=${cyrus_sasl.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--disable-gconf" - ]; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch; - sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4"; - }) - (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch; - sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s"; - }) - (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch; - sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz"; - }) - ]; - - postInstall = '' - wrapProgram "$out"/bin/ekiga \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - passthru = { - updateInfo = { - downloadPage = "mirror://gnome/sources/ekiga"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with stdenv.lib; { - description = "VOIP/Videoconferencing app with full SIP and H.323 support"; - homepage = "https://www.ekiga.org/"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} - diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 04a31ba403a..7e01f97fe0d 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ndowens ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile index 3ebd745e4f1..216af305b4a 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile @@ -7,34 +7,30 @@ def source(url) source 'https://rubygems.org' -ruby '>= 2.3.0' +ruby '>= 2.5.0' group :default do - gem 'oauth', '>= 0.5.1' - gem 'json_pure', '~> 1.8' - gem 'addressable', '>= 2.5.2', '< 2.6' - gem 'diva', '>= 0.3.2', '< 2.0' - gem 'memoist', '>= 0.16', '< 0.17' - gem 'ruby-hmac', '~> 0.4' - gem 'typed-array', '~> 0.1' - gem 'delayer', '~> 0.0' - gem 'pluggaloid', '>= 1.1.1', '< 2.0' - gem 'delayer-deferred', '>= 2.0', '< 3.0' - gem 'twitter-text', '>= 2.1.0' + gem 'addressable','>= 2.7.0', '< 2.8' + gem 'delayer','>= 1.0.1', '< 1.1' + gem 'delayer-deferred','>= 2.1.1', '< 2.2' + gem 'diva','>= 1.0.1', '< 1.1' + gem 'memoist','>= 0.16.2', '< 0.17' + gem 'oauth','>= 0.5.4' + gem 'pluggaloid','>= 1.2.0', '< 1.3' + gem 'typed-array','>= 0.1.2', '< 0.2' end group :test do - gem 'test-unit', '~> 3.0' - gem 'rake', '~> 10.1' - gem 'watch', '~> 0.1' - gem 'mocha', '~> 0.14' - gem 'webmock', '~> 1.17' - gem 'ruby-prof' + gem 'test-unit','>= 3.3.4', '< 4.0' + gem 'rake','>= 13.0.1' + gem 'mocha','>= 1.11.1' + gem 'webmock','>= 3.7.6' + gem 'ruby-prof','>= 1.1.0' end group :plugin do - Dir.glob(File.expand_path(File.join(__dir__, 'core/plugin/*/Gemfile'))){ |path| + Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path| eval File.open(path).read } Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| diff --git a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock index 2e1f2fbd382..63f9a63849b 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock +++ b/pkgs/applications/networking/instant-messengers/mikutter/Gemfile.lock @@ -1,117 +1,103 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - atk (3.3.2) - glib2 (= 3.3.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + atk (3.4.1) + glib2 (= 3.4.1) cairo (1.16.4) native-package-installer (>= 1.0.3) pkg-config (>= 1.2.2) - cairo-gobject (3.3.2) + cairo-gobject (3.4.1) cairo (>= 1.16.2) - glib2 (= 3.3.2) + glib2 (= 3.4.1) crack (0.4.3) safe_yaml (~> 1.0.0) - delayer (0.0.2) - delayer-deferred (2.0.0) - delayer (>= 0.0.2, < 0.1) - diva (0.3.2) - addressable (>= 2.5, < 2.6) - gdk_pixbuf2 (3.3.2) - gio2 (= 3.3.2) + delayer (1.0.1) + delayer-deferred (2.1.1) + delayer (>= 1.0, < 2.0) + diva (1.0.1) + addressable (>= 2.5.2, < 2.8) + gdk_pixbuf2 (3.4.1) + gio2 (= 3.4.1) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) - gio2 (3.3.2) - gobject-introspection (= 3.3.2) - glib2 (3.3.2) + gio2 (3.4.1) + gobject-introspection (= 3.4.1) + glib2 (3.4.1) native-package-installer (>= 1.0.3) - pkg-config (>= 1.2.2) - gobject-introspection (3.3.2) - glib2 (= 3.3.2) - gtk2 (3.3.2) - atk (= 3.3.2) - gdk_pixbuf2 (= 3.3.2) - pango (= 3.3.2) - hashdiff (0.3.9) + pkg-config (>= 1.3.5) + gobject-introspection (3.4.1) + glib2 (= 3.4.1) + gtk2 (3.4.1) + atk (= 3.4.1) + gdk_pixbuf2 (= 3.4.1) + pango (= 3.4.1) + hashdiff (1.0.0) httpclient (2.8.3) - idn-ruby (0.1.0) instance_storage (1.0.0) - irb (1.0.0) - json_pure (1.8.6) + io-console (0.5.3) + irb (1.2.1) + reline (>= 0.0.1) locale (2.1.2) - memoist (0.16.0) - metaclass (0.0.4) + memoist (0.16.2) mini_portile2 (2.4.0) - mocha (0.14.0) - metaclass (~> 0.0.1) - moneta (1.1.1) - native-package-installer (1.0.7) - nokogiri (1.10.3) + mocha (1.11.1) + moneta (1.2.1) + native-package-installer (1.0.9) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) oauth (0.5.4) - pango (3.3.2) - cairo-gobject (= 3.3.2) - gobject-introspection (= 3.3.2) - pkg-config (1.3.7) - pluggaloid (1.1.2) - delayer + pango (3.4.1) + cairo-gobject (= 3.4.1) + gobject-introspection (= 3.4.1) + pkg-config (1.4.0) + pluggaloid (1.2.0) + delayer (>= 1.0.0, < 2.0) instance_storage (>= 1.0.0, < 2.0.0) - power_assert (1.1.4) - public_suffix (3.0.3) - rake (10.5.0) - ruby-hmac (0.4.0) - ruby-prof (0.17.0) + power_assert (1.1.5) + public_suffix (4.0.1) + rake (13.0.1) + reline (0.1.2) + io-console (~> 0.5) + ruby-prof (1.1.0) safe_yaml (1.0.5) - test-unit (3.3.2) + test-unit (3.3.4) power_assert text (1.3.1) - totoridipjp (0.1.0) - twitter-text (3.0.0) - idn-ruby - unf (~> 0.1.0) typed-array (0.1.2) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.6) - watch (0.1.0) - webmock (1.24.6) + webmock (3.7.6) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff + hashdiff (>= 0.4.0, < 2.0.0) PLATFORMS ruby DEPENDENCIES - addressable (>= 2.5.2, < 2.6) - delayer (~> 0.0) - delayer-deferred (>= 2.0, < 3.0) - diva (>= 0.3.2, < 2.0) + addressable (>= 2.7.0, < 2.8) + delayer (>= 1.0.1, < 1.1) + delayer-deferred (>= 2.1.1, < 2.2) + diva (>= 1.0.1, < 1.1) gettext (>= 3.2.9, < 3.3) - gtk2 (= 3.3.2) + gtk2 (= 3.4.1) httpclient - irb (>= 1.0.0, < 1.1) - json_pure (~> 1.8) - memoist (>= 0.16, < 0.17) - mocha (~> 0.14) + irb (>= 1.2.0, < 1.3) + memoist (>= 0.16.2, < 0.17) + mocha (>= 1.11.1) moneta nokogiri - oauth (>= 0.5.1) - pluggaloid (>= 1.1.1, < 2.0) - rake (~> 10.1) - ruby-hmac (~> 0.4) - ruby-prof - test-unit (~> 3.0) - totoridipjp - twitter-text (>= 2.1.0) - typed-array (~> 0.1) - watch (~> 0.1) - webmock (~> 1.17) + oauth (>= 0.5.4) + pluggaloid (>= 1.2.0, < 1.3) + rake (>= 13.0.1) + ruby-prof (>= 1.1.0) + test-unit (>= 3.3.4, < 4.0) + typed-array (>= 0.1.2, < 0.2) + webmock (>= 3.7.6) RUBY VERSION - ruby 2.5.5p157 + ruby 2.7.0p0 BUNDLED WITH - 1.17.2 + 2.1.2 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 3e2718c9c57..7d2037d16a7 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -7,40 +7,44 @@ # find latest version at: http://mikutter.hachune.net/download#download # run these commands: # -# wget http://mikutter.hachune.net/bin/mikutter.3.8.7.tar.gz -# tar xvf mikutter.3.8.7.tar.gz +# wget http://mikutter.hachune.net/bin/mikutter.4.0.0.tar.gz +# mkdir mikutter # cd mikutter +# tar xvf ../mikutter.4.0.0.tar.gz # find . -not -name Gemfile -exec rm {} \; # find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; # cd .. # mv mikutter/* . -# rm mikutter.3.8.7.tar.gz +# rm mikutter.4.0.0.tar.gz # rm gemset.nix Gemfile.lock; nix-shell -p bundler bundix --run 'bundle lock && bundix' stdenv.mkDerivation rec { pname = "mikutter"; - version = "3.8.7"; + version = "4.0.0"; src = fetchurl { url = "https://mikutter.hachune.net/bin/mikutter.${version}.tar.gz"; - sha256 = "1griypcd1xgyfd9wc3ls32grpw4ig0xxdiygpdinzr3bigfmd7iv"; - }; - - env = bundlerEnv { - name = "mikutter-${version}-gems"; - gemdir = ./.; - - inherit ruby; + sha256 = "0nx14vlp7p69m2vw0s6kbiyymsfq0r2jd4nm0v5c4xb9avkpgc8g"; }; buildInputs = [ alsaUtils libnotify which gtk2 ruby atk gobject-introspection ]; nativeBuildInputs = [ wrapGAppsHook ]; - postUnpack = '' - rm -rf $sourceRoot/vendor + unpackPhase = '' + mkdir source + cd source + unpackFile $src + rm -rf vendor ''; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "mikutter-${version}-gems"; + gemdir = ./.; + + inherit ruby; + }; + in '' install -v -D -m644 README $out/share/doc/mikutter/README install -v -D -m644 LICENSE $out/share/doc/mikutter/LICENSE rm -v README LICENSE @@ -73,5 +77,6 @@ stdenv.mkDerivation rec { homepage = https://mikutter.hachune.net; platforms = ruby.meta.platforms; license = licenses.mit; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix index 5f3ef945b3d..88ea97be1ca 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; type = "gem"; }; - version = "2.5.2"; + version = "2.7.0"; }; atk = { dependencies = ["glib2"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17c5ixwyg16lbbjix2prk7fa6lm0vkxvc1z6m6inc6jgkb1x0700"; + sha256 = "0a8q9a1f6x4gy55p8cf52a22bnpjgn18ad9n959x0f4gybbhs948"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; cairo = { dependencies = ["native-package-installer" "pkg-config"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12q441a5vnfvbcnli4fpq2svb75vq1wvs2rlgsp6fv38fh6fgsfz"; + sha256 = "0gkxdfslcvrwrs48giilji3bgxd5bwijwq33p9h00r10jzfg2028"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; crack = { dependencies = ["safe_yaml"]; @@ -59,10 +59,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "156vy4x1d2jgafkjaafzfz7g8ghl4p5zgbl859b8slp4wdxy3v1r"; + sha256 = "09p4rkh3dpdm1mhq721m4d6zvxqqp44kg7069s8l7kmaf7nv2nb3"; type = "gem"; }; - version = "0.0.2"; + version = "1.0.1"; }; delayer-deferred = { dependencies = ["delayer"]; @@ -70,10 +70,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvqphyzngj5wghgbb2nd1qj2qvj2plsz9vx8hz24c7bfq55n4xz"; + sha256 = "1mbdxn1hskjqf3zlj4waxl71ccvbj6lk81c99769paxw4fajwrgx"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; diva = { dependencies = ["addressable"]; @@ -81,10 +81,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rp125gdlq7jqq7x8la52pdpimhx5wr66frcgf6z4jm927rjw84d"; + sha256 = "182gws1zihhpl7r3m8jsf29maqg9xdhj46s9lidbldar8clpl23h"; type = "gem"; }; - version = "0.3.2"; + version = "1.0.1"; }; gdk_pixbuf2 = { dependencies = ["gio2"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071z8a8khs5qb43ri5hbvaijwbx43mick7cjfmhn6javifkzijk7"; + sha256 = "0194gzn0kialfh0j7crllvp808r64sg6dh297x69b0av21ar5pam"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; gettext = { dependencies = ["locale" "text"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f131yd9zzfsjn8i4k8xkl7xm3c5f9sm7irvwxnqqh635qccfz8n"; + sha256 = "1l3jpgbdvb55xhcmpkcqgwx5068dfyi8kijfvzhbqh96ng0p1m7g"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; glib2 = { dependencies = ["native-package-installer" "pkg-config"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13r1i8gkgxj0fjz7bdnqqrsvszl7dffbf85ghx2f8p7zrcbzlk3p"; + sha256 = "18clyn0fp0h5alnkf9i2bqd6wvl78h468pdbzs1csqnba8vw4q1c"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; gobject-introspection = { dependencies = ["glib2"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15njcm0yg4qpwkhyx6gf2nxvjl6fxm9jffan8zrl2xyh68yr4jf7"; + sha256 = "1a3x8qiisbax3x0izj8l5w66r53ba5ma53ax2jhdbhbvaxx3d02n"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; gtk2 = { dependencies = ["atk" "gdk_pixbuf2" "pango"]; @@ -147,20 +147,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a4lj6anmvr82cwrg8swzglz90jss995zr7bvsiwr876qqdwv7qs"; + sha256 = "17az8g0n1yzz90kdbjg2hpabi04qccda7v6lin76bs637ivfg2md"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; hashdiff = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x"; + sha256 = "18jqpbvidrlnq3xf0hkdbs00607jgz35lry6gjw4bcxgh52am2mk"; type = "gem"; }; - version = "0.3.9"; + version = "1.0.0"; }; httpclient = { groups = ["plugin"]; @@ -172,16 +172,6 @@ }; version = "2.8.3"; }; - idn-ruby = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; - type = "gem"; - }; - version = "0.1.0"; - }; instance_storage = { groups = ["default"]; platforms = []; @@ -192,25 +182,26 @@ }; version = "1.0.0"; }; - irb = { + io-console = { groups = ["default" "plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "181d88hns00fpw8szg8hbchflwq69wp3y5zvd3dyqjzbq91v1dcr"; + sha256 = "0srn91ly4cc5qvyj3r87sc7v8dnm52qj1hczzxmysib6ffparngd"; type = "gem"; }; - version = "1.0.0"; + version = "0.5.3"; }; - json_pure = { - groups = ["default"]; + irb = { + dependencies = ["reline"]; + groups = ["default" "plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vllrpm2hpsy5w1r7000mna2mhd7yfrmd8hi713lk0n9mv27bmam"; + sha256 = "1r1y8i46qd5izdszzzn5jxvwvq00m89rk0hm8cs8f21p7nlwmh5w"; type = "gem"; }; - version = "1.8.6"; + version = "1.2.1"; }; locale = { groups = ["default" "plugin"]; @@ -227,20 +218,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; type = "gem"; }; - version = "0.16.0"; - }; - metaclass = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; - type = "gem"; - }; - version = "0.0.4"; + version = "0.16.2"; }; mini_portile2 = { groups = ["default" "plugin"]; @@ -253,35 +234,34 @@ version = "2.4.0"; }; mocha = { - dependencies = ["metaclass"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0id1x7g46fzy8f4jna20ys329ydaj3sad75qs9db2a6nd7f0zc2b"; + sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; type = "gem"; }; - version = "0.14.0"; + version = "1.11.1"; }; moneta = { groups = ["plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbs9w3c13phza8008mwlx8s991fzigml7pncq94i1c2flz9vw95"; + sha256 = "0q7fskfdc0h5dhl8aamg3ypybd6cyl4x0prh4803gj7hxr17jfm1"; type = "gem"; }; - version = "1.1.1"; + version = "1.2.1"; }; native-package-installer = { groups = ["default" "plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qrzhk807f98bdwy6c37acksyb5fnairdz4jpl7y3fifh7k7yfn"; + sha256 = "0piclgf6pw7hr10x57x0hn675djyna4sb3xc97yb9vh66wkx1fl0"; type = "gem"; }; - version = "1.0.7"; + version = "1.0.9"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -289,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.7"; }; oauth = { groups = ["default"]; @@ -310,20 +290,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbhjsd6y42iw572xcynd6gcapczjki41h932s90rkh6022pbm9p"; + sha256 = "1d0cn50qgpifrcv8qx72wi6l9xalw3ryngbfmm9xpg9vx5rl1qbp"; type = "gem"; }; - version = "3.3.2"; + version = "3.4.1"; }; pkg-config = { groups = ["default" "plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s56ym0chq3fycl29vqabcalqdcf7y2f25pmihjwqgbmrmzdyvr1"; + sha256 = "1cxdpr2wlz9b587avlq04a1da5fz1vdw8jvr6lx23mcq7mqh2xcx"; type = "gem"; }; - version = "1.3.7"; + version = "1.4.0"; }; pluggaloid = { dependencies = ["delayer" "instance_storage"]; @@ -331,60 +311,61 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fkm6y7aq132icmmv4k8mqw08fxqil8k52l8li642jyi79hvzrqh"; + sha256 = "1gv0rjjdic8c41gfr3kyyphvf0fmv5rzcf6qd57zjdfcn6fvi3hh"; type = "gem"; }; - version = "1.1.2"; + version = "1.2.0"; }; power_assert = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072y5ixw59ad47hkfj6nl2i4zcyad8snfxfsyyrgjkiqnvqwvbvq"; + sha256 = "1dii0wkfa0jm8sk9b20zl1z4980dmrjh0zqnii058485pp3ws10s"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.5"; }; public_suffix = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; type = "gem"; }; - version = "3.0.3"; + version = "4.0.1"; }; rake = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; type = "gem"; }; - version = "10.5.0"; + version = "13.0.1"; }; - ruby-hmac = { - groups = ["default"]; + reline = { + dependencies = ["io-console"]; + groups = ["default" "plugin"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954"; + sha256 = "0908ijrngc3wkn5iny7d0kxkp74w6ixk2nwzzngplplfla1vkp8x"; type = "gem"; }; - version = "0.4.0"; + version = "0.1.2"; }; ruby-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; + sha256 = "18ga5f4h1fnwn0xh910kpnw4cg3lq3jqljd3h16bdw9pgc5ff7dn"; type = "gem"; }; - version = "0.17.0"; + version = "1.1.0"; }; safe_yaml = { groups = ["default" "test"]; @@ -402,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hf47w70ajvwdchx0psq3dir26hh902x9sz0iwbxqj8z9w1kc6sd"; + sha256 = "0mrkpb6wz0cs1740kaca240k4ymmkbvb2v5xaxsy6vynqw8n0g6z"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.4"; }; text = { groups = ["default" "plugin"]; @@ -417,27 +398,6 @@ }; version = "1.3.1"; }; - totoridipjp = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03ci9hbwc6xf4x0lkm6px4jgbmi37n8plsjhbf2ir5vka9f29lck"; - type = "gem"; - }; - version = "0.1.0"; - }; - twitter-text = { - dependencies = ["idn-ruby" "unf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ibk4bl9hrq0phlg7zplkilsqgniji6yvid1a7k09rs0ai422jax"; - type = "gem"; - }; - version = "3.0.0"; - }; typed-array = { groups = ["default"]; platforms = []; @@ -448,46 +408,15 @@ }; version = "0.1.2"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; - type = "gem"; - }; - version = "0.0.7.6"; - }; - watch = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02g4g6ynnldyjjzrh19r584gj4z6ksff7h0ajz5jdwhpp5y7cghx"; - type = "gem"; - }; - version = "0.1.0"; - }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vlr6axajz6c7xmlk0w1kvkxc92f8y2zp27wq1z6yk916ry25n5"; + sha256 = "19xvs7gdf8r75bmyb17w9g367qxzqnlrmbdda1y36cn1vrlnf2l8"; type = "gem"; }; - version = "1.24.6"; + version = "3.7.6"; }; } \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile index efe602edc4f..3306c29e3cb 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/gtk/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/gtk/Gemfile @@ -1,3 +1,4 @@ source 'https://rubygems.org' -gem 'gtk2', '3.3.2' +gem 'gtk2', '3.4.1' + diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile index f86005fef07..f86005fef07 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/image_file_cache/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/image_file_cache/Gemfile diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile index ee2ecf52d42..66016eee9c4 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/photo_support/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/photo_support/Gemfile @@ -2,4 +2,3 @@ source 'https://rubygems.org' gem 'nokogiri' gem 'httpclient' -gem 'totoridipjp' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile index 61424d395f9..14ebffd4e0a 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/core/plugin/uitranslator/Gemfile +++ b/pkgs/applications/networking/instant-messengers/mikutter/plugin/uitranslator/Gemfile @@ -2,5 +2,5 @@ source 'https://rubygems.org' group :default do gem 'gettext', '>= 3.2.9', '< 3.3' - gem 'irb', '>= 1.0.0', '< 1.1' + gem 'irb', '>= 1.2.0', '< 1.3' end diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index eb6d954eb33..bfd4b1abd5e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [pkgconfig]; buildInputs = [gtk2 glib pidgin]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -e 's/-Wl,-soname//' -i Makefile diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 44133e777c7..e9a0812e925 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ # glib-2.62 deprecations "-DGLIB_DISABLE_DEPRECATION_WARNINGS" # override "-O0 -Werror" set by build system diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix index a2e59f0c0ff..edb4ca3c349 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sed -i -e 's|DESTINATION.*PURPLE_PLUGIN_DIR}|DESTINATION lib/purple-2|' CMakeLists.txt ''; - cmakeFlags = "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1"; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; meta = { homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index ef298883b1b..c38ff8f454e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=cast-function-type" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 1ddc603dc62..1d70c9641f8 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { buildInputs = [ trousers gtk3 gtkspell3 ] ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; - buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; + buildFlags = stdenv.lib.optionals (!gui) [ "-tags" "nogui" ]; excludedPackages = "\\(appengine\\|bn256cgo\\)"; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index e895b3cc00d..19438c4d037 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xorgproto, libSM -, libICE, qca2, pkgconfig, which, glib -, libXScrnSaver +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine +, libidn, qca2-qt5, libXScrnSaver, hunspell }: - stdenv.mkDerivation rec { - name = "psi-0.15"; - - src = fetchurl { - url = "mirror://sourceforge/psi/${name}.tar.bz2"; - sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6"; + pname = "psi"; + version = "1.4"; + src = fetchFromGitHub { + owner = "psi-im"; + repo = pname; + rev = version; + sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4"; + fetchSubmodules = true; }; - - buildInputs = - [ enchant qt4 zlib sox libX11 xorgproto libSM libICE - qca2 pkgconfig which glib libXScrnSaver - ]; - - NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto"; - - NIX_LDFLAGS="-lqca"; - + patches = [ + ./fix-cmake-hunspell-1.7.patch + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ + qtbase qtmultimedia qtx11extras qttools qtwebengine + libidn qca2-qt5 libXScrnSaver hunspell + ]; enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Psi, an XMPP (Jabber) client"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch new file mode 100644 index 00000000000..7d5711a6f2b --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi/fix-cmake-hunspell-1.7.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/FindHunspell.cmake b/cmake/modules/FindHunspell.cmake +index a2d180b3..3a5aef3a 100644 +--- a/cmake/modules/FindHunspell.cmake ++++ b/cmake/modules/FindHunspell.cmake +@@ -64,6 +64,7 @@ set(HUNSPELL_NAMES + hunspell-1.4 + hunspell-1.5 + hunspell-1.6 ++ hunspell-1.7 + libhunspell${d} + ) + find_library( diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 569c7b68edc..757551c7074 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,6 +1,8 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools -, libqmatrixclient_0_5 }: +, libqmatrixclient_0_5 +, gnome3 +}: let generic = version: sha256: prefix: library: mkDerivation { @@ -14,7 +16,7 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library gnome3.libsecret ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index a23dbda6cb2..1a11e8c0443 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "rambox-bare"; - version = "0.6.9"; + version = "0.7.3"; src = fetchFromGitHub { owner = "ramboxapp"; repo = "community-edition"; rev = version; - sha256 = "1h44srl2gzkhjaazpwz1pwy4dp5x776fc685kahlvjlsfls0fvy9"; + sha256 = "03pwzyij2i5m23qzhyqdcipixmqj46qbjmq626swwqy03a0p91qv"; }; nativeBuildInputs = [ nodejs-10_x ruby sencha ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-10_x; - sha256 = "0qsgr8cq81yismal5sqr02skakqpynwwzk5s98dr5bg91y361fgy"; + sha256 = "05vb0r0q3ckg2g87fsm22j0cbfvk81q5z43zwmrzh3pb3zh54xj1"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index c821c4b0f44..8471f43c6dd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; }; - buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4a72c186dfa..2e8581f4eae 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.29.1"; # Please backport all updates to the stable channel. + version = "1.29.3"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "12n17d8b31si7gngvv8bhbcid46n18kznv875nyy34i6b97zavmh"; + sha256 = "1rkj6rwmwwvyd5041r96j1dxlfbmc6xsdrza43c0ykdrhfj73h11"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 3ac2b567a8c..8093f91feb3 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./conference.patch ]; buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ]; - NIX_LDFLAGS = [ "-lvorbis" ]; + NIX_LDFLAGS = "-lvorbis"; meta = { homepage = http://atdot.ch/scr/; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index a368473b0c8..d43d8e1f988 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.54.0.91"; + version = "8.55.0.123"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -63,7 +63,7 @@ let "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1hnha8sqk78zxkjqg62npmg6dymi5fnyj2bmxlwpgi61v3pyxj94"; + sha256 = "08dvgqwj7f8k3xv5kv96k6v6ga1v2chif9m7amncg6ppp81hy7nx"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index db1d0a54dce..d47b7d00af9 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ GConf ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${libxml2.dev}/include/libxml2" "-I${miniupnpc}/include/miniupnpc" "-I${qtwebkit.dev}/include/QtWebKit" @@ -31,10 +31,8 @@ stdenv.mkDerivation rec { "-fpermissive" ]; - preInstall = '' - installTargets="$out" - installFlags+=" SWIFT_INSTALLDIR=$out" - ''; + installTargets = [ (placeholder "out") ]; + installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = https://swift.im/; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 983b8509dc2..165e3e959e0 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, rpmextract, autoPatchelfHook -, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify }: +, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify +, wrapGAppsHook }: let version = "4.5.2"; @@ -17,7 +18,7 @@ in stdenv.mkDerivation { }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - nativeBuildInputs = [ rpmextract autoPatchelfHook ]; + nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ]; buildInputs = (with xorg; [ libXdamage libXtst libXScrnSaver libxkbfile ]) ++ [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index fde40c62e4d..c04851d586b 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -20,13 +20,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.10.3215"; - x86_64-linux = "3.11.2912"; + x86_64-darwin = "3.12.3490"; + x86_64-linux = "3.12.2916"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa"; - x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl"; + x86_64-darwin = "0xvhx3r99fl1v1cdqj6sk46kzxv9qi7j754amkhv7knrpmgyp55z"; + x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 79151434297..972d7c13a28 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkDerivation, autoPatchelfHook +{ stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash , fetchFromGitHub # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative @@ -94,19 +94,35 @@ in mkDerivation { mkdir -p $out/share/icons/hicolor/$path/apps cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png done - - ln -s $out/share/zoom-us/zoom $out/bin/zoom-us ''; + # $out/share/zoom-us isn't in auto-wrap directories list, need manual wrapping + dontWrapQtApps = true; + qtWrapperArgs = [ ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}'' ''--prefix LD_PRELOAD : ${libv4l}/lib/libv4l/v4l2convert.so'' + # --run "cd ${placeholder "out"}/share/zoom-us" + # ^^ unfortunately, breaks run arg into multiple array elements, due to + # some bad array propagation. We'll do that in bash below ]; + postFixup = '' + # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect + # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: + qtWrapperArgs+=( --run "cd ${placeholder "out"}/share/zoom-us" ) + + for app in ZoomLauncher zopen zoom; do + wrapQtApp $out/share/zoom-us/$app + done + + ln -s $out/share/zoom-us/ZoomLauncher $out/bin/zoom-us + ''; + passthru.updateScript = ./update.sh; meta = { - homepage = https://zoom.us/; + homepage = "https://zoom.us/"; description = "zoom.us video conferencing application"; license = stdenv.lib.licenses.unfree; platforms = builtins.attrNames srcs; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 249fdc958c8..43ec0910cc2 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -23,9 +23,21 @@ stdenv.mkDerivation rec { url = "https://projects.duckcorp.org/projects/bip/repository/revisions/39414f8ff9df63c8bc2e4eee34f09f829a5bf8f5/diff/src/connection.c?format=diff"; sha256 = "1hvg58vci6invh0z19wf04jjvnm8w6f6v4c4nk1j5hc3ymxdp1rb"; }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/87192685f55856d2c28021963ab2c308e21faddc/diff?format=diff"; + sha256 = "0rspzp7q1lq8v0cl0c35xxpgisfk264i648vslgsjax2s0g9svx0"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/814d54c676d5827f6ea37c1cd2d6e846d080c13c/diff?format=diff"; + sha256 = "137l77kmm6p9p4c4kvw2zc4xkr10ayyc9z5rlpwn67574h47v55i"; + }) + (fetchpatch { + url = "https://projects.duckcorp.org/projects/bip/repository/bip/revisions/d2dcb0adb1aa8c2c4526aa6ad650483b0e02ab7d/diff?format=diff"; + sha256 = "1pvywaljdkmy4870xs6gvsk4qwg69h47qr0yjywbcdsfycrgp8aq"; + }) ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" "-Wno-error=duplicate-decl-specifier" "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=duplicate-decl-specifier"; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index a90446a87fa..0cf06a1f452 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = http://epicsol.org; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; - maintainers = [ maintainers.ndowens ]; + maintainers = []; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index d1b950a7757..f78053bdc37 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -46,7 +46,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { enableParallelBuilding = true; # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; buildInputs = [ cmake makeWrapper qtbase ] diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index b081a6b3672..40914295597 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sic"; version = "1.2"; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; src = fetchurl { url = "https://dl.suckless.org/tools/sic-${version}.tar.gz"; sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 1e03bb77ced..13ac80677ee 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib -, ncurses, openssl, aspell, gnutls +, ncurses, openssl, aspell, gnutls, gettext , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv , asciidoctor # manpages @@ -49,7 +49,7 @@ let ; buildInputs = with stdenv.lib; [ - ncurses openssl aspell gnutls zlib curl pkgconfig + ncurses openssl aspell gnutls gettext zlib curl pkgconfig libgcrypt makeWrapper cmake asciidoctor ] ++ optionals stdenv.isDarwin [ libobjc libresolv ] diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 0a670b2b9a6..44b97fb3793 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy ''; - buildFlags = if debugBuild then "lumail2-debug" else ""; + buildFlags = stdenv.lib.optional debugBuild "lumail2-debug"; installPhase = '' mkdir -p $out/bin || true diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 6c3b3a69b1d..ba8f272203b 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index daf665f77af..f0b8fdcf8e2 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0pc77rcq7bjr6vmfyh74fhzp94ijx05fdn0z9nbjhx75j899bd8z"; + sha256 = "0x4yfvk8415p80h9an242n6q3b43mw6mnnczh95zd3j0zwdr6wrg"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 986ee5fe3c9..8e1f6720120 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { ++ optionals gpgSupport [ gpgme ] ++ optionals sslSupport [ openssl ]; - configureFlags = [ - (optional gpgSupport "--enable-gpgme") - (optional sslSupport "--enable-ssl") - ]; + configureFlags = optional gpgSupport "--enable-gpgme" + ++ optional sslSupport "--enable-ssl"; meta = { homepage = http://sylpheed.sraoss.jp/en/; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a996841055b..5cfb14d2e2f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.3.0"; + version = "68.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ar/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ar/thunderbird-68.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "f582e0a5609b2bf6a9690bd48c906898acbf2cad973dcf3ed0cfd1ea733c600e878e90eb1965f95f1f2436fdaa70590f46d5d8b4b1908841dccf61ef852266bb"; + sha512 = "17052536aa5e0a3e2aae2ef7bd07fb44abdb8871df0d5fd99b9c2965ef747d542601bd6088701b5af0fead05617073f5a496af2d6626f77cedc7fa3e8e2a1c85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ast/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ast/thunderbird-68.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "10485e481a6f9c08daf12dfa6a97820b799a232f21cf365d974cb91d88d9f388f04c6338b99ad1e8ddcc97e848256e2c8223f757be8341a9061fb385feea91e1"; + sha512 = "218b923ec83a9c049d743ff75207b07619ea4368c0620a162eb2f48e094173b404c4a393327c4dc497ee951d97fc3010c424c3b186da0e1bb1a024d7f7b3769e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/be/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/be/thunderbird-68.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "634dcbb067bda884f81442a4b91e451aefc3ebc9a0b5672f573dee02fba3f21e33142a67ebcb77eb2efc0c1eebf405ae1efe4cda6834653b842f73ea0e8a8101"; + sha512 = "74ed02a0e62a2eba57d2fec9485ff38974d8077c3a9e9b5f37bcaa5823a43ebde657f69f863ba72a079e9f3c0e8139dc12b192604c55024a48b1929b39ade504"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/bg/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/bg/thunderbird-68.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4416c114ea4c7f07ae4d81ee6f6616949338370a55204949dd6d5ad8434d84393c5f9aacf7d56e0ca9b556f2a874b126fcae18ad683fccaee1c4a464396a5137"; + sha512 = "95869b21e7141624310a9c6d0a021e84a507f13a06fbc68ece2eb20c8a302ccfae8dfe3fd00141aba0fec3becd5949520436d1a637234dee504a3bb71ed6e966"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/br/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/br/thunderbird-68.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "5f4ec4f3829e25ffa6fa0077d4b25ef4375d928dd29659b1c95e8b3c331f63d330d58de43a7ead00089e98da929bfbc8a27d6991b577a4c6d9d5cf0a7c98cec2"; + sha512 = "8b76d5929bb1a45abe3d86b8725e268e67aa5bc427cdb2e6d3a60c3ae58dc0e1563fbe3b9a205836a71907fb0248ab4d8f9c11d5f646cb1a0ebb4a95aecb578f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ca/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ca/thunderbird-68.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44b7ffb36fbf6fd96a2910d09224c96c5767e3724d282537d2a1bd8db437b173dca9ad99b8f114b82a2b18a311ef67809dbcd147aa19997e5a9f2e5ef1135719"; + sha512 = "62e161105db38e5fc9bc55a9cc0edfb42982fbe8af9a01a9664638e5fefa06aa4304ce4ddeffe893007dbdee873772571b99b03644027f42d576ac9d00e978b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/cak/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cak/thunderbird-68.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "61d1ee6a05caac1395c866bbaefdda733fa10fa95b283138df7db59c7d573c182aa3923dcfb83523b7904c53f26de33ca3bfb6af89ee1be5971e867df31e9345"; + sha512 = "f80101e3ac77d140ee27bd489174c61114b9f72c3b2185e1908d488f3f13c445a02d2c38ec897dcc24a66f87ebe2d76104d37ced482ea9fc1c7241edf38db724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/cs/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cs/thunderbird-68.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "904d95ee8869bb6cbe299d873dc70a334a8142d8ac441f398b9914afb3dd544ac8079b57cd9c47e6b469461a4e677b6ce091ee55852b9d6afd95479ecb6abe74"; + sha512 = "f4b27aae7c69c4a46c974f75f0f1a7a2154d422e236618df8efdf99859954b04c2b672c553fcadaaf07868fc95b35b75e678b855f5734d204cab32b0c20792ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/cy/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cy/thunderbird-68.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "f67b192b0421383eac3bd1ce6281f1fc4bd78a5aa1a9fb7562caa304bcd8ee8c3ac4af356f760b5dc1e4a7941ce3ac55d95962dae3beac9fe25b79a79a5f4ead"; + sha512 = "5c94a45af181ab8f5c1f1c485a2f2af9fe82eca02f9a910326c69a555c5e3f7bdb99712d9efe0efeba3f2d8af30fe83f62191a4399434f442ffd7442f861fd08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/da/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/da/thunderbird-68.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "5c8cebebb6872caff3e9e0e4d9b41d1b885a3b06c2ad0b7684973eb36e3edd335a83e01ce5296df3da204ae93665b7d83074fb80d76e632adc53307b6b7ee26f"; + sha512 = "1141851239c3808f6fd65a027e7656279c950de67bf02416e43e37baf96e25ae567122e7610baa02fcf168a3b8e3d8b4200493d835a7a40b08cf99b4d42feb26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/de/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/de/thunderbird-68.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "62ae07b032dd4045724cd48699bf39adaa83985e48a79f10650fcb40514f82f80401b6127a46c42115ef6a2011831382b01d04506f571b3246caff16891185ab"; + sha512 = "e201a89c573416cb1ae5d3f6fa9e7dd5f9ab53e60eba55755c78d70545f77341ddd4d7298903e2e424c9f6a14c5e10138348250c843d95b91503132b7909063d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/dsb/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/dsb/thunderbird-68.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3d69c00a24b02ea3f0aab03688e595a9b09919d363c6bfa59e3b0bb0b5b0d1604c8af3e003eac0083bb73c11f613074635822a48f2d2c4fc6cd074249657aa69"; + sha512 = "a7f700781d233b78a83cfb35fd1dd2393acd10d685b3dc4b333580c2511946f5e44f057e7ba775160ac2c635b5a15db0bb3faf0e7e946c92d365025eee6b741d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/el/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/el/thunderbird-68.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "8b636763c36567308f605e7547cccc47151b6bc864fb6a6a4af750c3d32ac4b908b76539d9d64ea416b2078532c3c6d41769fa3c3176a4bff71713d2641d2cda"; + sha512 = "f88050e071131929ac728938674e1a77c938538634e6a11f7d085a577bcc7b49855cf568d1bdaf6b86a79052cd294d3cf7962650f11d066f5a98a3cd90856482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/en-GB/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/en-GB/thunderbird-68.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2bfa2ad92b41529c805d16325806ea454915c4c843b76a0aa66af3785275a027c6b882508e216cc6eaeb6dd50d725dd999226bc3e5e9d0e1fae67e57a66477a2"; + sha512 = "314400d8f9cef4cb6d177b60824b371b6c135d0df5d5a69bf0d8870c3d51e88902df6404e7226abf5cba68de538f0b4019725c1a7f6f788270698ea0d26b75bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/en-US/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/en-US/thunderbird-68.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1dfdbcc84d1df6c7e1864b26f2fe25c253d6108f3661280fc29cff1ae77d42962322b224f3fc9f409a17e28167f38293427c5c1bd8fad674bb70c2019368ef13"; + sha512 = "6c8dd662d2e2d998476828247e5455219fce61c251a37d08ddfea4b5d78e236c85c61dd3304038d274ebbcfb442c15b94080df57fb002a3627961b204cf8954d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/es-AR/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/es-AR/thunderbird-68.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "362a34dd3bcf8aa3beef0ee5bb788f2f32610a0867b553cf1f60d2c906177c67d4246ee7e0aa13b899bde81018042110ff8fb3bd697a2c4d9a9bee1b9dffe69f"; + sha512 = "86a55fe5347382b5c607e29d9a1f7fcf15c5db97180fad4e643f2da0a11c98476688cbdac03e37ba8e3483cc5a65a802fa2b6913719083a529dc2ead08473991"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/es-ES/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/es-ES/thunderbird-68.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ddd967628e74f356518a9c1bdfd2b7cfbacde3e22fcb0f1804391b824092884605ba537c2199d792661996fabd7684bbecbdb1e8402d956cbaede6a9a7aa70a1"; + sha512 = "ffd8390320c7c8fd04dcaea219bc3c51be8af9c922b465e778c7a03d388cc496d9ce288fa6e9c2d5c2ef718f1e870929a7079f76c703961959037111f634db69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/et/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/et/thunderbird-68.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d8ae804573532ed3357c693a7553db9256a225024f8fa1bd83d3f5aaf435e0d4474c9142f714edc306b01680d554c29bdf8ed598734a81addb4c1c606fc361d9"; + sha512 = "b8b7305eb644b5637fad17015dc6ef37f35ac2f238327589e50c6ddcb80e1fdd365451de3ee28fb5ac34e37ce3f69883a38464d799aad0cfa8c8da6a41b8ea6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/eu/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/eu/thunderbird-68.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "01397fa10c975955e6580fa7fc5252cf745bdf1593161de719380022e3ccf60ecd894d2eee291e048faede454b867bb54be187b3adb58bbd072d373f2d4ae735"; + sha512 = "68b424b3b53f66efbc90543683ad83f76ecb8a2e0469c00aeb013b5828a95a88bef6de6d1809767238715ffb81495508b765a1a7b347810e69e51bd2d732a0a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/fi/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fi/thunderbird-68.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "990950af50391f7ce541acba2d3c3c1685495cba899822a094c1d1cedb11e369e42e5c385f4377ad3686deada49f11c49bb7fde9bc21b838146db239eb20f805"; + sha512 = "4088e2260609b14b8a8dbf6b60b3f88fd4fbdaa182da5671056333e01906a5dedfbf63f39cccf331de25ce2e905811fa6be6b25f615bf0244dff4f3b11a5fe6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/fr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fr/thunderbird-68.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "88f9d6a3baf49d70f88a11f9e1460af67656faf932545cb40e5cb55ffb2adee5b3795cbb5497c5dd1a158b030be9d7cc42e0d23450dd1c2e940eb2e0c0c27030"; + sha512 = "c986e334221e56f9c7b45a09bc3cb8ff2c8376ed363e52ab6421a468a050b9369206942830043aee9acc1b1f5ffbc03df649542c69e05d99a6ef4ee604bcae3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/fy-NL/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fy-NL/thunderbird-68.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "7242aa4cc11d30cb85047cf2398c0d65717651649224e2770273ecc753a02efb870519737b824b091edcb35669a8b7586c659664ba0ae7363aa98fda006fce26"; + sha512 = "8ae6e8aacb6e7788fddb3169db4099a6c4cbf0ced65bd2892977a9c6a480de7437abce78dd526cf442aa9f6d56d369248252442249bc21e333e218a927fe852d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ga-IE/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ga-IE/thunderbird-68.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a79aa117a98d621b959ac35c02eebdce5f55debabec29e63b2bcb34e5c99f0151a7e41439192b241f10cdccb414934b6aacafd7083cd4a3f67b9e88991037fd2"; + sha512 = "8528b198a821ed03d859c1a05704cfcaef3a809205521a07fb08422e93c0bb46e205b26466223b1dd5722ffcb2966298f6b3d98dbd31a211bd9862e536c7cc48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/gd/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/gd/thunderbird-68.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d9e10c9c528229e31b342e2be5cb3bc8822418ae026f80874c943132cfe924e1aa6612cbb2e5dd6a10d37bf4a7ac6ce8a409a276833ccc625bae370cf64fb9c0"; + sha512 = "273acb355638ae7f8d14bf9ad8a9f55ed31c64c2f08a2e10eb987b2a061b77e5b87616421375346dc12c23ceb134c00b607ebf96de6bd80c745bdc19cfbe3e47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/gl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/gl/thunderbird-68.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "74967cdb1eaa2f701f84b4a33c7e0528292ed98c5bb9e85e2debfcdf12fbf192dadebd4c085daa76a0a24073895bb2c5d5f2050f2bf303f01b74afcb9a4a7e5a"; + sha512 = "d7ce4c44846140365cbc950429feda5204c5683ca760aa70ba7c5d81c5213968ea0bd81d6eab304b383778be7bcaf041784f4d91a4b1f7cadea45a4a102e3bae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/he/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/he/thunderbird-68.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "be33af55add594049337961fbd23542180c5413c8620f70e37d774efd83057d1077020a222fcd06d831a2be89d67970cec64fd4c2d9c7c17699818c3c1381618"; + sha512 = "a7847097dedf3337211a79b18323b3cb81d208286dfbb4371cbb306a52923461e016587e62a9e74ef1cf9eb21a1d8ae961ef10822c774ffbf6d4ef8c66789e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/hr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hr/thunderbird-68.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b85584ebd2327dda3147294ba93ac7ee4b434074b1416f90bc9dfd983d36b5badd32565b75c3603cd1b36330780014ef2f1d7e8955d909916c7b942d07248f27"; + sha512 = "e92d6ecd1c32e411d5f8af94aeb9f5880e20f752ade3d30357770d9e35af8bf68f14db25503a0d52a58e6f36687f0ac4666e320db942f69700d239a0ad4bbb3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/hsb/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hsb/thunderbird-68.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "276fa7d24faf3392b0911f12370f7d7b4fe43b2f95be9b5b5abb2f5e466d682c4d6f2f43c23f5214aaff806fa9c80ac3a699ff9445908b2aa20304e1a1dfec13"; + sha512 = "b13eb09fef032e74424b7ec24d551e1e4de12fbedc6a21786165ba7c4799fdea2bfe9a7142cb218af2dc9199ac5412146a3c954457d0c3a1801031733d6c65c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/hu/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hu/thunderbird-68.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "665226a5b74c3fb6161f16869ba01940e4d284733397978e1ef646e8835d675310aa74d791e62770edafa95aaf3f9298ba32cbea5e4976f42ee26c1705333f0f"; + sha512 = "d507f27473f7e1213208405ec8b266e0bd3f91ff23ac026180361445d59e92d69838212343684d12dca6f05c15ba2de19fd60062395b1f791ff6954dc6754097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/hy-AM/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hy-AM/thunderbird-68.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "64654186079dd7fad44cc3c64f3c760de48d98d7f96a330be41d4d6b6f18162e0ac99ad962be81207e275d0005dc1f00f0b1e3f900b41ccf1a0bc6a8a80134f0"; + sha512 = "ec1ecb62ae98887a49d5da9f81c97909a9d59a01b90c0435e8bd9efe682266faef88845f810a95af109e621d4a56b404e9283ae3a9c9104d6eb55afad4ae14dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/id/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/id/thunderbird-68.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "fe2771aad369847578d0e47466047bef12e73227c8d9d8b2399533e821d1e9c7020ef0454b9f6ccbc8b74d6e8aaa53f6f2e51552ba4addf018e0f1eef8d37fd5"; + sha512 = "1a96c8b40bf843ccf8fb1223a5f1f1f4418184b63e38c1a6b2c7f03fd43b97acb81917be5ba1acad5bf67fcecbc5374b56d7de34b651b21738dbfbe009ac36d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/is/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/is/thunderbird-68.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fcbce2500e556f8c2e32af295e5b5d9936175ef4b06ca38c804dc9ab9e7ad9d2ec0eac1e519774d5356e83fce00529d39f83d60de854d7d8f733dd7ced3fec0f"; + sha512 = "0f11e5aa11bc4ba7ab2064d69d8b0770c0db7b4dae5821a3d0c35257777ab690b114eb6c2d5e8dabb1efc17f9f5668ba32e824f3bc1650b65b9835758faf1d0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/it/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/it/thunderbird-68.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9ece75c604518358afc97b3a7da3a8db836fd5ffbe2fbe489beaec2b96fc6478b44cb4792b9321399fbbe37740a0d194568d7977470902e8a0f04a7790243ed4"; + sha512 = "2c3387fde0b35db4995ddad6ad3c4cefadea2f53eaa44a9dc34747fef8188c61e3eb3142952faa9a3800bcfab6ab0cd01268b5d5f94083e3fc0efdf72e6cc137"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ja/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ja/thunderbird-68.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "4d2f55c54ce1595216a47c2c35b8d01378647de612bc5e1a3f89b500c8180351dc1971ffb6d95ad2db205a9cd64a64f82b9e90769e2d8034e58cb6383c63cb4a"; + sha512 = "139d60c3aa21e5f9bde72b1bec2954ba1eead8a3806ffb54269211e44c343ebeb9bd2ef12a35c0e1dab004e44248454fea5e96b8c9f936d2b33ea91ae5969f95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ka/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ka/thunderbird-68.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9f36eefbdccc890df74906d924f21dce4eb1216cd7a8e738eb3464910ac131e8ceb2c641af492cd0f4e93250e764f70c75dfeff9f2e6a621df8757de4cf7798d"; + sha512 = "2ac9802728c2d5d9a380c28af124d0f983d818d3f4dd0d8465e7c14278db81b0eaf7bdaeed408920e64644cbf6857641791c8d02cb0c48dfeca663d5f2658b42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/kab/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/kab/thunderbird-68.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "fc5101da31fa898b101a9d472ca240951ec5aadf9c463f953e72796394340e6bf1eeffded2a866175165a012caf3d81bbccd26217e7bfa48d7a7706016977730"; + sha512 = "8105ae7b35653796128da3bb34200787649bf5ce0bdc4da9dbd43b02b64c7c5f0aad4c26413032b63fd0eb4600cc2992464da55da953dbb358b0ddfd1a676f90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/kk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/kk/thunderbird-68.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e23f914de467e43440a0fd20d11d0de2a703ac8b5c4dfc83d84346e932e4362340daa9f0e8e070bac1dd6e0c3d263763c69221f8bee9d3b8cdde6cff14f23986"; + sha512 = "80d85a5d30309964a6e139eb89a75fbddfe4e3ba2c8d8990040f2e9f25ee20d945e43a0de365ab44d6d54c593ba4e0bcb427334e3eaae2750e6fe4c6300a13b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ko/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ko/thunderbird-68.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "bdc3a0771397ff08f8b6bc1754a571685e93d41d20458b078e0290c922a79e0d09ca559e818c5298684acd97e67ff90c6b39f917a915c3941981aeffaae53c8b"; + sha512 = "034769456f8c78ae75b4ca094838c1398ecfeb570620f6f7f9a6beb68df1fa91fb6ff47296982edd720fc38c04a795525d1276c23172cbaae05cd8f367f6658c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/lt/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/lt/thunderbird-68.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6bb312c768cb4bb8828b03a107130cdecaaee3765cc08464cb2a5d1e4558646ffb1edaec47f66426ed94cc28e58fddd324d0cdc465e4923f5d4f0fec53411d7d"; + sha512 = "7726cc77d6346d9c80d6eefea6898a7a911d3ffc0f11c990183b90a21b216f0f26b80a01861c5d0be5e07a56cd6442cc4429cd8dc5e1274e1fc1086068aecdf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ms/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ms/thunderbird-68.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ab7f5181fd588defd9a37a0f23780dc8a6127722688cd21e16de6ffe529b0ad7c6f601d11282fab639d707035fa398d4eefdb372d7d1f9729556572fc49f5335"; + sha512 = "78ddacb75e28022d0bfc9add0ec0f397bee3b69c924d5f8a9731d74bbba150fcc160a84b67c27879560aa572a423c4973390b9bb221d8897460cb3ae6d1a4a5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/nb-NO/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nb-NO/thunderbird-68.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a37b3f85345fe7caa5d5aa575bdc8c36a0fd9abca61f7d295ab3a54d454e2e85cfecc674691bdc9436e8fbb7ad51fd0b99ffd5abd837fd30bf0c81b329ce1c35"; + sha512 = "3b70a504a6e2ac0ff8e7835b43b8dd1527ea934354e3cd97610e26ed60b3b4b2565ef6213a11ef9a5b58307e3c836f35d3359bbf79a4187ffdf58ac8718feb6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/nl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nl/thunderbird-68.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "8a79ba86f9c38825884f521994adb226d6f4a134ae6775fb4e6aa55ef6e3ca84f002c75469cf2b1241904592cc90fb5e770c2db2bf496317ad488139ff8af162"; + sha512 = "309be3866ced93396a528645c286e9ba9c031031a2cd3d608edb99b19b285a6ee313ff25067d25774d0f55c4a93c60dba4ab81ffca67786dca0873294ef96681"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/nn-NO/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nn-NO/thunderbird-68.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "a70e1550a31fd77b96a7f42a3e63bf45d9048a574fc39f91bbd6cae75a03e05541aeaab52f69e0f24c99f12db62d5bed5137286a0e98da3c4ecd67a3fb3bc640"; + sha512 = "026ba56748d96225c801aa8fa12e3c88b66ae9327155831e86ab5109afdacb69883b63a855c118c803f267cc04af91362cbb7155bec5eb23c28422c592f4b583"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/pl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pl/thunderbird-68.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "6be439e4b86d36fc216bb53d065c5f125a678e12f90cec361249608bbd4343e75889d061d8f6aad3402eaffc38124c14d03bca3289028af1f26a1353d3d31d53"; + sha512 = "53e64d86f139bc8463e63252ad52970a7eee25f281ca39ac73cf34affc302e0f9b620115d953fb40c661e8dfac08d219d2b65932ddbd93e4d9e3467f899e329f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/pt-BR/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pt-BR/thunderbird-68.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "72949dad1a38c720939f4510e4d3d0d00e0236163d883204c46cd0beabe10f5478fa78bb9ac6794fe12f55c731dd3df8e58b7edbad615057b269e949b5a471b8"; + sha512 = "8625c47ed663c68bdc25e16658bec052582ef48e582a7f932d072e29409554375e1787d36d2269ef32bbe9f9b0408530450c20b3be8c2526b96986308a87ff18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/pt-PT/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pt-PT/thunderbird-68.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "fc48fee9c910a9055835b0950ecd315ea5d89564760603672efc623faa2d5003a5daa7a935060ac29a31895c7ae347bb51f5e4451764a37fedb111fb3487723a"; + sha512 = "a17325aee249eb11cb8af4b787dbaa93f3c68fb57c6c27a7771ea04921f40c00a60b43f13fa0eb88c42a937b0c8d7b6697c74078be2427fb35702b7405e6c866"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/rm/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/rm/thunderbird-68.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "61da3802160882edee2e2d2b7e4d1042bb52e83c2e3b3b20cdc081e6b40cb134d573a64565344215302f6f0b78e30fd2608c03d0934058e92aa9275609d2821e"; + sha512 = "dea2186fcc46d3a795430a4fb15c3f50ff04eda053a54a1949335134b28044dd961bd6d52a5e8237aaffbc60ae6adaba2387a3b153362bfb7572046e002be0d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ro/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ro/thunderbird-68.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "f8e6b69e0e385fe28c60dcd5137a0d167cefd966d738befcef0401b64deda48b16193651865cccb6c0880c3c001bea320539931088ed898153c98260557ae177"; + sha512 = "94e30dc37fbc38528908c2e434c15a02e6e95e279b6fe92d9ea8df1b8ccc988f95f1fd5129e02c20be7bdd5e2201037ad47209d75f5fc005bc670a023aae143b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/ru/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ru/thunderbird-68.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "de446cacf6f07ce4d39e80b18374563c1c04ba7eaebe1ade785d54090012ae34d347089652167329e03646236370de433ce4072517a408a2130ea2dd94178899"; + sha512 = "c4f8b328c497760ee9149de6407a7bb9d1f2e63b8482ed279d70f693f5645ed688b8e5c4ee9a0d5a4e593819718f5e6764d1bc5e0b14061ecf03a0e2eca609b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/si/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/si/thunderbird-68.3.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "fef63a916d3f98d2d272fe0eded4c8ee9011a523a765fadde0bd578ef7c1203cafe11090d193e3d76eda424c4b2b933f0993ce5d2c86abd2c0e0cc41753602e4"; + sha512 = "80698a5bca63711db2f2f08617868803c99ce4afe2e0998ec98fab255bf632833e7d6cc84affd5306469854b29ade93eaf568fc870792dee29397335ea6c2e38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/sk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sk/thunderbird-68.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "3fe48340a7d01af80cc1522427043ccc38480b87f3eb17ded58b402be101b4b1ffebb8613c46b90016e05705db2901a17d3e5e468e17b2cb938564d96be76720"; + sha512 = "844d63101e62f7525bfe7e47cef0017aec6a8aaeb3693a345b247a50749c078f3d7697ee7ea0c758af48f2d12e354d0f0ad939959bfc8c813761e1cd092a065a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/sl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sl/thunderbird-68.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "59eb2ac79922d3df19834d323b0db04b490e9e46a7c6ac32799fd039cea49e50218954797dda19374b46279f5a305de39e442ecf819be0631233329fef83252b"; + sha512 = "5641b327576f56e44506dbcf4234e2885df4c1de482ca5acabafc29bd9885b263818eeb5d0c49693194721b03c6572ddb4ca8136c88438db457a80f442bb153e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/sq/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sq/thunderbird-68.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7f596d06d2fcdb8a93ab15ee2953197d9585775826cafd673dd131e44b3e31c29343ab1643cd7149654eb56acd7cd72976e3ec17824128917888d1ba3f42d9f7"; + sha512 = "070cb427f6e80935ed43f27145491c7a8d6eca7b54a69958912aeec724699362c4beedd8067ad94f30dde2b74f5763ae5c4375320c7aec039716e6274a540fd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/sr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sr/thunderbird-68.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6487e77c1fffaa20125252651253c36dd2eb7cb79f05452cda51b3d51846a6cb53e88a0b50839ab726f8ac018218d8ce5c96b22e7d12224fdfd4c72c6556fbe5"; + sha512 = "1966fbae58c58112afcae545d36e03d0555d6ca3e172ce6077c32b692ef049d3304f44534f7d2d05ff8d9877cef6297aecfe3aeb03bf6727d544f01475d731a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/sv-SE/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sv-SE/thunderbird-68.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "feb3826c3614b2f49cb00bdbcf66eeb53d1e7b638b80c78d72a2b440ac8dcacb0c2d535a2f9afacfaa497612086daa477c783871180453ba3c0d113c232eb535"; + sha512 = "5a07a3e16166fc7b0d8333279250f08dda228b588f5437a78469a30a3a2f28259658eef183dd7fbc595ee8133297cbaba5912a7260db4e5ec3bf3d45b0b51b49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/tr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/tr/thunderbird-68.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d4a5336fac3056197b8f4848f52916f7a03393c6146ff5b53b70a9a443551c222df8d9189f3eb654104a975fcc95e45bfd44d01549b7b2d4c137522825d9e1c0"; + sha512 = "f04678b9d30747a44279f5bb7660e5a4e24e48545054889752268dd130f184f00089ebdb74f1439f2d2861acc3d326513c483a5a82b0a2857696438783494986"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/uk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/uk/thunderbird-68.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "9e1b50bd1731e214e8a5ba891824b21b2f7247569196e0748ce6a06585440594a40a47bbb11d32026adb1045660077e727f6383c8510d8a5a3bea664177f962d"; + sha512 = "7b812fe4736d064a8854c52d7f4422fe0cbe1a82fe45d04a1713e5ac961e35e8df85fd0690e2b6102f631f64b487545b5886d9033cb5d26fce95dcb444a4312f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/uz/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/uz/thunderbird-68.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d0aaf85701e72d1ac7f212769d0092bf5c42167ab90a2314f234c96f902491cd5ee3bf07f19ebff243767811e0ae2d0a10d904c2869533f85e479f5885c7b839"; + sha512 = "0f1d60b83e48ebc2ee38e24aea951d7e1b17e7ede4145ba3170380b51479271d04f32da493e3d9eda751c41974320d2c3e75587fdcd9fa716d9795bde597d0b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/vi/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/vi/thunderbird-68.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "33b10c1cb56505e4475756a9541f27e76f7bb188759f867cce7d0954b2cbe0555c4b5661394de41c844c437065b1880e72572e382e1d04125189bc663859b418"; + sha512 = "ef8f8aa5f676d9b629ad0491be1767d5a66f25cccd1cf4e089cd48b0dc91efb4be22ee037b21645236b49f0c1d5016e89285dabafcca9a9dba27dd272cea7559"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/zh-CN/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/zh-CN/thunderbird-68.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "9222cba53d61179ccef562a0c24cb11a6da10c5eedd9ca306fa784527842d60a2aa3f3ab2a052109b22e7a75e0275fc7a817fdb46cfdb8ee65ed92f875efedb2"; + sha512 = "15eb738721b6cb0bbcc9547422ff89a1f3d9b28abddbc0c386a56ba44d91a1eeade1a4367aab0532b37b009ba7a29e8faea42cf84b320155defcae22ae113e46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-x86_64/zh-TW/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/zh-TW/thunderbird-68.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ca4405e0317f4dca6ec6af995e8df88927cbcb5d60f88439363a7e421e722fa2a5447710878ea6cee92b752e3a40fd57f40f6d908b73afce516489172016ebaf"; + sha512 = "012a043f5c66eb76876dfa44925751f37e7cd149dd7158cef2121c73e3bce714443663ba4fea011879e7c80d6a653d7cddfa889657b2ee6d6f62a287c3d17507"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ar/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ar/thunderbird-68.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9bfff5ce8473741122a2be1dcdf67f8008bbfa87b3889886b8cecc04db4692e3fdd6cd5953d86eef6ab5bf403de0a5b0039a687b47d3d9ae9446bb1dd5d51f82"; + sha512 = "5beb572e48d06893a38c17e7b5c9bae1f6a4f74e9d5f36137f73fef085c6e1a5583f7d1ddf1efa587479e682eeec96999f2c5ee82827665f27b963f242c87710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ast/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ast/thunderbird-68.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d838b0fc00a7f8502cb4b748b4a8c7ba2f9a497b6c0fb3cacacf32da316beeb06c0668ac1868feae2648273015915af3f3290e68557dde5c88350e885f4d8794"; + sha512 = "f0c5bfb629f594fe83692133496526df6d26147ea392451f9c279545cf2be8a160f6a9a1f7bdfe8684b099223764c5e0b3d751ce64e92eed7005fd970dc5dfcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/be/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/be/thunderbird-68.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f733c1ad5d0d5d9147f529a4eac2739f786fe17afea6266cf6b9b587bb53c836bc101d9b503e5ea63c24b605e4f17ab266fb4c9e4b68f03961a30ba3ae14eabc"; + sha512 = "446102c112be7dd92f1bcfd377c88b7801f0aad56f0b7f36ad18aa4bacd51e68ef3a6caf758465c42d0bc0d19d7845514a4f8920a98910244a73769c1177cc63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/bg/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/bg/thunderbird-68.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c62bc0877e39732e9c6fab4b06b1651a8116d4fc1d5fef449ea00f8039d46d6af10d6ca56f65ebec0fdf641ed48e3395bd39c8ccb895172122e6f031034519d3"; + sha512 = "455f22009b00a8ab2afe829181fa0d2d4fe973bc595a999da01521d514f2c4ea3df203e439426ce3bdd389e58f3c954af15068dcffbdf4b0d2988f197703cb1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/br/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/br/thunderbird-68.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "b1709d93092acb736811e24e4ba613cf76cd37cf535d8dfc8f288cc2455f7516cda2507e2233e9eb4a2d70f14351fb5b415dc15abc7d415fba78de44be4d8060"; + sha512 = "56c5dd9bbb19cde280b2b0c6cf4835dbfa4cf72f2dcaf5cef50e5d13e28aab99fd42c716c9fbbe5ef6b571e22aa0d6c7e82bf24d14746428547747026a41355a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ca/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ca/thunderbird-68.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9284d957dcef227800b51fcb5355b807931f865d936814e1e998edc07773a79a29c6cace90030565de91ac019c03afa13f4c339a2b23c3d7750f346a4b90817f"; + sha512 = "c35b3bd4752b3cd72347eaee3a48d288e9c0a65ba9c50d2da80aafab0d57df7315531941e89c1ce374ba3f2171553e465b8f1a653acf0032aa08cdefd06399a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/cak/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cak/thunderbird-68.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c379b3033885ef6e9a3c01d80dcb891763f45b4ca5b227982462235e1467797d3c252f19b87dea76f810b7521fffe099583d857ac12753d20a10efa5789a016c"; + sha512 = "ea7b2fd5abc216603897264efbd3501b5eadf4d0714dfa00ee351c53dd4595de5ee1f314bffd86a8a3e5dd92548d5c1ae28339e9bb0c32be2fe05f1279db009c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/cs/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cs/thunderbird-68.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "679bfcdadd37a08a4d46f4f1514455b8020ddec694a08ae9d567d9f323cb311055f078f715d1ae89965f420823a1cd7fc11142a73d26894d80c051e6971fe907"; + sha512 = "24e07fab3d550a3c5bf3e5c649dadf5466d2f7ea86bf607173802385f2a79454aebedc4ecff7d25c8fb86ebc7594a29ae2cce6cfa551cc3c0ddc165fd77a350b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/cy/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cy/thunderbird-68.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1e06c75c088488d1f6434882be890e799d7ea51adf53f311126ec9332add92b2f5ade6c190a406b58dd37c3f7964fdb4f1512c6489c9aff100fc47e9735b9c60"; + sha512 = "36c2b67b0c88cd2341ad6dab022afe7a5d37a2796fb75fac6014bac9b4b81e7734ab8d803bd97846bcf6b16e1e15921ea7e983b07fe77ca52d51a9819d785f81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/da/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/da/thunderbird-68.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "74d4a0de362a32c97a54559581097f4aab0ce64f956b9c65819e18ce6659bdd0e3f6e243facc7f64e4e7e165d22fca3035ff1d75c79be89a2fa940e66fbe0a85"; + sha512 = "c200e146778c1719b2ef1c31cf3b3a5cad8b07cd4f773d1e889a6fac8f6a4cc3700bbf8d108eaec90f8319056c036719601bebcdc975ac4ecbf86b962d65732c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/de/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/de/thunderbird-68.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8930e9628de1b3a7697a9dde7ce5999402794d34a2bb1ca33391c921c902d2563856ee00c4a6645633cd17cea4cfddbc9f54e55fa61b9d7f92a3f01ce12d4539"; + sha512 = "ebc55f82e83dd9d17bfcb8c5f471418ca561bc5acf01ec08251dc7c0715ce0c5dd2fb1ee28c2e92e1dc9b24b6fc8ecc1902a5e78e1b23967d683e2825c92aead"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/dsb/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/dsb/thunderbird-68.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "3c54c16a4352d46b7131cb579aadc8862e231595fd4d027c672acec6b4b812c8b1991d39cddfccd8f21e039d4439f292fb02dd0f57948f1d4ddb4b3314d70a72"; + sha512 = "9f67dd9f57b0f1289cee31750409b14fef52202c4cc205fa7426e81ec8f262f8d39786ee4750a47cc100fff133063a5a16c67729871e86eaddd1fcfde419f7ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/el/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/el/thunderbird-68.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "bf2c63e2c79e4f943d5f3134c882d115fec38c8c55cbd112e4eea8970a00c40787f14ffcce61281be8e18a1fb3d90b93b0183a005351d4bdf7cf62be6d5b81a8"; + sha512 = "6b9624e4779d1720d7bfd6d5ac72affb2559ea730222edd85322d17216a6d0491a745a15e98d1a5bb8b68df9bc6ba33144f9e4af1558844aba98583051a07f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/en-GB/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/en-GB/thunderbird-68.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "8a2920787ef249d7ccc2bcc9acd89e2fba0292ef42c75e607063615d7e8da7816521f9d6b9c55ac636f944441e1faeebdabe553d2a03d74f3c65120c51e96390"; + sha512 = "9e8ff4441e1f0813f7a797c7815961f229f6e4bacb3090e3417546d3c62274d94b7bcc7cd4e83319f456024fcbb6d4f5a1d347d8789d6cb5c530aed2369bd18d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/en-US/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/en-US/thunderbird-68.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "9173c566663b1e2e00e60538019e35b663ab14a54b1c2ff7a37c9897f83015975bee0296831d95ba34b51e9fd65ae3ec5c967edceed5fc79e3cad904ee4d2e9b"; + sha512 = "413614f1508befe9f5b518125bdb53791d2fc86acabf899f7d48ff645f02f09d74e751671be4e1a5aba8d816d3f45fd5f3cf5490fc037d87596a10574301af43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/es-AR/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/es-AR/thunderbird-68.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "ae563ad0c5d972effb138fb498af7a527d15c1a3b21e8f5d290708a2533ce6472e8be5d1a445d649820414782ddc84ff4b0dac89a8264cd5a7d1918f820f3aae"; + sha512 = "2ae7b1883b238727d2fa6261c7eda3bd428c996153b1cbb468f371e5fbf9f2101e4e2c078246359659fd495ad3ba80e71437aeb6157799225dbffaa7b7462f25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/es-ES/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/es-ES/thunderbird-68.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4337016feb63470a60016b90b5a14879e179cf279e160cbc33f337d53f87ba8cbbc2be097917f20ce400e5aa4f31a66dd62ffac15c8f2179a6b6911c862d2d23"; + sha512 = "927801de4ffc11354994cef415b231b967d8d70326c86ade52432287c8a8a10756974e3286b8c9b372c08db2530c0e28be7913537ff4d83a80c7a69fbe191959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/et/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/et/thunderbird-68.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6c460558dabff5b9828cb7d26bc46207e5e1cbb79fcbcd4d51cc5f6019beb5f76b137b4198c8d27ab489546b1b5f585eff3dfa6ba38751103066c856ec684d0a"; + sha512 = "e800b51e43a0e4ea23442419f51a17de6a0695bbbd03c2b5431097c1438befd31cf2e07b70ea4ddfdc02a68494d56e2263a5f6d97f84b9d077ab600a6e3b7d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/eu/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/eu/thunderbird-68.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "7c842f32478c94a502b44dbf913724419a5396225a56fb772bd850270403ad4fc89f63a4714983f6c1a9ead8c5269a796b6f2e5ad0e305c873c12a0f7fa05e22"; + sha512 = "deb4999da8a2a5bb6b695666581f544cb33d844a4a69fb802802c9eeef96fa945faeb88311ceb10fca4762c98e0134ff09705b3c76ca4f1b25f342fea048f69c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/fi/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fi/thunderbird-68.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "90d0b7e16afe664e32afd3c73ad524417446dc7756e4afb9ed1929fa0a7068fc5b8bb740acd91c3d7ad6bb1f72f4220af0162ef30952996b0e6c796f952756d1"; + sha512 = "c6913908c29f26242062ed647838d07a70183ede0712b5542125b121506ddffc6454ada2557d2bf5090b4d5f5a5f94300b979e3426c57af8949326bf4ed9a3c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/fr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fr/thunderbird-68.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "35df299fb1796057f4458fcfe4fc0f02f96e85f309ca63c800c24d140c02ac34a3c84b107ce386b407dc634146c0a834bae706cd73433647f21eff61c5e14237"; + sha512 = "53e65c88271b04f4b73de9b2ce32020da0aa0f27ccc383d6a567f65639a4d9274f7699506115893029f150969554aafa2e09ed97a345e0f5c9ebce0e33273003"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/fy-NL/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fy-NL/thunderbird-68.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "de12f5c27b98c023ca5723d5bdc8c334be56efd977459dae95f32e56b7d795a30dbbc48bc1cb3574aede090e79afc2132f195db90af798ea4adfd5391e7bc3f7"; + sha512 = "197182e6f8c024f1ad04e157bb33b9e9c2742adc58177434b070454de1d7fa529f7f4b7738b43bd7c5167774666de23c4031ad5418ab828ea354248351eb4b98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ga-IE/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ga-IE/thunderbird-68.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "69fbea7506884c76383b650a9d8dd59e73713866fd150cbc6b6a39518d6be0c010e287e1825cf229192d54e99f09f23ed4f5893b82895ad7e1c42ccc9d08a5f7"; + sha512 = "4001e0b11f7d9aff506b84bbe183d8d1a6b9f9db948b345ee302f5327631def91bd28ed101905bf024e3294c3c4ca3e80286b62dd42895d4845a98f321fdb27c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/gd/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/gd/thunderbird-68.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "15f49aded918d58508451a21351a99e83d1f7e4b8c6b0aefb8ce85a7a5bc5c492bf979f5f097628208334244f24dedc859cb40dfd746c678142795f27b35cd23"; + sha512 = "1059be94966f3451ec366ff7490face91f4af446f072356ec6f34c34b18df0a8b55577a074cd3ac55a631803bc2e6af1f7de50d3d6c4e52577f3d6990485ae45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/gl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/gl/thunderbird-68.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bfb6cd46ae5286913e1643bbcd2eae1d921a65f7db47b31d03ad87be02462d07583ee3aba890a01758d2674addc69e0cb4ae8e96d8d6914eeffed12eb6b1615e"; + sha512 = "405f4c81edaf4d00925966c22f7c85f0aed9b01ff362e93977a561e36ccfb40ffc7ef5569c580f1be48e731aa44fdc3c182b740342a8d5470a425c58d87edfe9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/he/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/he/thunderbird-68.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "477279a4f293d6e5e11941d6ee32a2ab183c56f13bf902fea6dcb2a8ffc2a186e67e54536b6db8e674a6275b3a965525d298248642b54b0f61e2573cd581f12a"; + sha512 = "87c6e427f40603a68f86aed839ae7b06e488ebe6f20838a49ac967ab08d13a715621fa20c103a8f9511a8aca1d42b89c8329fbe0334ebc64b03e8bbe47ca3ca6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/hr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hr/thunderbird-68.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "8960d92fec76567faccc1d0382866e29cf234cad185e44e086db850b07e0c7484a6a55ded37114ada77d16687bb248da9f121b47256af6f8040d5984dd3b9828"; + sha512 = "8137ea66317afac5c40bf81b49195662a3aa7fff827bf9c5da1aab46cd41bbf1237a5205f5be50faf456cbe8a8e95abdada90b44e6a31ee9b48b21144848ad40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/hsb/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hsb/thunderbird-68.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4943b05440b08b89a5bce9c21c7973daeff5d1f7e3b6b1e28e36d547bde9980b9fc75ba3788591d2a86c11170645027da6c6a579cb2ae6510be90705e9f3efdc"; + sha512 = "76f99828d3716d209e2fc2220f1a42a9e2de7ae905d833f286a3161f20bd4b9f015108a1c2d7fe5bee5aae11289568516010f347929e8f504601b96dbb3b051b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/hu/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hu/thunderbird-68.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "3b7fb180a55ee77579e11115cf7598aae4b0b68bbf304a70ee35ffb0c9cd71a668013f90b6508f5220d179923386807ab33efc73568d00b6a76be76ae6408d12"; + sha512 = "fa73fe24c69419e38edf786c3cb2085038f11b8071d03958ae82468a7782c523382784c4bfbb686db167b2b16059f4faf73df2faaf3ffcc94f00abf25e498c3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/hy-AM/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hy-AM/thunderbird-68.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "fab98957f466ffa746504e9755624d98d3caf27da8826376bed123e23c23a3ca80b42ab24857fc6a127e0e2c6018d6986d918c9a8e36d541d0d8cb1ba9a5893b"; + sha512 = "4e0c4d4cdedc595d73d2ef5618ee89018a574ed56055545ed41015bcd7fb1f8ca6c2e9f9916f09f043a62259f71b1a1b5e49ff59d3f7e2d58ad735b1f059896a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/id/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/id/thunderbird-68.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "023c7887a82db18b7f83b4db4a9888d67d34530c8c3e965e16937f5b6bc67793a87ef2e47ba656d01d24eca3c0f459819fa74e6c212a118eaadee70d5f4f8e34"; + sha512 = "0c53ed9927037db892c37f6b8c930af53c49d9325f35df7cffafab07500d8b3a76708ee01742b63ebbe952fd6e95e2e90d2445d06bdfcc86d293722d2c472609"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/is/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/is/thunderbird-68.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "f14c2b22c4ec814d85974f13f52fff2f90e9c7559215d0b7995c80dfd43b7126c6f25e1d8240259633197b970e9e59054c969b5973f7a6ce59a58e116cdb42d2"; + sha512 = "fe9da6b03a962cf613e46613dca0652a17e27f1084ad60b26d9b301ff8a81b8e9b7c81222ea9aa1c5ad50bd5a0b8baa565d70d479712abae4618724e2c64237f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/it/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/it/thunderbird-68.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "7577d730e2cf93caa4c6775f671b2367371485188221d861f9bcb425a6b52a1bcd2d53d9e4690a7f21d3208635412ab77cdf586f271a18b6475e63139016739e"; + sha512 = "a309f5cb7fd7e2187470fc46ffb008a829f5e33ce888afb3c015ce741d902534cc09a3338f3649223b2fef84368108e0fd1d5852c3fcc0dca0abbb1853c626d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ja/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ja/thunderbird-68.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f75e99077fc68435fb22cb2114f7e2db52c836788255516e85f1b6ec68bb7ecd594e03504fdc5085a0a7377e54a2c940634c7290330fe2c362bbee14918d0015"; + sha512 = "83af58ca30ebca413ab71cfc033ee3d7589088e73d739a89a81441725b67d1fe271db806538b0882ae802cdab45480f7c6d6d04f63e10b9a5dbb62c497a50389"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ka/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ka/thunderbird-68.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b74bca192d2427c29efe9d5e866d7e5ea7bb2baf5de3857936772f5e4450069a0450ca1696ca981c7e14c0835bd5bef33a37dbfa38aa3d30f0f308fd7eb526a9"; + sha512 = "9ca88cc5a66041e1db771c7551ce9f246b8eb25946c3a90988615287f4089c5e1c0c9dc89ce776d5ab7f3015005229aba3dc724efde954147411315c8e964f17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/kab/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/kab/thunderbird-68.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "8ca36ebc7105a87f1a3faaf018114e49a3878ca0597f70330e222c92139019a935197b081a912c9b2f0712b27f0f97669309655d821853f9462b5ff1a3cbbaca"; + sha512 = "b7ed2fbb279c5aaaed7b219bd2e3097a9b2f524df91b37c9d68d2b94187323cecfc92b176d6205a4d184f64273b75eb4121a882583a0e06a9c07b09501f06841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/kk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/kk/thunderbird-68.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "fe1fcc7a2e847f91970fb72a557fea4cb96be5d72b05abb162ea3d41d8deeb82ae2133b072e60a85ac3bda04839400bd1f1a05109da7512e16ec103270d4d35d"; + sha512 = "86215ba52d4bae535706159c60dbbe471f0656d4c69473771566205fb1a700111bb8181c156fa3593cfcd32e0a8d2c51b72056277cc2d6946cfb797d24c67b47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ko/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ko/thunderbird-68.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c72aa38dbf8da61dd02976ddffd21423a7b34cb176f58b8e4f5a99303494a85e897126c957fbe0a1c1b161d0a11caf222111ded0fe09bc1c00a2e3ea30c4a7c3"; + sha512 = "d97cce3025365dd274903630aaa096e89ebabdbf3335f03a3593c90f372b2df100df059391f16c7d1262dddb7dcc4e2e48b104e10a5735767d0d359f1d8f27ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/lt/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/lt/thunderbird-68.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9bfe8fb796e26318893b33726848b047ce49f1a8bd163848b7fb927e5a301630f4cd812c1ab409c8ba619f8d67c66138fa0e42d47d0572ccbc54d0c4c05ca4e"; + sha512 = "6e4f5e35b61589a10de95f2e8269893a061ba26fb19fd072643764f5c5b476c807f149abb9557c646e38dd4cffd63f6a1cc343803ea4bf3b2ebdec730ccca64d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ms/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ms/thunderbird-68.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ec99de4f5892575a0923d2cb00f060989b401c36f47e713d927f00222a82d9a6869af9d192f6c826007ef0a81d486bc26219b8a7c2e19cd7c7b74263481d8da5"; + sha512 = "32149a9dd72da68862e44203e1e89f3702cf01203f5a6c6362d696dfd6de8ac850f6aca273a8bc8b2e6146ef9987b1c054fc738942f64fcfb5d3f98016cbee38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/nb-NO/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nb-NO/thunderbird-68.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3bdfad0b5ded387e7a64870e5411563c4c678516055ea2f8234f1754c23105b468f6df926866cf0663ff99de38ba2b10685b2ed093406b6f8d289c10764b9767"; + sha512 = "2a28c4585dba6642f5216228380dfd4b3ff0b7cfa23bd44feffdd0baea3dd352d290d6d236547fb8e7f6e7d7c724607e472d718006884f35a00cd257f91e83d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/nl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nl/thunderbird-68.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8671693c58d65644da152c717b637517bebe4ab721fee271c85e7d0d6ee8e9631206067b6e91e14be6639d8491066474b8931ea192b67ca3d83cad0667515174"; + sha512 = "055f6e6eb1a6cb84e1a3268b394eb514ba45278a26ff507339d00f5b2fbc8f1704bccc59a691d8068e94be9a84296640401146ab522a393e0db2f32f2d31490d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/nn-NO/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nn-NO/thunderbird-68.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b3b367627096b9be42ab908e2fcfd6937f0a5a4f9712e4c514c2c6cf88708e14e0944085babaad7a958bf74d1a67dac89901628aaf73287deaf62a032bf326a8"; + sha512 = "a0fe6bddc1babd7671da9105e5870edd8bce128adacaee0f8f31b904c022d62d593d32863d4c8e836dab2f2cfa11e79d2cdc0f71bf0909f44b46b7883beddecc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/pl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pl/thunderbird-68.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "e4196e078a3ffbe3d92fdd2bb8a62ca2f27a2c9ac18cb5aa925c03a5bd14ce6f9046bd8df9cd9ad9fa9b8f08e310a441bafdde13a044d0a3499b1430515edbca"; + sha512 = "6bf2693ac1dc360cb0af200fa07cc59d8a85e1da3db62e90dbb372e6ea92551224ad638dfaf0789c006b7e6800e18bab3f8a787e58aaee1070e7e799733bd0d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/pt-BR/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pt-BR/thunderbird-68.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "f8637d56fc7aa6d5885182b73e2e864fffe1a1f66952d9e19a2e5da0cc1cce8c5ec0191d5f5599f7419025e0a6c7d533e2d23e2ee5f0dba5d76e2ffa9f8f272e"; + sha512 = "d428949e8e1157201e068127cab265a546d358c0015341cfb489d2ee212675dfb3b5b837eae90cc50a3d997cacaa92a7b0777542e6aada37b29df16644113d7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/pt-PT/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pt-PT/thunderbird-68.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "ce75b7c0522e1945430b184ca0aabee61da4a12067e16e43f17a63c110fd46ba7e9c1196183de1f8143cb26658ad5fc3e4db7585bd599150a4e3f86307a5382d"; + sha512 = "9d03c8563c16a1b765890e3d45686b02f8cf222628d44c2abf8069308e1c5698c4f7dce34a5dfe872cfbfed9f37c2ed9483b84fd56c85d1e9a42ef77a31297a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/rm/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/rm/thunderbird-68.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "41b437bceb092cd92ba45a93ba86cefed6d15b2cd76411164c0cfd2d2f4a2dd163acf16ced26a000054cdd5676d0836f91c2b3b4fb75391e5d2066ba9f18869d"; + sha512 = "307b2858f594ae685e0800a6c17c498f239e848e2c7c2df9d360b0bc34716b51e6ffd405614428d213af22e4dec188f2ceaa0ac9b88ac70504473c6182c52191"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ro/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ro/thunderbird-68.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2dd8ea752b22545ee60080f90d1520e58e562af2b8593a33dd6cb485ed1786d1682663f1fc0dcf455e87417a33233d8a85c6d8abd15240a5d8b058b5257a1376"; + sha512 = "711d7bbffd932f26e2ff4001ee72147daa247ab4952f5b7dd5bd382df59f0f21edd18e20aeb5ae74f3cb4dec6f1d357e3ce479607b8b049088b5126829e66e96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/ru/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ru/thunderbird-68.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "aaacadc609784de46686e84bec789b3cce1877b620f8351e9875e3a413b0cfe6389f3075f941f6e99669348c912f91c5b6803aaed11ae9865642a9aa6a029afd"; + sha512 = "1983e078d89de73e9767a03321278dac6adbf3684a0b06d9073a79b765a7abd1602a90e7a69774d878c3fc3ed2819a6cac0ea55e662a03d85242b2f2f5897355"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/si/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/si/thunderbird-68.3.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ac04cd69b428a37e71c770b8802c008780a8cae2150e1c1bedbf2f68a6e807ffdc7a17cab1a348411cf9f999214bff4953c97ea6b6ac6b38c4b3a5e93820f582"; + sha512 = "478a7faf1aa49f3416e0191bd733b1bac609cd5fc422e1ff5a6b45adac73572d32a12460c4577f3c9037fcb82f2bf672399a68b161d8e1d2f76a8b20ed272a44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/sk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sk/thunderbird-68.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "7cb6871c850f6a6646f565d33a5921e182143411b015dbec888d47823bea181d53214a275d7b8aa5a674692795beb5bfc2b1cd34945b2cac7866280bc71834c6"; + sha512 = "11754a89286dfc86868b6373ac73948efd239fc91dde87007ba07b7d62aed780ae6030818a8e3803098c2a8881705b1e39ac517e1883ff3064e2d37d5dd13caa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/sl/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sl/thunderbird-68.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7a71d4727fb7fdf7d7f004ce4599f683d428bad2b961706844de423d6851d7ce9a3b1c79f83e57f8dfc8032fafea743116a4eb485b1ebaa1b0c8b129c944ffe7"; + sha512 = "4f4142f9e0673eb4f53c21027f1ba74c02cb0ffce2894f2cc077d299b082da554bd972811daef73c14281cdad2de3af9ae2456032cb3dead186b75cd27ece020"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/sq/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sq/thunderbird-68.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "2def190dcd0b6945bb772ab49b9742aa7f8d10fb95b1ca8f27d384f73aac507403e49a0a8edef412ac326f75b9ee280dd9d276726686ea2d8ff782716551c9e3"; + sha512 = "cdfc9cf530d813a69073f481dca6ecbeb58c3e5b90d1f682f2ef84b2e0ea4b3c823e88704ad781e9b29e7cdb98732c66d8fd6182f7b721b18a29ceef75174c12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/sr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sr/thunderbird-68.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "d686a6cbc5c459e5d33ef1098aafb1325f634bf9340e8375e7647b0162d436739419d6d8273de52cb7c6001320b9a151977be0e5cacaefd1d8594b15928a7b89"; + sha512 = "81f6a3376db8db3eac012fe4b13bc9a47107cebc4114627ba1d6aa06007bba83b7f8348543b30056658a0080dd9e710ec8dff039d5383cd4cf7c91b4c2337f87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/sv-SE/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sv-SE/thunderbird-68.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6f6ea444f7cc8152ad3f5dbbe7bde4c483b683125869e794f1f246e97df11a829e50e924b9446596fc7e299af56b12321725c4128e51c713ad092dffeed8981d"; + sha512 = "4ce8d5244836c9935cf8c3413ec5189e9ef952c207df5d5cf83772f0d5e2d64519674344aa45838abd2c23a19a6170a213c4c76e57ccdd94efa1c238401e9a3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/tr/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/tr/thunderbird-68.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "14256b61bb598f684c2663cc8e5b58d7e395198e131269c9299caaa9f6bc45e7c6b867a0938d44f5a02c804039e5e359e8a194d0e325840993c0bd64f3d1a41d"; + sha512 = "648d8e03df497c67254a3757b52b555f032a4637f54a24cbd67d6c51a99db8b758c76e0b2c9523bd43a835c979f57975cc6d8df661b3d10526b33b3d1f535a63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/uk/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/uk/thunderbird-68.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "6b85864179a075fc6382e7c61a4af86445fa23da04e9e0b55486e063305fe4c3abc99b8e91ba6a9b3496c1f88ca2c6a480cb3bdcfc3ef028104353d8227adb26"; + sha512 = "7a121928cb1bb2f47db14bfe06a738249041e3a9ddb90895a9e9db614cc22980a5da1c0d6ad0e8f534a345c1765fd8240a307c0c8409c1554618ad822cd9c20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/uz/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/uz/thunderbird-68.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "56af9488b21270ca46cfac5ebbe1434ecfcfa300baf1e5fe2ee26395440e506597d56b0a46fe76bc72a91b393070204740107a58857db2bac6551b2e3767adeb"; + sha512 = "5a79dfeed1e2ab362df3500f94c177df5ec7b2a266c3f1362af5f74c74a6760deb85a0ca822a3777b6236639495d8e0c52203024582626d8fc4a6d5de18f1c1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/vi/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/vi/thunderbird-68.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "6bd5a70c222aa26a0c63b5ba3673d3d04b4879730aa1ae8bbddb98038a31caff2cff9e31ede98f22a7e7625c977fb8930e5fdc4db2c64cc80180254dce182021"; + sha512 = "4a88c3605b365265fc0c807b753a7b5b7fdb1ac2dfc781e9a8457690a5ea11a26eda39e617bd12e67d86ba26fd28f27088404e17af286546978abdba9349b71d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/zh-CN/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/zh-CN/thunderbird-68.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "816022b722adbcfa5ac72ea69dde238a0f2c531877340bda6a0c6e39fa5433f6fea615e74d1c4420bbe6adfa739f90db1d2d3c409e537a1a6cef5dc1b4915cb3"; + sha512 = "0499ab6f076c44901122c302208d919a977a5ae68df4780926efecdb4281bc085ee1e6a3e7f889dd2fe90d16f0ea939b1447203ad8a2950789e1972262149724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.0/linux-i686/zh-TW/thunderbird-68.3.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/zh-TW/thunderbird-68.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7b14d28c689a15a9c38dc6da2cf78ed46f48dafd1b0fcd009491feafbc3ddb93b08a710534035cea4b10df0090bd77d71aed7df0c626bd9c9063e06c02c2bf8a"; + sha512 = "b1456490911eead3f8afa640cff10f33673631df6431e2074fcf7baeea3f128a60a1e07a5d9224bc2776aeb3f1ab3655e27f51b16ed118bb8437ef50797930ac"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b756c0de680..a6c743a85ed 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.3.0"; + version = "68.3.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "3aqr3dj5laws516k6jf8f35a1964p0s75sp682yy87xnzgd8m1iha55z79dcavis2ma9hiyacjnznjz04qhqd4q8swjgfg7lj8lyiwl"; + "01vn2snp631lngfy0kz6fax6r6w5w2iqc27hqr3zsvkfsl6ji0rkxm17g4ifv2qvkqgrnhxicdh4gj80x7fkw2nmmsqsypdddp5a91f"; }; nativeBuildInputs = [ @@ -156,6 +156,8 @@ stdenv.mkDerivation rec { rm -rf obj-x86_64-pc-linux-gnu ''; + hardeningDisable = [ "format" ]; + preConfigure = '' # remove distributed configuration files rm -f configure diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 2cdfd19067f..dce1934febf 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q4ifzvl1gcndvqqqk7n9mc599r4s2knxjc7alflwb366fql58gv"; + sha256 = "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 6ebc3e66491..486b34ecb30 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1qa260xrm0fzlwxpjvgvq39m4dfkskjlyb7m4y2vlr8c8d3z29b6"; + sha256 = "1waiiksa57byb7gvx1zmh6srvl6r8rvwqklk0slb3iaf4kfbqlws"; }; patches = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 5f8844969b2..343685c4ab7 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -40,11 +40,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2019.8"; + version = "2019.10"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0cjc8j8pqgdhnax4mvwmvnxfcygjsp805hxalfaj8wa5adph96hz"; + sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 77aee30d38b..2692e5360ce 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -39,20 +39,20 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = '' - -DUSE_ASPELL=ON - -DUSE_QT_QML=ON - -DFREE_SPACE_BAR_C=ON - -DUSE_MINIUPNP=ON - -DLOCAL_MINIUPNP=ON - -DDBUS_NOTIFY=ON - -DUSE_JS=ON - -DPERL_REGEX=ON - -DUSE_CLI_XMLRPC=ON - -DWITH_SOUNDS=ON - -DLUA_SCRIPT=ON - -DWITH_LUASCRIPTS=ON - ''; + cmakeFlags = [ + "-DUSE_ASPELL=ON" + "-DUSE_QT_QML=ON" + "-DFREE_SPACE_BAR_C=ON" + "-DUSE_MINIUPNP=ON" + "-DLOCAL_MINIUPNP=ON" + "-DDBUS_NOTIFY=ON" + "-DUSE_JS=ON" + "-DPERL_REGEX=ON" + "-DUSE_CLI_XMLRPC=ON" + "-DWITH_SOUNDS=ON" + "-DLUA_SCRIPT=ON" + "-DWITH_LUASCRIPTS=ON" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 5488baddef4..d4fbb2ceb59 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { pname = "frostwire"; src = fetchurl { - url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "03vxg0qas4mz5ggrmi396nkz44x1kgq8bfbhbr9mnal9ay9qmi8m"; + url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; + sha256 = "0pd9akfq8cx9qkfkzravvrb8pjaxa4b0vgjdwqc1zvkng4wl8848"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; - platforms = platforms.all; + platforms = [ "x86_64-linux"]; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index a461b1fbd74..e4b306453a4 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.11.8"; + version = "0.12.1"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj"; + sha256 = "0zhz3dd4mr6k7wlcxw2xclq8p8l4ia5nlg78dylyz6lbz96h2lsm"; }; enableParallelBuilding = true; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = https://gnunet.org/; - license = licenses.gpl2Plus; + license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index c9e2f8f6714..e8f209239bf 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; */ - meta = { + meta = with stdenv.lib; { description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' @@ -84,9 +84,9 @@ stdenv.mkDerivation { homepage = https://gnunet.org/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.agpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 173b4f02cdf..8ab83c8a4ba 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "17vm6aa2k8k1q14z9r2r06c794bcr4m0l0fdsn08wid6mj1zjsbx"; + sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index f11aaa27370..72003f41721 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.64"; + version = "2.66"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "0xz2b2vasfc39wqv9lak2wdli7pr5b1vcm1lgpqx6kz7j5ba6jqp"; + sha256 = "1qwmxfkgc5q7v6ickxr29khil6mh9crv5mwdm72bp6k64w0akbs7"; }; installPhase = '' diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 0ca5402d6da..01da8a63374 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { pantheon.granite ]; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = https://github.com/davidmhewitt/torrential; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 4d1d39a05c2..925618bbe99 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; homepage = https://github.com/jeremyvaartjes/ping; diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index a585e7f948b..7acf821dfcf 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ , libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }: let - version = "1.2.2-1"; + version = "1.2.3-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -16,7 +16,7 @@ in mkDerivation { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl"; + sha256 = "032ggk9fvd19fbsqkzwzwh0hpyg8gpkrin71di7zsx6ias5innw1"; }; sourceRoot = "."; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 82b6614fcb6..573752b5b53 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg -, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome +, lsb-release, freetype, fontconfig, polkit, polkit_gnome , pulseaudio }: let @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL freetype fontconfig - pangox_compat polkit polkit_gnome pulseaudio + polkit polkit_gnome pulseaudio ] ++ (with xorg; [ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu libXrandr libXtst libXt libICE libSM libXrender @@ -67,6 +67,11 @@ in stdenv.mkDerivation rec { --set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \ $out/bin/anydesk + # pangox is not actually necessary (it was only added as a part of gtkglext) + patchelf \ + --remove-needed libpangox-1.0.so.0 \ + $out/bin/anydesk + wrapProgram $out/bin/anydesk \ --prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]} diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 8c2d9ac36e9..49182ec182f 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5324ae86e52..3c624faaf87 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "076vz6nzs8v4d44dklsfgmwyhp48c2iywixg032znz193anjcgqn"; + sha256 = "017bm43d56clgray7sjvb00wpchr4zazc9ll0cd5wimirm12cxba"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 2cadf7f2637..68a454745c7 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "14.7.1965"; + version = "15.0.8397"; src = fetchurl { - url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "056050x173y450apl096vw8g3b3kvrd2b4xpj706nw6jdxsnhfbp"; + url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; + sha256 = "0bidlwlpzqpba9c0zfasm08vp308hgfnq4pslj1b04v64mlci66s"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index e9d0727d31c..14d418cd2bf 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; - i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; + x86_64-linux = "1c1yksjag58p7yjm72iiz82p2r01lq7kxvq7z5phmq5z6gxdg4a8"; + i686-linux = "167baz9fzmzk50jffzvgmgyw1zw3955r3cb73z23qvw8zqzdqydc"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/sipcmd/default.nix b/pkgs/applications/networking/sipcmd/default.nix deleted file mode 100644 index a36c2286956..00000000000 --- a/pkgs/applications/networking/sipcmd/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchFromGitHub, opal, ptlib }: - -stdenv.mkDerivation rec { - - rev = "3090e9f"; - - name = "sipcmd-${rev}"; - - src = fetchFromGitHub { - repo = "sipcmd"; - owner = "tmakkonen"; - inherit rev; - sha256 = "072h9qapmz46r8pxbzkfmc4ikd7dv9g8cgrfrw21q942icbrvq2c"; - }; - - buildInputs = [ opal ptlib ]; - - buildPhase = '' - make IFLAGS="-I${opal}/include/opal -I${ptlib}/include -Isrc/ -L${opal}/lib -L${ptlib}/lib" - ''; - - installPhase = '' - mkdir -pv $out/bin - cp sipcmd $out/bin/sipcmd - ''; - - meta = { - homepage = https://github.com/tmakkonen/sipcmd; - description = "The command line SIP/H.323/RTP softphone"; - platforms = with stdenv.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; - }; -} - diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index ef1e07ca976..67365405cc2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.0.5"; + version = "3.2.0"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5"; + sha256 = "0v5nn7i2nbqr59jsw8cs2052hr7xd96x1sa3480g8ks5kahk7zac"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index 04ab1d1c98d..cf1159b83f8 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.1"; + version = "3.17.2"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "06wcgdcagmh80nr8nyrnz83wgq7j8r96hn3ccka7nmn02pdgvp3k"; + sha256 = "1pmy01jwdr461vsl4fsxi3jaqnjx9yl5dw4987y5g73qx21qc5d5"; }; binary = appimageTools.wrapType2 { diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index cdec695d90f..82a99bf2df1 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "casync"; - version = "2-152-ge4a3c5e"; + version = "2-219-ga8f6c84"; src = fetchFromGitHub { owner = "systemd"; repo = "casync"; - rev = "e4a3c5efc8f11e0e99f8cc97bd417665d92b40a9"; - sha256 = "0zx6zvj5a6rr3w9s207rvpfw7gwssiqmp1p3c75bsirmz4nmsdf0"; + rev = "a8f6c841ccfe59ca8c68aad64df170b64042dce8"; + sha256 = "1i3c9wmpabpmx2wfbcyabmwfa66vz92iq5dlbm89v5mvgavz7bws"; }; buildInputs = [ acl curl xz zstd ] diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 3e5d3187e9b..920a1c97539 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }: +{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }: buildPythonApplication rec { pname = "syncplay"; - version = "1.6.4"; + version = "1.6.4a"; format = "other"; @@ -10,13 +10,18 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4"; + sha256 = "0zz4a3vzfg808z1qkqz31z4818wzpfa2lika7wl0jgpmw4zi85ix"; }; - propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls; + propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; + postFixup = '' + wrapQtApp $out/bin/syncplay + ''; + meta = with lib; { homepage = https://syncplay.pl/; description = "Free software that synchronises media players"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index c7663ef4117..8a110c63929 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,19 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.3.2"; + version = "1.3.3"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "029mym3vdfg616gpmhv6p22iy65h8vff2sq6z70l37bjf3zx1cms"; + sha256 = "0bcp8kbj8xsnly2dfafnfvj6vl27mbgvj84pjk0wxdjfnr2my9ic"; }; goPackagePath = "github.com/syncthing/syncthing"; - modSha256 = "06anhfi9mswmwhhjyz8mla6h8v83cc7slfr752fvgfaxra1fwgx8"; + modSha256 = "0kv24bi3w3pvjyjng7ly67brq8wkc1xnhsyha1h7v3jbmj5fgb12"; patches = [ ./add-stcli-target.patch diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 0c30a3def33..e518502d6f3 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0rc5"; + version = "3.0rc6"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds"; + sha256 = "1ks7pqgrg382ry0a0jf1dwgcwv81snhkrhkjdbcpym6w5flmpjsv"; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { CLI tool which checks a server's service on any port for the support of TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more. ''; - homepage = https://testssl.sh/; + homepage = "https://testssl.sh/"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; }; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 5bb66245328..5b166711693 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "The simplest PDF viewer around"; homepage = https://github.com/lainsce/aesop; diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 96a518a7a28..e6c939b277e 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; - installTargets = "global_install"; + installTargets = [ "global_install" ]; meta = { homepage = http://www.winfield.demon.nl/; diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 9142fff9a2c..bb85ae2e12b 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { patchShebangs data/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Personal finance manager for elementary OS"; homepage = "https://github.com/cjfloss/envelope"; diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index f80620a2bf7..c215b9ef637 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2019.3.1.1"; + version = "2019.3.1.3"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0zlxbdwcb0xb0bx4nvj6dn0vpw21czgf196bjlkk1547j6146p1p"; + sha256 = "0jfj0vmrwa05ga4rhqn0sapad06mq0pampmkr75vail2289zkga2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d8fbd4392bd..963a896dd51 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.7"; + version = "3.8b"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb"; + sha256 = "0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; patches = [ ./cmake_check_symbol_exists.patch ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index b249186c2f1..d0a7757e49d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source bibliography reference manager"; - homepage = http://jabref.sourceforge.net; + homepage = https://www.jabref.org; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 966c36f1823..c7b4377c3dc 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -10,7 +10,7 @@ # Needed for running tests: , qtbase, xvfb_run -, python3Packages +, python2, python3Packages }: stdenv.mkDerivation rec { @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - doxygen extra-cmake-modules graphviz kdoctools python3Packages.wrapPython - wrapQtAppsHook + doxygen extra-cmake-modules graphviz kdoctools python2 + python3Packages.wrapPython wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md index eb21fe2f441..a084572d217 100644 --- a/pkgs/applications/office/libreoffice/README.md +++ b/pkgs/applications/office/libreoffice/README.md @@ -1,10 +1,9 @@ LibreOffice =========== -To generate `libreoffice-srcs.nix`: +To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that +the libreoffice build process needs to download: - nix-shell default-gen-shell.nix --run generate + nix-shell gen-shell.nix --argstr variant VARIANT --run generate -To generate `libreoffice-srcs-still.nix`: - - nix-shell still-gen-shell.nix --run generate +Where VARIANT is either `still` or `fresh`. diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix deleted file mode 100644 index b3b21174bc3..00000000000 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchurl }: - -rec { - major = "6"; - minor = "3"; - patch = "0"; - tweak = "4"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; - }; -} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 395ca901d95..c8bb58d2921 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -16,27 +16,25 @@ , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false -}: +, variant ? "fresh" +} @ args: + +assert builtins.elem variant [ "fresh" "still" ]; let - primary-src = import ./default-primary-src.nix { inherit fetchurl; }; -in + importVariant = f: import (./. + "/src-${variant}/${f}"); -let inherit (primary-src) major minor subdir version; in + primary-src = importVariant "primary.nix" { inherit fetchurl; }; + + inherit (primary-src) major minor subdir version; -let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; - fetchSrc = {name, sha256}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit sha256; - }; - srcs = { third_party = map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) - ((import ./libreoffice-srcs.nix) ++ [ + (importVariant "download.nix" ++ [ (rec { name = "unowinreg.dll"; url = "https://dev-www.libreoffice.org/extern/${md5name}"; @@ -46,20 +44,10 @@ let }) ]); - translations = fetchSrc { - name = "translations"; - sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; - }; - - # TODO: dictionaries - - help = fetchSrc { - name = "help"; - sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; - }; - + translations = primary-src.translations; + help = primary-src.help; }; -in stdenv.mkDerivation rec { +in (stdenv.mkDerivation rec { pname = "libreoffice"; inherit version; @@ -69,7 +57,7 @@ in stdenv.mkDerivation rec { # For some reason librdf_redland sometimes refers to rasqal.h instead # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"; patches = [ ./xdg-open-brief.patch @@ -260,7 +248,7 @@ in stdenv.mkDerivation rec { find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; ''; - makeFlags = "SHELL=${bash}/bin/bash"; + makeFlags = [ "SHELL=${bash}/bin/bash" ]; enableParallelBuilding = true; @@ -402,4 +390,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -} +}).overrideAttrs ((importVariant "override.nix") args) diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/pkgs/applications/office/libreoffice/gen-shell.nix index 36603097123..7429bb0cb38 100644 --- a/pkgs/applications/office/libreoffice/default-gen-shell.nix +++ b/pkgs/applications/office/libreoffice/gen-shell.nix @@ -1,10 +1,10 @@ -{ pkgs ? (import <nixpkgs> {}) }: +{ pkgs ? (import <nixpkgs> {}), variant }: with pkgs; let - primary-src = callPackage ./default-primary-src.nix {}; + primary-src = callPackage (./. + "/src-${variant}/primary.nix") {}; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { shellHook = '' function generate { - python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix + python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix } ''; } diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 4df8ce1059b..4df8ce1059b 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix new file mode 100644 index 00000000000..464965121d9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -0,0 +1,4 @@ +{ stdenv, ... }: +attrs: { + NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +} diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix new file mode 100644 index 00000000000..28bf127c398 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -0,0 +1,35 @@ +{ fetchurl }: + +rec { + fetchSrc = {name, sha256}: fetchurl { + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + inherit sha256; + }; + + major = "6"; + minor = "3"; + patch = "0"; + tweak = "4"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; + }; + + # FIXME rename + translations = fetchSrc { + name = "translations"; + sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; + }; + + # TODO: dictionaries + + help = fetchSrc { + name = "help"; + sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; + }; +} diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index b5a721b5679..b5a721b5679 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix new file mode 100644 index 00000000000..7192af01949 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -0,0 +1,6 @@ +{ stdenv, ... }: +attrs: +{ + configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; + meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; }; +} diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix new file mode 100644 index 00000000000..a27087a1b05 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -0,0 +1,34 @@ +{ fetchurl }: + +rec { + fetchSrc = {name, sha256}: fetchurl { + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + inherit sha256; + }; + + major = "6"; + minor = "2"; + patch = "6"; + tweak = "2"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; + }; + + translations = fetchSrc { + name = "translations"; + sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; + }; + + # TODO: dictionaries + + help = fetchSrc { + name = "help"; + sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; + }; +} diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/pkgs/applications/office/libreoffice/still-gen-shell.nix deleted file mode 100644 index c5c17c2aaad..00000000000 --- a/pkgs/applications/office/libreoffice/still-gen-shell.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs ? (import <nixpkgs> {}) }: - -with pkgs; - -let - - primary-src = callPackage ./still-primary-src.nix {}; - -in - -stdenv.mkDerivation { - name = "generate-libreoffice-srcs-shell"; - - buildCommand = "exit 1"; - - downloadList = stdenv.mkDerivation { - name = "libreoffice-${primary-src.version}-download-list"; - inherit (primary-src) src version; - builder = ./download-list-builder.sh; - }; - - buildInputs = [ python3 ]; - - shellHook = '' - function generate { - python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix - } - ''; -} diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix deleted file mode 100644 index 07f30a5525d..00000000000 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ fetchurl }: - -rec { - major = "6"; - minor = "2"; - patch = "6"; - tweak = "2"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; - }; -} diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix deleted file mode 100644 index 8fb03b437e6..00000000000 --- a/pkgs/applications/office/libreoffice/still.nix +++ /dev/null @@ -1,402 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext -, IOCompress, zlib, libjpeg, expat, freetype, libwpd -, libxml2, db, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which -, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge -, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient -, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra -, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, bluez5, libtool, carlito -, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf -, 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" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ] -, withHelp ? true -, kdeIntegration ? false -}: - -let - primary-src = import ./still-primary-src.nix { inherit fetchurl; }; -in - -let inherit (primary-src) major minor subdir version; in - -let - lib = stdenv.lib; - langsSpaces = lib.concatStringsSep " " langs; - - fetchSrc = {name, sha256}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit sha256; - }; - - srcs = { - third_party = - map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) - ((import ./libreoffice-srcs-still.nix) ++ [ - (rec { - name = "unowinreg.dll"; - url = "https://dev-www.libreoffice.org/extern/${md5name}"; - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; - md5 = "185d60944ea767075d27247c3162b3bc"; - md5name = "${md5}-${name}"; - }) - ]); - - translations = fetchSrc { - name = "translations"; - sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; - }; - - # TODO: dictionaries - - help = fetchSrc { - name = "help"; - sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; - }; - - }; -in stdenv.mkDerivation rec { - pname = "libreoffice"; - inherit version; - - inherit (primary-src) src; - - outputs = [ "out" "dev" ]; - - # For some reason librdf_redland sometimes refers to rasqal.h instead - # of rasqal/rasqal.h - NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ]; - - patches = [ - ./xdg-open-brief.patch - - # Poppler-0.82 compatibility - # https://gerrit.libreoffice.org/81545 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch"; - sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n"; - }) - # Poppler-0.83 compatibility - # https://gerrit.libreoffice.org/84384 - (fetchpatch { - url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch"; - sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2"; - }) - ]; - - tarballPath = "external/tarballs"; - - postUnpack = '' - mkdir -v $sourceRoot/${tarballPath} - '' + (lib.flip lib.concatMapStrings srcs.third_party (f: '' - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name} - ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} - '')) - + '' - ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} - ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} - tar -xf ${srcs.help} - tar -xf ${srcs.translations} - ''; - - postPatch = '' - sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx - - # configure checks for header 'gpgme++/gpgmepp_version.h', - # and if it is found (no matter where) uses a hardcoded path - # in what presumably is an effort to make it possible to write - # '#include <context.h>' instead of '#include <gpgmepp/context.h>'. - # - # Fix this path to point to where the headers can actually be found instead. - substituteInPlace configure.ac --replace \ - 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ - 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' - ''; - - QT4DIR = qt4; - - preConfigure = '' - configureFlagsArray=( - "--with-parallelism=$NIX_BUILD_CORES" - "--with-lang=${langsSpaces}" - ); - - chmod a+x ./bin/unpack-sources - patchShebangs . - - # This is required as some cppunittests require fontconfig configured - cp "${fontsConf}" fonts.conf - sed -e '/include/i<include>${carlito}/etc/fonts/conf.d</include>' -i fonts.conf - export FONTCONFIG_FILE="$PWD/fonts.conf" - - NOCONFIGURE=1 ./autogen.sh - ''; - - postConfigure = - # fetch_Download_item tries to interpret the name as a variable name, let it do so... - '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile - '' - # Test fixups - # May need to be revisited/pruned, left alone for now. - + '' - # unit test sd_tiledrendering seems to be fragile - # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html - echo > ./sd/CppunitTest_sd_tiledrendering.mk - sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk - # Pivot chart tests. Fragile. - sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx - sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # this I actually hate, this should be a data consistency test! - sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent test - sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx - # tilde expansion in path processing checks the existence of $HOME - sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx - # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 - sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' - # rendering-dependent: on my computer the test table actually doesn't fit… - # interesting fact: test disabled on macOS by upstream - sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? - sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx - sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx - sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx - sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx - sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx - sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx - # not sure about this fragile test - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - # bunch of new Fresh failures. Sigh. - sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' - sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx' - sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" - '' - # This to avoid using /lib:/usr/lib at linking - + '' - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk - - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - ''; - - makeFlags = "SHELL=${bash}/bin/bash"; - - enableParallelBuilding = true; - - buildPhase = '' - make build-nocheck - ''; - - doCheck = true; - - # It installs only things to $out/lib/libreoffice - postInstall = '' - mkdir -p $out/bin $out/share/desktop - - mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - - for a in sbase scalc sdraw smath swriter simpress soffice; do - ln -s $out/lib/libreoffice/program/$a $out/bin/$a - done - - ln -s $out/bin/soffice $out/bin/libreoffice - ln -s $out/lib/libreoffice/share/xdg $out/share/applications - - for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" - done - - cp -r sysui/desktop/icons "$out/share" - sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - - mkdir -p $dev - cp -r include $dev - ''; - - configureFlags = [ - (if withHelp then "" else "--without-help") - "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.out}/lib" - "--with-beanshell-jar=${bsh}" - "--with-vendor=NixOS" - "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" - "--disable-report-builder" - "--disable-online-update" - "--enable-python=system" - "--enable-dbus" - "--enable-release-build" - (lib.enableFeature kdeIntegration "kde4") - "--enable-epm" - "--with-jdk-home=${jdk.home}" - "--with-ant-home=${ant}/lib/ant" - "--with-system-cairo" - "--with-system-libs" - "--with-system-headers" - "--with-system-openssl" - "--with-system-libabw" - "--with-system-libcmis" - "--with-system-libwps" - "--with-system-openldap" - "--with-system-coinmp" - - "--with-alloc=system" - - # Without these, configure does not finish - "--without-junit" - - "--disable-libnumbertext" # system-libnumbertext" - - # We do tarball prefetching ourselves - "--disable-fetch-external" - "--enable-build-opensymbol" - - # I imagine this helps. Copied from go-oo. - # Modified on every upgrade, though - "--disable-odk" - "--disable-postgresql-sdbc" - "--disable-firebird-sdbc" - "--without-fonts" - "--without-myspell-dicts" - "--without-doxygen" - - # TODO: package these as system libraries - "--with-system-beanshell" - "--without-system-hsqldb" - "--without-system-altlinuxhyph" - "--without-system-lpsolve" - "--without-system-libetonyek" - "--without-system-libfreehand" - "--without-system-liblangtag" - "--without-system-libmspub" - "--without-system-libpagemaker" - "--without-system-libstaroffice" - "--without-system-libepubgen" - "--without-system-libqxp" - "--without-system-mdds" - # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f - "--without-system-orcus" - "--without-system-xmlsec" - ]; - - checkPhase = '' - make unitcheck - make slowcheck - ''; - - nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ]; - - buildInputs = with xorg; - [ ant ArchiveZip boost cairo clucene_core - IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk2 - hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg - libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 - libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib libmysqlclient - neon nspr nss openldap openssl ORBit2 pam perl poppler - python3 sane-backends unzip vigra which zip zlib - mdds bluez5 libcmis libwps libabw libzmf - libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext - ] - ++ lib.optional kdeIntegration kdelibs4; - - passthru = { - inherit srcs jdk; - }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = with lib; { - description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; - homepage = https://libreoffice.org/; - license = licenses.lgpl3; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index e7db27bdedc..1d2e581f3c9 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -48,7 +48,13 @@ stdenv.mkDerivation rec { ]; # Whether to build with contractor support (Pantheon specific) - cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ]; + cmakeFlags = stdenv.lib.optional (!withPantheon) "-Dnoele=yes"; + + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; meta = with stdenv.lib; { description = "Markdown notes editor and manager designed for elementary OS" diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index f454d8830cb..6189132d0f9 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; preConfigure = ''./autogen.sh''; configureFlags = [ diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 2ce6e8a0220..b4307eb286e 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -12,11 +12,11 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.4.0"; + version = "1.5.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "101wj6m931bj0ah6niw79i8ywb5zlb2783g7n7dmkhw6ay3jj4vq"; + sha256 = "173d9scf2z29qg279jf33zcl7sgc3wp662fgpm943bn9667q18wf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index b646d0fc93f..30569512129 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "19.11.14"; + version = "19.12.15"; 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 = "8faa67720443fc9a116feae3e7d641922a08814b9af4d973d348ff8a0ee0e35d"; + sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index f1148f66524..1db5ce16fe5 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.21.0"; + version = "2.21.1"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "1aqn0367q7mdg728r5085aqzc4mgfz1bgqqlhgdjjp7r192yq7r2"; + sha256 = "0lv953i7cybzbxr5gx6g4libdcjj086jf152mwrwvx1avrpjavb8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 6c09cc1de47..07a3b26a1a8 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { }) ]; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Create simple and beautiful presentations"; homepage = https://github.com/Philip-Scott/Spice-up; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index bb13cae08f2..c652f765687 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Plot out your own timetable for the week and organize it"; homepage = "https://github.com/lainsce/timetable"; diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch new file mode 100644 index 00000000000..1a4350ca71a --- /dev/null +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -0,0 +1,69 @@ +From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001 +From: Christian Kampka <christian@kampka.net> +Date: Mon, 9 Dec 2019 19:40:27 +0100 +Subject: [PATCH] Use console logger instead of rolling files + +--- + src/services/log.js | 26 +++----------------------- + 1 file changed, 3 insertions(+), 23 deletions(-) + +diff --git a/src/services/log.js b/src/services/log.js +index 1514c209..456c3749 100644 +--- a/src/services/log.js ++++ b/src/services/log.js +@@ -1,35 +1,15 @@ + "use strict"; + +-const fs = require('fs'); +-const dataDir = require('./data_dir'); +- +-if (!fs.existsSync(dataDir.LOG_DIR)) { +- fs.mkdirSync(dataDir.LOG_DIR, 0o700); +-} +- +-const logger = require('simple-node-logger').createRollingFileLogger({ +- errorEventName: 'error', +- logDirectory: dataDir.LOG_DIR, +- fileNamePattern: 'trilium-<DATE>.log', +- dateFormat:'YYYY-MM-DD' +-}); +- + function info(message) { + // info messages are logged asynchronously + setTimeout(() => { + console.log(message); +- +- logger.info(message); + }, 0); + } + + function error(message) { + message = "ERROR: " + message; + +- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError() +- // errors are logged synchronously to make sure it doesn't get lost in case of crash +- logger.info(message); +- + console.trace(message); + } + +@@ -45,12 +25,12 @@ function request(req) { + if (req.url.includes(".js.map") || req.url.includes(".css.map")) { + return; + } +- +- logger.info(req.method + " " + req.url); ++ if(process.env.DEBUG) ++ console.log(req.method + " " + req.url); + } + + module.exports = { + info, + error, + request +-}; +\ No newline at end of file ++}; +-- +2.23.0 + diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 877dfba88c0..28548091f6e 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: +{ stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases."; @@ -11,56 +11,105 @@ let categories = "Office"; }; -in stdenv.mkDerivation rec { - pname = "trilium"; - version = "0.33.6"; - - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91"; + meta = with stdenv.lib; { + inherit description; + homepage = https://github.com/zadam/trilium; + license = licenses.agpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - # Fetch from source repo, no longer included in release. - # (they did special-case icon.png but we want the scalable svg) - # Use the version here to ensure we get any changes. - trilium_svg = fetchurl { - url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; - sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + version = "0.38.2"; + +in { + + trilium-desktop = stdenv.mkDerivation rec { + pname = "trilium-desktop"; + inherit version; + inherit meta; + + src = fetchurl { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa"; + }; + + # Fetch from source repo, no longer included in release. + # (they did special-case icon.png but we want the scalable svg) + # Use the version here to ensure we get any changes. + trilium_svg = fetchurl { + url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg"; + sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg"; + }; + + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + ]; + + buildInputs = atomEnv.packages ++ [ gtk3 ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/trilium + mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + + cp -r ./* $out/share/trilium + ln -s $out/share/trilium/trilium $out/bin/trilium + + ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + ''; + + dontStrip = true; }; - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - ]; + trilium-server = stdenv.mkDerivation rec { + pname = "trilium-server"; + inherit version; + inherit meta; - buildInputs = [ atomEnv.packages gtk3 ]; + src = fetchurl { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61"; + }; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + nativeBuildInputs = [ + autoPatchelfHook + ]; - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium + buildInputs = [ + stdenv.cc.cc.lib + zlib + libxkbfile + ]; - ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg - cp ${desktopItem}/share/applications/* $out/share/applications - ''; + patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ; + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/trilium-server - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; + cp -r ./* $out/share/trilium-server + ''; - dontStrip = true; + postFixup = '' + cat > $out/bin/trilium-server <<EOF + #!${stdenv.cc.shell} + cd $out/share/trilium-server + exec ./node/bin/node src/www + EOF + chmod a+x $out/bin/trilium-server + ''; - meta = with stdenv.lib; { - inherit description; - homepage = https://github.com/zadam/trilium; - license = licenses.agpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ emmanuelrosa dtzWill ]; + passthru.tests = { + trilium-server = nixosTests.trilium-server; + }; }; } diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 971f2f645f8..4867fec514b 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -20,13 +20,13 @@ with stdenv.lib; python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "5.4.0"; + version = "5.4.1"; disabled = !python3Packages.isPy3k; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0wbq8y8z0n6c5b3h5ynlawn3z79a3hkb1fkmblz4pwnj0jfnbswd"; + sha256 = "0lk47qv944yc2b1ifhinp07af839r408w83rj8zzy8b43cwkpsxd"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix new file mode 100644 index 00000000000..d54f27f9bbf --- /dev/null +++ b/pkgs/applications/office/tusk/default.nix @@ -0,0 +1,54 @@ +{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 +, makeDesktopItem +}: + +let + pname = "tusk"; + version = "0.23.0"; + + icon = fetchurl { + url = "https://raw.githubusercontent.com/klaussinani/tusk/v${version}/static/Icon.png"; + sha256 = "1jqclyrjgg6hir45spg75plfmd8k9nrsrzw3plbcg43s5m1qzihb"; + }; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = icon; + desktopName = pname; + genericName = "Evernote desktop app"; + categories = "Application"; + }; + +in appimageTools.wrapType2 rec { + name = "${pname}-v${version}"; + src = fetchurl { + url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; + sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky"; + }; + + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + mkdir "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/" + ''; + + meta = with lib; { + description = "Refined Evernote desktop app"; + longDescription = '' + Tusk is an unofficial, featureful, open source, community-driven, free Evernote app used by people in more than 140 countries. Tusk is indicated by Evernote as an alternative client for Linux environments trusted by the open source community. + ''; + homepage = "https://klaussinani.github.io/tusk/"; + license = licenses.mit; + maintainers = with maintainers; [ tbenst ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 6142042e7cb..80b6ef6243c 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -3,7 +3,7 @@ let description = "A note-taking application that knows programmers and Markdown better"; in mkDerivation rec { - version = "2.7.2"; + version = "2.8.2"; pname = "vnote"; src = fetchFromGitHub { @@ -11,7 +11,7 @@ in mkDerivation rec { repo = "vnote"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "0mk1ingcyznpwq4bfkxa8nx9yx5y3kgsmr4qffriq7bh1cx9dwjy"; + sha256 = "18qffq5c2plr5rjb5lafhdz1v5kbbb2wiyacgdhh3xni3khni52l"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 6ece55182ab..abc2d1862cb 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec{ version = "11.1.0.8865"; src = fetchurl { - url = "https://wdl1.cache.wps.cn/wps/download/ep/Linux2019/8865/wps-office_11.1.0.8865_amd64.deb"; - sha256 = "0pxx3j02cm8d08iakg30azjvl3a50y4avyrf08ddgaavqnvkypfj"; + url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/8865/wps-office_11.1.0.8865_amd64.deb"; + sha256 = "1hfpj1ayhzlrnnp72yjzrpd60xsbj9y46m345lqysiaj1hnwdbd8"; }; unpackCmd = "dpkg -x $src ."; sourceRoot = "."; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 0c31a2006c7..dcbf3522e39 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,15 +4,15 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20191123"; + version = "20191221"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "11wzk0c9fa3gp185gyd47g3sh7gfallw7qapr6qp913q2zfmif8v"; + sha256 = "1f4h45cbaq3rssl95xax8gn2bm1slnsbgds479db46czgq6y1qhy"; }; propagatedBuildInputs = with python2.pkgs; [ - pygtk pyserial libxml2 + pygtk pyserial libxml2 future ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 5f25402c3eb..fba63362ab6 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82"; + sha256 = "0d514ixz062xyyh4k3laxwhn3k3a1l4jq4w7rxf8x46d3743zrf7"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index f718854224c..68b4cfe8af4 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { --replace /usr/local/bin/dmrconfig $out/bin/dmrconfig ''; - makeFlags = "VERSION=${version} GITCOUNT=0"; + makeFlags = [ "VERSION=${version}" "GITCOUNT=0" ]; installPhase = '' mkdir -p $out/bin $out/lib/udev/rules.d diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 016540c1e67..f5c89ae51ce 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -50,9 +50,7 @@ stdenv.mkDerivation rec { Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; enableParallelBuilding = true; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 3bb632a819c..017e2e1632c 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -12,14 +12,14 @@ assert pythonSupport -> python != null && swig != null; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gr-osmosdr"; - version = "2018-08-15"; + version = "0.1.5"; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; - rev = "4d83c6067f059b0c5015c3f59f8117bbd361e877"; - sha256 = "1d5nb47506qry52bg4cn02d3l4lwxwz44g2fz1ph0q93c7892j60"; + rev = "v${version}"; + sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index db1bfbb3f89..a4ef5a2a0d1 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw, +{ mkDerivation, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: -stdenv.mkDerivation rec { - version = "9.2.6"; +mkDerivation rec { + version = "9.4.4"; pname = "qsstv"; src = fetchurl { url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; - sha256 = "0sx70yk389fq5djvjwnam6ics5knmg9b5x608bk2sjbfxkila108"; + sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; }; enableParallelBuilding = true; @@ -20,27 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l fftwFloat ]; - desktopItem = makeDesktopItem { - name = "QSSTV"; - exec = "qsstv"; - icon = "qsstv.png"; - comment = "Qt-based slow-scan TV and fax"; - desktopName = "QSSTV"; - genericName = "qsstv"; - categories = "Application;HamRadio;"; - }; - - installPhase = '' - # Install binary to the right location - make install INSTALL_ROOT=$out - mv $out/usr/bin $out/ - rm -r $out/usr - + postInstall = '' # Install desktop icon install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png - - # Install desktop item - cp -rv ${desktopItem}/share $out ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 5e4a78cfbd2..c4879f01e60 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake , libusb, pkgconfig -, python, swig2, numpy, ncurses +, usePython ? false +, python, ncurses, swig2 , extraPackages ? [] } : @@ -24,12 +25,14 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses numpy python swig2 ]; + buildInputs = [ libusb ncurses ] + ++ lib.optionals usePython [ python swig2 ]; + + propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_PYTHON_CONFIG=ON" - ]; + ] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON"; postFixup = lib.optionalString (lib.length extraPackages != 0) '' # Join all plugins via symlinking diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 3434c0624ed..2268cdf725d 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; buildInputs = [ glib pkgconfig gtk2 hamlib ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 1c193c37cb3..eca25774c59 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1ki3s4smazr6xfkr0grrmjp2s8yjprismiaq7l54d0il7rkvhibd"; + sha256 = "175aj4bgi9b6bif6fvjdlpd68brcwij4x3ml0lxk6i51binv233y"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix index e9fc0607998..752e25b4d8d 100644 --- a/pkgs/applications/science/astronomy/xearth/default.nix +++ b/pkgs/applications/science/astronomy/xearth/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libXt libXext ]; - installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; - installTargets="install install.man"; + installFlags = [ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"]; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "sets the X root window to an image of the Earth"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 33e4de0d95a..4a6a464de46 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.9"; + version = "1.10.2"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1j3h638i8kgihzyrlnpj82xg1b23sijibys9hvwari3fy7kd0dkg"; + sha256 = "0b2f6lqhxdlrvfjqxv7a4nzqj68c1j4avn16iqxwwm80kn302wzm"; }; buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix new file mode 100644 index 00000000000..ad737c6699d --- /dev/null +++ b/pkgs/applications/science/biology/blast/default.nix @@ -0,0 +1,108 @@ +{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: + +stdenv.mkDerivation rec { + pname = "blast"; + version = "2.10.0"; + + src = fetchurl { + url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s"; + }; + + sourceRoot = "ncbi-blast-${version}+-src/c++"; + + configureFlags = [ + # With flat Makefile we can use all_projects in order not to build extra. + # These extra cause clang to hang on Darwin. + "--with-flat-makefile" + "--without-makefile-auto-update" + "--with-dll" # build dynamic libraries (static are default) + ]; + + makeFlags = [ "all_projects=app/" ]; + + preConfigure = '' + export NCBICXX_RECONF_POLICY=warn + export PWD=$(pwd) + export HOME=$PWD + + # The configure scripts wants to set AR="ar cr" unless it is already set in + # the environment. Because stdenv sets AR="ar", the result is a bad call to + # the assembler later in the process. Thus, we need to unset AR + unset AR + + for awks in scripts/common/impl/is_log_interesting.awk \ + scripts/common/impl/report_duplicates.awk; do + + substituteInPlace $awks \ + --replace /usr/bin/awk ${gawk}/bin/awk + done + + for mk in src/build-system/Makefile.meta.in \ + src/build-system/helpers/run_with_lock.c ; do + + substituteInPlace $mk \ + --replace /bin/rm ${coreutils}/bin/rm + done + + for mk in src/build-system/Makefile.meta.gmake=no \ + src/build-system/Makefile.meta_l \ + src/build-system/Makefile.meta_r \ + src/build-system/Makefile.requirements \ + src/build-system/Makefile.rules_with_autodep.in; do + + substituteInPlace $mk \ + --replace /bin/echo ${coreutils}/bin/echo + done + for mk in src/build-system/Makefile.meta_p \ + src/build-system/Makefile.rules_with_autodep.in \ + src/build-system/Makefile.protobuf.in ; do + + substituteInPlace $mk \ + --replace /bin/mv ${coreutils}/bin/mv + done + + + substituteInPlace src/build-system/configure \ + --replace /bin/pwd ${coreutils}/bin/pwd \ + --replace /bin/ln ${coreutils}/bin/ln + + substituteInPlace src/build-system/configure.ac \ + --replace /bin/pwd ${coreutils}/bin/pwd \ + --replace /bin/ln ${coreutils}/bin/ln + + substituteInPlace src/build-system/Makefile.meta_l \ + --replace /bin/date ${coreutils}/bin/date + ''; + + nativeBuildInputs = [ perl ]; + + # perl is necessary in buildInputs so that installed perl scripts get patched + # correctly + buildInputs = [ coreutils perl gawk zlib bzip2 cpio ] + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + hardeningDisable = [ "format" ]; + + postInstall = '' + substituteInPlace $out/bin/get_species_taxids.sh \ + --replace /bin/rm ${coreutils}/bin/rm + ''; + patches = [ ./no_slash_bin.patch ]; + + enableParallelBuilding = true; + + # Many tests require either network access or locally available databases + doCheck = false; + + meta = with stdenv.lib; { + description = ''Basic Local Alignment Search Tool (BLAST) finds regions of + similarity between biological sequences''; + homepage = https://blast.ncbi.nlm.nih.gov/Blast.cgi; + license = licenses.publicDomain; + + # Version 2.10.0 fails on Darwin + # See https://github.com/NixOS/nixpkgs/pull/61430 + platforms = platforms.linux; + maintainers = with maintainers; [ luispedro ]; + }; +} diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/pkgs/applications/science/biology/blast/no_slash_bin.patch new file mode 100644 index 00000000000..9b78ac57926 --- /dev/null +++ b/pkgs/applications/science/biology/blast/no_slash_bin.patch @@ -0,0 +1,184 @@ +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/collect_outside_libs.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/collect_outside_libs.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/collect_outside_libs.sh 2014-08-01 22:01:17.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/collect_outside_libs.sh 2019-05-15 12:40:44.145239480 +0800 +@@ -1,8 +1,5 @@ + #!/bin/sh + set -e +-PATH=/bin:/usr/bin +-export PATH +-unset CDPATH + + base=$1 + search=`echo ${2-$LD_LIBRARY_PATH} | tr : ' '` +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/create_flat_tuneups.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/create_flat_tuneups.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/create_flat_tuneups.sh 2011-08-17 02:55:10.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/create_flat_tuneups.sh 2019-05-15 12:40:48.449276574 +0800 +@@ -1,9 +1,6 @@ + #!/bin/sh + id='$Id: create_flat_tuneups.sh 331412 2011-08-16 18:55:10Z ucko $' + +-PATH=/bin:/usr/bin +-export PATH +- + exec > auto_flat_tuneups.mk + + cat <<EOF +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/get_lock.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/get_lock.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/get_lock.sh 2011-08-20 04:12:28.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/get_lock.sh 2019-05-15 12:40:52.901315000 +0800 +@@ -1,7 +1,5 @@ + #!/bin/sh + +-PATH=/bin:/usr/bin +-export PATH + + dir=$1.lock + +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/if_diff.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/if_diff.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/if_diff.sh 2014-07-30 22:06:45.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/if_diff.sh 2019-05-15 12:42:57.298410841 +0800 +@@ -4,9 +4,6 @@ + # Author: Denis Vakatov (vakatov@ncbi.nlm.nih.gov) + ################################# + +-orig_PATH=$PATH +-PATH=/bin:/usr/bin +- + script_name=`basename $0` + script_args="$*" + +@@ -16,7 +13,7 @@ + base_action=`basename "$action"` + case "$base_action" in + cp | cp\ * | ln | ln\ * ) +- action=/bin/$base_action ++ action=$base_action + rm="rm -f" + ;; + * ) +@@ -58,10 +55,8 @@ + shift + cmd="$* $dest_file" + test "$quiet" = yes || echo "$cmd" +- PATH=$orig_PATH + "$@" "$dest" + status=$? +- PATH=/bin:/usr/bin + return $status + } + +@@ -74,7 +69,7 @@ + case "$base_action" in + ln | ln\ -f ) + test "$quiet" = yes || echo "failed; trying \"cp -p ...\" instead" +- cmd="/bin/cp -p $src_file $dest_file" ++ cmd="cp -p $src_file $dest_file" + ExecHelper "$dest_file" /bin/cp -p "$src_file" || + Usage "\"$cmd\" failed" + ;; +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/make_lock_map.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/make_lock_map.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/make_lock_map.sh 2011-11-17 04:43:52.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/make_lock_map.sh 2019-05-15 12:40:56.769348434 +0800 +@@ -1,8 +1,6 @@ + #!/bin/sh + # $Id: make_lock_map.sh 344587 2011-11-16 20:43:52Z ucko $ + +-PATH=/bin:/usr/bin +-export PATH + + act=false + cache_dir='.#SRC-cache' +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/run_with_lock.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/run_with_lock.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/run_with_lock.sh 2015-10-29 22:36:05.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/run_with_lock.sh 2019-05-15 12:41:53.401842849 +0800 +@@ -1,10 +1,6 @@ + #!/bin/sh + # $Id: run_with_lock.sh 483249 2015-10-29 14:36:05Z ucko $ + +-orig_PATH=$PATH +-PATH=/bin:/usr/bin +-export PATH +- + base= + logfile= + map= +@@ -23,7 +19,7 @@ + : ${base:=`basename "$1"`} + + clean_up () { +- /bin/rm -rf "$base.lock" ++ rm -rf "$base.lock" + } + + case $0 in +@@ -45,7 +41,7 @@ + trap "clean_up; exit $error_status" 1 2 15 + if [ -n "$logfile" ]; then + status_file=$base.lock/status +- (PATH=$orig_PATH; export PATH; "$@"; echo $? > "$status_file") 2>&1 \ ++ ("$@"; echo $? > "$status_file") 2>&1 \ + | tee "$logfile.new" + # Emulate egrep -q to avoid having to move from under scripts. + if [ ! -f "$logfile" ] \ +@@ -58,8 +54,6 @@ + status=1 + fi + else +- PATH=$orig_PATH +- export PATH + "$@" + status=$? + fi +diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install.sh ncbi-blast-2.9.0+-src.patched/scripts/common/impl/strip_for_install.sh +--- ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install.sh 2013-09-24 03:06:51.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/strip_for_install.sh 2019-05-15 12:40:13.272975092 +0800 +@@ -1,8 +1,5 @@ + #!/bin/sh + +-PATH=/bin:/usr/bin:/usr/ccs/bin +-export PATH +- + case "$1" in + --dirs ) + shift +--- ncbi-blast-2.9.0+-src/scripts/common/impl/update_configurable.sh 2017-07-13 22:53:24.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/scripts/common/impl/update_configurable.sh 2019-05-15 15:03:35.861276083 +0800 +@@ -1,6 +1,4 @@ + #!/bin/sh +-PATH=/bin:/usr/bin +-export PATH + + script_name=`basename $0` + script_dir=`dirname $0` +--- ncbi-blast-2.9.0+-src/src/build-system/Makefile.mk.in 2019-01-04 01:38:37.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/src/build-system/Makefile.mk.in 2019-05-15 15:14:41.749416495 +0800 +@@ -50,12 +50,12 @@ + + ### Auxiliary commands, filters + +-RM = /bin/rm -f +-RMDIR = /bin/rm -rf +-COPY = /bin/cp -p ++RM = rm -f ++RMDIR = rm -rf ++COPY = cp -p + BINCOPY = @BINCOPY@ + TOUCH = @TOUCH@ +-MKDIR = /bin/mkdir ++MKDIR = mkdir + BINTOUCH = $(TOUCH) + LN_S = @LN_S@ + GREP = @GREP@ +--- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800 ++++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800 +@@ -10417,10 +10417,6 @@ + echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-case "$LN_S" in +- /*) ;; +- * ) LN_S=/bin/$LN_S ;; +-esac + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix new file mode 100644 index 00000000000..c9e546dc2ce --- /dev/null +++ b/pkgs/applications/science/biology/last/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip, zlib, python3, parallel }: + +stdenv.mkDerivation rec { + pname = "last"; + version = "1045"; + + src = fetchurl { + url = "http://last.cbrc.jp/last-${version}.zip"; + sha256 = "0x2wrm52ca935n3yc486m8yy59ap34w1x9h3csjca3jab5agnjkc"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ zlib python3 ]; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + postFixup = '' + for f in $out/bin/parallel-* ; do + sed -i 's|parallel |${parallel}/bin/parallel |' $f + done + ''; + + meta = with stdenv.lib; { + description = "Genomic sequence aligner"; + homepage = "http://last.cbrc.jp/"; + license = licenses.gpl3; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 56bb35b64df..86414980177 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchFromGitHub, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "megahit"; - version = "1.1.4"; + version = "1.2.9"; src = fetchFromGitHub { owner = "voutcn"; repo = "megahit"; rev = "v${version}"; - sha256 = "011k0776w76l03zmy70kfd3y9zjmdnspfbs9fcxmnl3bdwd36kcw"; + sha256 = "1r5d9nkdmgjsbrpj43q9hy3s8jwsabaz3ji561v18hy47v58923c"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - installPhase = '' - for bin in megahit_sdbg_build megahit megahit_asm_core megahit_toolkit; do - install -vD $bin $out/bin/$bin - done - ''; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; diff --git a/pkgs/applications/science/biology/minia/default.nix b/pkgs/applications/science/biology/minia/default.nix new file mode 100644 index 00000000000..2a80de733b0 --- /dev/null +++ b/pkgs/applications/science/biology/minia/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, hdf5, boost }: + +stdenv.mkDerivation rec { + pname = "minia"; + version = "3.2.1"; + + src = fetchFromGitHub { + owner = "GATB"; + repo = "minia"; + rev = "v${version}"; + sha256 = "0bmfrywixaaql898l0ixsfkhxjf2hb08ssnqzlzacfizxdp46siq"; + fetchSubmodules = true; + }; + + patches = [ ./no-bundle.patch ]; + + NIX_CFLAGS_COMPILE = [ "-Wformat" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ hdf5 boost ]; + + prePatch = '' + rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost} + ''; + + meta = with stdenv.lib; { + description = "Short read genome assembler"; + homepage = "https://github.com/GATB/minia"; + license = licenses.agpl3; + maintainers = with maintainers; [ jbedo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/minia/no-bundle.patch b/pkgs/applications/science/biology/minia/no-bundle.patch new file mode 100644 index 00000000000..21d12c7f6f2 --- /dev/null +++ b/pkgs/applications/science/biology/minia/no-bundle.patch @@ -0,0 +1,222 @@ +diff --git a/thirdparty/gatb-core/gatb-core/CMakeLists.txt b/thirdparty/gatb-core/gatb-core/CMakeLists.txt +index f48a70b..0e11ece 100644 +--- a/thirdparty/gatb-core/gatb-core/CMakeLists.txt ++++ b/thirdparty/gatb-core/gatb-core/CMakeLists.txt +@@ -257,7 +257,6 @@ ADD_SUBDIRECTORY(thirdparty) + # DEPENDENCIES + ################################################################################ + # we must be sure that hdf5 is built and installed before building gatb-core +-ADD_DEPENDENCIES (gatbcore-static hdf5 hdf5_postbuild) + + ################################################################################ + # DOCUMENTATION GENERATION +@@ -288,7 +287,6 @@ IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/doc/misc/README.txt DESTINATION . OPTIONAL) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/LICENCE DESTINATION . OPTIONAL) + INSTALL (FILES ${PROJECT_SOURCE_DIR}/THIRDPARTIES.md DESTINATION . OPTIONAL) +- INSTALL (DIRECTORY ${PROJECT_SOURCE_DIR}/thirdparty/boost DESTINATION ./include) + ENDIF() + + ################################################################################ +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/LargeInt.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/LargeInt.hpp +index dfeee1c..d5553a2 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/LargeInt.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/LargeInt.hpp +@@ -35,7 +35,7 @@ + #include <stdint.h> + #include <algorithm> + #include <iostream> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + #include <gatb/system/api/Exception.hpp> + #include <gatb/system/api/config.hpp> +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt128.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt128.hpp +index 60be5d5..25ae75e 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt128.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt128.hpp +@@ -33,7 +33,7 @@ + /********************************************************************************/ + + #include <iostream> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + #include <gatb/system/api/types.hpp> + #include <gatb/tools/misc/api/Abundance.hpp> +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt16.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt16.hpp +index 6a71bb0..b9205df 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt16.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt16.hpp +@@ -31,7 +31,7 @@ + #include <iostream> + #include <gatb/system/api/types.hpp> + #include <gatb/tools/misc/api/Abundance.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt32.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt32.hpp +index c22b892..62e6586 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt32.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt32.hpp +@@ -31,7 +31,7 @@ + #include <iostream> + #include <gatb/system/api/types.hpp> + #include <gatb/tools/misc/api/Abundance.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt64.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt64.hpp +index c06aaab..e0befba 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt64.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt64.hpp +@@ -31,7 +31,7 @@ + #include <iostream> + #include <gatb/system/api/types.hpp> + #include <gatb/tools/misc/api/Abundance.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + extern const unsigned char revcomp_4NT[]; + extern const unsigned char comp_NT []; +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt8.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt8.hpp +index 9659874..0c79ff6 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt8.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/math/NativeInt8.hpp +@@ -31,7 +31,7 @@ + #include <iostream> + #include <gatb/system/api/types.hpp> + #include <gatb/tools/misc/api/Abundance.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/Abundance.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/Abundance.hpp +index 3cb84f8..cd5d382 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/Abundance.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/Abundance.hpp +@@ -31,7 +31,7 @@ + /********************************************************************************/ + + #include <sys/types.h> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/IHistogram.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/IHistogram.hpp +index b8f6c79..a040832 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/IHistogram.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/misc/api/IHistogram.hpp +@@ -28,7 +28,7 @@ + + #include <gatb/system/api/ISmartPointer.hpp> + #include <gatb/tools/storage/impl/Storage.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5.hpp +index 2645abd..fad48c0 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5.hpp +@@ -40,7 +40,7 @@ + #include <string> + #include <vector> + #include <stdarg.h> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5Patch.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5Patch.hpp +index a92b729..66d552f 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5Patch.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/CollectionHDF5Patch.hpp +@@ -40,7 +40,7 @@ + #include <string> + #include <vector> + #include <stdarg.h> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + + /********************************************************************************/ + namespace gatb { +diff --git a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/StorageHDF5.hpp b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/StorageHDF5.hpp +index 29e0949..0565cc4 100644 +--- a/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/StorageHDF5.hpp ++++ b/thirdparty/gatb-core/gatb-core/src/gatb/tools/storage/impl/StorageHDF5.hpp +@@ -33,7 +33,7 @@ + #include <gatb/tools/storage/impl/CollectionHDF5.hpp> + #include <gatb/tools/storage/impl/CollectionHDF5Patch.hpp> + #include <gatb/system/impl/System.hpp> +-#include <hdf5/hdf5.h> ++#include <hdf5.h> + #include <sstream> + + /********************************************************************************/ +diff --git a/thirdparty/gatb-core/gatb-core/thirdparty/CMakeLists.txt b/thirdparty/gatb-core/gatb-core/thirdparty/CMakeLists.txt +index 6e0b5c4..34aef28 100644 +--- a/thirdparty/gatb-core/gatb-core/thirdparty/CMakeLists.txt ++++ b/thirdparty/gatb-core/gatb-core/thirdparty/CMakeLists.txt +@@ -1,54 +1,3 @@ +-################################################################################ +-# HDF5 GENERATION +-################################################################################ +- +-#SET (HDF5_ENABLE_THREADSAFE ON) +-#SET (H5_HAVE_THREADSAFE 1) +- +-########## MOMENTARY DEACTIVATED => CRASH ON MACOS TO BE INVESTIGATED ########## +-SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools") +-#SET (CMAKE_EXE_LINKER_FLAGS "-lpthread -lz") +- +-SET (HDF5_EXTERNALLY_CONFIGURED ON) +- +-#SET (HDF5_INSTALL_BIN_DIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}) +-#SET (HDF5_INSTALL_LIB_DIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}) +-SET (HDF5_INSTALL_BIN_DIR bin) +-SET (HDF5_INSTALL_LIB_DIR lib) +- +-SET (HDF5_INSTALL_INCLUDE_DIR ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/hdf5) +-SET (HDF5_INSTALL_DATA_DIR ${PROJECT_BINARY_DIR}/share/${CMAKE_BUILD_TYPE}) +-SET (HDF5_INSTALL_CMAKE_DIR ${PROJECT_BINARY_DIR}/share/${CMAKE_BUILD_TYPE}) +- +-IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE) +- SET (HDF5_EXPORTED_TARGETS "gatb-hdf5") +-ENDIF() +- +-IF (NOT DEFINED GATB_CORE_EXCLUDE_HDF5_ZLIB) +- OPTION (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" ON) +-ENDIF() +- +-# We don't want warnings from HDF5 compilation +-set (COMPILE_DEFINITIONS "${COMPILE_DEFINITIONS} -w") +-add_definitions (${COMPILE_DEFINITIONS}) +- +-# add HDF5 generation +-ADD_SUBDIRECTORY (hdf5) +- +-# We add a custom target for copying header files. +-add_custom_target (hdf5_postbuild ALL) +- +-# We build the output directory +-add_custom_command (TARGET hdf5_postbuild POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${HDF5_INSTALL_INCLUDE_DIR}) +- +-# We define all the header files to be copied +-file (GLOB headerfiles ${PROJECT_SOURCE_DIR}/thirdparty/hdf5/src/*.h ${PROJECT_BINARY_DIR}/thirdparty/hdf5/H5pubconf.h) +- +-# We copy each header file +-foreach (header ${headerfiles}) +- add_custom_command (TARGET hdf5_postbuild POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${HDF5_INSTALL_INCLUDE_DIR} ) +-endforeach() +- + # include other smaller libraries (json, Boophf) + + add_custom_target (thirdparty_copy ALL) diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index 6379f2c3282..48bd1b21ecd 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "07v9v9s41lvw72wpb1jgh2nzanyc994779bd35p76vg8mzifmprl"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index cb83b19269b..184dcb48a0d 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python2 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=maybe-uninitialized" + "-Wno-error=pessimizing-move" + ]; preConfigure = '' sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix index f9042f30011..5230fcd2eb6 100644 --- a/pkgs/applications/science/biology/sumatools/default.nix +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -22,7 +22,7 @@ in rec { rev = "sumalib_v${version}"; sha256 = "0hwkrxzfz7m5wdjvmrhkjg8kis378iaqr5n4nhdhkwwhn8x1jn5a"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; inherit meta; }; diff --git a/pkgs/applications/science/biology/tebreak/default.nix b/pkgs/applications/science/biology/tebreak/default.nix new file mode 100644 index 00000000000..9ff81944f6a --- /dev/null +++ b/pkgs/applications/science/biology/tebreak/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa +, samtools, findutils }: + +python3Packages.buildPythonApplication rec { + pname = "tebreak"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "adamewing"; + repo = "tebreak"; + rev = version; + sha256 = "194av17wz66n4zxyi56mbkik31j2wmkly5i9qmxgaxymhavzi3kq"; + }; + + nativeBuildInputs = [ findutils python3Packages.cython ]; + propagatedBuildInputs = with python3Packages; [ + pysam + scipy + bx-python + scikit-bio + ]; + + preConfigure = '' + # patch the paths to all required software + for f in $(find . -type f) ; do + sed -i "s|'bwa'|'${bwa}/bin/bwa'|" $f + sed -i "s|'minia'|'${minia}/bin/minia'|" $f + sed -i "s|'exonerate'|'${exonerate}/bin/exonerate'|" $f + sed -i "s|'samtools'|'${samtools}/bin/samtools'|" $f + sed -i "s|'lastal'|'${last}/bin/lastal'|" $f + sed -i "s|'lastdb'|'${last}/bin/lastdb'|" $f + done + ''; + + meta = with stdenv.lib; { + description = "Find and characterise transposable element insertions"; + homepage = "https://github.com/adamewing/tebreak"; + license = licenses.mit; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 3ec127e7e06..2577b2a16e6 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.30.0"; + version = "14.30.1"; 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 = "0g0pykdp9xgvc485c89lwajy5wgrz66w1n6pqan1v1i4zfbz9vna"; + sha256 = "0qnxsw6pjjkn6yigrfh85fz58ibqdmbv1jhf6i5q68wm5pr1ff3d"; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 8b7da71c80f..c3395a85148 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "19.23.0"; + version = "19.27.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1m28jki2qan6gdzs544y1v72ybp4vyj66ri5sy44jqi94xg1mb5f"; + sha256 = "10pzprr43pklf4yl14m9q921ynalsil1dsfbl6lx8r1jmyjgl3w7"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 487558a23c1..d73e86d2f57 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl , openblas, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh -, makeWrapper +, makeWrapper, fetchpatch } : let - version = "18.09"; + version = "19.11"; gitLabRev = "v${version}"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -18,9 +18,19 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "1di1ygifx7ycfpwh25mv76xlv15wqfdmqzjsg5nani2d5z0arri2"; + sha256 = "1wwqhkyyi7pw5x1ghnp83ir17zl5jsj7phhqxapybyi3bmg0i00q"; }; + patches = [ (fetchpatch { + name = "Fix-MPI-INT-size"; # upstream patch, fixes a Fortran compiler error + url = "https://gitlab.com/Molcas/OpenMolcas/commit/860e3350523f05ab18e49a428febac8a4297b6e4.patch"; + sha256 = "0h96h5ikbi5l6ky41nkxmxfhjiykkiifq7vc2s3fdy1r1siv09sb"; + }) (fetchpatch { + name = "fix-cisandbox"; # upstream patch, fixes a Fortran compiler error + url = "https://gitlab.com/Molcas/OpenMolcas/commit/d871590c8ce4689cd94cdbbc618954c65589393d.patch"; + sha256 = "0dgz1w2rkglnis76spai3m51qa72j4bz6ppnk5zmzrr6ql7gwpgg"; + })]; + nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; buildInputs = [ gfortran diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix new file mode 100644 index 00000000000..6bc66596229 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -0,0 +1,130 @@ +{ lib, stdenv, fetchFromGitLab, cmake, libGLU, libGL, zlib, wxGTK +, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig +, doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages + +, pname ? "kicad" +, stable ? true +, baseName ? "kicad" +, versions ? { } +, oceSupport ? false, opencascade +, withOCCT ? true, opencascade-occt +, ngspiceSupport ? true, libngspice +, scriptingSupport ? true, swig, python, pythonPackages, wxPython +, debug ? false, valgrind +, withI18n ? true +}: + +assert ngspiceSupport -> libngspice != null; + +with lib; +let + + versionConfig = versions.${baseName}; + baseVersion = "${versions.${baseName}.kicadVersion.version}"; + + # oce on aarch64 fails a test + withOCE = oceSupport && !stdenv.isAarch64; + withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64); + + kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + +in +stdenv.mkDerivation rec { + + inherit pname; + version = "base-${baseVersion}"; + + src = fetchFromGitLab ( + { + group = "kicad"; + owner = "code"; + repo = "kicad"; + rev = baseVersion; + } // versionConfig.kicadVersion.src + ); + + # quick fix for #72248 + # should be removed if a a more permanent fix is published + patches = [ + ( + fetchpatch { + url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch"; + sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd"; + } + ) + ]; + + # tagged releases don't have "unknown" + # kicad nightlies use git describe --dirty + # nix removes .git, so its approximated here + postPatch = '' + substituteInPlace CMakeModules/KiCadVersion.cmake \ + --replace "unknown" ${builtins.substring 0 10 src.rev} + ''; + + makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; + + cmakeFlags = + optionals (scriptingSupport) [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + ] + ++ optional (!scriptingSupport) + "-DKICAD_SCRIPTING=OFF" + ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" + ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" + ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" + ++ optionals (withOCE) [ + "-DKICAD_USE_OCE=ON" + "-DOCE_DIR=${opencascade}" + ] + ++ optionals (withOCC) [ + "-DKICAD_USE_OCC=ON" + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + ] + ++ optionals (debug) [ + "-DCMAKE_BUILD_TYPE=Debug" + "-DKICAD_STDLIB_DEBUG=ON" + "-DKICAD_USE_VALGRIND=ON" + ] + ; + + nativeBuildInputs = [ cmake doxygen pkgconfig lndir ]; + + buildInputs = [ + libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext + glew glm libpthreadstubs cairo curl openssl boost + ] + ++ optionals (scriptingSupport) [ swig python wxPython ] + ++ optional (ngspiceSupport) libngspice + ++ optional (withOCE) opencascade + ++ optional (withOCC) opencascade-occt + ++ optional (debug) valgrind + ; + + # debug builds fail all but the python test + # 5.1.x fails the eeschema test + doInstallCheck = !debug && !stable; + installCheckTarget = "test"; + + dontStrip = debug; + + postInstall = optional (withI18n) '' + mkdir -p $out/share + lndir ${kicad-libraries.i18n}/share $out/share + ''; + + meta = { + description = "Just the built source without the libraries"; + longDescription = '' + Just the build products, optionally with the i18n linked in + the libraries are passed via an env var in the wrapper, default.nix + ''; + homepage = "https://www.kicad-pcb.org/"; + license = licenses.agpl3; + maintainers = with maintainers; [ evils kiwi berce ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 6b0c998d751..47222fe4a96 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,121 +1,175 @@ -{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib -, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig -, doxygen, pcre, libpthreadstubs, libXdmcp -, wrapGAppsHook -, oceSupport ? true, opencascade +{ lib, stdenv, gnome3, pkgs, wxGTK30, wxGTK31 +, gsettings-desktop-schemas, hicolor-icon-theme +, callPackage, callPackages +, librsvg, cups + +, pname ? "kicad" +, oceSupport ? false, opencascade +, withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, swig, python, pythonPackages -, lndir +, scriptingSupport ? true, swig, python3, python3Packages +, debug ? false, valgrind +, with3d ? true +, withI18n ? true }: assert ngspiceSupport -> libngspice != null; with lib; let - mkLib = version: name: sha256: attrs: stdenv.mkDerivation ({ - name = "kicad-${name}-${version}"; - src = fetchFromGitHub { - owner = "KiCad"; - repo = "kicad-${name}"; - rev = version; - inherit sha256 name; - }; - nativeBuildInputs = [ - cmake - ]; - } // attrs); - -in stdenv.mkDerivation rec { - pname = "kicad"; - series = "5.0"; - version = "5.1.4"; - - src = fetchurl { - url = "https://launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz"; - sha256 = "1r60dgh6aalbpq1wsmpyxkz0nn4ck8ydfdjcrblpl69k5rks5k2j"; - }; - postPatch = '' - substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace no-vcs-found ${version} - ''; - - cmakeFlags = [ - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - # nix installs wxPython headers in wxPython package, not in wxwidget - # as assumed. We explicitely set the header location. - "-DCMAKE_CXX_FLAGS=-I${pythonPackages.wxPython}/include/wx-3.0" - "-DwxPYTHON_INCLUDE_DIRS=${pythonPackages.wxPython}/include/wx-3.0" - ] ++ optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] - ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"; - - nativeBuildInputs = [ - cmake - doxygen - pkgconfig - wrapGAppsHook - pythonPackages.wrapPython - lndir - ]; - pythonPath = [ pythonPackages.wxPython ]; - propagatedBuildInputs = [ pythonPackages.wxPython ]; - - buildInputs = [ - libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs - cairo curl openssl boost - swig (python.withPackages (ps: with ps; [ wxPython ])) - ] ++ optional (oceSupport) opencascade - ++ optional (ngspiceSupport) libngspice; - - # this breaks other applications in kicad - dontWrapGApps = true; - - passthru = { - i18n = mkLib version "i18n" "1dk7wis4cncmihl8fnic3jyhqcdzpifchzsp7hmf214h0vp199zr" { - buildInputs = [ - gettext - ]; - meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 - }; - symbols = mkLib version "symbols" "1lna4xlvzrxif3569pkp6mrg7fj62z3a3ri5j97lnmnnzhiddnh3" { - meta.license = licenses.cc-by-sa-40; - }; - footprints = mkLib version "footprints" "0c0kcywxlaihzzwp9bi0dsr2v9j46zcdr85xmfpivmrk19apss6a" { - meta.license = licenses.cc-by-sa-40; - }; - templates = mkLib version "templates" "1bagb0b94cjh7zp9z0h23b60j45kwxbsbb7b2bdk98dmph8lmzbb" { - meta.license = licenses.cc-by-sa-40; + stable = pname != "kicad-unstable"; + baseName = if (stable) then "kicad" else "kicad-unstable"; + + versions = { + "kicad" = { + kicadVersion = { + version = "5.1.5"; + src.sha256 = "15h3rwisjss3fdc9bam9n2wq94slhacc3fbg14bnzf4n5agsnv5b"; + }; + libVersion = { + version = "5.1.5"; + libSources = { + i18n.sha256 = "1rfpifl8vky1gba2angizlb2n7mwmsiai3r6ip6qma60wdj8sbd3"; + symbols.sha256 = "048b07ffsaav1ssrchw2p870lvb4rsyb5vnniy670k7q9p16qq6h"; + templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; + footprints.sha256 = "1c4whgn14qhz4yqkl46w13p6rpv1k0hsc9s9h9368fxfcz9knb2j"; + packages3d.sha256 = "0cff2ms1bsw530kqb1fr1m2pjixyxzwa81mxgac3qpbcf8fnpvaz"; + }; + }; }; - packages3d = mkLib version "packages3d" "0h2qjj8vf33jz6jhqdz90c80h5i1ydgfqnns7rn0fqphlnscb45g" { - hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store - meta.license = licenses.cc-by-sa-40; + "kicad-unstable" = { + kicadVersion = { + version = "2019-12-31"; + src = { + rev = "eaaa4eb63acb289047dfbb6cc275579dea58f12b"; + sha256 = "1v2hf2slphjdh14y56pmzlpi6mqidrd8198if1fi0cch72v37zch"; + }; + }; + libVersion = { + version = "unstable"; + libSources = { + i18n.rev = "e7439fd76f27cfc26e269c4e6c4d56245345c28b"; + i18n.sha256 = "1nqm1kx5b4f7s0f9q8bg4rdhqnp0128yp6bgnrkia1kwmfnf5gmy"; + symbols.rev = "1bc5ff11c76bcbfda227e534b0acf737edddde8f"; + symbols.sha256 = "05kv93790wi4dpbn2488p587b83yz1zw9h62lkv41h7vn2r1mmb7"; + templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; + templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; + footprints.rev = "454126c125edd3fa8633f301421a7d9c4de61b77"; + footprints.sha256 = "00nli4kx2i68bk852rivbirzcgpsdlpdk34g1q892952jsbh7fy6"; + packages3d.rev = "c2b92a411adc93ddeeed74b36b542e1057f81a2a"; + packages3d.sha256 = "05znc6y2lc31iafspg308cxdda94zg6c7mwslmys76npih1pb8qc"; + }; + }; }; }; + versionConfig = versions.${baseName}; + + wxGTK = if (stable) + # wxGTK3x may default to withGtk2 = false, see #73145 + then wxGTK30.override { withGtk2 = false; } + # wxGTK31 currently introduces an issue with opening the python interpreter in pcbnew + # but brings high DPI support? + else wxGTK31.override { withGtk2 = false; }; + + pythonPackages = python3Packages; + python = python3; + wxPython = python3Packages.wxPython_4_0; + + kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + kicad-base = callPackage ./base.nix { + pname = baseName; + inherit versions stable baseName; + inherit wxGTK python wxPython; + inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport; + }; + +in +stdenv.mkDerivation rec { + + inherit pname; + version = versions.${baseName}.kicadVersion.version; + + src = kicad-base; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + pythonPath = optionals (scriptingSupport) + [ wxPython pythonPackages.six ]; + + nativeBuildInputs = optionals (scriptingSupport) + [ pythonPackages.wrapPython ]; - modules = with passthru; [ i18n symbols footprints templates ]; + # wrapGAppsHook added the equivalent to ${kicad-base}/share + # though i noticed no difference without it + makeWrapperArgs = [ + "--prefix XDG_DATA_DIRS : ${kicad-base}/share" + "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" + "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" + "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" + # wrapGAppsHook did these two as well, no idea if it matters... + "--prefix XDG_DATA_DIRS : ${cups}/share" + "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - postInstall = '' - mkdir -p $out/share - for module in $modules; do - lndir $module/share $out/share - done - ''; + "--set KISYSMOD ${kicad-libraries.footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${kicad-libraries.symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${kicad-libraries.templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.footprints}/share/kicad/template" + ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${kicad-libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] - preFixup = '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") + # infinisil's workaround for #39493 + ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] + ; - wrapGApp "$out/bin/kicad" --prefix LD_LIBRARY_PATH : "${libngspice}/lib" - ''; + # dunno why i have to add $makeWrapperArgs manually... + # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? + # not sure if anything has to be done with the other stuff in kicad-base/bin + # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest + installPhase = + optionalString (scriptingSupport) '' buildPythonPath "${kicad-base} $pythonPath" + '' + + '' makeWrapper ${kicad-base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + + '' makeWrapper ${kicad-base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' + + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" + '' + ; meta = { - description = "Free Software EDA Suite"; - homepage = http://www.kicad-pcb.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ berce ]; + description = if (stable) + then "Open Source Electronics Design Automation Suite" + else "Open Source EDA Suite, Development Build"; + homepage = "https://www.kicad-pcb.org/"; + longDescription = '' + KiCad is an open source software suite for Electronic Design Automation. + The Programs handle Schematic Capture, and PCB Layout with Gerber output. + ''; + license = licenses.agpl3; + # berce seems inactive... + maintainers = with maintainers; [ evils kiwi berce ]; + # kicad's cross-platform, not sure what to fill in here platforms = with platforms; linux; - broken = stdenv.isAarch64; }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix new file mode 100644 index 00000000000..53e190d2749 --- /dev/null +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, cmake, gettext +, fetchFromGitHub, fetchFromGitLab +, version, libSources +}: + +# callPackage libraries { +# version = "unstable"; +# libs.symbols = { +# rev = "09f9.."; +# sha256 = "..."; +# }; +# }; +with lib; +let + mkLib = name: attrs: + stdenv.mkDerivation ( + { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitHub ( + { + owner = "KiCad"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + nativeBuildInputs = [ cmake ]; + meta.license = licenses.cc-by-sa-40; + } // attrs + ); +in +{ + symbols = mkLib "symbols" { }; + templates = mkLib "templates" { }; + footprints = mkLib "footprints" { }; + packages3d = mkLib "packages3d" { + hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store + }; + + # i18n is a special case, not actually a library + # more a part of kicad proper, but also optional and separate + # since their move to gitlab they're keeping it in a separate path + # kicad has no way to find i18n except through a path relative to its install path + # therefore this is being linked into ${kicad-base}/share/ + # and defined here to make use of the rev & sha256's brought here for the libs + i18n = let name = "i18n"; in + stdenv.mkDerivation { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitLab ( + { + group = "kicad"; + owner = "code"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + buildInputs = [ gettext ]; + nativeBuildInputs = [ cmake ]; + meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + }; +} diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix deleted file mode 100644 index df0d9932b8a..00000000000 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib -, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig -, doxygen, pcre, libpthreadstubs, libXdmcp - -, oceSupport ? true, opencascade -, ngspiceSupport ? true, libngspice -, scriptingSupport ? true, swig, python, wxPython -}: - -assert ngspiceSupport -> libngspice != null; - -with lib; -stdenv.mkDerivation rec { - pname = "kicad-unstable"; - version = "2018-06-12"; - - src = fetchFromGitHub { - owner = "KICad"; - repo = "kicad-source-mirror"; - rev = "bc7bd107d980da147ad515aeae0469ddd55c2368"; - sha256 = "11nsx52pd3jr2wbzr11glmcs1a9r7z1mqkqx6yvlm0awbgd8qlv8"; - }; - - postPatch = '' - substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace no-vcs-found ${version} - ''; - - cmakeFlags = - optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ] - ++ optional (ngspiceSupport) "-DKICAD_SPICE=ON" - ++ optionals (scriptingSupport) [ - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_WXPYTHON=ON" - # nix installs wxPython headers in wxPython package, not in wxwidget - # as assumed. We explicitely set the header location. - "-DCMAKE_CXX_FLAGS=-I${wxPython}/include/wx-3.0" - ]; - - nativeBuildInputs = [ cmake doxygen pkgconfig ]; - buildInputs = [ - libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs - cairo curl openssl boost - ] ++ optional (oceSupport) opencascade - ++ optional (ngspiceSupport) libngspice - ++ optionals (scriptingSupport) [ swig python wxPython ]; - - meta = { - description = "Free Software EDA Suite, Nightly Development Build"; - homepage = http://www.kicad-pcb.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ berce ]; - platforms = with platforms; linux; - broken = true; - }; -} diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 78240a40bac..f044f1d88e7 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "30"; + version = "31"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "15v0jdfy2a2zxp8dmy04fdp7w7a4vwvffcwa688r81b86wphxzh8"; + sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 93d99928d7d..ec47a37140f 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,25 +1,59 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex -, netpbm, imagemagick, dbus, xlibsWrapper, libGLU, libGL -, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg +{ stdenv +, fetchurl +, pkgconfig +, gtk2 +, bison +, intltool +, flex +, netpbm +, imagemagick +, dbus +, xlibsWrapper +, libGLU +, libGL +, shared-mime-info +, tcl +, tk +, gnome2 +, gd +, xorg }: stdenv.mkDerivation rec { pname = "pcb"; - version = "20140316"; + version = "4.2.1"; src = fetchurl { - url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz"; - sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; + url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz"; + sha256 = "1i9zvcj0vgwp2g2hkmvafdq0k39klj90jsdanqx9xl7gl70345cq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + bison + intltool + flex + netpbm + imagemagick + ]; + buildInputs = [ - gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper - libGLU libGL tcl shared-mime-info tk - gnome2.gtkglext pangox_compat gd xorg.libXmu + gtk2 + dbus + xlibsWrapper + libGLU + libGL + tcl + shared-mime-info + tk + gnome2.gtkglext + gd + xorg.libXmu ]; - configureFlags = ["--disable-update-desktop-database"]; + configureFlags = [ + "--disable-update-desktop-database" + ]; meta = with stdenv.lib; { description = "Printed Circuit Board editor"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 98deda0ae6b..c940fd4ac34 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.022"; + version = "4.024"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1sj0qzl387pl2ygii3ssx35c3m601nb07j16lqj5zcxzhcg62i9p"; + sha256 = "0nmjazdv36ksjp8ys48c1grlzkd6yx3zhcd9y165d4sjm3m1pffs"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 6af7eaf3a5b..82458d7c566 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "SAT/PseudoBoolean/MaxSat/ASP solver using glucose"; - maintainers = with maintainers; [ gebner ma27 ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.asl20; homepage = https://alviano.net/software/maxino/; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 9b59828ddab..b43e0c6fbf1 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation { }; buildInputs = [ cmake zlib boost.out boost.dev ]; - NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ] + NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" ] # Squelch endless stream of warnings on same few things ++ stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-empty-body" "-Wno-tautological-compare" "-Wc++11-compat-deprecated-writable-strings" "-Wno-deprecated" - ]; + ]); prePatch = '' sed -i -e '1i#include <stdint.h>' abc/src/bdd/dsd/dsd.h diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 2378cb9408e..ac001540e09 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -143,7 +143,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = "revision coq coqide bin/votour"; + buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; createFindlibDestdir = true; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index f9a911d8210..e9ef16b2392 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; - cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd"; + cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; src = fetchFromGitHub { owner = "kha"; diff --git a/pkgs/applications/science/logic/minisat/clang.diff b/pkgs/applications/science/logic/minisat/clang.diff deleted file mode 100644 index 5b5072c71f3..00000000000 --- a/pkgs/applications/science/logic/minisat/clang.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur minisat/core/SolverTypes.h minisat.clang/core/SolverTypes.h ---- minisat/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 -+++ minisat.clang/core/SolverTypes.h 2016-05-13 12:14:50.759671959 +0200 -@@ -47,7 +47,7 @@ - int x; - - // Use this as a constructor: -- friend Lit mkLit(Var var, bool sign = false); -+ //friend Lit mkLit(Var var, bool sign = false); - - bool operator == (Lit p) const { return x == p.x; } - bool operator != (Lit p) const { return x != p.x; } -@@ -55,7 +55,7 @@ - }; - - --inline Lit mkLit (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; } -+inline Lit mkLit (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; } - inline Lit operator ~(Lit p) { Lit q; q.x = p.x ^ 1; return q; } - inline Lit operator ^(Lit p, bool b) { Lit q; q.x = p.x ^ (unsigned int)b; return q; } - inline bool sign (Lit p) { return p.x & 1; } -diff -aur minisat/utils/Options.h minisat.clang/utils/Options.h ---- minisat/utils/Options.h 2010-07-10 18:07:36.000000000 +0200 -+++ minisat.clang/utils/Options.h 2016-05-13 12:14:50.759671959 +0200 -@@ -282,15 +282,15 @@ - if (range.begin == INT64_MIN) - fprintf(stderr, "imin"); - else -- fprintf(stderr, "%4"PRIi64, range.begin); -+ fprintf(stderr, "%4" PRIi64, range.begin); - - fprintf(stderr, " .. "); - if (range.end == INT64_MAX) - fprintf(stderr, "imax"); - else -- fprintf(stderr, "%4"PRIi64, range.end); -+ fprintf(stderr, "%4" PRIi64, range.end); - -- fprintf(stderr, "] (default: %"PRIi64")\n", value); -+ fprintf(stderr, "] (default: %" PRIi64 ")\n", value); - if (verbose){ - fprintf(stderr, "\n %s\n", description); - fprintf(stderr, "\n"); -Only in minisat.clang/utils: Options.o -Only in minisat.clang/utils: System.o diff --git a/pkgs/applications/science/logic/minisat/darwin.patch b/pkgs/applications/science/logic/minisat/darwin.patch deleted file mode 100644 index f2b618d6bb3..00000000000 --- a/pkgs/applications/science/logic/minisat/darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/fasterthanlime/homebrew-mingw/blob/master/Library/Formula/minisat.rb - -diff --git a/utils/System.cc b/utils/System.cc -index a7cf53f..feeaf3c 100644 ---- a/utils/System.cc -+++ b/utils/System.cc -@@ -78,16 +78,17 @@ double Minisat::memUsed(void) { - struct rusage ru; - getrusage(RUSAGE_SELF, &ru); - return (double)ru.ru_maxrss / 1024; } --double MiniSat::memUsedPeak(void) { return memUsed(); } -+double Minisat::memUsedPeak(void) { return memUsed(); } - - - #elif defined(__APPLE__) - #include <malloc/malloc.h> - --double Minisat::memUsed(void) { -+double Minisat::memUsed() { - malloc_statistics_t t; - malloc_zone_statistics(NULL, &t); - return (double)t.max_size_in_use / (1024*1024); } -+double Minisat::memUsedPeak() { return memUsed(); } - - #else - double Minisat::memUsed() { diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 34051a1da40..6b642832b83 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -1,27 +1,19 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchFromGitHub, cmake, zlib }: stdenv.mkDerivation rec { pname = "minisat"; - version = "2.2.0"; + version = "2.2.1"; - src = fetchurl { - url = "http://minisat.se/downloads/${pname}-${version}.tar.gz"; - sha256 = "023qdnsb6i18yrrawlhckm47q8x0sl7chpvvw3gssfyw3j2pv5cj"; + src = fetchFromGitHub { + owner = "stp"; + repo = pname; + rev = "releases/${version}"; + sha256 = "14vcbjnlia00lpyv2fhbmw3wbc9bk9h7bln9zpyc3nwiz5cbjz4a"; }; - patches = - [ ./darwin.patch ] - ++ stdenv.lib.optionals stdenv.cc.isClang [ ./clang.diff ]; - + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - preBuild = "cd simp"; - makeFlags = [ "r" "MROOT=.." ]; - installPhase = '' - mkdir -p $out/bin - cp minisat_release $out/bin/minisat - ''; - meta = with stdenv.lib; { description = "Compact and readable SAT solver"; maintainers = with maintainers; [ gebner raskin ]; diff --git a/pkgs/applications/science/logic/minisat/unstable.nix b/pkgs/applications/science/logic/minisat/unstable.nix deleted file mode 100644 index ef46c694acb..00000000000 --- a/pkgs/applications/science/logic/minisat/unstable.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchFromGitHub, zlib, cmake }: - -stdenv.mkDerivation { - name = "minisat-unstable-2013-09-25"; - - src = fetchFromGitHub { - owner = "niklasso"; - repo = "minisat"; - rev = "37dc6c67e2af26379d88ce349eb9c4c6160e8543"; - sha256 = "091hf3qkm197s5r7xcr3m07xsdwyz2rqk1hc9kj0hn13imz09irq"; - }; - - buildInputs = [ zlib ]; - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "Compact and readable SAT solver"; - maintainers = with maintainers; [ mic92 ]; - platforms = platforms.unix; - license = licenses.mit; - homepage = http://minisat.se/; - }; -} diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index a4538e1070a..9528a5942a4 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { done ''; - buildFlags = "all"; + buildFlags = [ "all" ]; checkPhase = "make test1"; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 0ea659d1927..dd00eda1b57 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl, python3, python3Packages, zlib, minisatUnstable, cryptominisat }: +{ stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl +, python3, python3Packages, zlib, minisat, cryptominisat }: stdenv.mkDerivation rec { pname = "stp"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; - buildInputs = [ boost zlib minisatUnstable cryptominisat python3 ]; + buildInputs = [ boost zlib minisat cryptominisat python3 ]; nativeBuildInputs = [ cmake bison flex perl ]; preConfigure = '' python_install_dir=$out/${python3Packages.python.sitePackages} diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 24d5f99ec32..6f2d61cd80f 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack spooles openblas ]; - NIX_CFLAGS_COMPILE = [ - "-I${spooles}/include/spooles" - ]; + NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; patches = [ ./calculix.patch diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 75c49591675..a08c0ee3403 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "geogebra"; - version = "5-0-569-0"; + version = "5-0-570-0"; preferLocalBuild = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2" ]; - sha256 = "16bav6hf80l21gnhdjll82hpjqi7kr3w74jcq7mnf24acmcn70qm"; + sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 6e1926810df..643d990feb8 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too - makeFlags = "CC=cc all"; + makeFlags = [ "CC=cc" "all" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index fdc4de7b028..d4f13f84f81 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeWrapper ninja ant perl ]; - ninjaFlags = "-C build/Opt"; + ninjaFlags = [ "-C" "build/Opt" ]; postInstall = '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index 4b237a01a3e..b244ee75b30 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://mrob.com/pub/ries/; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index dc8ba48e45e..4530cbf69f4 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -118,6 +118,13 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da"; sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc"; }) + + # https://trac.sagemath.org/ticket/28911 + (fetchpatch { + name = "sympy-1.5.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831"; + sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 432280a18fb..02f1f4e58a9 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!withXaw3d) "--with-local-xaw" ; - makeFlags = "all"; + makeFlags = [ "all" ]; meta = { homepage = http://www.scilab.org/; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 672569ed100..da118f6bca5 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; let boost_static = boost.override { enableStatic = true; }; -in +in mkDerivation rec { version = "3.5"; pname = "colmap"; @@ -15,7 +15,14 @@ mkDerivation rec { rev = version; sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; }; - + + patches = [ + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; + sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; + }) + ]; + buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index f86bed854a2..6cdc86d20eb 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - makeFlags = "CAML_INCLUDES=${ocaml}/lib/ocaml/caml"; + makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 dontStrip = true; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index 1a1ae3df942..ed4101bdb47 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: +doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: let @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu + doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 7a03369febe..b901e40a194 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext -, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib +{ stdenv, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft +, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash +, zlib , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] @@ -73,6 +74,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do + wrapProgram "$out/bin/$prog" \ + --prefix PYTHONPATH : "$out/lib" + done + ''; + setupHook = ./setup-hook.sh; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 58f464575b0..44b0f5d84b6 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -54,28 +54,28 @@ stdenv.mkDerivation rec { # # For more information see: # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) - cmakeFlags= '' - -Denable_documentation=${optionOnOff buildDocumentation} - -Denable_java=${optionOnOff buildJavaBindings} - -Denable_fortran=${optionOnOff fortranSupport} - -Denable_model-checking=${optionOnOff modelCheckingSupport} - -Denable_ns3=off - -Denable_lua=off - -Denable_lib_in_jar=off - -Denable_maintainer_mode=off - -Denable_mallocators=on - -Denable_debug=on - -Denable_smpi=on - -Denable_smpi_ISP_testsuite=${optionOnOff moreTests} - -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests} - -Denable_compile_warnings=${optionOnOff debug} - -Denable_compile_optimizations=${optionOnOff (!debug)} - -Denable_lto=${optionOnOff (!debug)} - ''; - # -Denable_lua=${optionOnOff luaSupport} - # -Denable_smpi_papi=${optionOnOff moreTests} + cmakeFlags = [ + "-Denable_documentation=${optionOnOff buildDocumentation}" + "-Denable_java=${optionOnOff buildJavaBindings}" + "-Denable_fortran=${optionOnOff fortranSupport}" + "-Denable_model-checking=${optionOnOff modelCheckingSupport}" + "-Denable_ns3=off" + "-Denable_lua=off" + "-Denable_lib_in_jar=off" + "-Denable_maintainer_mode=off" + "-Denable_mallocators=on" + "-Denable_debug=on" + "-Denable_smpi=on" + "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" + "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" + "-Denable_compile_warnings=${optionOnOff debug}" + "-Denable_compile_optimizations=${optionOnOff (!debug)}" + "-Denable_lto=${optionOnOff (!debug)}" + # "-Denable_lua=${optionOnOff luaSupport}" + # "-Denable_smpi_papi=${optionOnOff moreTests}" + ]; - makeFlags = optionalString debug "VERBOSE=1"; + makeFlags = optional debug "VERBOSE=1"; # Some Perl scripts are called to generate test during build which # is before the fixupPhase, so do this manualy here: diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d720f5ea078..7536d071f6b 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, cmake +{ stdenv +, fetchurl +, cmake , singlePrec ? true , mpiEnabled ? false , fftw @@ -6,31 +8,39 @@ , perl }: - stdenv.mkDerivation { - name = "gromacs-2019.4"; + name = "gromacs-2020"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.4.tar.gz"; - sha256 = "0rqqrbjrdhprlw2z6cqid59xwxfdx05ikvywppvdp8f8vzp6chxs"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz"; + sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ fftw perl ] ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]); - cmakeFlags = '' - ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} - ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE - -DGMX_CPU_ACCELERATION:STRING=SSE4.1 - -DGMX_OPENMP:BOOL=TRUE - -DGMX_THREAD_MPI:BOOL=FALSE" - else "-DGMX_MPI:BOOL=FALSE" } - ''; + cmakeFlags = ( + if singlePrec then [ + "-DGMX_DOUBLE=OFF" + ] else [ + "-DGMX_DOUBLE=ON" + "-DGMX_DEFAULT_SUFFIX=OFF" + ] + ) ++ ( + if mpiEnabled then [ + "-DGMX_MPI:BOOL=TRUE" + "-DGMX_CPU_ACCELERATION:STRING=SSE4.1" + "-DGMX_OPENMP:BOOL=TRUE" + "-DGMX_THREAD_MPI:BOOL=FALSE" + ] else [ + "-DGMX_MPI:BOOL=FALSE" + ] + ); meta = with stdenv.lib; { - homepage = "http://www.gromacs.org"; - license = licenses.gpl2; + homepage = "http://www.gromacs.org"; + license = licenses.gpl2; description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 2af93961e02..818bea7d0ff 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "xfitter"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { name = "${pname}-${version}.tgz"; url = "https://www.xfitter.org/xFitter/xFitter/DownloadPage?action=AttachFile&do=get&target=${pname}-${version}.tgz"; - sha256 = "0j47s8laq3aqjlgp769yicvgyzqjb738a3rqss51d9fjrihi2515"; + sha256 = "0kmgc67nw5flp92yw5x6l2vsnhwsfi5z2a20404anisdgdjs8zc6"; }; patches = [ ./undefined_behavior.patch ]; - CXXFLAGS = "-Werror=return-type"; + # patch needs to updated due to version bump + #CXXFLAGS = "-Werror=return-type"; preConfigure = # Fix F77LD to workaround for a following build error: diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 890e824cf2e..0348d015309 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.17"; + version = "1.8.18"; src = fetchPypi { inherit pname version; - sha256 = "193hjilsmbljbgj7v6icy3b4hzm14l0z6v05v7ycx6larij5xj2r"; + sha256 = "1fi4m3591wws5cq43q8aljf91mzs6i9yhn9rimhpfrskbyf9knvm"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix new file mode 100644 index 00000000000..139a49d9505 --- /dev/null +++ b/pkgs/applications/system/monitor/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, vala +, pkg-config +, pantheon +, python3 +, gettext +, glib +, gtk3 +, bamf +, libwnck3 +, libgee +, libgtop +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "monitor"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "stsdc"; + repo = "monitor"; + rev = version; + sha256 = "0cqzxlzdbij26qgbbngqx6njcpcymkgvm29b7ipldgkssxp1mkkg"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + vala + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + bamf + glib + gtk3 + pantheon.granite + pantheon.wingpanel + libgee + libgtop + libwnck3 + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Manage processes and monitor system resources"; + homepage = "https://github.com/stsdc/monitor"; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 0a1ecbb6532..81b779f0206 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/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.48"; + version = "1.50"; 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.48.tar.gz"; - sha256 = "16gw24y5x96mx6zby8cys0f03x1bqw4r7g1390qlpg75pbydqlf9"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.50.tar.gz"; + sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 2551c980fa8..96c2c8622f8 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ma27 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index edc5f9d7bfb..fa3970c4b15 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "git-bug"; - version = "0.5.0"; - rev = "8d7a2c076a38c89085fd3191a2998efb659650c2"; + version = "0.6.0"; + rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf"; goPackagePath = "github.com/MichaelMure/git-bug"; src = fetchFromGitHub { inherit rev; owner = "MichaelMure"; repo = "git-bug"; - sha256 = "1l86m0y360lmpmpw2id0k7zc2nyq1irr26k2ik06lxhzvpbyajz6"; + sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli"; }; buildFlagsArray = '' diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 64ef6db980b..cfdcd80f38b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "5.0.0"; + version = "5.1.0"; src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0c839kc5mhi1iqhc696p4dj67i5hm2gi4d8cvdpskaapb124mj2f"; + sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky"; }; nativeBuildInputs = [ unixtools.column which ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 4e13d0fb497..61852684387 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "11b0adh46fr0j61pz286pycqz15m1b9pfvlz7z08cd0gw526l3f0"; + sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; }; cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postFixup = '' + wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + ''; + meta = with stdenv.lib; { description = "Cleanup stale Git branches of pull requests"; homepage = "https://github.com/lunaryorn/git-gone"; diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 193133d6d3e..33b3d0bc167 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { - sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z"; - rev = "v${version}"; - repo = "git-hub"; owner = "sociomantic-tsunami"; + repo = "git-hub"; + rev = "v${version}"; + sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb"; }; buildInputs = [ python2Packages.python ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 76b29135f66..528a96c9903 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - makeFlags = "PREFIX= DESTDIR=$(out)" ; + makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; meta = with stdenv.lib; { homepage = https://github.com/mhagger/git-imerge; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 32d3465016c..6f8c4091a16 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.12.2"; + version = "2.12.6"; src = fetchPypi { inherit pname version; - sha256 = "0kmwm9rwngxm2qdlv6nvxyhwpfa0i95kbrmasrj1qqdz7rmyyzmi"; + sha256 = "1h7daf74s0plnqrz2f63s6rak8fmqns96ydjn01366bcsqrbvkw6"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 6df3a97dbbb..28e63c4f166 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; - installFlags = "HOME=\${out} install-doc"; + installFlags = [ "HOME=\${out}" "install-doc" ]; postInstall = '' wrapProgram $out/bin/git-remote-hg \ diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 312879a49e8..7c46d26bf5b 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation { # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead. # We need many of these files during the installCheckPhase. - installFlags = "NO_INSTALL_HARDLINKS=1"; + installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; preInstall = (stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 8cf9662d8f9..94753275b61 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2019-05-06"; + version = "unstable-2019-12-18"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "9c791f93c23c04dadfab8b4309a863b62a6ee424"; - sha256 = "0jbdrgl62x6j920h72n2q6304fb6gdgnmllpv4aa76m13b9qhgq6"; + rev = "8ae9c17a60158dcf91f56d9167493e3988a5e921"; + sha256 = "1czjwsgbmxd1d656srs3n6wj6bmqr8p3aw5gw61q4wdxw3mni2a6"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "s|local daemon.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh + sed -i "s|local daemon=.*|local daemon=$out/bin/gitstatusd|" gitstatus.plugin.zsh ''; installPhase = '' install -Dm755 gitstatusd $out/bin/gitstatusd diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 0ff7fae2878..211ad1eccd8 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -13,7 +13,7 @@ libgit2.overrideAttrs (oldAttrs: { src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "aab6c56e6766fa752bef00c745067d875925fc89"; - sha256 = "1yqqhpi5xi6s86411sixw4yq5c6n2v8pdh447c8b7q5lfc089lvl"; + rev = "75be63625a0de418ec3551306362ee1e21034039"; + sha256 = "1bwr1ahfxn1nn2f78ri91icxpv8xhpmgypcvg042cmcpm2qrahz9"; }; }) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index c8700c18ea1..3e47631caf6 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lab"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "1z83v1dl9c5f99jvvc23ijkwrfrv489la05rlsrc3r4zzza1hx1f"; + sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c"; }; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 660c391c0d5..3a354133e87 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ python2 git ]; - makeFlags = "prefix=$$out"; + makeFlags = [ "prefix=$$out" ]; postInstall = '' mkdir -p "$out/etc/bash_completion.d/" diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 3c7784e8506..45b427341a2 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation { "SVN_INCLUDE=${subversion.dev}/include/subversion-1" ]; - NIX_LDFLAGS = [ - "-lsvn_fs-1" - ]; + NIX_LDFLAGS = "-lsvn_fs-1"; meta = with stdenv.lib; { homepage = https://github.com/svn-all-fast-export/svn2git; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 99e660d9276..4d5814548ff 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1b1vmixc94kzfnd266r3hx25lcm3h4ywqg7d9kif83ixm612cj3g"; + sha256 = "04ksalhpf47wzjfhx295kf4rbamxbb3s9946vfda358lm360adic"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index acd2da71219..2272e66faf5 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.3.1"; + version = "6.4.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "071i3z6jym6f5nfy2mq36m45jywpk53w1vpzr2n599pabdkavj89"; + sha256 = "1w8iwpbr6nwzhhf63fvr7pd66yjx3jgjy4gx5y02qxa3ip5psq5b"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ed8debb404d..be7f0afdc77 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.5.4", - "repo_hash": "08jngv83pvxjyw3iaqzv484v4mwgwnzg9am3iqfidl9ihbm7i4h2", + "version": "12.6.2", + "repo_hash": "0bchamvr3f0ph49f7xa76gsp2mjj1ajy4q0wy1hjvr9bayxx94av", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.5.4-ee", + "rev": "v12.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.72.1", + "GITALY_SERVER_VERSION": "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83", "GITLAB_PAGES_VERSION": "1.12.0", - "GITLAB_SHELL_VERSION": "10.2.0", - "GITLAB_WORKHORSE_VERSION": "8.14.1" + "GITLAB_SHELL_VERSION": "10.3.0", + "GITLAB_WORKHORSE_VERSION": "8.18.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 60035990ed0..fa2154c4472 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -43,7 +43,14 @@ let pname = "gitlab-assets"; inherit version src; - nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ]; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ]; + + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + patches = [ ./remove-hardcoded-locations.patch ]; + # One of the patches uses this variable - if it's unset, execution + # of rake tasks fails. + GITLAB_LOG_PATH = "log"; configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 90c4e1bccea..9d28a073096 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -99,7 +99,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -111,7 +111,7 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.3.0) + msgpack (1.3.1) multi_json (1.13.1) multipart-post (2.0.0) nokogiri (1.10.5) @@ -176,7 +176,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rugged (0.28.3.1) + rugged (0.28.4.1) safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2c764162230..97d7404de8b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,16 +17,20 @@ let }; }; in buildGoPackage rec { - version = "1.72.1"; + version = "a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; - rev = "v${version}"; - sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91"; + rev = version; + sha256 = "1pxmhq1nrc8q2kk83bz5afx14hshqgzqm6j4vgmyjvbmdvgl80wv"; }; + # Fix a check which assumes that hook files are writeable by their + # owner. + patches = [ ./fix-executable-check.patch ]; + goPackagePath = "gitlab.com/gitlab-org/gitaly"; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 951ea39e5be..31210f2d606 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; }; } { @@ -109,6 +109,15 @@ }; } { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "v1.0.0"; + sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; + }; + } + { goPackagePath = "github.com/cloudflare/tableflip"; fetch = { type = "git"; @@ -338,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; }; } { @@ -581,8 +590,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; }; } { @@ -640,6 +649,15 @@ }; } { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.2.0"; + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; + }; + } + { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; @@ -833,8 +851,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } { @@ -847,6 +865,15 @@ }; } { + goPackagePath = "github.com/sebest/xff"; + fetch = { + type = "git"; + url = "https://github.com/sebest/xff"; + rev = "6c115e0ffa35"; + sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; + }; + } + { goPackagePath = "github.com/sergi/go-diff"; fetch = { type = "git"; @@ -869,8 +896,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + rev = "v1.3.0"; + sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; }; } { @@ -1067,8 +1094,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "0c3fc7cdd57c"; - sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i"; + rev = "3253d7975ca7"; + sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s"; }; } { @@ -1139,8 +1166,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; }; } { @@ -1202,8 +1229,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch new file mode 100644 index 00000000000..65e130078b7 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch @@ -0,0 +1,13 @@ +diff --git a/internal/config/config.go b/internal/config/config.go +index 037c9602..3d5409dc 100644 +--- a/internal/config/config.go ++++ b/internal/config/config.go +@@ -185,7 +185,7 @@ func checkExecutable(path string) error { + return err + } + +- if fi.Mode()&0755 < 0755 { ++ if fi.Mode()&0555 < 0555 { + return fmt.Errorf("not executable: %v", path) + } + diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 47e1c3b3568..638f6512c1a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -418,10 +418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; + sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -490,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; + sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; multi_json = { source = { @@ -791,10 +791,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; + sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx"; type = "gem"; }; - version = "0.28.3.1"; + version = "0.28.4.1"; }; safe_yaml = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2a83cbe5f3c..53dd1bb7ffb 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell-go"; - version = "10.2.0"; + version = "10.3.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1mpzsdqd8mlsh8wccz4s8415w080z55lnifn7l7vd5rflpnyfhcj"; + sha256 = "0kxbw2n5kabh0876xqn1dcjbxyrp82ms566rw065nqrb32g8c2hk"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index d5ea22f960b..b4105f18c10 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -388,21 +388,12 @@ }; } { - goPackagePath = "github.com/otiai10/curr"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/curr"; - rev = "f5a3d24e5776"; - sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w"; - }; - } - { goPackagePath = "github.com/otiai10/mint"; fetch = { type = "git"; url = "https://github.com/otiai10/mint"; - rev = "v1.2.4"; - sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m"; + rev = "v1.2.3"; + sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k"; }; } { @@ -662,8 +653,8 @@ fetch = { type = "git"; url = "https://gopkg.in/DataDog/dd-trace-go.v1"; - rev = "v1.9.0"; - sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j"; + rev = "v1.7.0"; + sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 515a41ad34e..ee00070df2d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,7 +1,7 @@ -diff --git a/go/internal/config/config.go b/go/internal/config/config.go +diff --git a/internal/config/config.go b/internal/config/config.go index 2231851..c869930 100644 ---- a/go/internal/config/config.go -+++ b/go/internal/config/config.go +--- a/internal/config/config.go ++++ b/internal/config/config.go @@ -3,7 +3,6 @@ package config import ( "io/ioutil" @@ -29,10 +29,10 @@ index 2231851..c869930 100644 } func newFromFile(filename string) (*Config, error) { -diff --git a/go/internal/keyline/key_line.go b/go/internal/keyline/key_line.go -index f92f50b..160e287 100644 ---- a/go/internal/keyline/key_line.go -+++ b/go/internal/keyline/key_line.go +diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go +index c29a320..c44b701 100644 +--- a/internal/keyline/key_line.go ++++ b/internal/keyline/key_line.go @@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi } @@ -43,10 +43,10 @@ index f92f50b..160e287 100644 return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) } diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb -index 1416488..90a5f79 100644 +index 52ac5ee..d96baa3 100644 --- a/support/gitlab_config.rb +++ b/support/gitlab_config.rb -@@ -4,7 +4,7 @@ class GitlabConfig +@@ -7,7 +7,7 @@ class GitlabConfig attr_reader :config def initialize diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 4f3322f3d0f..0e10cdc882d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.14.1"; + version = "8.18.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl"; + sha256 = "0qsbz8gv9r9wfvxsh9mpspgs2gyyidxdz5n9n7ibfy7z129mx4ak"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index 9db1c002f8f..c27c5bbf548 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -28,6 +28,42 @@ }; } { + goPackagePath = "github.com/Joker/hpp"; + fetch = { + type = "git"; + url = "https://github.com/Joker/hpp"; + rev = "6893e659854a"; + sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5"; + }; + } + { + goPackagePath = "github.com/Joker/jade"; + fetch = { + type = "git"; + url = "https://github.com/Joker/jade"; + rev = "v1.0.0"; + sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf"; + }; + } + { + goPackagePath = "github.com/Shopify/goreferrer"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/goreferrer"; + rev = "ec9c9a553398"; + sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; + }; + } + { + goPackagePath = "github.com/ajg/form"; + fetch = { + type = "git"; + url = "https://github.com/ajg/form"; + rev = "v1.5.1"; + sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; + }; + } + { goPackagePath = "github.com/alecthomas/template"; fetch = { type = "git"; @@ -46,6 +82,15 @@ }; } { + goPackagePath = "github.com/aymerick/raymond"; + fetch = { + type = "git"; + url = "https://github.com/aymerick/raymond"; + rev = "v2.0.2"; + sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3"; + }; + } + { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; @@ -100,6 +145,15 @@ }; } { + goPackagePath = "github.com/codegangsta/inject"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/inject"; + rev = "33e0aa1cb7c0"; + sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; + }; + } + { goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; @@ -118,6 +172,33 @@ }; } { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "cdade1c07385"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "v1.1.0"; + sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; + }; + } + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } + { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; @@ -127,6 +208,15 @@ }; } { + goPackagePath = "github.com/gavv/monotime"; + fetch = { + type = "git"; + url = "https://github.com/gavv/monotime"; + rev = "30dba4353424"; + sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g"; + }; + } + { goPackagePath = "github.com/getsentry/raven-go"; fetch = { type = "git"; @@ -136,6 +226,51 @@ }; } { + goPackagePath = "github.com/getsentry/sentry-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/sentry-go"; + rev = "v0.3.0"; + sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1"; + }; + } + { + goPackagePath = "github.com/gin-contrib/sse"; + fetch = { + type = "git"; + url = "https://github.com/gin-contrib/sse"; + rev = "5545eab6dad3"; + sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = "https://github.com/gin-gonic/gin"; + rev = "v1.4.0"; + sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; + }; + } + { + goPackagePath = "github.com/go-check/check"; + fetch = { + type = "git"; + url = "https://github.com/go-check/check"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { goPackagePath = "github.com/go-kit/kit"; fetch = { type = "git"; @@ -154,6 +289,15 @@ }; } { + goPackagePath = "github.com/go-martini/martini"; + fetch = { + type = "git"; + url = "https://github.com/go-martini/martini"; + rev = "22fa46961aab"; + sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; + }; + } + { goPackagePath = "github.com/go-stack/stack"; fetch = { type = "git"; @@ -212,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.3.1"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; } { @@ -235,6 +379,15 @@ }; } { + 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/google/renameio"; fetch = { type = "git"; @@ -262,6 +415,15 @@ }; } { + goPackagePath = "github.com/gorilla/schema"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/schema"; + rev = "v1.1.0"; + sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9"; + }; + } + { goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; @@ -298,6 +460,51 @@ }; } { + goPackagePath = "github.com/imkira/go-interpol"; + fetch = { + type = "git"; + url = "https://github.com/imkira/go-interpol"; + rev = "v1.1.0"; + sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; + }; + } + { + goPackagePath = "github.com/iris-contrib/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/blackfriday"; + rev = "v2.0.0"; + sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; + }; + } + { + goPackagePath = "github.com/iris-contrib/formBinder"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/formBinder"; + rev = "v5.0.0"; + sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg"; + }; + } + { + goPackagePath = "github.com/iris-contrib/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/go.uuid"; + rev = "v2.0.0"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + }; + } + { + goPackagePath = "github.com/iris-contrib/httpexpect"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/httpexpect"; + rev = "ebe99fcebbce"; + sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; + }; + } + { goPackagePath = "github.com/jfbus/httprs"; fetch = { type = "git"; @@ -334,6 +541,33 @@ }; } { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "089d3ea4e4d5"; + sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "584905176618"; + sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; + }; + } + { + goPackagePath = "github.com/juju/testing"; + fetch = { + type = "git"; + url = "https://github.com/juju/testing"; + rev = "472a3e8b2073"; + sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; + }; + } + { goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { type = "git"; @@ -343,6 +577,42 @@ }; } { + goPackagePath = "github.com/k0kubun/colorstring"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/colorstring"; + rev = "9440f1994b88"; + sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; + }; + } + { + goPackagePath = "github.com/kataras/golog"; + fetch = { + type = "git"; + url = "https://github.com/kataras/golog"; + rev = "99c81de45f40"; + sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p"; + }; + } + { + goPackagePath = "github.com/kataras/iris"; + fetch = { + type = "git"; + url = "https://github.com/kataras/iris"; + rev = "v11.1.1"; + sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg"; + }; + } + { + goPackagePath = "github.com/kataras/pio"; + fetch = { + type = "git"; + url = "https://github.com/kataras/pio"; + rev = "ea782b38602d"; + sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; + }; + } + { goPackagePath = "github.com/kelseyhightower/envconfig"; fetch = { type = "git"; @@ -361,6 +631,24 @@ }; } { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "v1.4.0"; + sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "e7e905edc00e"; + sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf"; + }; + } + { goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; fetch = { type = "git"; @@ -406,6 +694,24 @@ }; } { + goPackagePath = "github.com/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.10"; + sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; @@ -424,6 +730,33 @@ }; } { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.2"; + sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.9"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/goveralls"; + fetch = { + type = "git"; + url = "https://github.com/mattn/goveralls"; + rev = "v0.0.2"; + sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; + }; + } + { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { type = "git"; @@ -433,6 +766,15 @@ }; } { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "v1.0.2"; + sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; + }; + } + { goPackagePath = "github.com/mitchellh/copystructure"; fetch = { type = "git"; @@ -469,6 +811,15 @@ }; } { + goPackagePath = "github.com/moul/http2curl"; + fetch = { + type = "git"; + url = "https://github.com/moul/http2curl"; + rev = "v1.0.0"; + sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; + }; + } + { goPackagePath = "github.com/mwitkow/go-conntrack"; fetch = { type = "git"; @@ -482,8 +833,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; }; } { @@ -491,8 +842,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; }; } { @@ -514,12 +865,21 @@ }; } { + goPackagePath = "github.com/pingcap/errors"; + fetch = { + type = "git"; + url = "https://github.com/pingcap/errors"; + rev = "v0.11.1"; + sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp"; + }; + } + { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -586,6 +946,15 @@ }; } { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { goPackagePath = "github.com/sebest/xff"; fetch = { type = "git"; @@ -595,6 +964,24 @@ }; } { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; @@ -635,8 +1022,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -676,12 +1063,129 @@ }; } { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "v1.1.4"; + sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "v1.0.0"; + sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasthttp"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasthttp"; + rev = "v1.4.0"; + sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.0.1"; + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; + }; + } + { + goPackagePath = "github.com/valyala/tcplisten"; + fetch = { + type = "git"; + url = "https://github.com/valyala/tcplisten"; + rev = "ceec8f93295a"; + sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "df4f5c81cb3b"; + sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.1.0"; + sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; + }; + } + { + goPackagePath = "github.com/yalp/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/yalp/jsonpath"; + rev = "5cc68e5049a0"; + sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; + }; + } + { + goPackagePath = "github.com/yudai/gojsondiff"; + fetch = { + type = "git"; + url = "https://github.com/yudai/gojsondiff"; + rev = "v1.0.0"; + sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; + }; + } + { + goPackagePath = "github.com/yudai/golcs"; + fetch = { + type = "git"; + url = "https://github.com/yudai/golcs"; + rev = "ecda9a501e82"; + sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; + }; + } + { + goPackagePath = "github.com/yudai/pp"; + fetch = { + type = "git"; + url = "https://github.com/yudai/pp"; + rev = "v2.0.1"; + sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; + }; + } + { goPackagePath = "gitlab.com/gitlab-org/gitaly"; fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitaly.git"; - rev = "v1.57.0"; - sha256 = "0mgawp5afcv9s4y8fq3mc4dn6hhdg1shbns8vmjwklh9bia988cy"; + rev = "v1.74.0"; + sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd"; }; } { @@ -689,8 +1193,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "905271af7abb"; - sha256 = "144w5dikd82wz53drml9khlx39pmp6kgqccc5c0xfzpijbj7krbd"; + rev = "3253d7975ca7"; + sha256 = "1q7vqcbwzgwk4n09jnzdh2filv1aqclw9bgf3qjr5qrfk7hby58s"; }; } { @@ -707,8 +1211,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "20be4c3c3ed5"; - sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + rev = "4def268fd1a4"; + sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; }; } { @@ -716,8 +1220,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; }; } { @@ -761,8 +1265,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "953cdadca894"; - sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; + rev = "fde4db37ae7a"; + sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3"; }; } { @@ -806,8 +1310,8 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; - rev = "v1.16.0"; - sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + rev = "v1.24.0"; + sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; }; } { @@ -856,6 +1360,33 @@ }; } { + goPackagePath = "gopkg.in/go-playground/assert.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/assert.v1"; + rev = "v1.2.1"; + sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; + }; + } + { + goPackagePath = "gopkg.in/go-playground/validator.v8"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/validator.v8"; + rev = "v8.18.2"; + sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } + { goPackagePath = "gopkg.in/tomb.v1"; fetch = { type = "git"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d27bc276088..b6f57297c07 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -22,6 +22,7 @@ gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.1' gem 'faraday', '~> 0.12' +gem 'marginalia', '~> 1.8.0' # Authentication libraries gem 'devise', '~> 4.6' @@ -53,7 +54,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' -gem 'akismet', '~> 2.0' +gem 'akismet', '~> 3.0' gem 'invisible_captcha', '~> 0.12.1' # Two-factor authentication @@ -101,7 +102,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.8.8' +gem 'hamlit', '~> 2.11.0' # Files attachments gem 'carrierwave', '~> 1.3' @@ -135,11 +136,11 @@ gem 'aws-sdk' gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.8' +gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.2.1' gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.17' +gem 'commonmarker', '~> 0.20' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' gem 'org-ruby', '~> 0.9.12' @@ -170,8 +171,8 @@ group :unicorn do end group :puma do - gem 'puma', '~> 3.12', require: false - gem 'puma_worker_killer', require: false + gem 'gitlab-puma', '~> 4.3.1.gitlab.2', require: false + gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false gem 'rack-timeout', require: false end @@ -242,7 +243,7 @@ gem 'slack-notifier', '~> 1.5.1' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '~> 0.8.1' +gem 'asana', '~> 0.9' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -273,8 +274,8 @@ gem 'mimemagic', '~> 0.3.2' gem 'fast_blank' # Parse time & duration -gem 'chronic', '~> 0.10.2' -gem 'gitlab_chronic_duration', '~> 0.10.6.1' +gem 'gitlab-chronic', '~> 0.10.5' +gem 'gitlab_chronic_duration', '~> 0.10.6.2' gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' @@ -312,8 +313,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -# https://gitlab.com/gitlab-org/gitlab/issues/13996 -gem 'gitlab-peek', '~> 0.0.1', require: 'peek' +gem 'peek', '~> 1.1' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' @@ -347,20 +347,15 @@ group :development do end group :development, :test do - gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] + gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', require: false - gem 'fuubar', '~> 2.2.0' gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 3.8.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false + gem 'rspec-rails', '~> 4.0.0.beta3' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -368,10 +363,6 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'capybara', '~> 3.22.0' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.141' - gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' @@ -382,7 +373,7 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.31.0', require: false + gem 'haml_lint', '~> 0.34.0', require: false gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false @@ -390,7 +381,7 @@ group :development, :test do gem 'knapsack', '~> 1.17' - gem 'stackprof', '~> 0.2.10', require: false + gem 'stackprof', '~> 0.2.13', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -403,6 +394,16 @@ group :development, :test, :omnibus do end group :test do + gem 'fuubar', '~> 2.2.0' + gem 'rspec-retry', '~> 0.6.1' + gem 'rspec_profiling', '~> 0.0.5' + gem 'rspec-set', '~> 0.1.3' + gem 'rspec-parameterized', require: false + + gem 'capybara', '~> 3.22.0' + gem 'capybara-screenshot', '~> 1.0.22' + gem 'selenium-webdriver', '~> 3.142' + gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' @@ -416,7 +417,7 @@ end gem 'octokit', '~> 4.9' -gem 'mail_room', '~> 0.9.1' +gem 'mail_room', '~> 0.10.0' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -451,7 +452,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 1.70.0' +gem 'gitaly', '~> 1.73.0' gem 'grpc', '~> 1.24.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 15465cd6b03..0e322705862 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -58,16 +58,16 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) aes_key_wrap (1.0.1) - akismet (2.0.0) + akismet (3.0.0) apollo_upload_server (2.0.0.beta.3) graphql (>= 1.8) rails (>= 4.2) arel (9.0.0) - asana (0.8.1) + asana (0.9.3) faraday (~> 0.9) faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) + oauth2 (~> 1.4) asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) @@ -118,9 +118,9 @@ GEM brakeman (4.2.1) browser (2.5.3) builder (3.2.3) - bullet (5.5.1) + bullet (6.0.2) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.11) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) @@ -143,9 +143,7 @@ GEM cause (0.1) character_set (1.1.2) charlock_holmes (0.7.6) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - chronic (0.10.2) + childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) claide (1.0.3) @@ -157,7 +155,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.17.13) + commonmarker (0.20.1) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -287,7 +285,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.11.1) + ffi (1.11.3) flipper (0.17.1) flipper-active_record (0.17.1) activerecord (>= 4.2, < 7) @@ -359,9 +357,11 @@ GEM po_to_json (>= 1.0.0) rails (>= 3.2.0) git (1.5.0) - gitaly (1.70.0) + gitaly (1.73.0) grpc (~> 1.0) github-markup (1.7.0) + gitlab-chronic (0.10.5) + numerizer (~> 0.2) gitlab-labkit (0.7.0) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) @@ -372,8 +372,11 @@ GEM gitlab-license (1.0.0) gitlab-markup (1.7.0) gitlab-net-dns (0.9.1) - gitlab-peek (0.0.1) - railties (>= 4.0.0) + gitlab-puma (4.3.1.gitlab.2) + nio4r (~> 2.0) + gitlab-puma_worker_killer (0.1.1.gitlab.1) + get_process_mem (~> 0.2) + gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) gitlab-styles (2.8.0) @@ -381,8 +384,8 @@ GEM rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.19) - gitlab_chronic_duration (0.10.6.1) - numerizer (~> 0.1.1) + gitlab_chronic_duration (0.10.6.2) + numerizer (~> 0.2) gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -460,17 +463,16 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.0.4) + haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.31.0) - haml (>= 4.0, < 5.1) + haml_lint (0.34.0) + haml (>= 4.0, < 5.2) rainbow - rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.8.8) - temple (>= 0.8.0) + hamlit (2.11.0) + temple (>= 0.8.2) thor tilt hangouts-chat (0.0.5) @@ -484,7 +486,7 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (2.8.4) + html-pipeline (2.12.2) activesupport (>= 2) nokogiri (>= 1.4) html2text (0.2.0) @@ -591,9 +593,12 @@ GEM lumberjack (1.0.13) mail (2.7.1) mini_mime (>= 0.1.1) - mail_room (0.9.1) + mail_room (0.10.0) marcel (0.3.3) mimemagic (~> 0.3.2) + marginalia (1.8.0) + actionpack (>= 2.3) + activerecord (>= 2.3) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -622,7 +627,7 @@ GEM net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) - nio4r (2.3.1) + nio4r (2.5.2) no_proxy_fix (0.1.2) nokogiri (1.10.5) mini_portile2 (~> 2.4.0) @@ -631,7 +636,7 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - numerizer (0.1.1) + numerizer (0.2.0) oauth (0.5.4) oauth2 (1.4.1) faraday (>= 0.8, < 0.16.0) @@ -724,6 +729,8 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) parslet (1.8.2) + peek (1.1.0) + railties (>= 4.0.0) pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -749,10 +756,6 @@ GEM pry-rails (0.3.6) pry (>= 0.10.4) public_suffix (3.1.1) - puma (3.12.0) - puma_worker_killer (0.1.0) - get_process_mem (~> 0.2) - puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) rack (2.0.7) @@ -881,14 +884,14 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) + rspec-rails (4.0.0.beta3) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.8) + rspec-expectations (~> 3.8) + rspec-mocks (~> 3.8) + rspec-support (~> 3.8) rspec-retry (0.6.1) rspec-core (> 3.3) rspec-set (0.1.3) @@ -927,7 +930,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.3.0) - rugged (0.28.3.1) + rugged (0.28.4.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -956,9 +959,9 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -1002,7 +1005,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (2.0.0) - stackprof (0.2.10) + stackprof (0.2.13) state_machines (0.5.0) state_machines-activemodel (0.7.1) activemodel (>= 4.1) @@ -1017,7 +1020,7 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - temple (0.8.1) + temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) test-prof (0.10.0) @@ -1026,10 +1029,10 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) thrift (0.11.0.0) - tilt (2.0.9) + tilt (2.0.10) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml (0.2.0) @@ -1057,7 +1060,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.10.0) + uniform_notifier (1.13.0) unleash (0.1.5) murmurhash3 (~> 0.1.6) unparser (0.4.5) @@ -1117,9 +1120,9 @@ DEPENDENCIES activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) - akismet (~> 2.0) + akismet (~> 3.0) apollo_upload_server (~> 2.0.0.beta3) - asana (~> 0.8.1) + asana (~> 0.9) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (= 0.0.9) @@ -1139,14 +1142,13 @@ DEPENDENCIES bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 2.5) - bullet (~> 5.5.0) + bullet (~> 6.0.2) bundler-audit (~> 0.5.0) capybara (~> 3.22.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) - chronic (~> 0.10.2) - commonmarker (~> 0.17) + commonmarker (~> 0.20) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1194,16 +1196,18 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 1.70.0) + gitaly (~> 1.73.0) github-markup (~> 1.7.0) + gitlab-chronic (~> 0.10.5) gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) gitlab-net-dns (~> 0.9.1) - gitlab-peek (~> 0.0.1) + gitlab-puma (~> 4.3.1.gitlab.2) + gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) - gitlab_chronic_duration (~> 0.10.6.1) + gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) @@ -1219,13 +1223,13 @@ DEPENDENCIES grpc (~> 1.24.0) gssapi guard-rspec - haml_lint (~> 0.31.0) - hamlit (~> 2.8.8) + haml_lint (~> 0.34.0) + hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 2.8) + html-pipeline (~> 2.12) html2text httparty (~> 0.16.4) icalendar @@ -1243,7 +1247,8 @@ DEPENDENCIES licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) - mail_room (~> 0.9.1) + mail_room (~> 0.10.0) + marginalia (~> 1.8.0) memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) @@ -1275,13 +1280,12 @@ DEPENDENCIES omniauth_crowd (~> 2.2.0) omniauth_openid_connect (~> 0.3.3) org-ruby (~> 0.9.12) + peek (~> 1.1) pg (~> 1.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) - puma (~> 3.12) - puma_worker_killer rack (~> 2.0.7) rack-attack (~> 6.2.0) rack-cors (~> 1.0.0) @@ -1307,7 +1311,7 @@ DEPENDENCIES rouge (~> 3.11.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 3.8.0) + rspec-rails (~> 4.0.0.beta3) rspec-retry (~> 0.6.1) rspec-set (~> 0.1.3) rspec_junit_formatter @@ -1325,7 +1329,7 @@ DEPENDENCIES sassc-rails (~> 2.1.0) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 3.141) + selenium-webdriver (~> 3.142) sentry-raven (~> 2.9) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) @@ -1339,7 +1343,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) sshkey (~> 2.0) - stackprof (~> 0.2.10) + stackprof (~> 0.2.13) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dc9c8128d2f..55cdfaa16b9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -188,10 +188,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; + sha256 = "0c5jhqfgvpz84d8jai51hin018ldpfd0civbk7mfwmrj7n71p6bl"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; apollo_upload_server = { dependencies = ["graphql" "rails"]; @@ -220,10 +220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx"; + sha256 = "19yr6ibz481jizvx0cjfvql142v8izi474c4vmwy9qzksyq2xhdj"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.3"; }; asciidoctor = { groups = ["default"]; @@ -545,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5"; + sha256 = "1h16vrqblcdlizgbidk7bgmhcfb96a9y5jw117my5yhs07yp0i3s"; type = "gem"; }; - version = "5.5.1"; + version = "6.0.2"; }; bundler-audit = { dependencies = ["thor"]; @@ -639,25 +639,14 @@ version = "0.7.6"; }; childprocess = { - dependencies = ["ffi"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; - chronic = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "0.10.2"; + version = "3.0.0"; }; chunky_png = { groups = ["default"]; @@ -741,10 +730,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9"; + sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461"; type = "gem"; }; - version = "0.17.13"; + version = "0.20.1"; }; concord = { dependencies = ["adamantium" "equalizer"]; @@ -1385,10 +1374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; + sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.3"; }; flipper = { groups = ["default"]; @@ -1655,10 +1644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3"; + sha256 = "1bls6aywjkvq1jw324criphzbzl710rx1nab4y22bvyi98qvdi38"; type = "gem"; }; - version = "1.70.0"; + version = "1.73.0"; }; github-markup = { groups = ["default"]; @@ -1670,6 +1659,17 @@ }; version = "1.7.0"; }; + gitlab-chronic = { + dependencies = ["numerizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xf857vj55r1jafbkdpdzq6c22r964rj9186m1q8hw4vd7f1h3zq"; + type = "gem"; + }; + version = "0.10.5"; + }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; @@ -1711,16 +1711,27 @@ }; version = "0.9.1"; }; - gitlab-peek = { - dependencies = ["railties"]; - groups = ["default"]; + gitlab-puma = { + dependencies = ["nio4r"]; + groups = ["puma"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql"; + sha256 = "0a0kihx7ps6hc1a5xbpbssqnh1k0gzfvln7xkjinpqipvk53l094"; type = "gem"; }; - version = "0.0.1"; + version = "4.3.1.gitlab.2"; + }; + gitlab-puma_worker_killer = { + dependencies = ["get_process_mem" "gitlab-puma"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iagbqh4djbxfd18srvfg9qcxn845ibs3kf0q1sd57k27lxj0har"; + type = "gem"; + }; + version = "0.1.1.gitlab.1"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -1750,10 +1761,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs"; + sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd"; type = "gem"; }; - version = "0.10.6.1"; + version = "0.10.6.2"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -1978,21 +1989,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; + sha256 = "0dwarfbc04bblljs4xg9fy57b5y8xrck6slhssa6bd7x58bh222c"; type = "gem"; }; - version = "5.0.4"; + version = "5.1.2"; }; haml_lint = { - dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; + dependencies = ["haml" "rainbow" "rubocop" "sysexits"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1"; + sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn"; type = "gem"; }; - version = "0.31.0"; + version = "0.34.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -2000,10 +2011,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i"; + sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60"; type = "gem"; }; - version = "2.8.8"; + version = "2.11.0"; }; hangouts-chat = { groups = ["default"]; @@ -2084,10 +2095,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; + sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2"; type = "gem"; }; - version = "2.8.4"; + version = "2.12.2"; }; html2text = { dependencies = ["nokogiri"]; @@ -2561,10 +2572,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa"; + sha256 = "0q06fkv6wka68gbva17jknm57jnjwk57f9ng1lvyvwki2v4jnkz4"; type = "gem"; }; - version = "0.9.1"; + version = "0.10.0"; }; marcel = { dependencies = ["mimemagic"]; @@ -2577,6 +2588,17 @@ }; version = "0.3.3"; }; + marginalia = { + dependencies = ["actionpack" "activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1akbiibmg64liw8ya6xzf9lavh2n2707hxsnf9sfslsk36iwx0yn"; + type = "gem"; + }; + version = "1.8.0"; + }; memoist = { groups = ["default"]; platforms = []; @@ -2835,14 +2857,14 @@ version = "0.11.0"; }; nio4r = { - groups = ["default" "development" "test"]; + groups = ["default" "puma" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; + sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.2"; }; no_proxy_fix = { groups = ["default" "development"]; @@ -2892,10 +2914,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h"; + sha256 = "0ysxf30qcybh131r98frp38sqqkdhcjwpnajgrxl2w2kxvapd075"; type = "gem"; }; - version = "0.1.1"; + version = "0.2.0"; }; oauth = { groups = ["default"]; @@ -3263,6 +3285,17 @@ }; version = "1.8.2"; }; + peek = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k1yggixrcj72jlc98hi3jjd04x71dpynn8dxpcdhinyijniwl6n"; + type = "gem"; + }; + version = "1.1.0"; + }; pg = { groups = ["default" "development" "test"]; platforms = []; @@ -3388,27 +3421,6 @@ }; version = "3.1.1"; }; - puma = { - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; - type = "gem"; - }; - version = "3.12.0"; - }; - puma_worker_killer = { - dependencies = ["get_process_mem" "puma"]; - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i"; - type = "gem"; - }; - version = "0.1.0"; - }; pyu-ruby-sasl = { groups = ["default"]; platforms = []; @@ -3981,10 +3993,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; + sha256 = "164dni69b9imgv33rxzsy3272ni10xny0f4dbx6k90zr1cgzmj5s"; type = "gem"; }; - version = "3.8.2"; + version = "4.0.0.beta3"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4192,10 +4204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; + sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx"; type = "gem"; }; - version = "0.28.3.1"; + version = "0.28.4.1"; }; safe_yaml = { groups = ["default" "test"]; @@ -4297,14 +4309,14 @@ }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; + sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb"; type = "gem"; }; - version = "3.141.0"; + version = "3.142.6"; }; sentry-raven = { dependencies = ["faraday"]; @@ -4522,10 +4534,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; + sha256 = "1wck8lqmlndaic2c8z678ylxkkyqlip9ikms9x6lplk298rrdybl"; type = "gem"; }; - version = "0.2.10"; + version = "0.2.13"; }; state_machines = { groups = ["default"]; @@ -4596,10 +4608,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09"; + sha256 = "060zzj7c2kicdfk6cpnn40n9yjnhfrr13d0rsbdhdij68chp2861"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -4644,14 +4656,14 @@ version = "1.7.2"; }; thor = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; type = "gem"; }; - version = "0.19.4"; + version = "0.20.3"; }; thread_safe = { groups = ["default" "development" "test"]; @@ -4678,10 +4690,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; type = "gem"; }; - version = "2.0.9"; + version = "2.0.10"; }; timecop = { groups = ["development" "test"]; @@ -4846,10 +4858,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l"; + sha256 = "0vm4aix8jmv42s1x58m3lj3xwkbxyn9qn6lzhhig0d1j8fv6j30c"; type = "gem"; }; - version = "1.10.0"; + version = "1.13.0"; }; unleash = { dependencies = ["murmurhash3"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a2231f813e8..dc2d1e29719 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -195,7 +195,7 @@ def update_gitlab_shell(): for fn in ['go.mod', 'go.sum']: with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}")) + f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 04c0b44f4ac..e77f18aff85 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -258,6 +258,14 @@ }; } { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.7.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.5.tgz"; + sha1 = "f0835f044cef85b31071a924010a2a390add11d4"; + }; + } + { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; path = fetchurl { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz"; @@ -322,6 +330,14 @@ }; } { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.7.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.7.4.tgz"; + sha1 = "c91fdde6de85d2eb8906daea7b21944c3610c901"; + }; + } + { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; path = fetchurl { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; @@ -626,11 +642,11 @@ }; } { - name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz"; + name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz"; - sha1 = "1fd247d6ab477d53d4c330e05f007e3afa303689"; + name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-2.0.0.tgz"; + sha1 = "e30dbf2b170a7a4ca003a321de9f4170a2512510"; }; } { @@ -650,35 +666,35 @@ }; } { - name = "_gitlab_svgs___svgs_1.82.0.tgz"; + name = "_gitlab_svgs___svgs_1.88.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.82.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz"; - sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80"; + name = "_gitlab_svgs___svgs_1.88.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.88.0.tgz"; + sha1 = "0a9b72e9591264fcac592ebf9944665c70f48de2"; }; } { - name = "_gitlab_ui___ui_7.11.0.tgz"; + name = "_gitlab_ui___ui_8.8.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz"; - sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b"; + name = "_gitlab_ui___ui_8.8.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.8.0.tgz"; + sha1 = "c22b4dece89d224c525b3510970f3c61321a6765"; }; } { - name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz"; path = fetchurl { - name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz"; - sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a"; + name = "_gitlab_visual_review_tools___visual_review_tools_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.5.1.tgz"; + sha1 = "2552927cd7a376f1f06ef3293a69fe2ffcdddb52"; }; } { - name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz"; + name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz"; path = fetchurl { - name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.2.1.tgz"; - sha1 = "f407b5aa710863e5b7f021f4a1f66160331ab263"; + name = "_gitlab_vue_toasted___vue_toasted_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.3.0.tgz"; + sha1 = "f21550d4ce406ee5f99447a02abf36250ecc922d"; }; } { @@ -786,59 +802,59 @@ }; } { - name = "_sentry_browser___browser_5.7.1.tgz"; + name = "_sentry_browser___browser_5.10.2.tgz"; path = fetchurl { - name = "_sentry_browser___browser_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz"; - sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4"; + name = "_sentry_browser___browser_5.10.2.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.10.2.tgz"; + sha1 = "0bbb05505c58ea998c833cffec3f922fe4b4fa58"; }; } { - name = "_sentry_core___core_5.7.1.tgz"; + name = "_sentry_core___core_5.10.2.tgz"; path = fetchurl { - name = "_sentry_core___core_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz"; - sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e"; + name = "_sentry_core___core_5.10.2.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.10.2.tgz"; + sha1 = "1cb64489e6f8363c3249415b49d3f1289814825f"; }; } { - name = "_sentry_hub___hub_5.7.1.tgz"; + name = "_sentry_hub___hub_5.10.2.tgz"; path = fetchurl { - name = "_sentry_hub___hub_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz"; - sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad"; + name = "_sentry_hub___hub_5.10.2.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.10.2.tgz"; + sha1 = "25d9f36b8f7c5cb65cf486737fa61dc9bf69b7e3"; }; } { - name = "_sentry_minimal___minimal_5.7.1.tgz"; + name = "_sentry_minimal___minimal_5.10.2.tgz"; path = fetchurl { - name = "_sentry_minimal___minimal_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz"; - sha1 = "56afc537737586929e25349765e37a367958c1e1"; + name = "_sentry_minimal___minimal_5.10.2.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.10.2.tgz"; + sha1 = "267c2f3aa6877a0fe7a86971942e83f3ee616580"; }; } { - name = "_sentry_types___types_5.7.1.tgz"; + name = "_sentry_types___types_5.10.0.tgz"; path = fetchurl { - name = "_sentry_types___types_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz"; - sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090"; + name = "_sentry_types___types_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.10.0.tgz"; + sha1 = "4f0ba31b6e4d5371112c38279f11f66c73b43746"; }; } { - name = "_sentry_utils___utils_5.7.1.tgz"; + name = "_sentry_utils___utils_5.10.2.tgz"; path = fetchurl { - name = "_sentry_utils___utils_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz"; - sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0"; + name = "_sentry_utils___utils_5.10.2.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.10.2.tgz"; + sha1 = "261f575079d30aaf604e59f5f4de0aa21db22252"; }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz"; - sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.14.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.14.tgz"; + sha1 = "e12b08371dc37bf4a468450b008c6e167705e1a8"; }; } { @@ -922,14 +938,6 @@ }; } { - name = "_types_jquery___jquery_2.0.48.tgz"; - path = fetchurl { - name = "_types_jquery___jquery_2.0.48.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz"; - sha1 = "3e90d8cde2d29015e5583017f7830cb3975b2eef"; - }; - } - { name = "_types_minimatch___minimatch_3.0.3.tgz"; path = fetchurl { name = "_types_minimatch___minimatch_3.0.3.tgz"; @@ -1602,6 +1610,14 @@ }; } { + name = "array_includes___array_includes_3.0.3.tgz"; + path = fetchurl { + name = "array_includes___array_includes_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; + sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + }; + } + { name = "array_union___array_union_1.0.2.tgz"; path = fetchurl { name = "array_union___array_union_1.0.2.tgz"; @@ -4322,19 +4338,19 @@ }; } { - name = "es_abstract___es_abstract_1.13.0.tgz"; + name = "es_abstract___es_abstract_1.16.2.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; - sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + name = "es_abstract___es_abstract_1.16.2.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz"; + sha1 = "4e874331645e9925edef141e74fc4bd144669d34"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { @@ -4418,11 +4434,11 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz"; - sha1 = "546178dab5e046c8b562bbb50705e2456d7bda49"; + name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; + sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; }; } { @@ -4434,11 +4450,11 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz"; - sha1 = "97ac3e75d0791c4fac0e15ef388510217be7f66f"; + name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; + sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; }; } { @@ -4458,11 +4474,11 @@ }; } { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.1.0.tgz"; - sha1 = "d03b74224c5cfbc7fc0bdd12ce4eb400d09e0c0b"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.0.tgz"; + sha1 = "fccdad84afa61baa4c0527dd6249cdcbfa0f74a8"; }; } { @@ -5602,11 +5618,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -8618,6 +8634,14 @@ }; } { + name = "object_inspect___object_inspect_1.7.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + }; + } + { name = "object_keys___object_keys_1.1.1.tgz"; path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; @@ -8666,6 +8690,14 @@ }; } { + name = "object.values___object.values_1.1.0.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz"; + sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9"; + }; + } + { name = "obuf___obuf_1.1.2.tgz"; path = fetchurl { name = "obuf___obuf_1.1.2.tgz"; @@ -10402,11 +10434,11 @@ }; } { - name = "resolve___resolve_1.11.1.tgz"; + name = "resolve___resolve_1.12.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz"; - sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e"; + name = "resolve___resolve_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; + sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; }; } { @@ -11266,6 +11298,22 @@ }; } { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; + sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; + sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + }; + } + { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; @@ -11458,6 +11506,14 @@ }; } { + name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; + path = fetchurl { + name = "swagger_ui_dist___swagger_ui_dist_3.24.3.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.24.3.tgz"; + sha1 = "99754d11b0ddd314a1a50db850acb415e4b0a0c6"; + }; + } + { name = "symbol_observable___symbol_observable_1.2.0.tgz"; path = fetchurl { name = "symbol_observable___symbol_observable_1.2.0.tgz"; @@ -11634,11 +11690,11 @@ }; } { - name = "timeago.js___timeago.js_3.0.2.tgz"; + name = "timeago.js___timeago.js_4.0.1.tgz"; path = fetchurl { - name = "timeago.js___timeago.js_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz"; - sha1 = "32a67e7c0d887ea42ca588d3aae26f77de5e76cc"; + name = "timeago.js___timeago.js_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.1.tgz"; + sha1 = "4be4aa19565ceaeb0da31fe14e01ce6ca4742da6"; }; } { diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index c08e441b05a..fe1cce9ba84 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -1,13 +1,14 @@ -{ fetchFromGitHub, pythonPackages, stdenv }: +{ fetchFromGitHub, python, stdenv }: -pythonPackages.buildPythonApplication rec { - ver = "0.8.6"; - name = "gitless-${ver}"; +with python.pkgs; +buildPythonApplication rec { + pname = "gitless"; + version = "0.8.8"; src = fetchFromGitHub { owner = "sdg-mit"; repo = "gitless"; - rev = "v${ver}"; + rev = "v${version}"; sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g"; }; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index c2153ebea89..d06ae234ae9 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ] ++ optional pamSupport pam; - buildFlags = "-tags"; + buildFlags = [ "-tags" ]; buildFlagsArray = ( optional sqliteSupport "sqlite" diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix new file mode 100644 index 00000000000..b8fc767bd3a --- /dev/null +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +, guiSupport ? false, tk ? null +, ApplicationServices +, mercurialSrc ? fetchurl rec { + meta.name = "mercurial-${meta.version}"; + meta.version = "4.9.1"; + url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; + } +}: + +let + inherit (python2Packages) docutils hg-git dulwich python; + +in python2Packages.buildPythonApplication { + + inherit (mercurialSrc.meta) name version; + src = mercurialSrc; + + format = "other"; + + inherit python; # pass it so that the same version can be used in hg2git + + buildInputs = [ makeWrapper docutils unzip ] + ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + + propagatedBuildInputs = [ hg-git dulwich ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = (stdenv.lib.optionalString guiSupport + '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done + + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi + + # install bash/zsh completions + install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg + install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg + ''; + + meta = { + inherit (mercurialSrc.meta) version; + description = "A fast, lightweight SCM system for very large distributed projects"; + homepage = https://www.mercurial-scm.org; + downloadPage = https://www.mercurial-scm.org/release/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.eraserhd ]; + updateWalker = true; + platforms = stdenv.lib.platforms.unix; + }; +} + diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index ee0ab375666..792e647324a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ stdenv, fetchurl, python3Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices -, mercurialSrc ? fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = "4.9.1"; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - } }: let - inherit (python2Packages) docutils hg-git dulwich python; + inherit (python3Packages) docutils dulwich python; -in python2Packages.buildPythonApplication { +in python3Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "5.2.1"; - inherit (mercurialSrc.meta) name version; - src = mercurialSrc; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + }; format = "other"; @@ -24,41 +22,39 @@ in python2Packages.buildPythonApplication { buildInputs = [ makeWrapper docutils unzip ] ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; - propagatedBuildInputs = [ hg-git dulwich ]; + propagatedBuildInputs = [ dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport - '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') + - '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done + postInstall = (stdenv.lib.optionalString guiSupport '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi - # install bash/zsh completions - install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg - install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg - ''; + # install bash/zsh completions + install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg + install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg + ''; meta = { - inherit (mercurialSrc.meta) version; + inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = https://www.mercurial-scm.org; downloadPage = https://www.mercurial-scm.org/release/; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index a4632399df0..66e63fcc375 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Multiple Repository management tool"; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index b0a7108ac07..797bc782496 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -1,6 +1,6 @@ -{lib, python2Packages, git, mercurial, coreutils}: +{lib, python, git, mercurial, coreutils}: -with python2Packages; +with python.pkgs; buildPythonApplication rec { version = "0.3.6"; pname = "nbstripout"; @@ -8,7 +8,7 @@ buildPythonApplication rec { # Mercurial should be added as a build input but because it's a Python # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests - checkInputs = [ pytest pytest-flake8 pytest-cram git ]; + checkInputs = [ pytest pytest-flake8 git ]; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 862b9eacd62..3283a3c046a 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { make $checkFlags check || print_logs_and_fail ''; - NIX_CFLAGS_COMPILE = [ "-std=c99" ]; + NIX_CFLAGS_COMPILE = "-std=c99"; hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index b51096d16f3..b1c651695c7 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -2,26 +2,21 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.3" -gem "rouge", "~> 3.3.0" -gem "request_store", "1.0.5" +gem "rails", "5.2.4.1" +gem "rouge", "~> 3.12.0" +gem "request_store", "~> 1.4.1" gem "mini_mime", "~> 1.0.1" gem "actionpack-xml_parser" -gem "roadie-rails", "~> 1.3.0" +gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") gem "mimemagic" gem "mail", "~> 2.7.1" -gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" - -gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") -gem "i18n", "~> 0.7.0" -gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" - -# TODO: Remove the following line when #32223 is fixed -gem "sprockets", "~> 3.7.2" +gem "csv", "~> 3.1.1" +gem "nokogiri", "~> 1.10.0" +gem "i18n", "~> 1.6.0" +gem "rbpdf", "~> 1.20.0" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] -gem "rbpdf", "~> 1.19.6" # Optional gem for LDAP authentication group :ldap do @@ -34,16 +29,14 @@ group :openid do gem "rack-openid" end -platforms :mri, :mingw, :x64_mingw do - # Optional gem for exporting the gantt to a PNG file, not supported with jruby - group :rmagick do - gem "rmagick", "~> 2.16.0" - end +# Optional gem for exporting the gantt to a PNG file +group :minimagick do + gem "mini_magick", "~> 4.9.5" +end - # Optional Markdown support, not for JRuby - group :markdown do - gem "redcarpet", "~> 3.4.0" - end +# Optional Markdown support, not for JRuby +group :markdown do + gem "redcarpet", "~> 3.5.0" end # Include database gems for the database adapters NixOS supports @@ -56,12 +49,17 @@ end group :test do gem "rails-dom-testing" - gem "mocha" - gem "simplecov", "~> 0.14.1", :require => false + gem 'mocha', '>= 1.4.0' + gem "simplecov", "~> 0.17.0", :require => false + gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] # For running system tests gem 'puma', '~> 3.7' - gem "capybara", '~> 2.13' + gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0") gem "selenium-webdriver" + # RuboCop + gem 'rubocop', '~> 0.76.0' + gem 'rubocop-performance', '~> 1.5.0' + gem 'rubocop-rails', '~> 2.3.0' end local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index aa434465b02..806847a298e 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,46 +1,46 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.3) - actionpack (= 5.2.3) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.3) - activesupport (= 5.2.3) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) arel (>= 9.0) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) marcel (~> 0.3.1) - activesupport (5.2.3) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -48,116 +48,138 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) - builder (3.2.3) - capybara (2.18.0) + ast (2.4.0) + builder (3.2.4) + capybara (3.25.0) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.5) + xpath (~> 3.2) childprocess (3.0.0) concurrent-ruby (1.1.5) crass (1.0.5) - css_parser (1.7.0) + css_parser (1.7.1) addressable - csv (3.0.9) - docile (1.1.5) + csv (3.1.2) + docile (1.3.2) erubi (1.9.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) - i18n (0.7.0) - json (2.2.0) - loofah (2.3.0) + i18n (1.6.0) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + json (2.3.0) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - metaclass (0.0.4) method_source (0.9.2) mimemagic (0.3.3) + mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.12.2) - mocha (1.9.0) - metaclass (~> 0.0.1) - mysql2 (0.5.2) - net-ldap (0.16.1) + minitest (5.13.0) + mocha (1.11.1) + mysql2 (0.5.3) + net-ldap (0.16.2) nio4r (2.5.2) - nokogiri (1.10.4) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) + parallel (1.19.1) + parser (2.6.5.0) + ast (~> 2.4.0) pg (1.1.4) public_suffix (4.0.1) - puma (3.12.1) - rack (2.0.7) + puma (3.12.2) + rack (2.0.8) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) bundler (>= 1.3.0) - railties (= 5.2.3) + railties (= 5.2.4.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.0) - rbpdf (1.19.8) + rainbow (3.0.0) + rake (13.0.1) + rbpdf (1.20.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - redcarpet (3.4.0) - request_store (1.0.5) - rmagick (2.16.0) + redcarpet (3.5.0) + regexp_parser (1.6.0) + request_store (1.4.1) + rack (>= 1.4) roadie (3.5.1) css_parser (~> 1.4) nokogiri (~> 1.8) - roadie-rails (1.3.0) - railties (>= 3.0, < 5.3) + roadie-rails (2.1.0) + railties (>= 5.1, < 6.1) roadie (~> 3.1) - rouge (3.3.0) + rouge (3.12.0) + rubocop (0.76.0) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-performance (1.5.1) + rubocop (>= 0.71.0) + rubocop-rails (2.3.2) + rack (>= 1.1) + rubocop (>= 0.72.0) ruby-openid (2.9.2) + ruby-progressbar (1.10.1) rubyzip (2.0.0) selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.17.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) + unicode-display_width (1.6.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) @@ -171,31 +193,34 @@ PLATFORMS DEPENDENCIES actionpack-xml_parser bundler (>= 1.5.0) - capybara (~> 2.13) - csv (~> 3.0.1) - i18n (~> 0.7.0) + capybara (~> 3.25.0) + csv (~> 3.1.1) + ffi + i18n (~> 1.6.0) mail (~> 2.7.1) mimemagic + mini_magick (~> 4.9.5) mini_mime (~> 1.0.1) - mocha + mocha (>= 1.4.0) mysql2 (~> 0.5.0) net-ldap (~> 0.16.0) nokogiri (~> 1.10.0) pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.3) + rails (= 5.2.4.1) rails-dom-testing - rbpdf (~> 1.19.6) - redcarpet (~> 3.4.0) - request_store (= 1.0.5) - rmagick (~> 2.16.0) - roadie-rails (~> 1.3.0) - rouge (~> 3.3.0) + rbpdf (~> 1.20.0) + redcarpet (~> 3.5.0) + request_store (~> 1.4.1) + roadie-rails (~> 2.1.0) + rouge (~> 3.12.0) + rubocop (~> 0.76.0) + rubocop-performance (~> 1.5.0) + rubocop-rails (~> 2.3.0) ruby-openid (~> 2.9.2) selenium-webdriver - simplecov (~> 0.14.1) - sprockets (~> 3.7.2) + simplecov (~> 0.17.0) tzinfo-data yard diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index e70850e8821..e25cde11af0 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.0.5"; + version = "4.1.0"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1s39qd3j27ryn3p01501iavbkyvikdxl3165nk8i8pgxcxlbxsk4"; + sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index e969d2bfee0..e69cbb0e1c2 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -3,28 +3,28 @@ dependencies = ["actionpack" "nio4r" "websocket-driver"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; + sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; + sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; + sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -39,55 +39,55 @@ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; + sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; + sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; activemodel = { dependencies = ["activesupport"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; + sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; + sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; + sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; + sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -106,22 +106,30 @@ }; version = "9.0.0"; }; + ast = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + type = "gem"; + }; + version = "2.4.0"; + }; builder = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; type = "gem"; }; - version = "3.2.3"; + version = "3.2.4"; }; capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"]; + dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8"; + sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx"; type = "gem"; }; - version = "2.18.0"; + version = "3.25.0"; }; childprocess = { source = { @@ -151,26 +159,26 @@ dependencies = ["addressable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; csv = { source = { remotes = ["https://rubygems.org"]; - sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b"; + sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; type = "gem"; }; - version = "3.0.9"; + version = "3.1.2"; }; docile = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; type = "gem"; }; - version = "1.1.5"; + version = "1.3.2"; }; erubi = { source = { @@ -198,29 +206,38 @@ version = "4.3.4"; }; i18n = { + dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; type = "gem"; }; - version = "0.7.0"; + version = "1.6.0"; + }; + jaro_winkler = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; + type = "gem"; + }; + version = "1.5.4"; }; json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; loofah = { dependencies = ["crass" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x"; + sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; mail = { dependencies = ["mini_mime"]; @@ -240,14 +257,6 @@ }; version = "0.3.3"; }; - metaclass = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5"; - type = "gem"; - }; - version = "0.0.4"; - }; method_source = { source = { remotes = ["https://rubygems.org"]; @@ -264,6 +273,14 @@ }; version = "0.3.3"; }; + mini_magick = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; + type = "gem"; + }; + version = "4.9.5"; + }; mini_mime = { source = { remotes = ["https://rubygems.org"]; @@ -283,35 +300,34 @@ minitest = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw"; + sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; type = "gem"; }; - version = "5.12.2"; + version = "5.13.0"; }; mocha = { - dependencies = ["metaclass"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s56iivmwpv4979hd25v3ghwwgy8ah15nh378lrj8czlh4kf5k5s"; + sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; type = "gem"; }; - version = "1.9.0"; + version = "1.11.1"; }; mysql2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4"; + sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.3"; }; net-ldap = { source = { remotes = ["https://rubygems.org"]; - sha256 = "016igqz81a8zcwqzp5bbhryqmb2skmyf57ij3nb5z8sxwhw22jgh"; + sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; type = "gem"; }; - version = "0.16.1"; + version = "0.16.2"; }; nio4r = { source = { @@ -325,10 +341,27 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; + sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + type = "gem"; + }; + version = "1.10.7"; + }; + parallel = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + type = "gem"; + }; + version = "1.19.1"; + }; + parser = { + dependencies = ["ast"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; type = "gem"; }; - version = "1.10.4"; + version = "2.6.5.0"; }; pg = { source = { @@ -349,18 +382,18 @@ puma = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3"; + sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj"; type = "gem"; }; - version = "3.12.1"; + version = "3.12.2"; }; rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.8"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -384,10 +417,10 @@ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; + sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -411,27 +444,35 @@ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; + sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.4.1"; + }; + rainbow = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; }; rake = { source = { remotes = ["https://rubygems.org"]; - sha256 = "05l80mgaabdipkjsnjlffn9gc1wx9fi629d2kfbz8628cx3m6686"; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; type = "gem"; }; - version = "13.0.0"; + version = "13.0.1"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195"; + sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71"; type = "gem"; }; - version = "1.19.8"; + version = "1.20.1"; }; rbpdf-font = { source = { @@ -444,26 +485,27 @@ redcarpet = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; - request_store = { + regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh"; + sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2"; type = "gem"; }; - version = "1.0.5"; + version = "1.6.0"; }; - rmagick = { + request_store = { + dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6"; + sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d"; type = "gem"; }; - version = "2.16.0"; + version = "1.4.1"; }; roadie = { dependencies = ["css_parser" "nokogiri"]; @@ -478,18 +520,45 @@ dependencies = ["railties" "roadie"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02km0ama85mkw7kkn6qif86b781pglfdmqrwx5s6hwjlzk16qih3"; + sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i"; type = "gem"; }; - version = "1.3.0"; + version = "2.1.0"; }; rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql"; + sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw"; + type = "gem"; + }; + version = "3.12.0"; + }; + rubocop = { + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0"; + type = "gem"; + }; + version = "0.76.0"; + }; + rubocop-performance = { + dependencies = ["rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8"; type = "gem"; }; - version = "3.3.0"; + version = "1.5.1"; + }; + rubocop-rails = { + dependencies = ["rack" "rubocop"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf"; + type = "gem"; + }; + version = "2.3.2"; }; ruby-openid = { source = { @@ -499,6 +568,14 @@ }; version = "2.9.2"; }; + ruby-progressbar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; + }; rubyzip = { source = { remotes = ["https://rubygems.org"]; @@ -520,10 +597,10 @@ dependencies = ["docile" "json" "simplecov-html"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww"; + sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; type = "gem"; }; - version = "0.14.1"; + version = "0.17.1"; }; simplecov-html = { source = { @@ -537,10 +614,10 @@ dependencies = ["concurrent-ruby" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; type = "gem"; }; - version = "3.7.2"; + version = "4.0.0"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -554,10 +631,10 @@ thor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; thread_safe = { source = { @@ -576,6 +653,14 @@ }; version = "1.2.5"; }; + unicode-display_width = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + type = "gem"; + }; + version = "1.6.0"; + }; websocket-driver = { dependencies = ["websocket-extensions"]; source = { diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 779c33627e8..653db11ab5d 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,43 +1,38 @@ -{ lib, fetchurl, python2Packages -, mercurial +{ lib, fetchurl, python3Packages +, mercurial, qt5 }@args: let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.0.2"; - url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz"; - sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz"; + meta.version = "5.2.1"; + url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz"; + sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv"; }; - mercurial = - if args.mercurial.meta.version == tortoisehgSrc.meta.version - then args.mercurial - else args.mercurial.override { - mercurialSrc = fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = tortoisehgSrc.meta.version; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19"; - }; - }; - -in python2Packages.buildPythonApplication { + tortoiseMercurial = mercurial.overridePythonAttrs (old: rec { + inherit (tortoisehgSrc.meta) version; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + }; + }); +in python3Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; src = tortoisehgSrc; - pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ]; - - propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ]; + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial qscintilla-qt5 iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; # tests fail with "thg: cannot connect to X server" - dontStrip = true; - buildPhase = ""; - installPhase = '' - ${python2Packages.python.executable} setup.py install --prefix=$out + postInstall = '' mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz - ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg ''; checkPhase = '' @@ -45,7 +40,7 @@ in python2Packages.buildPythonApplication { $out/bin/thg version ''; - passthru.mercurial = mercurial; + passthru.mercurial = tortoiseMercurial; meta = { description = "Qt based graphical tool for working with Mercurial"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 4995216b8b6..f3ddf8059b2 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.0.1"; in +let version = "2.3.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0knz2p0xyid65z6gdmjqfcqljqilxhqi02v4n6n4akl2i12kk193"; + sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0"; }; dontConfigure = true; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 83f7ebc29d1..123308babea 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -108,9 +108,7 @@ stdenv.mkDerivation # this is fixed upstream though not yet in an officially released version, # should be fine remove on next release (if one ever happens) - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index e8a81a192b5..59a8c2377ce 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,9 +9,10 @@ { stdenv, lib, fetchurl, fetchpatch, # Main build tools - python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma, + python2, pkgconfig, autoconf, automake, libtool, m4, lzma, + numactl, # Processing, video codecs, containers - ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, + ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, # Codecs, audio libopus, lame, libvorbis, a52dec, speex, libsamplerate, # Text processing @@ -48,22 +49,22 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z"; + sha256 = "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59"; }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake cmake nasm libtool m4 + python2 pkgconfig autoconf automake libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ - ffmpeg-full libogg libtheora x264 x265 libvpx + ffmpeg-full libogg libtheora x264 x265 libvpx dav1d libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray lzma + libdvdread libdvdnav libdvdcss libbluray lzma numactl ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev @@ -74,20 +75,6 @@ stdenv.mkDerivation rec { # look at ./make/configure.py search "enable_nvenc" ++ lib.optional stdenv.isLinux nv-codec-headers; - # NOTE: 2018-12-25: v1.2.0 now requires cmake dep - # (default distribution bundles&builds 3rd party libs), - # don't trigger cmake build - dontUseCmakeConfigure = true; - # cp: cannot create regular file './internal_defaults.json': File exists - enableParallelBuilding = false; - - # The samplerate patch should be removed when HandBrake 1.3.0 is released - patches = [(fetchpatch { - name = "set-ffmpeg-samplerate.patch"; - url = "https://patch-diff.githubusercontent.com/raw/HandBrake/HandBrake/pull/2126.patch"; - sha256 = "00lds9h27cvyr53qpvv8gbv01hfxdxd8gphxcwbwg8akqrvk9gbf"; - })]; - preConfigure = '' patchShebangs scripts @@ -99,6 +86,9 @@ stdenv.mkDerivation rec { # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules + sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ + -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ + -i make/configure.py ''; configureFlags = [ @@ -110,8 +100,10 @@ stdenv.mkDerivation rec { ]; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ "-lx265" + # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0 + "-ldl" ]; preBuild = '' diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 1b9f0d0997a..2a0af3ed59e 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -71,10 +71,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lavcodec" - "-lavutil" - ]; + NIX_LDFLAGS = "-lavcodec -lavutil"; patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d47797a3046..4fae93aa1a1 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -179,7 +179,7 @@ in stdenv.mkDerivation { ++ lib.optional udevSupport udev ++ lib.optional usbSupport libusb ++ lib.optional vdpauSupport libvdpau - ++ lib.optional useWayland [ + ++ lib.optionals useWayland [ wayland waylandpp # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev @@ -192,7 +192,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - ] ++ lib.optional useWayland [ wayland-protocols ]; + ] ++ lib.optionals useWayland [ wayland-protocols ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index f1f757d588f..635779187a8 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = https://flavio.tordini.org/minitube; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a75a7a11d67..f5559e3fb6c 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -195,11 +195,11 @@ stdenv.mkDerivation rec { echo CONFIG_MPEGAUDIODSP=yes >> config.mak ''; - NIX_LDFLAGS = with stdenv.lib; + NIX_LDFLAGS = with stdenv.lib; toString ( optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] - ; + ); installTargets = [ "install" ] ++ stdenv.lib.optional x11Support "install-gui"; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 91a9f4a7d01..c333790d6a6 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -52,7 +52,7 @@ , zimgSupport ? true, zimg ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null -, openalSupport ? true, openalSoft ? null +, openalSupport ? true, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null }: @@ -105,13 +105,13 @@ let in stdenv.mkDerivation rec { pname = "mpv"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "17mxjgcfljlv6h0ik3332xsqbs0ybvk6dkwflyl0cjh15vl1iv6f"; + sha256 = "138m09l4wi6ifbi15z76j578plmxkclhlzfryasfcdp8hswhs59r"; }; postPatch = '' @@ -197,7 +197,6 @@ in stdenv.mkDerivation rec { # Ensure youtube-dl is available in $PATH for mpv wrapperFlags = - ''--prefix PATH : "${luaEnv}/bin" \'' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ @@ -235,7 +234,7 @@ in stdenv.mkDerivation rec { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = https://mpv.io; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ]; + maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ma27 tadeokondrak ]; platforms = platforms.darwin ++ platforms.linux; longDescription = '' diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 778dc52d96a..e383823f2cc 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpv-mpris-${version}.so"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "06hq3j1jjlaaz9ss5l7illxz8vm5bng86jl24kawglwkqayhdnjx"; + sha256 = "02lqsgp296s8wr0yh6wm8h7nhn53rj254zahpzbwdv15apgy0z17"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fdcfd7e0bec..0c103f997b2 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -34,21 +34,19 @@ }: let - optional = stdenv.lib.optional; + inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "24.0.4"; + version = "24.0.6"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = version; - sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q"; + sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh"; }; - nativeBuildInputs = [ cmake - pkgconfig - ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -68,7 +66,7 @@ in mkDerivation rec { makeWrapper mbedtls ] - ++ optional scriptingSupport [ luajit swig python3 ] + ++ optionals scriptingSupport [ luajit swig python3 ] ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 95f89e0eda5..2ed4b8ce3e3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg , swig, python3 -, unittest-cpp, cppzmq, czmqpp +, unittest-cpp, cppzmq, zeromq , qtbase, qtmultimedia }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ imagemagick ffmpeg swig python3 unittest-cpp - cppzmq czmqpp qtbase qtmultimedia ]; + cppzmq zeromq qtbase qtmultimedia ]; LIBOPENSHOT_AUDIO_DIR = libopenshot-audio; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 4636ce48b1a..33ce5c18028 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -3,34 +3,20 @@ , qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: -assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; -assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; - -let - # https://github.com/mltframework/shotcut/issues/771 - fixVaapiRendering1 = fetchpatch { - url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch"; - sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp"; - }; - fixVaapiRendering2 = fetchpatch { - url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch"; - sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw"; - }; -in +assert stdenv.lib.versionAtLeast libmlt.version "6.18.0"; +assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "19.09.14"; + version = "19.12.31"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; + sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9"; }; - patches = [ fixVaapiRendering1 fixVaapiRendering2 ]; - enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ @@ -74,7 +60,7 @@ mkDerivation rec { ''; homepage = https://shotcut.org; license = licenses.gpl3; - maintainers = with maintainers; [ goibhniu woffs ]; + maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index db9a5ce7850..676c218776c 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,25 +1,54 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l -, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}: +{ stdenv +, fetchurl +, ncurses +, libjpeg +, libX11 +, libXt +, alsaLib +, aalib +, libXft +, xorgproto +, libv4l +, libFS +, libXaw +, libXpm +, libXext +, libSM +, libICE +, perl +}: stdenv.mkDerivation rec { name = "xawtv-3.106"; + src = fetchurl { url = "https://linuxtv.org/downloads/xawtv/${name}.tar.bz2"; sha256 = "174wd36rk0k23mgx9nlnpc398yd1f0wiv060963axg6sz0v4rksp"; }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build" - ''; - - configureFlags= [ "--prefix=" ]; - - NIX_LDFLAGS = "-lgcc_s"; - - makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; + buildInputs = [ + ncurses + libjpeg + libX11 + libXt + libXft + xorgproto + libFS + perl + alsaLib + aalib + libXaw + libXpm + libXext + libSM + libICE + libv4l + ]; - buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib - libXaw libXpm libXext libSM libICE libv4l]; + makeFlags = [ + "SUID_ROOT=" # do not try to setuid + "resdir=${placeholder ''out''}/share/X11" + ]; meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; @@ -28,5 +57,4 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; - } diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 4d3d88d5be8..e92d7384591 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -2,11 +2,11 @@ , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { - name = "xine-ui-0.99.10"; + name = "xine-ui-0.99.12"; src = fetchurl { url = "mirror://sourceforge/xine/${name}.tar.xz"; - sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a"; + sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; }; nativeBuildInputs = [ pkgconfig shared-mime-info ]; diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch b/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch new file mode 100644 index 00000000000..e662913574d --- /dev/null +++ b/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch @@ -0,0 +1,13 @@ +diff -Naur bochs-2.6.10.orig/iodev/network/slirp/slirp.h bochs-2.6.10.mod/iodev/network/slirp/slirp.h +--- bochs-2.6.10.orig/iodev/network/slirp/slirp.h 2019-11-02 16:30:39.843938000 -0300 ++++ bochs-2.6.10.mod/iodev/network/slirp/slirp.h 2019-12-29 12:55:49.541630697 -0300 +@@ -44,8 +44,8 @@ + #endif + + #include <sys/types.h> +-#if defined(__OpenBSD__) || defined(__linux__) + #include <stdint.h> ++#if defined(__OpenBSD__) || defined(__linux__) + #include <sys/wait.h> + #endif + #ifdef HAVE_SYS_BITYPES_H diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch b/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch deleted file mode 100644 index a13b42ee35a..00000000000 --- a/pkgs/applications/virtualization/bochs/bochs-2.6.9-glibc-2.26.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/iodev/network/slirp/slirp.h b/iodev/network/slirp/slirp.h -index 7c16aa3..202a1b7 100644 ---- a/iodev/network/slirp/slirp.h -+++ b/iodev/network/slirp/slirp.h -@@ -33,8 +33,8 @@ typedef char *caddr_t; - #endif - - #include <sys/types.h> --#if defined(__OpenBSD__) - #include <stdint.h> -+#if defined(__OpenBSD__) - #include <sys/wait.h> - #endif - #ifdef HAVE_SYS_BITYPES_H diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 770154f1918..f6e202ac499 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -19,16 +19,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bochs"; - version = "2.6.9"; + version = "2.6.10"; src = fetchurl { url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; - sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; + sha256 = "1c3mw4b8wrjf8z44fvhycs95j1wd1c0b4khcv63giiia5j5q0gvj"; }; - patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; + patches = [ ./bochs-2.6.10-glibc-2.26.patch ]; - buildInputs = with stdenv.lib; + buildInputs = [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] @@ -118,9 +118,9 @@ stdenv.mkDerivation rec { in C++, that runs on most popular platforms. It includes emulation of the Intel x86 CPU, common I/O devices, and a custom BIOS. ''; - homepage = http://bochs.sourceforge.net/; + homepage = "http://bochs.sourceforge.net/"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 77f3d271b59..49d14d25bab 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "17pv80ba79wh4nwxy3wl0vl1m8054s346hgcp87iy3mpnrvq2cv2"; + sha256 = "0wy3nihif9ih62rlskrjysshfaxdl878fj5ni1zfb9db4nsx6z0m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 70865ea848b..9e9e6657291 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; buildInputs = [ btrfs-progs go-md2man utillinux ]; - buildFlags = "VERSION=v${version}"; + buildFlags = [ "VERSION=v${version}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 29111399ae9..483c6f8b337 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,7 +15,10 @@ , pkgconfig }: -buildGoPackage rec { +let + makeFlags = "BUILDTAGS=\"apparmor seccomp selinux + containers_image_ostree_stub\""; +in buildGoPackage rec { project = "cri-o"; version = "1.16.1"; name = "${project}-${version}${flavor}"; @@ -35,9 +38,6 @@ buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; - makeFlags = ''BUILDTAGS="apparmor seccomp selinux - containers_image_ostree_stub"''; - buildPhase = '' pushd go/src/${goPackagePath} diff --git a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.patch b/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff index 46b091b3a35..f1aa50ee102 100644 --- a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.patch +++ b/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff @@ -1,9 +1,9 @@ -diff --git a/src/main.rs b/src/main.rs -index 81f20a7..481ebd7 100644 ---- a/src/main.rs -+++ b/src/main.rs -@@ -158,7 +158,9 @@ impl Default for Config { - wayland_dmabuf: false, +diff --git a/src/crosvm.rs b/src/crosvm.rs +index b7055df..5989c87 100644 +--- a/src/crosvm.rs ++++ b/src/crosvm.rs +@@ -141,7 +141,9 @@ impl Default for Config { + x_display: None, shared_dirs: Vec::new(), sandbox: !cfg!(feature = "default-no-sandbox"), - seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR), diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 106b39b0336..5035b65f981 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -11,32 +11,15 @@ let else if isx86_64 then "x86_64" else throw "no seccomp policy files available for host platform"; - # used to turn symlinks into real files because write permissions are necessary for the vendoring process - delink = src: runCommand "${src.name}-delinked" { - preferLocalBuild = true; - allowSubstitutes = false; - } '' - cp -prL --reflink=auto ${src} $out - ''; - - # used to place subtrees into the location they have in the Chromium monorepo - move = src: target: runCommand "moved-${src.name}" { - preferLocalBuild = true; - allowSubstitutes = false; - } '' - mkdir -p $(dirname $out/${target}) - ln -s ${src} $out/${target} - ''; - - # used to check out subtrees from the Chromium monorepo - chromiumSource = name: subtrees: delink (symlinkJoin { - inherit name; - paths = stdenv.lib.mapAttrsToList ( - location: { url, rev, sha256, fetchSubmodules, ... }: - move (fetchgit { - inherit url rev sha256 fetchSubmodules; - }) location) subtrees; - }); + crosvmSrc = fetchgit { + inherit (upstreamInfo.components."chromiumos/platform/crosvm") + url rev sha256 fetchSubmodules; + }; + + adhdSrc = fetchgit { + inherit (upstreamInfo.components."chromiumos/third_party/adhd") + url rev sha256 fetchSubmodules; + }; in @@ -44,15 +27,33 @@ in pname = "crosvm"; inherit (upstreamInfo) version; - src = chromiumSource "${pname}-sources" upstreamInfo.components; + unpackPhase = '' + runHook preUnpack + + mkdir -p chromiumos/platform chromiumos/third_party + + pushd chromiumos/platform + unpackFile ${crosvmSrc} + mv ${crosvmSrc.name} crosvm + popd + + pushd chromiumos/third_party + unpackFile ${adhdSrc} + mv ${adhdSrc.name} adhd + popd - sourceRoot = "${src.name}/chromiumos/platform/crosvm"; + chmod -R u+w -- "$sourceRoot" + + runHook postUnpack + ''; + + sourceRoot = "chromiumos/platform/crosvm"; patches = [ - ./default-seccomp-policy-dir.patch + ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "16cfp79c13ng5jjcrvz00h3cg7cc9ywhjiq02vsm757knn9jgr1v"; + cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85"; nativeBuildInputs = [ pkgconfig ]; @@ -72,11 +73,16 @@ in cp seccomp/${arch}/* $out/share/policy/ ''; - passthru.updateScript = ./update.py; + passthru = { + inherit adhdSrc; + src = crosvmSrc; + updateScript = ./update.py; + }; meta = with stdenv.lib; { description = "A secure virtual machine monitor for KVM"; homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/"; + maintainers = with maintainers; [ qyliss ]; license = licenses.bsd3; platforms = [ "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index d00bffce3b8..280d6ec1811 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -1,15 +1,15 @@ #! /usr/bin/env nix-shell -#! nix-shell -p python3 -p nix-prefetch-git -i python +#! nix-shell -p nix-prefetch-git "python3.withPackages (ps: with ps; [ lxml ])" +#! nix-shell -i python import base64 -import csv import json import re import subprocess -import xml.etree.ElementTree as ElementTree from codecs import iterdecode -from operator import itemgetter from os.path import dirname, splitext +from lxml import etree +from lxml.etree import HTMLParser from urllib.request import urlopen # ChromiumOS components required to build crosvm. @@ -27,13 +27,19 @@ buildspecs_url = f'{manifest_versions}/+/refs/heads/master/paladin/buildspecs/' # branch branches are used for fixes for specific devices. So for # Chromium OS they will always be 0. This is a best guess, and is not # documented. -with urlopen('https://cros-omahaproxy.appspot.com/all') as resp: - versions = csv.DictReader(iterdecode(resp, 'utf-8')) - stables = filter(lambda v: v['track'] == 'stable-channel', versions) - stable = sorted(stables, key=itemgetter('chrome_version'), reverse=True)[0] +with urlopen('https://cros-updates-serving.appspot.com/') as resp: + document = etree.parse(resp, HTMLParser()) + # bgcolor="lightgreen" is set on the most up-to-date version for + # each channel, so find a lightgreen cell in the "Stable" column. + (platform_version, chrome_version) = document.xpath(""" + (//table[@id="cros-updates"]/tr/td[1 + count( + //table[@id="cros-updates"]/thead/tr[1]/th[text() = "Stable"] + /preceding-sibling::*) + ][@bgcolor="lightgreen"])[1]/text() + """) -chrome_major_version = re.match(r'\d+', stable['chrome_version'])[0] -chromeos_tip_build = re.match(r'\d+', stable['chromeos_version'])[0] +chrome_major_version = re.match(r'\d+', chrome_version)[0] +chromeos_tip_build = re.match(r'\d+', platform_version)[0] # Find the most recent buildspec for the stable Chrome version and # Chromium OS build number. Its branch build and branch branch build @@ -52,8 +58,8 @@ revisions = {} # Read the buildspec, and extract the git revisions for each component. with urlopen(f'{buildspecs_url}{chrome_major_version}/{buildspec}.xml?format=TEXT') as resp: - xml = base64.decodebytes(resp.read()).decode('utf-8') - root = ElementTree.fromstring(xml) + xml = base64.decodebytes(resp.read()) + root = etree.fromstring(xml) for project in root.findall('project'): revisions[project.get('name')] = project.get('revision') diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index 01921f9460a..690eca38bff 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,18 +1,18 @@ { - "version": "77.12371.0.0-rc1", + "version": "79.12607.0.0-rc4", "components": { "chromiumos/platform/crosvm": { "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "f5285c647acacb4f25ef8cf9334254b976e71686", - "date": "2019-07-25T22:15:48+00:00", - "sha256": "1ccjd540xmpad082w9ri13q78wkg95xxmq38b8ybcrj4f7lsxm6w", + "rev": "cfb7db44eb9e5a0bca9a22bfb985252ef74ab251", + "date": "2019-10-17T23:22:08+00:00", + "sha256": "0gm1ggyzh9qfizm36jmh71c3anygxj1840cm94h71kzg9kiw0330", "fetchSubmodules": false }, "chromiumos/third_party/adhd": { "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", - "rev": "a1c0d93d991daffb042b979ac807bbe9c1f9a3ee", - "date": "2019-07-25T20:38:50-07:00", - "sha256": "11bijqd876adarq96syywn6znfbiflqssgb2j4w032iw2vfnnsyy", + "rev": "a8df1c52bde3bfd2aebc1d7adcd6f195eb212cb1", + "date": "2019-10-17T18:53:18+00:00", + "sha256": "1hyvnvwr5ka9zw4h7hhl6fpsfl2acp3zy4wr5qrw8s1cn8ljr9vy", "fetchSubmodules": false } } diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7b4e7787985..f6fc999269e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -53,9 +53,7 @@ rec { patchPhase = '' ''; - NIX_CFLAGS_COMPILE = [ - "-DMINIMAL=ON" - ]; + NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); in stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { @@ -208,9 +206,9 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.4"; - rev = "9013bf583a215dc1488d941f9b6f7f11e1ea899f"; - sha256 = "094d6d93jd7g1vw362cqbv9qbyv8h6pb6dj750pgqvnf1bn1mffb"; + version = "19.03.5"; + rev = "633a0ea838f10e000b7c6d6eed1623e6e988b5bc"; + sha256 = "1cs38ffh5xn8c40rln4pvd53iahvi4kys9an6kpclvvciqfc2cxs"; runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339"; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 49e77a5ec9d..cf160d8af53 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -46,9 +46,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # igrone glib-2.62 deprecations - # Drop in next stable release. - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = builtins.toString [ + # igrone glib-2.62 deprecations + # Drop in next stable release. + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + + # fix build with gcc9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + ]; postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 9d94ced0bf2..607d790247f 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkgconfig, installShellFiles , buildGoPackage, gpgme, lvm2, btrfs-progs, libseccomp, systemd , go-md2man }: buildGoPackage rec { pname = "podman"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "0y87pylpff2xl796n5s2vrm90pspzqfw8h4a5gndn1mx18s09s69"; + sha256 = "1f1dq9g08mlm9y9d7jbs780nrfc25ln97ca5qifcsyc9bmp4f6r1"; }; goPackagePath = "github.com/containers/libpod"; outputs = [ "bin" "out" "man" ]; - nativeBuildInputs = [ pkgconfig go-md2man ]; + nativeBuildInputs = [ pkgconfig go-md2man installShellFiles ]; buildInputs = [ btrfs-progs libseccomp gpgme lvm2 systemd ]; @@ -30,6 +30,8 @@ buildGoPackage rec { installPhase = '' install -Dm555 bin/podman $bin/bin/podman + installShellCompletion --bash completions/bash/podman + installShellCompletion --zsh completions/zsh/_podman MANDIR=$man/share/man make install.man ''; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f90873c6e33..67aa36b7827 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -35,7 +35,7 @@ let in stdenv.mkDerivation rec { - version = "4.1.0"; + version = "4.2.0"; pname = "qemu" + stdenv.lib.optionalString xenSupport "-xen" + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only" @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1bpl6hwiw1jdxk4xmqp10qgki0dji0l2rzr10dyhyk8d85vxxw29"; + sha256 = "1gczv8hn3wqci86css3mhzrppp3z8vppxw25l08j589k6bvz7x1w"; }; nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ]; @@ -77,6 +77,13 @@ stdenv.mkDerivation rec { ./no-etc-install.patch ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2019-15890.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=c59279437eda91841b9d26079c70b8a540d41204"; + sha256 = "1q2rc67mfdz034mk81z9bw105x9zad7n954sy3kq068b1svrf7iy"; + stripLen = 1; + extraPrefix = "slirp/"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 57e190f5ae7..5bab930d06a 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,13 +1,12 @@ diff --git a/Makefile b/Makefile -index 85862fb8..ed52c5ec 100644 --- a/Makefile +++ b/Makefile -@@ -841,7 +841,7 @@ endif +@@ -867,7 +867,7 @@ install-includedir: + $(INSTALL_DIR) "$(DESTDIR)$(includedir)" - ICON_SIZES=16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 - --install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir \ -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir \ + install: all $(if $(BUILD_DOCS),install-doc) \ +- install-datadir install-localstatedir install-includedir \ ++ install-datadir install-includedir \ $(if $(INSTALL_BLOBS),$(edk2-decompressed)) \ recurse-install ifneq ($(TOOLS),) diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index d8a2878e3f7..58710365b6e 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "remotebox"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "1bbdnf13vp35ddfmk4pn167vfxgmdw0fd8bqg51wd8dd4cj8y3wp"; + sha256 = "0csf6gd7pqq4abia4z0zpzlq865ri1z0821kjy7p3iawqlfn75pb"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index c850a18c867..48bd81f383a 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -22,14 +22,14 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ go-md2man libseccomp libapparmor apparmor-parser which ]; - makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; + makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ]; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . substituteInPlace libcontainer/apparmor/apparmor.go \ --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser - make ${makeFlags} runc + make ${toString makeFlags} runc ''; installPhase = '' diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 70ae09aa6ef..6f5cbeb7ed4 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,17 +1,18 @@ {stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, - libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, + libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.18.0"; + name = "spice-vdagent-0.19.0"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; + sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib spice-protocol glib + buildInputs = [ alsaLib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 39508412333..fcc599b451f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -13,10 +13,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i /tini-static/d CMakeLists.txt"; - NIX_CFLAGS_COMPILE = [ - "-DPR_SET_CHILD_SUBREAPER=36" - "-DPR_GET_CHILD_SUBREAPER=37" - ]; + NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; buildInputs = [ cmake glibc glibc.static ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6ecdf1d29bc..6c15b2ea2ce 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,6 +23,16 @@ let # guest-additions/default.nix as well. main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy"; version = "6.0.14"; + + iasl' = iasl.overrideAttrs (old: rec { + inherit (old) pname; + version = "20190108"; + src = fetchurl { + url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; + sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; + }; + NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation"; + }); in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -41,7 +51,7 @@ in stdenv.mkDerivation { dontWrapQtApps = true; buildInputs = - [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsaLib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index af136f7e545..0d6b3632bc7 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0s8gk2kqxkfwx1x44g19ckm7rqgrcax59y8brgmigajqizik7sql"; + sha256 = "1lh45cxzpdwvhahlcayzqwq1q5hra25mszs13j0dswklcjvjqw8b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index d3c2ed9060c..f15a7ef0f9d 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -148,7 +148,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24. "-Wno-error=deprecated-declarations" # Fix build with GCC 8 @@ -156,6 +156,10 @@ callPackage (import ./generic.nix (rec { "-Wno-error=stringop-truncation" "-Wno-error=format-truncation" "-Wno-error=array-bounds" + # Fix build with GCC 9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=absolute-value" ]; postPatch = '' diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index c7568d99062..1d0e01fcb82 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -167,7 +167,7 @@ callPackage (import ./generic.nix (rec { xenpmdpatch ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ # Fix build on Glibc 2.24 "-Wno-error=deprecated-declarations" # Fix build with GCC8 @@ -175,6 +175,10 @@ callPackage (import ./generic.nix (rec { "-Wno-error=stringop-truncation" "-Wno-error=format-truncation" "-Wno-error=array-bounds" + # Fix build with GCC9 + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=absolute-value" ]; postPatch = '' diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 8093d4752a0..5a8814fb9e2 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -187,11 +187,11 @@ stdenv.mkDerivation (rec { ''; # TODO: Flask needs more testing before enabling it by default. - #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ]; makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] ++ (config.makeFlags or []); - buildFlags = "xen tools"; + buildFlags = [ "xen" "tools" ]; postBuild = '' make -C docs man-pages diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index b8f31e5b512..54244d4dc8d 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { description = "Highly configurable, dynamic window manager for X"; homepage = https://awesomewm.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 rasendubi ndowens ]; + maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index c109cd5cb68..53489eca3a0 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cwm"; - version = "6.3"; + version = "6.6"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "1m08gd6nscwfx6040zbg2zl89m4g73im68iflzcihd6pdc8rzzs4"; + sha256 = "1rvb4y37vw3bpkqa6fbizgc74x3nrlkk6yf5hlm0hf8qz0c17vbl"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index c62edd6d71a..acfd06235ac 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0v9307ij8xzwdaxay3r75sd2cp453s3qb6q7dy9fks2p6wwqpazi"; }; - makeFlags = "all"; - installFlags = "PREFIX=\${out} VERSION=${version}"; + makeFlags = [ "all" ]; + installFlags = [ "PREFIX=\${out}" "VERSION=${version}" ]; buildInputs = optional (contains_any scripts perlscripts) perl; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index afa14b48451..85d103e172a 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Saving, loading and managing layouts for i3wm."; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 2fb6fb44833..7895d8c124a 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile libjpeg_turbo xcbutilxrm ]; - makeFlags = "all"; + makeFlags = [ "all" ]; preInstall = '' mkdir -p $out/share/man/man1 ''; - installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; + installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" "MANDIR=\${out}/share/man" ]; postInstall = '' mv $out/bin/i3lock $out/bin/i3lock-color mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1 diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 3e976f8919f..619345d1b96 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; - makeFlags = "all"; - installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc"; + makeFlags = [ "all" ]; + installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" ]; postInstall = '' mkdir -p $out/share/man/man1 cp *.1 $out/share/man/man1 diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index c13b950599e..073af3bfd05 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -13,6 +13,6 @@ stdenv.mkDerivation { sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ xlibsWrapper lua gettext groff ]; - buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; - installFlags = "PREFIX=\${out}"; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + installFlags = [ "PREFIX=\${out}" ]; } diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index 4ec1a4bcd05..f6f3132178c 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXext libXmu ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { homepage = http://www.fnurt.net/larswm; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index eaeb9979c10..60900bd2a3c 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [makeWrapper xlibsWrapper lua gettext mandoc which libXinerama libXrandr libX11 ] ++ stdenv.lib.optional enableXft libXft; - buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}"; - installFlags = "PREFIX=\${out}"; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" "PREFIX=\${out}" ]; + installFlags = [ "PREFIX=\${out}" ]; postInstall = '' wrapProgram $out/bin/notion \ diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/picom/default.nix index 0941329bdbe..ad5f73ab173 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -3,15 +3,16 @@ , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 , libXinerama, libXext, xwininfo, libxdg_basedir }: + stdenv.mkDerivation rec { - pname = "compton"; - version = "7.2"; + pname = "picom"; + version = "7.5"; src = fetchFromGitHub { owner = "yshui"; - repo = "compton"; + repo = "picom"; rev = "v${version}"; - sha256 = "1vwa5f0nifc1913diqd6cp5k1dlfyc2ijxbcdj1s37ywpx6c63c3"; + sha256 = "1l48fxl04vkzr4r94sl37nbbw7a621rn8sxmkbdv4252i1gjxd4z"; fetchSubmodules = true; }; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { libxdg_basedir ]; - NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; + NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; mesonFlags = [ "-Dbuild_docs=true" @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; postInstall = '' - wrapProgram $out/bin/compton-trans \ + wrapProgram $out/bin/picom-trans \ --prefix PATH : ${lib.makeBinPath [ xwininfo ]} ''; @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { well-defined and proper place. ''; license = licenses.mit; - homepage = "https://github.com/yshui/compton"; + homepage = "https://github.com/yshui/picom"; maintainers = with maintainers; [ ertes enzime twey ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index ba43403d9bb..1eb19e2de6f 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { subdir = if stdenv.isDarwin then "osx" else "linux"; in "spectrwm-SPECTRWM_2_7_2/${subdir}"; - makeFlags="PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; installPhase = "PREFIX=$out make install"; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 215a576a578..c9427fbf695 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -3,11 +3,11 @@ , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf -, wlroots, wayland-protocols, swaybg +, wlroots, wayland-protocols }: stdenv.mkDerivation rec { - pname = "sway"; + pname = "sway-unwrapped"; version = "1.2"; src = fetchFromGitHub { @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { ./load-configuration-from-etc.patch ]; - nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ]; + nativeBuildInputs = [ + pkgconfig meson ninja scdoc + ]; buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev @@ -37,15 +39,11 @@ stdenv.mkDerivation rec { "-Dtray=enabled" "-Dman-pages=enabled" ]; - postInstall = '' - wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin" - ''; - meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; + maintainers = with maintainers; [ primeos synthetica ma27 ]; }; } diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix new file mode 100644 index 00000000000..6dd8db0f45b --- /dev/null +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, coreutils, grim, gawk, swaylock +, imagemagick, getopt, fontconfig, makeWrapper +}: + +let + depsPath = stdenv.lib.makeBinPath [ + coreutils + grim + gawk + swaylock + imagemagick + getopt + fontconfig + ]; +in stdenv.mkDerivation rec { + pname = "swaylock-fancy-unstable"; + version = "2019-03-31"; + + src = fetchFromGitHub { + owner = "Big-B"; + repo = pname; + rev = "35618ceec70338047355b6b057825e68f16971b5"; + sha256 = "06fjqwblmj0d9pq6y11rr73mizirna4ixy6xkvblf1c7sn5n8lpc"; + }; + + postPatch = '' + substituteInPlace swaylock-fancy \ + --replace "/usr/share" "$out/share" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postInstall = '' + wrapProgram $out/bin/swaylock-fancy \ + --prefix PATH : "${depsPath}" + ''; + + meta = with stdenv.lib; { + description = "This is an swaylock bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text"; + homepage = "https://github.com/Big-B/swaylock-fancy"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix new file mode 100644 index 00000000000..bd59ac5fa45 --- /dev/null +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -0,0 +1,50 @@ +{ lib, stdenv +, sway-unwrapped, swaybg +, makeWrapper, symlinkJoin, writeShellScriptBin +, withBaseWrapper ? true, extraSessionCommands ? "", dbus +, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf +}: + +assert extraSessionCommands != "" -> withBaseWrapper; + +with lib; + +let + baseWrapper = writeShellScriptBin "sway" '' + set -o errexit + if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then + export _SWAY_WRAPPER_ALREADY_EXECUTED=1 + ${extraSessionCommands} + fi + if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then + export DBUS_SESSION_BUS_ADDRESS + exec ${sway-unwrapped}/bin/sway "$@" + else + exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@" + fi + ''; +in symlinkJoin { + name = "sway-${sway-unwrapped.version}"; + + paths = (optional withBaseWrapper baseWrapper) + ++ [ sway-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ] + ++ (optional withGtkWrapper wrapGAppsHook); + + buildInputs = optional withGtkWrapper gdk-pixbuf; + + postBuild = '' + # We want to run wrapProgram manually to only wrap sway and add swaybg: + export dontWrapGApps=true + ${optionalString withGtkWrapper "wrapGAppsHook"} + wrapProgram $out/bin/sway \ + --prefix PATH : "${swaybg}/bin" ${optionalString withGtkWrapper ''\ + "''${gappsWrapperArgs[@]}" + ''} + ''; + + passthru.providedSessions = [ "sway" ]; + + inherit (sway-unwrapped) meta; +} diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index e0f2243827c..426fcfe8efc 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libX11 libXrender libXext libXinerama libXrandr libXft ]; # For some reason including mercurial in buildInputs did not help - makeFlags = "WMII_HGVERSION=hg${rev}"; + makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; meta = { homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 3e5d8e6c384..0d054eaa546 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -47,9 +47,9 @@ let includeDirs = self.buildDependsAgdaShareAgda ++ self.sourceDirectories ++ self.topSourceDirectories ++ [ "." ]; - buildFlags = concatStringsSep " " (map (x: "-i " + x) self.includeDirs); + buildFlags = stdenv.lib.concatMap (x: ["-i" x]) self.includeDirs; - agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; + agdaWithArgs = "${Agda}/bin/agda ${toString self.buildFlags}"; buildPhase = '' runHook preBuild diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index c60abdd03e8..84020505a63 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -66,7 +66,7 @@ let else null; expand-response-params = - if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + if buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 151313847e4..b078bf2fbbd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -59,7 +59,7 @@ let infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; expand-response-params = - if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + if buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null" then import ../expand-response-params { inherit (buildPackages) stdenv; } else ""; diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index db187d2ac14..4e2e2af1aa7 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,158 +1,109 @@ -{ lib, stdenv, echo_build_heading, noisily, makeDeps, rust }: +{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs, rust }: { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, crateType, metadata, crateBin, hasCrateBin, - extraRustcOpts, verbose, colors }: + extraRustcOpts, verbose, colors, + buildTests +}: let - - deps = makeDeps dependencies crateRenames; - rustcOpts = - lib.lists.foldl' (opts: opt: opts + " " + opt) - (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); + baseRustcOpts = + [(if release then "-C opt-level=3" else "-C debuginfo=2")] + ++ ["-C codegen-units=$NIX_BUILD_CORES"] + ++ [(mkRustcDepArgs dependencies crateRenames)] + ++ [crateFeatures] + ++ extraRustcOpts + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" + ; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + + + # build the final rustc arguments that can be different between different + # crates + libRustcOpts = lib.concatStringsSep " " ( + baseRustcOpts + ++ [rustcMeta] + ++ (map (x: "--crate-type ${x}") crateType) + ); + + binRustcOpts = lib.concatStringsSep " " ( + baseRustcOpts + ); + + build_bin = if buildTests then "build_bin_test" else "build_bin"; in '' runHook preBuild - norm="" - bold="" - green="" - boldgreen="" - if [[ "${colors}" == "always" ]]; then - norm="$(printf '\033[0m')" #returns to "normal" - bold="$(printf '\033[0;1m')" #set bold - green="$(printf '\033[0;32m')" #set green - boldgreen="$(printf '\033[0;1;32m')" #set bold, and set green. - fi ${echo_build_heading colors} ${noisily colors verbose} - build_lib() { - lib_src=$1 - echo_build_heading $lib_src ${libName} - - noisily rustc --crate-name $CRATE_NAME $lib_src \ - ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)} \ - ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ - --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ - $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} - - EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}.rlib" - if [ -e target/deps/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary} ]; then - EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-${metadata}${stdenv.hostPlatform.extensions.sharedLibrary}" - fi - } - - build_bin() { - crate_name=$1 - crate_name_=$(echo $crate_name | sed -e "s/-/_/g") - main_file="" - if [[ ! -z $2 ]]; then - main_file=$2 - fi - echo_build_heading $@ - noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ - ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ - $LINK ${deps}$EXTRA_LIB --cap-lints allow \ - $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ - ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} - if [ "$crate_name_" != "$crate_name" ]; then - mv target/bin/$crate_name_ target/bin/$crate_name - fi - } + # configure & source common build functions + LIB_RUSTC_OPTS="${libRustcOpts}" + BIN_RUSTC_OPTS="${binRustcOpts}" + LIB_EXT="${stdenv.hostPlatform.extensions.sharedLibrary}" + LIB_PATH="${libPath}" + LIB_NAME="${libName}" + source ${./lib.sh} + CRATE_NAME='${lib.replaceStrings ["-"] ["_"] libName}' - EXTRA_LIB="" - CRATE_NAME=$(echo ${libName} | sed -e "s/-/_/g") + setup_link_paths - if [[ -e target/link_ ]]; then - EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD" - fi - - if [[ -e "${libPath}" ]]; then - build_lib ${libPath} + if [[ -e "$LIB_PATH" ]]; then + build_lib "$LIB_PATH" + ${lib.optionalString buildTests ''build_lib_test "$LIB_PATH"''} elif [[ -e src/lib.rs ]]; then build_lib src/lib.rs - elif [[ -e src/${libName}.rs ]]; then - build_lib src/${libName}.rs + ${lib.optionalString buildTests "build_lib_test src/lib.rs"} + elif [[ -e "src/$LIB_NAME.rs" ]]; then + build_lib src/$LIB_NAME.rs + ${lib.optionalString buildTests ''build_lib_test "src/$LIB_NAME.rs"''} fi - echo "$EXTRA_LINK_SEARCH" | while read i; do - if [[ ! -z "$i" ]]; then - for library in $i; do - echo "-L $library" >> target/link - L=$(echo $library | sed -e "s#$(pwd)/target/build#$lib/lib#") - echo "-L $L" >> target/link.final - done - fi - done - echo "$EXTRA_LINK" | while read i; do - if [[ ! -z "$i" ]]; then - for library in $i; do - echo "-l $library" >> target/link - echo "-l $library" >> target/link.final - done - fi - done - - if [[ -e target/link ]]; then - sort -u target/link.final > target/link.final.sorted - mv target/link.final.sorted target/link.final - sort -u target/link > target/link.sorted - mv target/link.sorted target/link - - tr '\n' ' ' < target/link > target/link_ - LINK=$(cat target/link_) - fi - ${lib.optionalString (crateBin != "") '' - printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do + + + ${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin: '' mkdir -p target/bin - # filter empty entries / empty "lines" - if [[ -z "$BIN_NAME" ]]; then - continue - fi + BIN_NAME='${bin.name or crateName}' + ${if !bin ? path then '' + BIN_PATH="" + search_for_bin_path "$BIN_NAME" + '' else '' + BIN_PATH='${bin.path}' + ''} + ${build_bin} "$BIN_NAME" "$BIN_PATH" + '') crateBin)} + + ${lib.optionalString buildTests '' + # When tests are enabled build all the files in the `tests` directory as + # test binaries. + if [ -d tests ]; then + # find all the .rs files (or symlinks to those) in the tests directory, no subdirectories + find tests -maxdepth 1 \( -type f -o -type l \) -a -name '*.rs' -print0 | while IFS= read -r -d ''' file; do + mkdir -p target/bin + build_bin_test_file "$file" + done - if [[ -z "$BIN_PATH" ]]; then - # heuristic to "guess" the correct source file as found in cargo: - # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325 - - # the first two cases are the "new" default IIRC - BIN_NAME_=$(echo $BIN_NAME | sed -e 's/-/_/g') - FILES=( "src/bin/$BIN_NAME.rs" "src/bin/$BIN_NAME/main.rs" "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" ) - - if ! [ -e "${libPath}" -o -e src/lib.rs -o -e "src/${libName}.rs" ]; then - # if this is not a library the following path is also valid - FILES=( "src/$BIN_NAME.rs" "src/$BIN_NAME_.rs" "''${FILES[@]}" ) - fi - - for file in "''${FILES[@]}"; - do - echo "checking file $file" - # first file that exists wins - if [[ -e "$file" ]]; then - BIN_PATH="$file" - break - fi - done - - if [[ -z "$BIN_PATH" ]]; then - echo "failed to find file for binary target: $BIN_NAME" >&2 - exit 1 - fi - fi - build_bin "$BIN_NAME" "$BIN_PATH" - done + # find all the subdirectories of tests/ that contain a main.rs file as + # that is also a test according to cargo + find tests/ -mindepth 1 -maxdepth 2 \( -type f -o -type l \) -a -name 'main.rs' -print0 | while IFS= read -r -d ''' file; do + mkdir -p target/bin + build_bin_test_file "$file" + done + + fi ''} - ${lib.optionalString (crateBin == "" && !hasCrateBin) '' + # If crateBin is empty and hasCrateBin is not set then we must try to + # detect some kind of bin target based on some files that might exist. + ${lib.optionalString (lib.length crateBin == 0 && !hasCrateBin) '' if [[ -e src/main.rs ]]; then mkdir -p target/bin - build_bin ${crateName} src/main.rs + ${build_bin} ${crateName} src/main.rs fi for i in src/bin/*.rs; do #*/ mkdir -p target/bin - build_bin "$(basename $i .rs)" "$i" + ${build_bin} "$(basename $i .rs)" "$i" done ''} # Remove object files to avoid "wrong ELF type" diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 2c7226b0962..efc538f0fd6 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, echo_build_heading, noisily, makeDeps }: +{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs }: { build , buildDependencies , colors @@ -20,12 +20,12 @@ , verbose , workspace_member }: let version_ = lib.splitString "-" crateVersion; - versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1; + versionPre = if lib.tail version_ == [] then "" else lib.elemAt version_ 1; version = lib.splitVersion (lib.head version_); - rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) + rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); - buildDeps = makeDeps buildDependencies crateRenames; + buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; completeDepsDir = lib.concatStringsSep " " completeDeps; @@ -90,9 +90,9 @@ in '' export HOST="${stdenv.hostPlatform.config}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out - export CARGO_PKG_VERSION_MAJOR=${builtins.elemAt version 0} - export CARGO_PKG_VERSION_MINOR=${builtins.elemAt version 1} - export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} + export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} + export CARGO_PKG_VERSION_MINOR=${lib.elemAt version 1} + export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2} export CARGO_PKG_VERSION_PRE="${versionPre}" export CARGO_PKG_HOMEPAGE="${crateHomepage}" export NUM_JOBS=1 diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index edff3941636..2885b2aef51 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -13,60 +13,38 @@ let then "macos" else stdenv.hostPlatform.parsed.kernel.name; - makeDeps = dependencies: crateRenames: - (lib.concatMapStringsSep " " (dep: + # Create rustc arguments to link against the given list of dependencies and + # renames + mkRustcDepArgs = dependencies: crateRenames: + lib.concatMapStringsSep " " (dep: let - extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; - name = if builtins.hasAttr dep.crateName crateRenames then + extern = lib.replaceStrings ["-"] ["_"] dep.libName; + name = if lib.hasAttr dep.crateName crateRenames then lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName} else extern; - in (if lib.lists.any (x: x == "lib") dep.crateType then + in (if lib.any (x: x == "lib") dep.crateType then " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" else " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") - ) dependencies); - - echo_build_heading = colors: '' - echo_build_heading() { - start="" - end="" - if [[ "${colors}" == "always" ]]; then - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - fi - if (( $# == 1 )); then - echo "$start""Building $1""$end" - else - echo "$start""Building $1 ($2)""$end" - fi - } - ''; - noisily = colors: verbose: '' - noisily() { - start="" - end="" - if [[ "${colors}" == "always" ]]; then - start="$(printf '\033[0;1;32m')" #set bold, and set green. - end="$(printf '\033[0m')" #returns to "normal" - fi - ${lib.optionalString verbose '' - echo -n "$start"Running "$end" - echo $@ - ''} - $@ - } - ''; - - configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; }; - buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps rust; }; - installCrate = import ./install-crate.nix; - - in + ) dependencies; + + inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading; + + configureCrate = import ./configure-crate.nix { + inherit lib stdenv echo_build_heading noisily mkRustcDepArgs; + }; + + buildCrate = import ./build-crate.nix { + inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust; + }; + + installCrate = import ./install-crate.nix { inherit stdenv; }; +in crate_: lib.makeOverridable ({ rust, release, verbose, features, buildInputs, crateOverrides, dependencies, buildDependencies, crateRenames, - extraRustcOpts, + extraRustcOpts, buildTests, preUnpack, postUnpack, prePatch, patches, postPatch, preConfigure, postConfigure, preBuild, postBuild, preInstall, postInstall }: @@ -77,59 +55,66 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath" "buildDependencies" "dependencies" "features" "crateRenames" "crateName" "version" "build" "authors" "colors" "edition" + "buildTests" ]; - extraDerivationAttrs = lib.filterAttrs (n: v: ! lib.elem n processedAttrs) crate; + extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; buildInputs_ = buildInputs; extraRustcOpts_ = extraRustcOpts; + buildTests_ = buildTests; + + # take a list of crates that we depend on and override them to fit our overrides, rustc, release, … + makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; })); + + # crate2nix has a hack for the old bash based build script that did split + # entries at `,`. No we have to work around that hack. + # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89 + crateBin = lib.filter (bin: !(bin ? name && bin.name == ",")) (crate.crateBin or []); + hasCrateBin = crate ? crateBin; in stdenv.mkDerivation (rec { inherit (crate) crateName; - inherit preUnpack postUnpack prePatch patches postPatch preConfigure postConfigure preBuild postBuild preInstall postInstall; - - src = if lib.hasAttr "src" crate then - crate.src - else - fetchCrate { inherit (crate) crateName version sha256; }; - name = "rust_${crate.crateName}-${crate.version}"; + inherit + preUnpack + postUnpack + prePatch + patches + postPatch + preConfigure + postConfigure + preBuild + postBuild + preInstall + postInstall + buildTests + ; + + src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; }); + name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; depsBuildBuild = [ rust stdenv.cc ]; buildInputs = (crate.buildInputs or []) ++ buildInputs_; - dependencies = - builtins.map - (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })) - dependencies_; - - buildDependencies = - builtins.map - (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })) - buildDependencies_; - - completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies); - completeBuildDeps = lib.lists.unique ( + dependencies = makeDependencies dependencies_; + buildDependencies = makeDependencies buildDependencies_; + + completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); + completeBuildDeps = lib.unique ( buildDependencies - ++ lib.lists.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies + ++ lib.concatMap (dep: dep.completeBuildDeps ++ dep.completeDeps) buildDependencies ); - crateFeatures = if crate ? features then - lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features) #" - else ""; + crateFeatures = lib.optionalString (crate ? features) + (lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features)); libName = if crate ? libName then crate.libName else crate.crateName; libPath = if crate ? libPath then crate.libPath else ""; - depsMetadata = builtins.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); - metadata = builtins.substring 0 10 (builtins.hashString "sha256" (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata )); - - crateBin = if crate ? crateBin then - builtins.foldl' (bins: bin: let - name = (if bin ? name then bin.name else crateName); - path = if bin ? path then bin.path else ""; - in - bins + (if bin == "" then "" else ",") + "${name} ${path}" - - ) "" crate.crateBin - else ""; - hasCrateBin = crate ? crateBin; + # Seed the symbol hashes with something unique every time. + # https://doc.rust-lang.org/1.0.0/rustc/metadata/loader/index.html#frobbing-symbols + metadata = let + depsMetadata = lib.foldl' (str: dep: str + dep.metadata) "" (dependencies ++ buildDependencies); + hashedMetadata = builtins.hashString "sha256" + (crateName + "-" + crateVersion + "___" + toString crateFeatures + "___" + depsMetadata); + in lib.substring 0 10 hashedMetadata; build = crate.build or ""; workspace_member = crate.workspace_member or "."; @@ -142,9 +127,13 @@ stdenv.mkDerivation (rec { if lib.attrByPath ["plugin"] false crate then ["dylib"] else (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; - extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); + extraLinkFlags = lib.concatStringsSep " " (crate.extraLinkFlags or []); edition = crate.edition or null; - extraRustcOpts = (if crate ? extraRustcOpts then crate.extraRustcOpts else []) ++ extraRustcOpts_ ++ (lib.optional (edition != null) "--edition ${edition}"); + extraRustcOpts = + lib.optionals (crate ? extraRustcOpts) crate.extraRustcOpts + ++ extraRustcOpts_ + ++ (lib.optional (edition != null) "--edition ${edition}"); + configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription @@ -155,13 +144,15 @@ stdenv.mkDerivation (rec { buildPhase = buildCrate { inherit crateName dependencies crateFeatures crateRenames libName release libPath crateType - metadata crateBin hasCrateBin verbose colors - extraRustcOpts; + metadata hasCrateBin crateBin verbose colors + extraRustcOpts buildTests; }; - installPhase = installCrate crateName metadata; + installPhase = installCrate crateName metadata buildTests; - outputs = [ "out" "lib" ]; - outputDev = [ "lib" ]; + # depending on the test setting we are either producing something with bins + # and libs or just test binaries + outputs = if buildTests then [ "out" ] else [ "out" "lib" ]; + outputDev = if buildTests then [ "out" ] else [ "lib" ]; } // extraDerivationAttrs )) { @@ -186,4 +177,5 @@ stdenv.mkDerivation (rec { dependencies = crate_.dependencies or []; buildDependencies = crate_.buildDependencies or []; crateRenames = crate_.crateRenames or {}; + buildTests = crate_.buildTests or false; } diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix index 14d997b2d5c..386d0ce7084 100644 --- a/pkgs/build-support/rust/build-rust-crate/helpers.nix +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -3,23 +3,23 @@ kernel = stdenv.hostPlatform.parsed.kernel.name; abi = stdenv.hostPlatform.parsed.abi.name; cpu = stdenv.hostPlatform.parsed.cpu.name; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + updateFeatures = f: up: functions: lib.deepSeq f (lib.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: + mkFeatures = feat: lib.foldl (features: featureName: if feat.${featureName} or false then [ featureName ] ++ features else features - ) [] (builtins.attrNames feat); + ) [] (lib.attrNames feat); include = includedFiles: src: builtins.filterSource (path: type: - lib.lists.any (f: + lib.any (f: let p = toString (src + ("/" + f)); in p == path || (lib.strings.hasPrefix (p + "/") path) ) includedFiles ) src; exclude = excludedFiles: src: builtins.filterSource (path: type: - lib.lists.all (f: + lib.all (f: !lib.strings.hasPrefix (toString (src + ("/" + f))) path ) excludedFiles ) src; diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix index 934c3a03176..5ba7b69bedc 100644 --- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix @@ -1,5 +1,6 @@ -crateName: metadata: -'' +{ stdenv }: +crateName: metadata: buildTests: +if !buildTests then '' runHook preInstall # always create $out even if we do not have binaries. We are detecting binary targets during compilation, if those are missing there is no way to only have $lib mkdir $out @@ -29,4 +30,22 @@ crateName: metadata: fi fi runHook postInstall +'' else +# for tests we just put them all in the output. No execution. +'' + runHook preInstall + + mkdir -p $out/tests + if [ -e target/bin ]; then + find target/bin/ -type f -executable -exec cp {} $out/tests \; + fi + if [ -e target/lib ]; then + find target/lib/ -type f \! -name '*.rlib' \ + -a \! -name '*${stdenv.hostPlatform.extensions.sharedLibrary}' \ + -a \! -name '*.d' \ + -executable \ + -print0 | xargs --no-run-if-empty --null install --target $out/tests; + fi + + runHook postInstall '' diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh new file mode 100644 index 00000000000..d4d9317496f --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -0,0 +1,138 @@ +build_lib() { + lib_src=$1 + echo_build_heading $lib_src ${libName} + + noisily rustc \ + --crate-name $CRATE_NAME \ + $lib_src \ + --out-dir target/lib \ + --emit=dep-info,link \ + -L dependency=target/deps \ + --cap-lints allow \ + $LIB_RUSTC_OPTS \ + $BUILD_OUT_DIR \ + $EXTRA_BUILD \ + $EXTRA_FEATURES \ + $EXTRA_RUSTC_FLAGS \ + --color $colors + + EXTRA_LIB=" --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-$metadata.rlib" + if [ -e target/deps/lib$CRATE_NAME-$metadata$LIB_EXT ]; then + EXTRA_LIB="$EXTRA_LIB --extern $CRATE_NAME=target/lib/lib$CRATE_NAME-$metadata$LIB_EXT" + fi +} + +build_bin() { + local crate_name=$1 + local crate_name_=$(echo $crate_name | tr '-' '_') + local main_file="" + + if [[ ! -z $2 ]]; then + main_file=$2 + fi + echo_build_heading $@ + noisily rustc \ + --crate-name $crate_name_ \ + $main_file \ + --crate-type bin \ + $BIN_RUSTC_OPTS \ + --out-dir target/bin \ + --emit=dep-info,link \ + -L dependency=target/deps \ + $LINK \ + $EXTRA_LIB \ + --cap-lints allow \ + $BUILD_OUT_DIR \ + $EXTRA_BUILD \ + $EXTRA_FEATURES \ + $EXTRA_RUSTC_FLAGS \ + --color ${colors} \ + + if [ "$crate_name_" != "$crate_name" ]; then + mv target/bin/$crate_name_ target/bin/$crate_name + fi +} + +build_lib_test() { + local file="$1" + EXTRA_RUSTC_FLAGS="--test $EXTRA_RUSTC_FLAGS" build_lib "$1" "$2" +} + +build_bin_test() { + local crate="$1" + local file="$2" + EXTRA_RUSTC_FLAGS="--test $EXTRA_RUSTC_FLAGS" build_bin "$1" "$2" +} + +build_bin_test_file() { + local file="$1" + local derived_crate_name="${file//\//_}" + derived_crate_name="${derived_crate_name%.rs}" + build_bin_test "$derived_crate_name" "$file" +} + +setup_link_paths() { + EXTRA_LIB="" + if [[ -e target/link_ ]]; then + EXTRA_BUILD="$(cat target/link_) $EXTRA_BUILD" + fi + + echo "$EXTRA_LINK_SEARCH" | while read i; do + if [[ ! -z "$i" ]]; then + for library in $i; do + echo "-L $library" >> target/link + L=$(echo $library | sed -e "s#$(pwd)/target/build#$lib/lib#") + echo "-L $L" >> target/link.final + done + fi + done + echo "$EXTRA_LINK" | while read i; do + if [[ ! -z "$i" ]]; then + for library in $i; do + echo "-l $library" >> target/link + echo "-l $library" >> target/link.final + done + fi + done + + if [[ -e target/link ]]; then + sort -u target/link.final > target/link.final.sorted + mv target/link.final.sorted target/link.final + sort -u target/link > target/link.sorted + mv target/link.sorted target/link + + tr '\n' ' ' < target/link > target/link_ + LINK=$(cat target/link_) + fi +} + +search_for_bin_path() { + # heuristic to "guess" the correct source file as found in cargo: + # https://github.com/rust-lang/cargo/blob/90fc9f620190d5fa3c80b0c8c65a1e1361e6b8ae/src/cargo/util/toml/targets.rs#L308-L325 + + BIN_NAME=$1 + BIN_NAME_=$(echo $BIN_NAME | tr '-' '_') + + # the first two cases are the "new" default IIRC + FILES=( "src/bin/$BIN_NAME.rs" "src/bin/$BIN_NAME/main.rs" "src/bin/$BIN_NAME_.rs" "src/bin/$BIN_NAME_/main.rs" "src/bin/main.rs" "src/main.rs" ) + + if ! [ -e "$LIB_PATH" -o -e src/lib.rs -o -e "src/$LIB_NAME.rs" ]; then + # if this is not a library the following path is also valid + FILES=( "src/$BIN_NAME.rs" "src/$BIN_NAME_.rs" "${FILES[@]}" ) + fi + + for file in "${FILES[@]}"; + do + echo "checking file $file" + # first file that exists wins + if [[ -e "$file" ]]; then + BIN_PATH="$file" + break + fi + done + + if [[ -z "$BIN_PATH" ]]; then + echo "failed to find file for binary target: $BIN_NAME" >&2 + exit 1 + fi +} diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix new file mode 100644 index 00000000000..25181c787e2 --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -0,0 +1,33 @@ +{ lib }: +{ + echo_build_heading = colors: '' + echo_build_heading() { + start="" + end="" + ${lib.optionalString (colors == "always") '' + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + ''} + if (( $# == 1 )); then + echo "$start""Building $1""$end" + else + echo "$start""Building $1 ($2)""$end" + fi + } + ''; + noisily = colors: verbose: '' + noisily() { + start="" + end="" + ${lib.optionalString (colors == "always") '' + start="$(printf '\033[0;1;32m')" #set bold, and set green. + end="$(printf '\033[0m')" #returns to "normal" + ''} + ${lib.optionalString verbose '' + echo -n "$start"Running "$end" + echo $@ + ''} + $@ + } + ''; +} diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 4a90cf442a4..f0f1ed4d1eb 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -29,10 +29,30 @@ let } ''; + mkTestFile = name: functionName: mkFile name '' + #[cfg(test)] + #[test] + fn ${functionName}() { + assert!(true); + } + ''; + mkTestFileWithMain = name: functionName: mkFile name '' + #[cfg(test)] + #[test] + fn ${functionName}() { + assert!(true); + } + + fn main() {} + ''; + + mkLib = name: mkFile name "pub fn test() -> i32 { return 23; }"; mkTest = crateArgs: let - crate = mkCrate crateArgs; + crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); + hasTests = crateArgs.buildTests or false; + expectedTestOutputs = crateArgs.expectedTestOutputs or null; binaries = map (v: ''"${v.name}"'') (crateArgs.crateBin or []); isLib = crateArgs ? libName || crateArgs ? libPath; crateName = crateArgs.crateName or "nixtestcrate"; @@ -44,16 +64,28 @@ let src = mkBinExtern "src/main.rs" libName; }; - in runCommand "run-buildRustCrate-${crateName}-test" { - nativeBuildInputs = [ crate ]; - } '' - ${lib.concatStringsSep "\n" binaries} - ${lib.optionalString isLib '' - test -e ${crate}/lib/*.rlib || exit 1 - ${libTestBinary}/bin/run-test-${crateName} - ''} - touch $out - ''; + in + assert expectedTestOutputs != null -> hasTests; + assert hasTests -> expectedTestOutputs != null; + + runCommand "run-buildRustCrate-${crateName}-test" { + nativeBuildInputs = [ crate ]; + } (if !hasTests then '' + ${lib.concatStringsSep "\n" binaries} + ${lib.optionalString isLib '' + test -e ${crate}/lib/*.rlib || exit 1 + ${libTestBinary}/bin/run-test-${crateName} + ''} + touch $out + '' else '' + for file in ${crate}/tests/*; do + $file 2>&1 >> $out + done + set -e + ${lib.concatMapStringsSep "\n" (o: "grep '${o}' $out || { echo 'output \"${o}\" not found in:'; cat $out; exit 23; }") expectedTestOutputs} + '' + ); + in rec { tests = let @@ -85,6 +117,71 @@ let dependencies = [ (mkCrate { crateName = "foo"; libName = "foolib"; src = mkLib "src/lib.rs"; }) ]; crateRenames = { "foo" = "foo_renamed"; }; }; + rustLibTestsDefault = { + src = mkTestFile "src/lib.rs" "baz"; + buildTests = true; + expectedTestOutputs = [ "test baz ... ok" ]; + }; + rustLibTestsCustomLibName = { + libName = "test_lib"; + src = mkTestFile "src/test_lib.rs" "foo"; + buildTests = true; + expectedTestOutputs = [ "test foo ... ok" ]; + }; + rustLibTestsCustomLibPath = { + libPath = "src/test_path.rs"; + src = mkTestFile "src/test_path.rs" "bar"; + buildTests = true; + expectedTestOutputs = [ "test bar ... ok" ]; + }; + rustLibTestsCustomLibPathWithTests = { + libPath = "src/test_path.rs"; + src = symlinkJoin { + name = "rust-lib-tests-custom-lib-path-with-tests-dir"; + paths = [ + (mkTestFile "src/test_path.rs" "bar") + (mkTestFile "tests/something.rs" "something") + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test bar ... ok" + "test something ... ok" + ]; + }; + rustBinTestsCombined = { + src = symlinkJoin { + name = "rust-bin-tests-combined"; + paths = [ + (mkTestFileWithMain "src/main.rs" "src_main") + (mkTestFile "tests/foo.rs" "tests_foo") + (mkTestFile "tests/bar.rs" "tests_bar") + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test src_main ... ok" + "test tests_foo ... ok" + "test tests_bar ... ok" + ]; + }; + rustBinTestsSubdirCombined = { + src = symlinkJoin { + name = "rust-bin-tests-subdir-combined"; + paths = [ + (mkTestFileWithMain "src/main.rs" "src_main") + (mkTestFile "tests/foo/main.rs" "tests_foo") + (mkTestFile "tests/bar/main.rs" "tests_bar") + ]; + }; + buildTests = true; + expectedTestOutputs = [ + "test src_main ... ok" + "test tests_foo ... ok" + "test tests_bar ... ok" + ]; + }; + }; brotliCrates = (callPackage ./brotli-crates.nix {}); in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 1d8e4448674..f9cf8f1f0c1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,6 +4,7 @@ , cargoSha256 ? "unset" , src ? null , srcs ? null +, unpackPhase ? null , cargoPatches ? [] , patches ? [] , sourceRoot ? null @@ -29,7 +30,7 @@ assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null then fetchcargo { - inherit name src srcs sourceRoot cargoUpdateHook; + inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; copyLockfile = verifyCargoDeps; patches = cargoPatches; sha256 = cargoSha256; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index a515ce9c6eb..7a0ba38dce7 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -18,19 +18,19 @@ let cargo-vendor-normalise = stdenv.mkDerivation { }; in { name ? "cargo-deps" -, src -, srcs -, patches +, src ? null +, srcs ? [] +, patches ? [] , sourceRoot , sha256 , cargoUpdateHook ? "" , # whenever to also include the Cargo.lock in the output copyLockfile ? false -}: -stdenv.mkDerivation { +, ... +} @ args: +stdenv.mkDerivation ({ name = "${name}-vendor"; nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; - inherit src srcs patches sourceRoot; phases = "unpackPhase patchPhase installPhase"; @@ -76,4 +76,6 @@ stdenv.mkDerivation { impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; -} +} // (builtins.removeAttrs args [ + "name" "sha256" "cargoUpdateHook" "copyLockfile" +])) diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index a05d4f689db..ff0cda7eaf0 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -42,7 +42,9 @@ wrapGAppsHook() { fi for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do - gappsWrapperArgs+=(--prefix "$v" : "${!v}") + if [ -n "${!v}" ]; then + gappsWrapperArgs+=(--prefix "$v" : "${!v}") + fi done if [[ -z "${dontWrapGApps:-}" ]]; then diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 38a2d8fe56c..b14ba6479d9 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -35,7 +35,7 @@ let sha256 = "1xknlg2h287dx34v2n5r33bpcl4biqf0cv7nak657rjki7s0k4bk"; }; - buildFlags = "full-ttf"; + buildFlags = [ "full-ttf" ]; preBuild = "patchShebangs scripts"; diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 1c36d0f57fe..201b0dfe417 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.3.92"; + version = "4.7.95"; in fetchFromGitHub { name = "material-design-icons-${version}"; owner = "Templarian"; @@ -10,14 +10,13 @@ in fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - mkdir -p $out/share/fonts/{eot,svg,truetype,woff,woff2} + mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} cp fonts/*.eot $out/share/fonts/eot/ - cp fonts/*.svg $out/share/fonts/svg/ cp fonts/*.ttf $out/share/fonts/truetype/ cp fonts/*.woff $out/share/fonts/woff/ cp fonts/*.woff2 $out/share/fonts/woff2/ ''; - sha256 = "0dbm4qfd0b91yrw3cv4i377pnm98fgj936nk1m5wlx8mx8jahz48"; + sha256 = "0da92kz8ryy60kb5xm52md13w28ih4sfap8g3v9b4ziyww66zjhz"; meta = with lib; { description = "3200+ Material Design Icons from the Community"; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 06fb7499b81..22714170fa4 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, python, fontforge }: +{ stdenv, fetchFromGitHub, python2 }: +# Python 3 support requires https://github.com/larsenwork/monoid/pull/233 to be merged stdenv.mkDerivation { pname = "monoid"; @@ -11,7 +12,11 @@ stdenv.mkDerivation { sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj"; }; - nativeBuildInputs = [ python fontforge ]; + nativeBuildInputs = [ + (python2.withPackages (pp: with pp; [ + fontforge + ])) + ]; buildPhase = '' local _d="" diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 326fe73341f..13eb4a4da5f 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.007"; + version = "1.008"; in fetchzip { name = "public-sans-${version}"; @@ -16,7 +16,7 @@ in fetchzip { unzip -j $downloadedFile binaries/webfonts/\*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "1yzraw08qm1ig7ks850b329xp6zv2znjwl610dppax34kwhqghsm"; + sha256 = "1s4xmliri3r1gcn1ws3wa6davj6giliqjdbcv0bh9ryg3dfpjz74"; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 8b6c3749962..bf19fb8238f 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,32 +1,40 @@ -{ stdenv, fetchgit, fontforge, python3 }: +{ stdenv, fetchgit, fontforge, python2, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; - version = "0.0.1"; + version = "1.2.0"; + src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; - rev = "refs/tags/${version}"; - sha256 = "12lhb0k4d8p4lzw9k6hlsxpfpc15zfshz1h5cbaa88sb8n5jh360"; + rev = version; + sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn"; fetchSubmodules = true; }; - buildPhase = '' + postPatch = '' + # Make builds more reproducible substituteInPlace apply-feature.py --replace \ 'ricty = ttLib.TTFont(options.in_font)' \ 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' substituteInPlace build-py3.py --replace \ 'datetime.date.today()' \ 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' - - make ''; installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/rictydiminished-with-firacode *.ttf + + runHook postInstall ''; nativeBuildInputs = [ - fontforge + # Python 3 not supported by parts of the build system + # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3 + (fontforge.override { + python = python2; + }) (python3.withPackages (ps: [ ps.jinja2 ps.py3to2 @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; + homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; description = "The best Japanese programming font meets the awesone ligatures of Firacode"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 74f851d77b5..ea562f7fa6e 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -2,7 +2,7 @@ let pname = "victor-mono"; - version = "1.2.7"; + version = "1.3.0"; in fetchFromGitHub rec { name = "${pname}-${version}"; @@ -26,7 +26,7 @@ in fetchFromGitHub rec { unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname} ''; - sha256 = "0x4ydp11ry94wkkspnmy1xpzqq3m45xg60z1hq4ll9gmlccaknj0"; + sha256 = "1lv2x7kfspabnhvm8z79n165fw3awvzj1r8f0g5zn26wgdalgw69"; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index c4092e3d858..218af2d9b3c 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20191201"; + version = "20200102"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "02bkd9gx9z14x5gjhpwchhhngiigzvb51a4z67aqfdnmqirv102n"; + sha256 = "0jnx6prgrwz9i979a20sd58dwhsz8cakvl8ickakadca1j7gs7kb"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 99739646a8b..34dd48b897f 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nss, python +{ stdenv, fetchurl, nss, python3 , blacklist ? [] , includeEmail ? false }: @@ -22,7 +22,7 @@ stdenv.mkDerivation { outputs = [ "out" "unbundled" ]; - nativeBuildInputs = [ python ]; + nativeBuildInputs = [ python3 ]; configurePhase = '' ln -s nss/lib/ckfw/builtins/certdata.txt diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 6d00f34e978..0ac5dc51d6b 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -19,9 +19,7 @@ in patchShebangs ./tools ''; - preConfigure = '' - configureFlags="$configureFlags --with-udevdir=$out/lib/udev" - ''; + configureFlags = [ "--with-udevdir=${placeholder "out"}/lib/udev" ]; meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 8af161e8707..31f7eb7efdb 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20190920"; + version = "20191125"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "12kwlqljaai4fsa08m7l28v41q6244dbracvqzcbg1cs0y9jxqy8"; + sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 16ccee8540b..7428b5fab2f 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }: +{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase, pantheon }: mkDerivation rec { pname = "adwaita-qt"; @@ -26,6 +26,12 @@ mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with lib; { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = https://github.com/FedoraQt/adwaita-qt; diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/data/themes/amber/default.nix index 5299f073ae9..a004c0fb3e9 100644 --- a/pkgs/data/themes/amber/default.nix +++ b/pkgs/data/themes/amber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amber-theme"; - version = "3.34-1"; + version = "3.34-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1fmsjhaxlw2znlbjys3ggmsr7zlfk1wlng7bh54g6b0vjgdbik3r"; + sha256 = "0809l4r1qrzs9z04kcs1j962dpsvgpwpksnxs09md5722mynn65l"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance"; - homepage = https://github.com/lassekongo83/amber-theme; + homepage = "https://github.com/lassekongo83/amber-theme"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 1c5a631a48c..cc665749d3c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.10"; + version = "3.22.11"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "1g1mnzxqwlbymq8npd2j294f8dzf9fw9nicd4pajmscg2vk71da9"; + sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc"; }; nativeBuildInputs = [ - autoreconfHook - which + meson + ninja + pkgconfig sassc - glib - libxml2 ]; buildInputs = [ @@ -30,8 +29,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; - homepage = https://github.com/shimmerproject/Greybird; - license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 + homepage = "https://github.com/shimmerproject/Greybird"; + license = [ licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 3a2dcea4b3a..452ee0f8897 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "1m89ws2a4nms4m8187d5cxi281b66i59xa5shlp3g1r2jc4312cy"; + sha256 = "123f6hpz0h5xfmas44xa1ci68w8f3lcjj54jpnrqhsww66c9vs0i"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index a76a7e40020..ff1825f6341 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine, librsvg }: stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.34-1"; + version = "3.34-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0fdg4jyc3xv98yg2r6c8rccvbpf8y2l3x79qbpiq6ck9k6d34ycq"; + sha256 = "0spbyvzb47vyfhcn3gr0z1gdb5xrprynm6442y1z32znai2bgpnd"; }; - buildInputs = [ gdk-pixbuf gtk_engines ]; + buildInputs = [ gdk-pixbuf gtk_engines librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { installPhase = '' install -dm 755 $out/share/themes/Plano cp -a * $out/share/themes/Plano/ - rm $out/share/themes/Plano/{COPYING.LGPL-2.1,LICENSE,README.md} + rm $out/share/themes/Plano/{LICENSE,README.md} ''; meta = with stdenv.lib; { description = "Flat theme for GNOME and Xfce"; - homepage = https://github.com/lassekongo83/plano-theme; + homepage = "https://github.com/lassekongo83/plano-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix new file mode 100644 index 00000000000..151fadddc16 --- /dev/null +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -0,0 +1,62 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, sassc +, gtk3 +, inkscape +, optipng +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "pop-gtk-theme"; + version = "2019-12-17"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "gtk-theme"; + rev = "77601545f049251bce9c63a07f0d9819aa27cb60"; + sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s"; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + gtk3 + inkscape + optipng + ]; + + buildInputs = [ + gdk-pixbuf + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + for file in $(find -name render-\*.sh); do + patchShebangs "$file" + + substituteInPlace "$file" \ + --replace 'INKSCAPE="/usr/bin/inkscape"' \ + 'INKSCAPE="inkscape"' \ + --replace 'OPTIPNG="/usr/bin/optipng"' \ + 'OPTIPNG="optipng"' + done + ''; + + meta = with stdenv.lib; { + description = "System76 Pop GTK+ Theme"; + homepage = "https://github.com/pop-os/gtk-theme"; + license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ elyhaka ]; + }; +} diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 673b97cc137..df8e86bf4c1 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -3,6 +3,7 @@ , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies +, fetchpatch }: let @@ -15,6 +16,13 @@ in mkDerivation { sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8"; }; + patches = [ + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; + sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index 65c0f309fbd..798c1b74f95 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.34-1"; + version = "3.34-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1qwz7i32jk7wm7m9ah6g1pxldz0rnviancndsr2lqmg55x36rs01"; + sha256 = "1i5cl61dk8sxa6h61ghynm4wp1qzp3c7kwf4ks0ddzzk9dbvdrhb"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; - homepage = https://github.com/lassekongo83/stilo-themes; + homepage = "https://github.com/lassekongo83/stilo-themes"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 1d24fb010f2..45f3862ea63 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.34-1"; + version = "3.34-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "19qg60rw5b0caqc542j2nrpkv8d37pai1cr1h0x2nvx0fkc3rmi2"; + sha256 = "1nc0qh6qai6ybmz3a44q0rirri0gfg7lyqy4k4l1sci5q5ckl7x4"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Themes for GTK, gnome-shell and Xfce"; - homepage = https://github.com/lassekongo83/zuki-themes; + homepage = "https://github.com/lassekongo83/zuki-themes"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix new file mode 100644 index 00000000000..09d53cdd1c5 --- /dev/null +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchgit, xorgproto, libX11, bison, ksh, perl, gnum4 +, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps +, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf +, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk +, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot }: + +let + x11ProjectRoot = symlinkJoin { + name = "x11ProjectRoot"; + paths = [ + bdftopcf mkfontdir + xset # fonts + xrdb # session load + ]; + }; +in stdenv.mkDerivation rec { + version = "2019-11-30"; + name = "cde-${version}"; + + src = fetchgit { + url = "https://git.code.sf.net/p/cdesktopenv/code"; + rev = "5cebd7c4da1afea353a3baef250e31a4cf867bc5"; + sha256 = "06wvnb3n8hn98kxvmrf6v3lyqp8bxpzl8wrixlw9jinmsivfs4b9"; + }; + setSourceRoot = ''export sourceRoot="$(echo */cde)"''; + + buildInputs = [ + libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps + libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh + ]; + nativeBuildInputs = [ + bison ncompress gawk autoPatchelfHook makeWrapper fakeroot + ]; + + makeFlags = [ + "World" + "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11" + "IMAKECPP=cpp" + "LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive" + ]; + + preBuild = '' + while IFS= read -r -d ''$'\0' i; do + substituteInPlace "$i" --replace /usr/dt $out/opt/dt + done < <(find "." -type f -exec grep -Iq /usr/dt {} \; -and -print0) + + cat >> config/cf/site.def << EOF +#define MakeFlagsToShellFlags(makeflags,shellcmd) set -e +#define KornShell ${ksh}/bin/ksh +#define PerlCmd ${perl}/bin/perl +#define M4Cmd ${gnum4}/bin/m4 +#define X11ProjectRoot ${x11ProjectRoot} +#define CppCmd ${gcc}/bin/cpp +TIRPCINC = -I${libtirpc.dev}/include/tirpc +EOF + + patchShebangs . + unset AR + ''; + + installPhase = '' + fakeroot admin/IntegTools/dbTools/installCDE -s . -DontRunScripts + + mkdir -p $out/bin + mv $out/opt/dt/bin/dtmail $out/bin + ''; + + meta = with stdenv.lib; { + description = "Common Desktop Environment"; + homepage = https://sourceforge.net/projects/cdesktopenv/; + license = licenses.lgpl2; + maintainers = [ maintainers.gnidorah ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 97e44c6c36e..a644da2e9a9 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -93,6 +93,14 @@ mkDerivation rec { --replace "/bin/systemctl" "${systemd}/bin/systemctl" ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' # debuging searchForUnresolvedDLL $out diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 7b44b69d5b7..62d5622340c 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -31,7 +31,7 @@ unwrapped = mkDerivation rec { deepin-desktop-schemas dtkcore dtkwidget - glib.bin + glib gsettings-qt libdbusmenu polkit @@ -64,6 +64,14 @@ unwrapped = mkDerivation rec { cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' searchHardCodedPaths $out ''; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 62b4da71dd6..5d0d04bfb76 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -45,8 +45,7 @@ mkDerivation rec { dtkwidget ffmpegthumbnailer file - glib.bin - glib.dev + glib gnugrep gsettings-qt gvfs @@ -233,6 +232,14 @@ mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib"; ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' # debuging unset LD_LIBRARY_PATH diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index f5e5f23cc2c..eae074381f3 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,7 +1,7 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, - which, xdg_utils, wrapGAppsHook }: + which, xdg_utils, wrapGAppsHook, glib }: mkDerivation rec { pname = "dde-launcher"; @@ -29,6 +29,7 @@ mkDerivation rec { deepin-wallpapers dtkcore dtkwidget + glib gsettings-qt qtsvg qtx11extras @@ -58,6 +59,14 @@ mkDerivation rec { # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' # debugging searchHardCodedPaths $out diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 699403567b7..a664defae56 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -104,10 +104,18 @@ mkDerivation rec { # - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768 ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' - # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec + # wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${qtWrapperArgs[@]}" + wrapProgram $binary "''${gappsWrapperArgs[@]}" done searchHardCodedPaths $out # debugging diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index f8258a1d8cd..b6b9feb410b 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; buildTargets = "all hicolor-links"; - installTargets = "install-icons install-cursors"; + installTargets = [ "install-icons" "install-cursors" ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 57b0b35a532..64dbdbfd104 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -50,6 +50,7 @@ let qcef = callPackage ./qcef { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; + startdde = callPackage ./startdde { }; udisks2-qt5 = callPackage ./udisks2-qt5 { }; }; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix new file mode 100644 index 00000000000..137b3f690a6 --- /dev/null +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -0,0 +1,136 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib, + coreutils, dbus-factory, dde-api, dde-daemon, dde-dock, + dde-file-manager, dde-polkit-agent, dde-session-ui, deepin, + deepin-desktop-base, deepin-desktop-schemas, deepin-turbo, + dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator, + go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc, + pulseaudio, systemd, xorg, wrapGAppsHook }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "startdde"; + version = "5.0.1"; + + goPackagePath = "pkg.deepin.io/dde/startdde"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43"; + }; + + goDeps = ./deps.nix; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + pkgconfig + dbus-factory + dde-api + go-dbus-factory + go-gir-generator + go-lib + jq + wrapGAppsHook + deepin.setupHook + ]; + + buildInputs = [ + alsaLib + dde-daemon + dde-dock + dde-file-manager + dde-kwin + dde-polkit-agent + dde-session-ui + deepin-desktop-schemas + deepin-turbo + glib + gnome3.dconf + gnome3.gnome-keyring + gnome3.libgnome-keyring + gtk3 + kmod + libX11 + libXi + libcgroup + pciutils + psmisc + pulseaudio + systemd + xorg.xdriinfo + ]; + + postPatch = '' + searchHardCodedPaths # debugging + + # Commented lines below indicates a doubt about how to fix the hard coded path + + fixPath $out /etc/X11 Makefile + #fixPath ? /etc/xdg/autostop autostop/autostop.go + fixPath ${coreutils} /bin/ls copyfile_test.go + fixPath $out /usr/share/startdde/auto_launch.json launch_group.go + #fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux + fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go + fixPath $out /usr/bin/startdde misc/00deepin-dde-env + fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json + fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json + fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json + fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json + fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json + fixPath $out /usr/bin/startdde misc/deepin-session + #fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux + #fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux + fixPath ${dde-session-ui} /usr/bin/dde-lock session.go + fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go + fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go + fixPath ${deepin-desktop-base} /etc/deepin-version session.go + fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go + fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go + #fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this + fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go + fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go + #fixPath ? /var/log/Xorg.0.log wm/driver.go + #fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux + + substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod" + + substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"' + substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"' + substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"' + substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' + substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' + substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"' + substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"' + substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"' + substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"' + ''; + + buildPhase = '' + make -C go/src/${goPackagePath} + ''; + + installPhase = '' + make install PREFIX="$out" -C go/src/${goPackagePath} + rm -rf $out/share/lightdm # this is uselesss for NixOS + remove-references-to -t ${go} $out/bin/* $out/sbin/* + ''; + + postFixup = '' + searchHardCodedPaths $out # debugging + ''; + + passthru = { + updateScript = deepin.updateScript { inherit name; }; + providedSessions = [ "deepin" ]; + }; + + meta = with stdenv.lib; { + description = "Starter of deepin desktop environment"; + homepage = https://github.com/linuxdeepin/startdde; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/startdde/deps.nix b/pkgs/desktops/deepin/startdde/deps.nix new file mode 100644 index 00000000000..8898b8c50fb --- /dev/null +++ b/pkgs/desktops/deepin/startdde/deps.nix @@ -0,0 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; + sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "daa7c04131f568e31c51927b359a2d197a357058"; + sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; + }; + } +] diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 355cc58f348..183e72565d3 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { source "$setupHook" ''; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 postInstall = '' # fix use of $out variable diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index 10b99e4eb5d..c12d50d792f 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ./patches/mail-notification-dont-link-against-bsd-compat.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; NIX_CFLAGS_COMPILE = "-Wno-error"; preConfigure = "./jb configure prefix=$out"; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index 1a1848491b1..f13ff571242 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }: +{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python3, intltool }: stdenv.mkDerivation rec { pname = "gconf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 libxml2 python2 ] + buildInputs = [ ORBit2 libxml2 python3 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { # fixes the "libgconfbackend-oldxml.so is not portable" error on darwin stdenv.lib.optional stdenv.isDarwin [ "--enable-static" ]; + postPatch = '' + 2to3 --write --nobackup gsettings/gsettings-schema-convert + ''; + meta = with stdenv.lib; { homepage = https://projects.gnome.org/gconf/; description = "Deprecated system for storing application preferences"; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 3b972718230..522c5ce6b06 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,32 +1,58 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU, libGL, pango, pangox_compat, xorg }: +{ stdenv +, fetchFromGitLab +, pkgconfig +, gtk-doc +, autoconf +, automake +, which +, libtool +, gobject-introspection +, glib +, gtk2 +, libGLU +, libGL +, pango +, xorg +}: stdenv.mkDerivation rec { - name = "gtkglext-1.2.0"; + pname = "gtkglext"; + version = "unstable-2019-12-19"; - src = fetchurl { - url = "mirror://gnome/sources/gtkglext/1.2/${name}.tar.bz2"; - sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; + repo = pname; + # build fixes + # https://gitlab.gnome.org/Archive/gtkglext/merge_requests/1 + rev = "ad95fbab68398f81d7a5c895276903b0695887e2"; + sha256 = "1d1bp4635nla7d07ci40c7w4drkagdqk8wg93hywvdipmjfb4yqb"; }; - buildInputs = with xorg; - [ pkgconfig glib gtk2 libGLU libGL pango libX11 libXmu ]; - propagatedBuildInputs = [ pangox_compat ]; + nativeBuildInputs = [ + pkgconfig + gtk-doc + autoconf + automake + which + libtool + gobject-introspection + ]; - patches = [ - # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and - # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. - (fetchpatch { - name = "02_fix_gtk-2.20_deprecated_symbols.diff"; - url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67; - sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08"; - }) - # Fix build with glibc ≥ 2.27 - (fetchurl { - url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; - sha256 = "1l1swkjkai6pnah23xfsfpbq2fgbhp5pzj3l0ybsx6b858cxqzj5"; - }) + buildInputs = [ + glib + gtk2 + libGLU + libGL + pango + xorg.libX11 + xorg.libXmu ]; + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; description = "GtkGLExt, an OpenGL extension to GTK"; diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix index 5ff687adcf6..3c89f9ff0fc 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ]; - NIX_LDFLAGS = [ "-lgthread-2.0" ]; + NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 0b833a876b6..8fd4a092376 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.34.2"; + version = "3.34.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1n6sy95j0r0v01sc9rbbpzikq2z4z42j8ah73hzmjdmck4iniik4"; + sha256 = "1ixyxfv2h5921x82d0r39v952ggclnf2xba5li01qmshl6b21kcc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 12dba8b41e1..784b0142f46 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.34.2"; + version = "3.34.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5"; + sha256 = "1p58il8dqj96nlv41gf926y8nw6ya15vmv9yr52025sizxaqzydw"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 8ac7ad7f2d2..9926672aa4b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -29,13 +29,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.34.1"; + version = "3.34.3"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "128griji0ficf9agnlhfqh9wf819zdfcz5bbrr12nkxnhksnqv99"; + sha256 = "0kp7r6l8hb8aq9j2fdiw49p7hyls4gllz258qy6fp3bbfzmbn4g7"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 0202821f7d5..02b476c2eea 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.34.0"; + version = "3.34.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns"; + sha256 = "0wcfkib673fpys7hcpi5cqc0zgqzqmqvpzjzx4wwmim8lb121x5w"; }; propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index e8f4663ad30..80ef1f4659f 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.34.1"; + version = "3.34.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0b7ld4azs9xbdjsk9b91ywhdzvxgajhndiwiivxjzbr0hjgp7c7x"; + sha256 = "1lx96nn8q61ajk2m5454s9b5v5wyn7jbz2sf3k1irv8waiq0aavg"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index f042bbd146a..46f0f4191df 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.34.2"; + version = "3.34.3.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18d48vcp2nxs63bddkdplslgbnlfq79pm2ivl8hk38kkggy3dahf"; + sha256 = "0vga9bqcv792ivnlw6pbfz17zn0nh6wq01rp60c4px08l7xpkr00"; }; # Tests need an X display diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 01127853a86..d2375b5341b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -5,14 +5,14 @@ , vala, meson, ninja, libhandy, gsettings-desktop-schemas }: let - version = "3.34"; + version = "3.34.1"; in stdenv.mkDerivation rec { pname = "gnome-contacts"; inherit version; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04igc9xvyc4kb5xf5g2missnvyvj9zv5cqxf5k4z7hb0sv42wq4r"; + sha256 = "1jqw5yrypvjxzgg70vjbryylwx06amg6sg85mqi14a97xbccg0qa"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index f94725eb3a6..d2346958303 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -67,11 +67,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0pji9r8b81w3dl08frzxknrmhlyrh8xkdicf4iic8dj1apayr0jz"; + sha256 = "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index f7f83b56932..6e777636747 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib +{ stdenv, fetchurl, fetchpatch, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) + + # honor $XKB_CONFIG_ROOT + # addresses #76590: services.xserver.extraLayouts aren't honored by GNOME3 + # NOTE: should be merged upstream in 3.36. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-desktop/commit/450446b5353e8231edded4d5b5db90a67a9fa9b7.diff"; + sha256 = "07y989x7mbgn3rsm2qfdi8qkkc8i60k28hw87l744nlkydn78kq5"; + }) ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index c6fd8658cde..4423755f71c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.34.1"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18dzx9z9bcfqfn1jivzm9m5lkcij1c9y8x77zlpxj733dgpi07z7"; + sha256 = "1dc87mcvr7vdhfx4q0c44q37lf7ls2qvnc34dm66802qssrcxy9k"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 8aaf68ea1e3..459512017c5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0q366pns99f6wka5ikahqpasnsm72q9pg0c0nnfb2ld7spi1z06p"; + sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb"; }; patches = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { packageName = "gnome-session"; attrPath = "gnome3.gnome-session"; }; + providedSessions = [ "gnome" "gnome-xorg" ]; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 3d9f901b66b..c388c4f7211 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07y1gbicz0pbxmdgwrdzyc4byy30wfwpbqgvnx27gnpqmc5s50cr"; + sha256 = "1vfpgbdxkhh9xwvb3ja174jk3gpzj4n3jzcy9ygbjlvy45zfdflz"; }; patches = [ @@ -99,11 +99,9 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; - NIX_CFLAGS_COMPILE = [ - # Default for release buildtype but passed manually because - # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + # Default for release buildtype but passed manually because + # we're using plain + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper postFixup = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 92c96001682..44c9e3eff44 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ny7mk82kpfac977j02860c75d7zn05gvy0h9bphvx0v7ca53bdh"; + sha256 = "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index e2d14ffcd26..c4fec93079a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.2"; + version = "3.34.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh"; + sha256 = "12mxavjf83d96qd5m8k0z2jnpi1587i25al5w9xpv965hvrvwx14"; }; LANG = "en_US.UTF-8"; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index fb4114a524a..051f0e4b432 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yd806dp1c51ym6sidbfafzcywkbxmzxbr4zz57i0yhfjmwr9mjx"; + sha256 = "1zhi6zkphq0wfm9z2d1rp1ym8x52c7as4r8h2nrcd34mmv02xnm7"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 61024788f15..642a825d539 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.2"; + version = "3.34.3"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd"; + sha256 = "12aaxmclg3aw7qkk3pzpw8f5vrk0cxwprdrjnx9bjpf31gfpvxfd"; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 48f47be04bc..e55bf19f528 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wvp0272wky2v1pcx6z27275crb48j9903v6qzf8ki8hlqb2rkip"; + sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 5023ffce6b9..16ef06d8d9d 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, gnome3, gtk3 -, gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: +{ stdenv +, fetchurl +, pkgconfig +, libxml2 +, gnome3 +, gtk3 +, yelp-tools +, gettext +, libX11 +, itstool +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "zenity"; @@ -10,13 +20,19 @@ stdenv.mkDerivation rec { sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; - preBuild = '' - mkdir -p $out/include - ''; + nativeBuildInputs = [ + pkgconfig + gettext + yelp-tools + itstool + libxml2 + wrapGAppsHook + ]; - buildInputs = [ gtk3 libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which wrapGAppsHook ]; + buildInputs = [ + gtk3 + libX11 + ]; passthru = { updateScript = gnome3.updateScript { @@ -26,6 +42,8 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + description = "Tool to display dialogs from the commandline and shell scripts"; + homepage = "https://wiki.gnome.org/Projects/Zenity"; platforms = platforms.linux; maintainers = gnome3.maintainers; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 605ef95656c..c7c26cec7c3 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -138,10 +138,6 @@ lib.makeScope pkgs.newScope (self: with self; { withGnome = true; }; - networkmanagerapplet = pkgs.networkmanagerapplet.override { - withGnome = true; - }; - rygel = callPackage ./core/rygel { }; simple-scan = callPackage ./core/simple-scan { }; @@ -360,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) yelp-tools; # added 2019-11-20 inherit (pkgs) dconf; # added 2019-11-30 + + inherit (pkgs) networkmanagerapplet; # added 2019-12-12 }) diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index ca232d090a8..5858883accd 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "27"; + version = "30"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0bpg7hl81wir3c15ri8kbvr6xhalpkfmcyazwmmwyj5lxpn40ykk"; + sha256 = "17j96y72mj7vg2csn5c9rji7jy04x5qzl8knf5gky6wppxj9zjb4"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 59b92a8b61c..94bc8a56b39 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.34.1"; + version = "3.34.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nfy1wvxsyrpdinfn5v86gvq3ma487njz607biwwhji9z050gw3p"; + sha256 = "0sl54ns1b5cff6vrls6716xb73krgd1sp36k94gc2lza5laixyh0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index c8cc9f121f5..484110cfaa9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-robots"; - version = "3.34.0"; + version = "3.34.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18vnx5096d3mc2i7w4ma9hflsqfnvahl29aifjnvhdm5ji8qi0mb"; + sha256 = "0ncghkv06x9qqfr5zyh6hdv28d0i6v9z4z365k05x9ji5pyzxiny"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 8ccf5107046..8f1d193a6d3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.2.3"; + version = "0.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; + sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 808d36dab95..c1791ee5bbd 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -141,6 +141,8 @@ let Type=Application DesktopNames=GNOME-Flashback;GNOME; ''; + } // { + providedSessions = [ "gnome-flashback-${wmName}" ]; }; mkSystemdTargetForWm = { wmName }: diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix index b1e9cde906c..4a530e54de7 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { systemd ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + configureFlags = [ "--enable-locking" "--with-systemd=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index e96dbf0b6fc..87cded31e5f 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -9,6 +9,7 @@ , libobjc, libgcrypt , icu , pkgconfig, portaudio +, libiberty }: let version = "1.26.0"; @@ -30,8 +31,14 @@ gsmakeDerivation { libobjc libgcrypt icu portaudio + libiberty ]; patches = [ ./fixup-paths.patch ]; + + # Bump to gcc9 has give missing xmemdup symbols. Need libiberty here + # to resolve it, unclear why. See #76927 for more info + NIX_LDFLAGS = "-liberty"; + meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; }; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 2b3aa73708a..c460a2cf2dc 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1c5yr4b8pzd7nz7g7ln9jwp4fx6qgq8vgbv4spfryy53il3gv75h"; + sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 4eefc7aa2e1..9569b1919e4 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd"; + sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch new file mode 100644 index 00000000000..fb2917b36bb --- /dev/null +++ b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch @@ -0,0 +1,81 @@ +From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Wed, 25 Dec 2019 18:48:38 -0300 +Subject: [PATCH] Search system themes in system data dirs + +--- + capplets/common/gtkrc-utils.c | 20 ++++++++++++-------- + capplets/common/mate-theme-info.c | 18 +++++++++++------- + 2 files changed, 23 insertions(+), 15 deletions(-) + +diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c +index 011c8a1..27e01da 100644 +--- a/capplets/common/gtkrc-utils.c ++++ b/capplets/common/gtkrc-utils.c +@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name) + + if (!path) + { +- gchar* theme_dir = gtk_rc_get_theme_dir(); +- path = g_build_filename(theme_dir, name, subpath, NULL); +- g_free(theme_dir); ++ const gchar * const * dirs = g_get_system_data_dirs(); + +- if (!g_file_test(path, G_FILE_TEST_EXISTS)) +- { +- g_free (path); +- path = NULL; +- } ++ if (dirs != NULL) ++ for (; !path && *dirs != NULL; ++dirs) ++ { ++ path = g_build_filename(*dirs, "themes", name, subpath, NULL); ++ ++ if (!g_file_test(path, G_FILE_TEST_EXISTS)) ++ { ++ g_free (path); ++ path = NULL; ++ } ++ } + } + + return path; +diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c +index 54ae3ae..a738f0b 100644 +--- a/capplets/common/mate-theme-info.c ++++ b/capplets/common/mate-theme-info.c +@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2) + void + mate_theme_init () + { ++ const gchar * const * dirs; + GFile *top_theme_dir; + gchar *top_theme_dir_string; + static gboolean initted = FALSE; +@@ -1783,13 +1784,16 @@ mate_theme_init () + theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + +- /* Add all the toplevel theme dirs. */ +- /* $datadir/themes */ +- top_theme_dir_string = gtk_rc_get_theme_dir (); +- top_theme_dir = g_file_new_for_path (top_theme_dir_string); +- g_free (top_theme_dir_string); +- add_top_theme_dir_monitor (top_theme_dir, 1, NULL); +- g_object_unref (top_theme_dir); ++ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */ ++ dirs = g_get_system_data_dirs (); ++ if (dirs != NULL) ++ for (; *dirs != NULL; ++dirs) { ++ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL); ++ top_theme_dir = g_file_new_for_path (top_theme_dir_string); ++ g_free (top_theme_dir_string); ++ add_top_theme_dir_monitor (top_theme_dir, 1, NULL); ++ g_object_unref (top_theme_dir); ++ } + + /* ~/.themes */ + top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL); +-- +2.24.1 + diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index d5c39a67d20..2451c403c82 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { ]; patches = [ + # see https://github.com/mate-desktop/mate-control-center/pull/528 + ./0001-Search-system-themes-in-system-data-dirs.patch # look up keyboard shortcuts in system data dirs ./mate-control-center.keybindings-dir.patch ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 0e99d03c081..23e8080f01f 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--without-console-kit" ]; - makeFlags = "DBUS_SESSION_SERVICE_DIR=$(out)/etc"; + makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; meta = with stdenv.lib; { description = "Screen saver and locker for the MATE desktop"; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index adba0b43008..244146771c4 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 3c73de6e7a9..1876020a8fe 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 4f4244fa03e..5a70fa94c5e 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index aedc445b05f..7c95d88053d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -36,8 +36,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 355f3ea8d0f..0e692a8e806 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 70d8f63c13c..fb56b3d1b33 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 1b5de7c168e..ae43a372acc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -24,13 +24,13 @@ , glib-networking , elementary-icon-theme , libcloudproviders -, fetchpatch +, libgit2-glib , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.2.0"; + version = "4.3.0"; repoName = "files"; @@ -40,13 +40,12 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "12f0hzb62nchksyqd2gwj3cv001rph24ggd9wywh9i1qwppx4b5k"; + sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5"; }; passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; @@ -71,6 +70,7 @@ stdenv.mkDerivation rec { libcloudproviders libdbusmenu-gtk3 libgee + libgit2-glib libnotify libunity pango @@ -81,11 +81,6 @@ stdenv.mkDerivation rec { patches = [ ./hardcode-gsettings.patch - # Fixes https://github.com/elementary/files/issues/1081 - (fetchpatch { - url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch"; - sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn"; - }) ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 7d235551a80..b5303021772 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 50a797a702d..ea74686e504 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -46,8 +46,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index ce9d0b6c82d..8485a1df9f3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index e847a139616..bbb3ee59596 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "5.4.0"; + version = "5.5.0"; repoName = "terminal"; @@ -28,13 +28,12 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1rj4hrg5qljsv11apgdp0x4dazlfmjq3s0lk0dvwjvh9nqkr6jbw"; + sha256 = "1wna3kcg621qjyvg70dzk4lfq8si2snnlm9fnl5gj0w6b707gz2x"; }; passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index e934a944df8..c8bde494399 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -32,8 +32,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 1fcd486263b..f04cb7cd53b 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 7a79f72f1a2..5cd5d365ed9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 6c97c986ae0..d501cba7c06 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index c15219fbdf8..0d0a7507afe 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index ca29ab65afc..6f2fefa4873 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index cafb4014407..501059896f2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index eb3066597ed..bd9669e2499 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index e31355b7b7e..81a694f2ea9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index c7f2fcce458..260b340c223 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index be4614df557..6e050c92d80 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index a6112495469..bd7fee51d8d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index fd1719814b8..fdd3f4f5765 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index f8fdb01aee6..ab9ecbc5a33 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index df2051d8040..a8513f0b29b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 10c95dd7b8e..b21fc1c099f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index e8d21478cc9..9d457aedc96 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 57e7fe6af44..3d240fc6221 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index cd4b4beb1df..8d8cd1c940a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 30f870671ee..03e6ef999eb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index c0abb172806..cc6b37095fd 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -5,10 +5,14 @@ , switchboard , switchboardPlugs , plugs + # Only useful to disable for development testing. +, useDefaultPlugs ? true }: let - selectedPlugs = if plugs == null then switchboardPlugs else plugs; + selectedPlugs = + if plugs == null then switchboardPlugs + else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs); in symlinkJoin { name = "${switchboard.name}-with-plugs"; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 34a87a6cb16..4a42bc3d565 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "5.3.0"; + version = "5.4.0"; repoName = "stylesheet"; @@ -16,13 +16,12 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0kxzgqgzbkwi0h4r7zc5yl57k8cm165d1ki1nzmb442wp42q438y"; + sha256 = "0dh7lqc9b4ciyzbphqw071xcg742fvlc7gz9l1q3nqjsa2k6xg80"; }; passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 1fba6a949d6..9943415a457 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index aff830fda56..c19a465e9b1 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -19,19 +19,18 @@ stdenv.mkDerivation rec { sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz"; }; - passthru = { - updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; - }; - }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + passthru = { + updateScript = pantheon.updateScript { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with stdenv.lib; { description = "A set of system sounds for elementary"; homepage = https://github.com/elementary/sound-theme; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 8a497372862..2f3b0ee059f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 9e5391243bd..d4e6b192f20 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -3,37 +3,6 @@ lib.makeScope pkgs.newScope (self: with self; { - apps = [ - elementary-calculator elementary-calendar - elementary-camera elementary-code elementary-files - elementary-music elementary-photos elementary-screenshot-tool - elementary-terminal elementary-videos switchboard-with-plugs - ]; - - artwork = [ - elementary-gtk-theme - elementary-icon-theme - elementary-sound-theme - elementary-wallpapers - ]; - - desktop = [ - elementary-default-settings - elementary-session-settings - elementary-shortcut-overlay - gala - wingpanel-with-indicators - ]; - - services = [ - cerbere - elementary-capnet-assist - elementary-settings-daemon - elementary-dpms-helper - pantheon-agent-geoclue2 - pantheon-agent-polkit - ]; - switchboardPlugs = [ switchboard-plug-a11y switchboard-plug-about switchboard-plug-applications switchboard-plug-bluetooth @@ -54,6 +23,8 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; + nixpkgs-github-update = callPackage ./nixpkgs_github_update { }; + updateScript = callPackage ./update.nix { }; maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; @@ -155,9 +126,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-keyboard = callPackage ./desktop/wingpanel-indicators/keyboard { }; - wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network { - inherit (gnome3) networkmanagerapplet; - }; + wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network { }; wingpanel-indicator-nightlight = callPackage ./desktop/wingpanel-indicators/nightlight { }; @@ -193,9 +162,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-mouse-touchpad = callPackage ./apps/switchboard-plugs/mouse-touchpad { }; - switchboard-plug-network = callPackage ./apps/switchboard-plugs/network { - inherit (gnome3) networkmanagerapplet; - }; + switchboard-plug-network = callPackage ./apps/switchboard-plugs/network { }; switchboard-plug-notifications = callPackage ./apps/switchboard-plugs/notifications { }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index f20f1197499..e601c99108b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -27,8 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 440893935f8..dc0b764d319 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 2c532f899ab..06b5183c1e0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -33,8 +33,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 0be2431d33d..e79a85bee95 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index ab7333212a0..58acdd12147 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -128,9 +128,9 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; + providedSessions = [ "pantheon" ]; }; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 097c62f344f..2ba5f4becc1 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 4b75b3bff56..5791fb5c58f 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,19 +26,18 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "unstable-2019-10-31"; # Is tracking https://github.com/elementary/gala/commits/stable/juno + version = "3.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "0f0724c97ad49f470f41c4a25c63103f51122997"; - sha256 = "09cl3k2am878iiy76bijb0ykrcafh944kz027jgi1y5yk4bwfjc4"; + rev = version; + sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - versionPolicy = "master"; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index ca9abadf9ba..34c29c1b72a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -39,8 +39,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 965d9800c5b..93ddb0e1dee 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index b4e9eeef0fd..f6ff962a944 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 02421f28164..66f805b9a49 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 01a815404a6..fd22de25d63 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 3b50866c0ed..9d2669821de 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 78512b341bb..e5dabead7c5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index b989bada571..12223644971 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index c80da53986a..72f94252cca 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 12654ff5509..ccd233e1a3e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 1fc7304feb2..694166a5d64 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index 253c61b7790..596ee816f89 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -6,10 +6,14 @@ , wingpanelIndicators , switchboard-with-plugs , indicators ? null + # Only useful to disable for development testing. +, useDefaultIndicators ? true }: let - selectedIndicators = if indicators == null then wingpanelIndicators else indicators; + selectedIndicators = + if indicators == null then wingpanelIndicators + else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in symlinkJoin { name = "${wingpanel.name}-with-indicators"; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 1b73ac88df5..198be9f3430 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc new file mode 100644 index 00000000000..1d953f4bd73 --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc @@ -0,0 +1 @@ +use nix diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs new file mode 100644 index 00000000000..d2cda26eddc --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs @@ -0,0 +1,4 @@ +# Used by "mix format" +[ + inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] +] diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore new file mode 100644 index 00000000000..877c95f1f63 --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore @@ -0,0 +1,32 @@ +# The directory Mix will write compiled artifacts to. +_build/ + +# If you run "mix test --cover", coverage assets end up here. +cover/ + +# The directory Mix downloads your dependencies sources to. +deps/ + +# Where third-party dependencies like ExDoc output generated docs. +doc/ + +# Ignore .fetch files in case you like to edit your project deps locally. +.fetch + +# If the VM crashes, it generates a dump, let's ignore it too. +erl_crash.dump + +# Also ignore archive artifacts (built via "mix archive.build"). +*.ez + +# Ignore package tarball (built via "mix hex.build"). +nixpkgs_github_update-*.tar + +# Ignore elixir_ls +.elixir_ls + +# mix escript.build result +nixpkgs_github_update + +# lockfile. only because this is nixpkgs. +mix.lock diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix new file mode 100644 index 00000000000..834291222cf --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix @@ -0,0 +1,53 @@ +{ lib +, beamPackages +, makeWrapper +, common-updater-scripts +}: + +let + + poison_4 = beamPackages.buildMix { + name = "poison"; + version = "4.0.1"; + + src = beamPackages.fetchHex { + pkg = "poison"; + version = "4.0.1"; + sha256 = "098gdz7xzfmnjzgnnv80nl4h3zl8l9czqqd132vlnfabxbz3d25s"; + }; + }; + + +in + +beamPackages.buildMix { + name = "nixpkgs-github-update"; + version = "0.1.0"; + + src = lib.cleanSource ./.; + + nativeBuildInputs = [ + makeWrapper + ]; + + beamDeps = with beamPackages; [ erlang poison_4 ]; + + buildPhase = '' + export HEX_OFFLINE=1 + export HEX_HOME=`pwd` + export MIX_ENV=prod + export MIX_NO_DEPS=1 + + mix escript.build --no-deps-check + ''; + + installPhase = '' + mkdir -p $out/bin + cp nixpkgs_github_update $out/bin + ''; + + postFixup = '' + wrapProgram $out/bin/nixpkgs_github_update \ + --prefix PATH : "${lib.makeBinPath [ common-updater-scripts ]}" + ''; +} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex new file mode 100644 index 00000000000..e735c428516 --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex @@ -0,0 +1,71 @@ +defmodule NixpkgsGitHubUpdate.CLI do + @moduledoc """ + Run updates on Nix Expressions that use fetchFromGitHub. + + Arguments the script accepts: + --attribute <attribute_path> + + Example usage: + ``` + ./nixpkgs_github_update --attribute "notes-up" + ``` + """ + alias NixpkgsGitHubUpdate.{Nix, GitHubLatestVersion} + + def help do + IO.puts(""" + Run updates on Nix Expressions that use fetchFromGitHub. + + Arguments the script accepts: + --attribute <attribute_path> + + Example usage: + ./nixpkgs_github_update --attribute "notes-up" + """) + end + + def main([]) do + help() + end + + def main(args) do + opts = parse_args(args) + + attribute = opts[:attribute] + + case Nix.attribute_exists?(attribute) do + true -> update(attribute) + _ -> exit("Requested attribute doesn't exist.") + end + end + + def parse_args(args) do + {options, _, _} = + args + |> OptionParser.parse(strict: [attribute: :string]) + + options + end + + def update(attribute) do + version = + Nix.get_owner_repo(attribute) + |> GitHubLatestVersion.fetch() + |> decode_response() + |> construct_version() + + Nix.update_source_version(attribute, version) + end + + def decode_response({:ok, response}), do: response + + def decode_response({:error, error}) do + IO.puts("Error getting latest release from GitHub: #{error["message"]}") + System.halt(2) + end + + def construct_version(response) do + Map.get(response, "tag_name") + |> String.trim_leading("v") + end +end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex new file mode 100644 index 00000000000..ad7f96d6b2a --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex @@ -0,0 +1,42 @@ +defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do + @user_agent 'httpc' + + def fetch({owner, repo}) do + endpoint = releases_endpoint(owner, repo) + headers = construct_headers() + + :httpc.request(:get, {endpoint, headers}, [], []) + |> handle_response + end + + def releases_endpoint(owner, repo) do + 'https://api.github.com/repos/#{owner}/#{repo}/releases/latest' + end + + def construct_headers do + headers = %{'User-Agent' => @user_agent} + + put_token(headers, get_token()) + |> Map.to_list + end + + defp get_token do + String.to_charlist("#{System.get_env("OAUTH_TOKEN")}") + end + + defp put_token(headers, token) when is_list(token) do + Map.put_new(headers, 'Authorization', 'token #{token}') + end + + defp put_token(headers, _), do: headers + + def handle_response({_, {{_httpv, status_code, _}, _headers, response}}) do + { + status_code |> check_for_error(), + response |> Poison.Parser.parse!(%{}) + } + end + + defp check_for_error(200), do: :ok + defp check_for_error(_), do: :error +end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex new file mode 100644 index 00000000000..d5d9af84a6b --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex @@ -0,0 +1,85 @@ +defmodule NixpkgsGitHubUpdate.Nix do + def executable do + nix = System.find_executable("nix") + + if nix == nil do + raise RuntimeError, message: "missing executable for 'nix'" + end + + nix + end + + def eval!(attribute) do + System.cmd( + executable(), + [ + "eval", + "--json", + attribute + ], + stderr_to_stdout: true + ) + |> handle_eval + end + + defp handle_eval({eval_result, 0}) do + case eval_result do + "" -> eval_result + _ -> Poison.Parser.parse!(eval_result, %{}) + end + end + + defp handle_eval({eval_result, _}) do + raise RuntimeError, message: "Error running nix eval: #{eval_result}" + end + + def attribute_exists?(attribute) do + attr_exist_expression = """ + with import <nixpkgs> {}; + + let + attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." "#{attribute}") null pkgs; + in + if attrSet == null then false + else true + """ + + eval!("(#{attr_exist_expression})") + end + + def update_source_version(attribute, version) do + System.cmd("update-source-version", [ + attribute, + version + ]) + end + + def get_url_attr(attribute) do + case attribute_exists?("#{attribute}.src.fetchSubmodules") do + true -> "url" + false -> "urls" + end + end + + def get_owner_repo(attribute) do + url_attr = get_url_attr(attribute) + + eval!("nixpkgs.#{attribute}.src.#{url_attr}") + |> case do + # It's fetchFromGitHub if we got a list + [url | _] -> + URI.parse(url).path + |> String.split("/archive", trim: true) + |> List.first() + |> String.split("/", trim: true) + + # It's fetchgit if we got a plain string + url -> + URI.parse(url).path + |> String.split(".git", trim: true) + |> List.first() + |> String.split("/", trim: true) + end + |> List.to_tuple() + end +end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs new file mode 100644 index 00000000000..3498c7066a4 --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs @@ -0,0 +1,28 @@ +defmodule NixpkgsGitHubUpdate.MixProject do + use Mix.Project + + def project do + [ + app: :nixpkgs_github_update, + version: "0.1.0", + elixir: "~> 1.9", + escript: [main_module: NixpkgsGitHubUpdate.CLI], + start_permanent: Mix.env() == :prod, + deps: deps() + ] + end + + # Run "mix help compile.app" to learn about applications. + def application do + [ + extra_applications: [:logger, :inets, :ssl] + ] + end + + # Run "mix help deps" to learn about dependencies. + defp deps do + [ + {:poison, "~> 4.0.1"} + ] + end +end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix new file mode 100644 index 00000000000..0bb4e58a6a1 --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix @@ -0,0 +1,19 @@ +with import <nixpkgs> {}; + +let + inherit (lib) optional; +in + +mkShell rec { + name = "nixpkgs-github-update-shell"; + + buildInputs = [ + elixir + erlang + common-updater-scripts + ] + ++ optional stdenv.isLinux libnotify # For ExUnit Notifier on Linux. + ++ optional stdenv.isLinux inotify-tools # For file_system on Linux. + ; + +} diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs new file mode 100644 index 00000000000..c5a57698fed --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs @@ -0,0 +1,49 @@ +defmodule NixTest do + @fake_package "asanotehhhuh" + @fetchgit_package "polybar" + @fetchgithub_package "notes-up" + + use ExUnit.Case + + import NixpkgsGitHubUpdate.Nix + + def check_for_nix(_context) do + try do + executable() + rescue + RuntimeError -> + IO.puts("You need Nix installed to run these tests.") + System.halt(127) + end + + :ok + end + + setup_all :check_for_nix + + describe "evaluation tests" do + test "evaluation handling" do + exists_attr = "nixpkgs.#{@fetchgithub_package}" + + assert is_binary(eval!(exists_attr)) == true + catch_error(eval!(@fake_package) == 1) + end + + # This should always be true or false + test "package exists?" do + assert attribute_exists?(@fetchgithub_package) == true + assert attribute_exists?(@fake_package) == false + end + end + + test "owner repo" do + assert get_url_attr(@fetchgit_package) == "url" + assert get_url_attr(@fetchgithub_package) == "urls" + + assert get_owner_repo(@fetchgit_package) == + {@fetchgit_package, @fetchgit_package} + + assert get_owner_repo(@fetchgithub_package) == + {"Philip-Scott", String.capitalize(@fetchgithub_package)} + end +end diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs new file mode 100644 index 00000000000..869559e709e --- /dev/null +++ b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs @@ -0,0 +1 @@ +ExUnit.start() diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index a8eaf766664..a911440fa5d 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index 5061793fa10..68532bdd812 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index b4982fcf6be..d41750f8dfc 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index fb9d28eaf6b..4ec1df36bea 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - inherit repoName; - attrPath = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d29178b220d..582793ff590 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -148,11 +148,9 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; - NIX_CFLAGS_COMPILE = [ # Default for release buildtype but passed manually because # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 1e7f82f134d..0f919c7c94d 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 0259e687bd3..f244e0e4637 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = pantheon.updateScript { - repoName = pname; + attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 3bc432c5d32..1137c533016 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -1,36 +1,6 @@ -{ runCommand -, nix -, bash -, git -, jq -, nix-prefetch-scripts -, coreutils -, common-updater-scripts -, gnugrep -, gnused -, curl -}: +{ nixpkgs-github-update }: -{ repoName -, attrPath ? repoName -, versionPolicy ? "release" -}: +{ attrPath }: -let - script = ./update.sh; - updateScript = runCommand "update.sh" { - inherit bash git jq nix coreutils gnugrep gnused curl; - # These weren't being substituted - nix_prefetch_scripts = nix-prefetch-scripts; - common_updater_scripts = common-updater-scripts; - } '' - substituteAll ${script} $out - chmod +x $out - ''; - - throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; - - versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag; - -in [ updateScript versionFlag repoName attrPath ] +[ "${nixpkgs-github-update}/bin/nixpkgs_github_update" "--attribute" attrPath ] diff --git a/pkgs/desktops/pantheon/update.sh b/pkgs/desktops/pantheon/update.sh deleted file mode 100755 index 4897697d94f..00000000000 --- a/pkgs/desktops/pantheon/update.sh +++ /dev/null @@ -1,236 +0,0 @@ -#!@bash@/bin/bash -PATH=@bash@/bin:@nix_prefetch_scripts@/bin:@common_updater_scripts@/bin:@git@/bin:@jq@/bin:@nix@/bin:@gnugrep@/bin:@gnused@/bin:@curl@/bin:$PATH -#!/usr/bin/env bash - -set -eu -o pipefail - -# -# ─── HOW TO USE ───────────────────────────────────────────────────────────────── -# - -function usage ( ) { - cat <<EOF -Usage: update.sh <repo_name> <attr> -EOF -} - -# -# ─── POINTS YOU IN THE RIGHT DIRECTION ────────────────────────────────────────── -# - - function usage_tip ( ) { - echo 'run `update.sh -h` for usage instructions' >&2 - exit 1 - } - -# -# ─── OPTIONS: RELEASE | MASTER ──────────────────────────────────────────────────── -# - - while getopts ":hrm" opt; do - case $opt in - r) - release=1 - master=0 - ;; - m) - master=1 - release=0 - ;; - h) - usage - exit - ;; - ?) - echo "Invalid option: -$OPTARG" >&2 - usage_tip - ;; - esac - done - - shift $((OPTIND-1)) - -# -# ─── FAIL WITH MESSAGE AND NON-ZERO EXIT STATUS ───────────────────────────────── -# - - function fail ( ) { - echo "$1" >&2 - exit 1 - } - -# -# ─── UPDATES PACKAGE TO LATEST TAGGED RELEASE ─────────────────────────────── -# - - function update_to_latest_release ( ) { - repo_name="$1" - attr="$2" - - version=$(get_latest_tag "$repo_name") - fetch=$(fetch "$repo_name" "refs/tags/${version}") - sha256=$(get_hash "${fetch}") - - update-source-version "pantheon.$attr" "$version" "$sha256" - - nix_file=$(get_file_path $attr) - - if [ ! -f "$nix_file" ]; then - fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!" - fi - - correct_rev "$attr" "$nix_file" "version" - } - -# -# ─── UPDATES PACKAGE TO MASTER ────────────────────────────────────────────────── -# - - function update_to_master ( ) { - repo_name="$1" - attr="$2" - - fetch=$(fetch "$repo_name" "refs/heads/master") - - version=$(get_version "$fetch") - sha256=$(get_hash "$fetch") - proper_version=$(get_master_date "$fetch") - - update-source-version "pantheon.$attr" "$proper_version" "$sha256" - - nix_file=$(get_file_path $attr) - - if [ ! -f "$nix_file" ]; then - fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!" - fi - - correct_rev "$attr" "$nix_file" '"'$version'"' - } - -# -# ─── GETS THE LATEST TAGGED RELEASE NAME FROM GITHUB ───────────────────── -# - - function get_latest_tag ( ) { - repo_name="$1" - - OAUTH_TOKEN=$(printenv OAUTH_TOKEN) - - if [ -n "$OAUTH_TOKEN" ]; then - curl \ - --silent \ - --show-error \ - --fail \ - -X GET \ - --header "Authorization: token $OAUTH_TOKEN" \ - "https://api.github.com/repos/elementary/$repo_name/releases/latest" \ - | jq -r '.tag_name' - else - curl \ - --silent \ - --show-error \ - --fail \ - -X GET \ - "https://api.github.com/repos/elementary/$repo_name/releases/latest" \ - | jq -r '.tag_name' - fi - } - -# -# ─── FETCHES REPO AND RETURNS RELEVANT INFORMATION ────────────────── -# - - function fetch ( ) { - repo_name="$1" - version="$2" - - base_url="https://github.com/elementary" - full_url="$base_url/$repo_name" - - nix-prefetch-git --quiet --no-deepClone --url "$full_url" --rev "$version" - } - -# -# ─── PARSES GIT REVISION FROM FETCH ───────────────────────────────────────────── -# - - function get_version ( ) { - fetch_info="$1" - - echo "$fetch_info" | jq -r '.rev' - } - -# -# ─── PARSES HASH FROM FETCH ───────────────────────────────────────────────────── -# - - function get_hash ( ) { - fetch_info="$1" - - echo "$fetch_info" | jq -r '.sha256' - } - -# -# ─── PARSES DATE FROM FETCH AND NORMALIZES IT TO NIXPKGS STANDARD ─────────────── -# - - function get_master_date ( ) { - fetch_info="$1" - - full_date=$(echo "$fetch_info" | jq -r '.date') - short_date=$(date -d "$full_date" +"%Y-%m-%d") - - echo "unstable-$short_date" - } - -# -# ─── RETURN NIX EXPRESSION PATH ───────────────────────────────────────────────── -# - - function get_file_path () { - attr="$1" - - nix-instantiate --eval --strict -A "pantheon.$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/' - } - -# -# ─── CORRECTS REV VERSION ─────────────────────────────────────────────────────────── -# - - function correct_rev ( ) { - attr="$1" - nix_file="$2" - rev="$3" - - check_pattern1='^\s*rev\s*=\s*"[0-9a-f]{5,40}"' - check_pattern2='^\s*rev\s*=\s*version' - - replace_pattern1='/\brev\b\s*=/ s|\"[0-9a-f]{5,40}\"|'$rev'|' - replace_pattern2='/\brev\b\s*=/ s|version|'$rev'|' - - if [ $(grep -c -P "$check_pattern1" "$nix_file") = 1 ]; then - pattern="$replace_pattern1" - elif [ $(grep -c -P "$check_pattern2" "$nix_file") = 1 ]; then - pattern="$replace_pattern2" - else - fail "Couldn't figure out where out where to patch in the correct version in pantheon.$attr!" - fi - - sed -i.bak "$nix_file" -re "$pattern" - rm -f "$nix_file.bak" - } - - -# -# ─── WHETHER TO UPDATE TO RELEASE OR MASTER ────────────────────────────────── -# - - if [ $release = 1 ]; then - update_to_latest_release $1 $2 - elif [ $master = 1 ]; then - update_to_master $1 $2 - else - exit 1 - fi - -# ──────────────────────────────────────────────────────────────────────────────── diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 05f5936a6cb..b7c40153209 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 gtk shared-mime-info libSM ]; - NIX_LDFLAGS = [ "-ldl" "-lm" ]; + NIX_LDFLAGS = "-ldl -lm"; patches = [ ./rox-filer-2.11-in-source-build.patch @@ -23,7 +23,7 @@ in stdenv.mkDerivation { setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; # patch source with defined patches - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix index 47b7e117206..dd064486647 100644 --- a/pkgs/desktops/surf-display/default.nix +++ b/pkgs/desktops/surf-display/default.nix @@ -43,6 +43,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru = { + providedSessions = [ "surf-display" ]; + }; + meta = with stdenv.lib; { description = "Kiosk browser session manager based on the surf browser"; homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/"; diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix index 3190c5e5d10..736e89a4f44 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg_utils, dconf, gtk3, pythonPackages, + findutils, xdg_utils, dconf, gtk3, python3Packages, wrapGAppsHook }: -pythonPackages.buildPythonApplication rec { - majorver = "1.4"; - minorver = "10"; - version = "${majorver}.${minorver}"; +python3Packages.buildPythonApplication rec { pname = "catfish"; + version = "1.4.12"; src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2"; - sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5"; + url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0jhk4x97vip6h7rsw8hbwzfjmz55w6dpcj9v96m54xr15gh31yy3"; }; nativeBuildInputs = [ - pythonPackages.distutils_extra + python3Packages.distutils_extra file which intltool @@ -26,16 +24,16 @@ pythonPackages.buildPythonApplication rec { buildInputs = [ gtk3 dconf - pythonPackages.pyxdg - pythonPackages.ptyprocess - pythonPackages.pycairo + python3Packages.pyxdg + python3Packages.ptyprocess + python3Packages.pycairo gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ]; propagatedBuildInputs = [ - pythonPackages.dbus-python - pythonPackages.pygobject3 - pythonPackages.pexpect + python3Packages.dbus-python + python3Packages.pygobject3 + python3Packages.pexpect xdg_utils findutils ]; diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f7e500bdf54..f4d86247c6c 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -11,7 +11,7 @@ mkXfceDerivation { buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = "-p1"; + patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 793142fdc18..7442ff478f5 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -56,6 +56,8 @@ lib.makeScope pkgs.newScope (self: with self; { #### APPLICATIONS + catfish = callPackage ./applications/catfish { }; + gigolo = callPackage ./applications/gigolo { }; mousepad = callPackage ./applications/mousepad { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 59f282d7411..83778aa8fff 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -9,7 +9,7 @@ mkXfceDerivation { nativeBuildInputs = [ automakeAddFlags ]; - NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0" "-I${dbus.dev}/include/dbus-1.0" ]; + NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index b6695029f34..d772ad7a3c7 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -23,7 +23,7 @@ let buildInputs = [ erlang ]; - installFlags = "PREFIX=$(out)/lib/erlang/lib"; + installFlags = [ "PREFIX=$(out)/lib/erlang/lib" ]; meta = { description = "WebDriver implementation in Erlang"; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 3058e926c3f..0b5ff381730 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -4,13 +4,13 @@ with builtins; stdenv.mkDerivation rec { pname = "arachne-pnr"; - version = "2018.09.09"; + version = "2019.07.29"; src = fetchFromGitHub { owner = "yosyshq"; repo = "arachne-pnr"; - rev = "840bdfdeb38809f9f6af4d89dd7b22959b176fdd"; - sha256 = "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"; + rev = "c40fb2289952f4f120cc10a5a4c82a6fb88442dc"; + sha256 = "0lg9rccr486cvips3jf289af2b4a2j9chc8iqnkhykgi1hw4pszc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index a0fc30c8586..c0fd742082f 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; /* ** We patch out a very annoying 'feature' in ./configure, which diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 34512fc8ef0..380755bf01e 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; - installFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; + buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; + installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" "VARDIR=$(out)/var/lib" ]; # We need a bootstrap-chicken to regenerate the c-files after # applying a patch to add support for CHICKEN_REPOSITORY_EXTRA @@ -63,7 +63,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index d0f3b8a4e26..8f796d09ee5 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -22,6 +22,6 @@ eggDerivation { homepage = https://github.com/the-kenny/egg2nix; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 5fefce12dbf..3e47e413636 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh; - buildFlags = "PLATFORM=${platform} PREFIX=$(out)"; - installFlags = "PLATFORM=${platform} PREFIX=$(out)"; + buildFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; + installFlags = [ "PLATFORM=${platform}" "PREFIX=$(out)" ]; buildInputs = [ makeWrapper @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 21e12849b3a..77ed32cafe1 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -24,6 +24,6 @@ eggDerivation { homepage = https://github.com/the-kenny/egg2nix; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; }; } diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 9a01519a881..edde6af615f 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; }; - buildFlags = "build"; + buildFlags = [ "build" ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 095f94143e3..03a914695a0 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -56,6 +56,8 @@ let inherit sha256; }; + outputs = [ "out" "lib" "bin" ]; + # we are almost able to run the full test suite now postPatch = '' substituteInPlace src/crystal/system/unix/time.cr \ @@ -97,22 +99,22 @@ let # This makes sure we don't keep depending on the previous version of # crystal used to build this one. - CRYSTAL_LIBRARY_PATH = "${placeholder "out"}/lib/crystal"; + CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/crystal"; # We *have* to add `which` to the PATH or crystal is unable to build stuff # later if which is not available. installPhase = '' runHook preInstall - install -Dm755 .build/crystal $out/bin/crystal - wrapProgram $out/bin/crystal \ + install -Dm755 .build/crystal $bin/bin/crystal + wrapProgram $bin/bin/crystal \ --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \ - --suffix CRYSTAL_PATH : lib:$out/lib/crystal \ + --suffix CRYSTAL_PATH : lib:$lib/crystal \ --suffix CRYSTAL_LIBRARY_PATH : ${ lib.makeLibraryPath (commonBuildInputs extraBuildInputs) } - install -dm755 $out/lib/crystal - cp -r src/* $out/lib/crystal/ + install -dm755 $lib/crystal + cp -r src/* $lib/crystal/ install -dm755 $out/share/doc/crystal/api cp -r docs/* $out/share/doc/crystal/api/ @@ -125,6 +127,10 @@ let install -Dm644 -t $out/share/licenses/crystal LICENSE README.md + mkdir -p $out + ln -s $bin/bin $out/bin + ln -s $lib $out/lib + runHook postInstall ''; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 9c983a38e4e..6531316fa12 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -129,5 +129,13 @@ in rec { gcc = gcc7; }; - cudatoolkit_10 = cudatoolkit_10_1; + cudatoolkit_10_2 = common { + version = "10.2.89"; + url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run"; + sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an"; + + gcc = gcc7; + }; + + cudatoolkit_10 = cudatoolkit_10_2; } diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 839ee821d00..37f79933b77 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Linux 8086 development environment"; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index a22862c4292..90c2b8fd23c 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ]; # skip interactive browser check - buildFlags = "nobrowsers"; + buildFlags = [ "nobrowsers" ]; preConfigure='' diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 3ceaae450f0..0831d382c4b 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -11,13 +11,10 @@ ver: deps: inherit (info) sha256; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' mkdir -p $out cp -r * $out ''; - }; in '' mkdir -p .elm/${ver}/packages/${name} diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 770e7c3529a..c9b54aee4fd 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -40,6 +40,15 @@ let sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; }; }; + "@sindresorhus/is-0.14.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + }; "@sindresorhus/is-0.7.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -49,6 +58,24 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; + "@szmarczak/http-timer-1.1.2" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + }; + "@types/color-name-1.1.1" = { + name = "_at_types_slash_color-name"; + packageName = "@types/color-name"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + }; + }; "@types/events-3.0.0" = { name = "_at_types_slash_events"; packageName = "@types/events"; @@ -76,13 +103,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-12.12.3" = { + "@types/node-13.1.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.3"; + version = "13.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.3.tgz"; - sha512 = "opgSsy+cEF9N8MgaVPnWVtdJ3o4mV2aMHvDq7thkQUFt0EuOHJon4rQpJfhjmNHB+ikl0Cd6WhWIErOyQ+f7tw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.1.2.tgz"; + sha512 = "B8emQA1qeKerqd1dmIsQYnXi+mmAzTB7flExjmy5X1aVAKFNNNDubkavwR13kR6JnpeLp3aLoJhwn9trWPAyFQ=="; }; }; "accepts-1.3.7" = { @@ -139,6 +166,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "ansi-styles-4.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + }; + }; "anymatch-2.0.0" = { name = "anymatch"; packageName = "anymatch"; @@ -274,13 +310,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.8.0" = { + "aws4-1.9.0" = { name = "aws4"; packageName = "aws4"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; }; }; "babel-runtime-6.18.0" = { @@ -346,15 +382,6 @@ let sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; }; }; - "bindings-1.5.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; - sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; - }; - }; "binwrap-0.2.2" = { name = "binwrap"; packageName = "binwrap"; @@ -364,13 +391,13 @@ let sha512 = "Y+Wvypk3JhH5GPZAvlwJAWOVH/OsOhQMSj37vySuWHwQivoALplPxfBA8b973rFJI7OS+O+1YmmYXIiEXVMAcw=="; }; }; - "bluebird-3.7.1" = { + "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz"; - sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; "body-parser-1.18.2" = { @@ -472,6 +499,15 @@ let sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; }; }; + "cacheable-request-6.1.0" = { + name = "cacheable-request"; + packageName = "cacheable-request"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + }; "camelcase-5.3.1" = { name = "camelcase"; packageName = "camelcase"; @@ -490,15 +526,6 @@ let sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="; }; }; - "capture-stack-trace-1.0.1" = { - name = "capture-stack-trace"; - packageName = "capture-stack-trace"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; - sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="; - }; - }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -544,6 +571,15 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; "charenc-0.0.2" = { name = "charenc"; packageName = "charenc"; @@ -571,6 +607,15 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "chownr-1.1.3" = { name = "chownr"; packageName = "chownr"; @@ -625,6 +670,15 @@ let sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; "color-name-1.1.3" = { name = "color-name"; packageName = "color-name"; @@ -634,6 +688,15 @@ let sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; @@ -661,6 +724,15 @@ let sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; + "compare-versions-3.5.1" = { + name = "compare-versions"; + packageName = "compare-versions"; + version = "3.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz"; + sha512 = "9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg=="; + }; + }; "component-emitter-1.3.0" = { name = "component-emitter"; packageName = "component-emitter"; @@ -760,22 +832,22 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "core-js-2.6.10" = { + "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz"; - sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.3.5" = { + "core-js-3.6.1" = { name = "core-js"; packageName = "core-js"; - version = "3.3.5"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.3.5.tgz"; - sha512 = "0J3K+Par/ZydhKg8pEiTcK/9d65/nqJOzY62uMkjeBmt05fDOt/khUVjDdh8TpeIuGQDy1yLDDCjiWN/8pFIuw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz"; + sha512 = "186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="; }; }; "core-util-is-1.0.2" = { @@ -787,15 +859,6 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "create-error-class-3.0.2" = { - name = "create-error-class"; - packageName = "create-error-class"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - }; "crocks-0.12.1" = { name = "crocks"; packageName = "crocks"; @@ -922,6 +985,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "defer-to-connect-1.1.1" = { + name = "defer-to-connect"; + packageName = "defer-to-connect"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.1.tgz"; + sha512 = "J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ=="; + }; + }; "define-properties-1.1.3" = { name = "define-properties"; packageName = "define-properties"; @@ -1067,6 +1139,15 @@ let sha512 = "zNinzt6/YMr11HgeBlC9Z0UM3qHkYrGsWJTjrCmgBkKnaOLUzTP5K9N3z1RltyunItXtHAxb8DFPvMxlYRPv/Q=="; }; }; + "elmi-to-json-1.3.0" = { + name = "elmi-to-json"; + packageName = "elmi-to-json"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elmi-to-json/-/elmi-to-json-1.3.0.tgz"; + sha512 = "6m1D5/Pb5pUrSOOBgRG3fE2mK19nhmLgZ16jj2KWTVIhT+0GIBuDI1iV0Fee27CZH790J7uMcdGWJ7fnVvpsKg=="; + }; + }; "emoji-regex-7.0.3" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1094,22 +1175,22 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "es-abstract-1.16.0" = { + "es-abstract-1.17.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz"; - sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz"; + sha512 = "yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug=="; }; }; - "es-to-primitive-1.2.0" = { + "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; "es6-promisify-6.0.2" = { @@ -1157,13 +1238,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "exec-sh-0.3.2" = { + "exec-sh-0.3.4" = { name = "exec-sh"; packageName = "exec-sh"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz"; - sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="; + url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz"; + sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A=="; }; }; "execa-1.0.0" = { @@ -1175,13 +1256,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-3.2.0" = { + "execa-3.4.0" = { name = "execa"; packageName = "execa"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-3.2.0.tgz"; - sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw=="; + url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz"; + sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; }; }; "expand-brackets-2.1.4" = { @@ -1292,22 +1373,22 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; - "fast-glob-3.1.0" = { + "fast-glob-3.1.1" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz"; - sha512 = "TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz"; + sha512 = "nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g=="; }; }; - "fast-json-stable-stringify-2.0.0" = { + "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "fastq-1.6.0" = { @@ -1319,22 +1400,13 @@ let sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA=="; }; }; - "fb-watchman-2.0.0" = { + "fb-watchman-2.0.1" = { 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"; - }; - }; - "file-uri-to-path-1.0.0" = { - name = "file-uri-to-path"; - packageName = "file-uri-to-path"; - version = "1.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; + url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; }; "fill-range-4.0.0" = { @@ -1499,15 +1571,6 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fs-extra-0.30.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "0.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"; - sha1 = "f233ffcc08d4da7d432daa449776989db1df93f0"; - }; - }; "fs-extra-2.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -1562,13 +1625,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.1" = { + "fsevents-2.1.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz"; - sha512 = "4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; + sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; "function-bind-1.1.1" = { @@ -1652,13 +1715,13 @@ let sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; - "glob-7.1.5" = { + "glob-7.1.6" = { name = "glob"; packageName = "glob"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; - sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "glob-parent-5.1.0" = { @@ -1679,22 +1742,22 @@ let sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A=="; }; }; - "got-6.7.1" = { + "got-8.3.2" = { name = "got"; packageName = "got"; - version = "6.7.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; + sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; }; }; - "got-8.3.2" = { + "got-9.6.0" = { name = "got"; packageName = "got"; - version = "8.3.2"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; + url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; "graceful-fs-4.2.3" = { @@ -1769,13 +1832,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.0" = { + "has-symbols-1.0.1" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -1832,6 +1895,15 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; + "http-cache-semantics-4.0.3" = { + name = "http-cache-semantics"; + packageName = "http-cache-semantics"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; + sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; + }; + }; "http-errors-1.6.2" = { name = "http-errors"; packageName = "http-errors"; @@ -2039,13 +2111,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.4" = { + "is-callable-1.1.5" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; - sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; }; }; "is-data-descriptor-0.1.4" = { @@ -2066,13 +2138,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.1" = { + "is-date-object-1.0.2" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-descriptor-0.1.6" = { @@ -2183,22 +2255,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-redirect-1.0.0" = { - name = "is-redirect"; - packageName = "is-redirect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - }; - "is-regex-1.0.4" = { + "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; "is-retry-allowed-1.2.0" = { @@ -2228,13 +2291,13 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; - "is-symbol-1.0.2" = { + "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; - sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-typedarray-1.0.0" = { @@ -2399,6 +2462,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-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -2435,15 +2507,6 @@ let sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="; }; }; - "klaw-1.3.1" = { - name = "klaw"; - packageName = "klaw"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"; - sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; - }; - }; "klaw-2.1.1" = { name = "klaw"; packageName = "klaw"; @@ -2498,6 +2561,15 @@ let sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; }; + "lowercase-keys-2.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + }; "lru-cache-4.1.5" = { name = "lru-cache"; packageName = "lru-cache"; @@ -2633,22 +2705,22 @@ let sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-db-1.40.0" = { + "mime-db-1.42.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.40.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; - sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; }; }; - "mime-types-2.1.24" = { + "mime-types-2.1.25" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.24"; + version = "2.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; - sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; }; }; "mimic-fn-2.1.0" = { @@ -2768,22 +2840,13 @@ let sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; }; }; - "mustache-3.1.0" = { + "mustache-3.2.1" = { name = "mustache"; packageName = "mustache"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mustache/-/mustache-3.1.0.tgz"; - sha512 = "3Bxq1R5LBZp7fbFPZzFe5WN4s0q3+gxZaZuZVY+QctYJiCiVgXHOTIC0/HgZuOPFt/6BQcx5u0H2CUOxT/RoGQ=="; - }; - }; - "nan-2.14.0" = { - name = "nan"; - packageName = "nan"; - version = "2.14.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + url = "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz"; + sha512 = "RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA=="; }; }; "nanomatch-1.2.13" = { @@ -2867,6 +2930,15 @@ let sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; }; }; + "normalize-url-4.5.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; + sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + }; + }; "npm-conf-1.1.3" = { name = "npm-conf"; packageName = "npm-conf"; @@ -2885,13 +2957,13 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "npm-run-path-4.0.0" = { + "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.0.tgz"; - sha512 = "8eyAOAH+bYXFPSnNnKr3J+yoybe8O87Is5rtAQ8qRczJz1ajcsjg8l2oZqP+Ppx15Ii3S1vUTjQN2h4YO2tWWQ=="; + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; "oauth-sign-0.9.0" = { @@ -2921,13 +2993,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.6.0" = { + "object-inspect-1.7.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; - sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; "object-keys-1.1.1" = { @@ -2948,13 +3020,22 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.getownpropertydescriptors-2.0.3" = { + "object.assign-4.1.0" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; + sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + }; + }; + "object.getownpropertydescriptors-2.1.0" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "object.pick-1.3.0" = { @@ -3056,6 +3137,15 @@ let sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; }; }; + "p-cancelable-1.1.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -3083,13 +3173,13 @@ let sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; }; }; - "p-limit-2.2.1" = { + "p-limit-2.2.2" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz"; - sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; + sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; }; }; "p-locate-3.0.0" = { @@ -3173,13 +3263,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-key-3.1.0" = { + "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz"; - sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; "path-to-regexp-0.1.7" = { @@ -3218,13 +3308,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "picomatch-2.1.0" = { + "picomatch-2.1.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.0.tgz"; - sha512 = "uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz"; + sha512 = "OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA=="; }; }; "pify-3.0.0" = { @@ -3254,15 +3344,6 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "prepend-http-1.0.4" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; - }; - }; "prepend-http-2.0.0" = { name = "prepend-http"; packageName = "prepend-http"; @@ -3317,13 +3398,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.4.0" = { + "psl-1.7.0" = { name = "psl"; packageName = "psl"; - version = "1.4.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; - sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; + sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; "pump-3.0.0" = { @@ -3461,6 +3542,15 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; + "readdirp-3.3.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; + sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + }; + }; "regenerator-runtime-0.9.6" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -3533,22 +3623,22 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "request-promise-4.2.4" = { + "request-promise-4.2.5" = { name = "request-promise"; packageName = "request-promise"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.4.tgz"; - sha512 = "8wgMrvE546PzbR5WbYxUQogUnUDfM0S7QIFZMID+J73vdFARkFy+HElj4T+MWYhpXwlLp0EQ8Zoj8xUA0he4Vg=="; + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.5.tgz"; + sha512 = "ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg=="; }; }; - "request-promise-core-1.1.2" = { + "request-promise-core-1.1.3" = { name = "request-promise-core"; packageName = "request-promise-core"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz"; + sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ=="; }; }; "require-directory-2.1.1" = { @@ -3650,13 +3740,13 @@ let sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; }; }; - "rxjs-6.5.3" = { + "rxjs-6.5.4" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz"; - sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; + sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; }; }; "safe-buffer-5.1.1" = { @@ -3731,6 +3821,15 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -3938,13 +4037,13 @@ let sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; }; }; - "source-map-resolve-0.5.2" = { + "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA=="; + url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; "source-map-url-0.4.0" = { @@ -4037,22 +4136,22 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.0" = { + "string.prototype.trimleft-2.1.1" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; - sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; }; }; - "string.prototype.trimright-2.1.0" = { + "string.prototype.trimright-2.1.1" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; - sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; }; }; "string_decoder-0.10.31" = { @@ -4154,15 +4253,6 @@ let sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; }; }; - "syncprompt-2.0.0" = { - name = "syncprompt"; - packageName = "syncprompt"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/syncprompt/-/syncprompt-2.0.0.tgz"; - sha512 = "tPYCsLGWTDRlET7cen2iAwbmO+lSwfIdKoLkUPC41t/54UhqbzpwXL4RhODu5fQnmZdQZlEFKeD0W/BysU5WEg=="; - }; - }; "tar-4.4.13" = { name = "tar"; packageName = "tar"; @@ -4181,6 +4271,15 @@ let sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; + "temp-0.9.1" = { + name = "temp"; + packageName = "temp"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; + sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; + }; + }; "through-2.3.8" = { name = "through"; packageName = "through"; @@ -4253,6 +4352,15 @@ let sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; }; + "to-readable-stream-1.0.0" = { + name = "to-readable-stream"; + packageName = "to-readable-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + }; "to-regex-3.0.2" = { name = "to-regex"; packageName = "to-regex"; @@ -4415,15 +4523,6 @@ let sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; }; }; - "unzip-response-2.0.1" = { - name = "unzip-response"; - packageName = "unzip-response"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; - }; - }; "unzip-stream-0.3.0" = { name = "unzip-stream"; packageName = "unzip-stream"; @@ -4451,15 +4550,6 @@ let sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; }; }; - "url-parse-lax-1.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; - }; - }; "url-parse-lax-3.0.0" = { name = "url-parse-lax"; packageName = "url-parse-lax"; @@ -4604,13 +4694,13 @@ let sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; }; }; - "web-tree-sitter-0.15.10" = { + "web-tree-sitter-0.15.11" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.15.10"; + version = "0.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.10.tgz"; - sha512 = "8utowZB5h5djbotf1umt4na9Vt6Q18ZICUeC9jW4qWWjUrtQ2xvxDuAJ+EibmqUJBAKATrDMXnY2xYaskGg8wg=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.11.tgz"; + sha512 = "7Sr26MV8bPPvKU+4VMpOoLYwaAFBsCsxRGtxYPSxClWIaR2KIciqg6zUeG14W9QrdlpBt7VHHzhd1CBb0e6i8w=="; }; }; "which-1.3.1" = { @@ -4631,6 +4721,15 @@ let sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; }; }; + "which-2.0.2" = { + name = "which"; + packageName = "which"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; "which-module-2.0.0" = { name = "which-module"; packageName = "which-module"; @@ -4703,13 +4802,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.2.0" = { + "ws-7.2.1" = { name = "ws"; packageName = "ws"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz"; - sha512 = "+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg=="; + url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz"; + sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="; }; }; "xmlbuilder-13.0.2" = { @@ -4775,13 +4874,13 @@ let sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; }; }; - "yn-2.0.0" = { + "yn-3.1.1" = { name = "yn"; packageName = "yn"; - version = "2.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; - sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; + url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; + sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; }; @@ -4790,57 +4889,49 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1"; + version = "0.19.1-revision2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1.tgz"; - sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz"; + sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ=="; }; dependencies = [ + sources."@types/color-name-1.1.1" sources."ajv-6.10.2" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-2.0.0" sources."binwrap-0.2.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffers-0.1.1" sources."caseless-0.12.0" sources."chainsaw-0.1.0" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."chokidar-3.2.1" + sources."chalk-3.0.0" + sources."chokidar-3.3.0" sources."chownr-1.1.3" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - (sources."cross-spawn-7.0.0" // { - dependencies = [ - sources."which-1.3.1" - ]; - }) + sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."elmi-to-json-1.2.0" - sources."escape-string-regexp-1.0.5" + sources."elmi-to-json-1.3.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ @@ -4854,14 +4945,14 @@ in sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.1" + sources."fsevents-2.1.2" sources."getpass-0.1.7" - sources."glob-7.1.4" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -4879,8 +4970,8 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-2.9.0" @@ -4891,12 +4982,14 @@ in ]; }) sources."murmur-hash-js-1.0.0" - sources."mustache-3.1.0" + sources."mustache-3.2.1" sources."nice-try-1.0.5" (sources."node-elm-compiler-5.0.4" // { dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."which-1.3.1" ]; }) @@ -4904,32 +4997,28 @@ in sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.1.0" - sources."psl-1.4.0" + sources."picomatch-2.1.1" + sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."readdirp-3.1.3" + sources."readdirp-3.2.0" sources."request-2.88.0" - sources."request-promise-4.2.4" - sources."request-promise-core-1.1.2" + sources."request-promise-4.2.5" + sources."request-promise-core-1.1.3" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."split-1.0.1" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."supports-color-7.1.0" sources."tar-4.4.13" - sources."temp-0.9.0" + sources."temp-0.9.1" sources."through-2.3.8" sources."to-regex-range-5.0.1" (sources."tough-cookie-2.4.3" // { @@ -4977,13 +5066,13 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-2.0.0" sources."binwrap-0.2.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffers-0.1.1" @@ -5021,7 +5110,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fill-range-7.0.1" (sources."find-elm-dependencies-2.0.2" // { dependencies = [ @@ -5036,7 +5125,7 @@ in sources."fs-extra-5.0.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.1" + sources."fsevents-2.1.2" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.4" @@ -5064,8 +5153,8 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."minipass-2.9.0" @@ -5076,7 +5165,7 @@ in ]; }) sources."murmur-hash-js-1.0.0" - sources."mustache-3.1.0" + sources."mustache-3.2.1" sources."nice-try-1.0.5" (sources."node-elm-compiler-5.0.4" // { dependencies = [ @@ -5088,21 +5177,21 @@ in sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."p-limit-2.2.1" + sources."p-limit-2.2.2" sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.1.0" - sources."psl-1.4.0" + sources."picomatch-2.1.1" + sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readdirp-3.1.3" sources."request-2.88.0" - sources."request-promise-4.2.4" - sources."request-promise-core-1.1.2" + sources."request-promise-4.2.5" + sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."rimraf-2.7.1" @@ -5233,7 +5322,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.3.5" + sources."core-js-3.6.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" sources."debug-2.6.9" @@ -5248,12 +5337,12 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-abstract-1.17.0" + sources."es-to-primitive-1.2.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."exec-sh-0.3.4" (sources."execa-1.0.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -5294,7 +5383,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fb-watchman-2.0.0" + sources."fb-watchman-2.0.1" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -5310,12 +5399,12 @@ in sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."got-8.3.2" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -5333,9 +5422,9 @@ in sources."ipaddr.js-1.9.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" (sources."is-number-3.0.0" // { @@ -5346,10 +5435,10 @@ in sources."is-object-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-regex-1.0.5" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -5369,8 +5458,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -5401,10 +5490,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -5498,7 +5588,7 @@ in }) sources."sort-keys-2.0.0" sources."source-map-0.5.7" - sources."source-map-resolve-0.5.2" + sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { @@ -5520,8 +5610,8 @@ in }) sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -5576,64 +5666,64 @@ in elm-upgrade = nodeEnv.buildNodePackage { name = "elm-upgrade"; packageName = "elm-upgrade"; - version = "0.19.6"; + version = "0.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.6.tgz"; - sha512 = "i7+z/6uAqKxOUD58nwyAJJGUCNKG7/wTBY1qBanveFSaQuX5vrfhQNH/3NWIGCufGoW3QEyADGhaLhAxNPVs5Q=="; + url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.7.tgz"; + sha512 = "/BFMWGJ0SmoFzsYb7QwKUZ7kfdimllVkRO51NokYCj9ehAts5TnuG+GLHsmVCJh1mGL4Qc0D4cgeleEwDgoCAQ=="; }; dependencies = [ - sources."balanced-match-1.0.0" - sources."bindings-1.5.0" - sources."brace-expansion-1.1.11" - sources."capture-stack-trace-1.0.1" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.1.0" + sources."lowercase-keys-2.0.0" + ]; + }) sources."caw-2.0.1" - sources."concat-map-0.0.1" + sources."clone-response-1.0.2" sources."config-chain-1.1.12" - sources."create-error-class-3.0.2" + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.1" sources."duplexer3-0.1.4" - sources."file-uri-to-path-1.0.0" - sources."fs-extra-0.30.0" - sources."fs.realpath-1.0.0" + sources."end-of-stream-1.4.4" + sources."fs-extra-8.1.0" sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."glob-7.1.5" - sources."got-6.7.1" + sources."get-stream-4.1.0" + sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."http-cache-semantics-4.0.3" sources."ini-1.3.5" sources."is-object-1.0.1" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" sources."isexe-2.0.0" sources."isurl-1.0.0" - sources."jsonfile-2.4.0" - sources."klaw-1.3.1" + sources."json-buffer-3.0.0" + sources."jsonfile-4.0.0" + sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" - sources."minimatch-3.0.4" - sources."nan-2.14.0" + sources."mimic-response-1.0.1" + sources."normalize-url-4.5.0" sources."npm-conf-1.1.3" sources."once-1.4.0" - sources."path-is-absolute-1.0.1" + sources."p-cancelable-1.1.0" sources."pify-3.0.0" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."proto-list-1.2.4" - sources."rimraf-2.7.1" + sources."pump-3.0.0" + sources."responselike-1.0.2" sources."safe-buffer-5.2.0" sources."safename-1.0.2" - sources."semver-5.7.1" - sources."syncprompt-2.0.0" - sources."timed-out-4.0.1" + sources."semver-6.3.0" + sources."to-readable-stream-1.0.0" sources."tunnel-agent-0.6.0" - sources."unzip-response-2.0.1" - sources."url-parse-lax-1.0.0" + sources."universalify-0.1.2" + sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yn-2.0.0" + sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -5662,7 +5752,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -5674,7 +5764,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -5712,7 +5802,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" (sources."finalhandler-1.1.1" // { dependencies = [ sources."statuses-1.4.0" @@ -5749,8 +5839,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -5766,7 +5856,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.7.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -5880,7 +5970,7 @@ in ]; }) sources."fresh-0.5.2" - sources."fsevents-2.1.1" + sources."fsevents-2.1.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.0" sources."has-ansi-2.0.0" @@ -5913,11 +6003,11 @@ in sources."parseurl-1.3.3" sources."path-key-2.0.1" sources."pem-1.14.2" - sources."picomatch-2.1.0" + sources."picomatch-2.1.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.2.0" + sources."readdirp-3.3.0" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -5956,13 +6046,14 @@ in elm-xref = nodeEnv.buildNodePackage { name = "elm-xref"; packageName = "elm-xref"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.0.0.tgz"; - sha512 = "9AjXLkznJBVLHHO+KErcgFMKeXe3tcudjj3PYIH6gWXG6W3PT+HF+t2zCflvgFPlhJO5H/wQCCo4rfCApltBzg=="; + url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz"; + sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA=="; }; dependencies = [ - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" + sources."compare-versions-3.5.1" sources."core-util-is-1.0.2" sources."fs-extra-6.0.1" sources."graceful-fs-4.2.3" @@ -5974,9 +6065,13 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" - sources."semver-5.7.1" + sources."semver-6.3.0" sources."semver-regex-1.0.0" - sources."semver-sort-0.0.4" + (sources."semver-sort-0.0.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."string_decoder-1.1.1" sources."through2-2.0.5" sources."universalify-0.1.2" @@ -5996,10 +6091,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.4.tgz"; - sha512 = "vhiQZHael3isY254nS/iiW5zFiTwXmyaj+IOO9q1PQ6URP8PKzQla74o7UuURRlkF5B/OuwB+u/hncmEbwyy+w=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.4.6.tgz"; + sha512 = "Cf1atW2nqZtDgyPFug0c9qo3A1a1mtTtKHRr3jGpIQnp8eb99kbPkERI3xFcbgyhgBOygVd3g282Y8jGawHbdA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -6008,7 +6103,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.3" + sources."@types/node-13.1.2" sources."accepts-1.3.7" sources."ajv-6.10.2" sources."array-flatten-1.1.1" @@ -6018,7 +6113,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-runtime-6.18.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -6034,7 +6129,7 @@ in sources."content-type-1.0.4" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.1" sources."dashdash-1.14.1" @@ -6055,7 +6150,7 @@ in sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."execa-3.2.0" // { + (sources."execa-3.4.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -6070,8 +6165,8 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-diff-1.2.0" - sources."fast-glob-3.1.0" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-glob-3.1.1" + sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.6.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.1" @@ -6084,7 +6179,7 @@ in sources."fs.realpath-1.0.0" sources."get-stream-5.1.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."globby-10.0.1" sources."graceful-fs-4.2.3" @@ -6121,15 +6216,15 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-watch-0.5.5" - sources."npm-run-path-4.0.0" + sources."npm-run-path-4.0.1" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -6141,15 +6236,15 @@ in sources."p-finally-2.0.1" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."performance-now-2.1.0" - sources."picomatch-2.1.0" + sources."picomatch-2.1.1" sources."pjson-1.0.9" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.7.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.1" @@ -6171,7 +6266,7 @@ in }) sources."reusify-1.0.4" sources."run-parallel-1.1.9" - sources."rxjs-6.5.3" + sources."rxjs-6.5.4" sources."safe-buffer-5.1.1" sources."safer-buffer-2.1.2" sources."send-0.16.2" @@ -6217,10 +6312,10 @@ in sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" sources."vscode-uri-2.1.1" - sources."web-tree-sitter-0.15.10" - sources."which-2.0.1" + sources."web-tree-sitter-0.15.11" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index cb960227beb..aac61912689 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - NIX_CFLAGS_COMPILE = [ "-fPIC" ]; + NIX_CFLAGS_COMPILE = "-fPIC"; postPatch = '' sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 14610af10ae..135bae2daf4 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.18"; + version = "1.73.21"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "0m88vi8ac9mlak430nyrg3nxsj0fzy3yli8kk0mqsw8rqw2pfvqb"; + sha256 = "143zh7x3q0r2kclshh8n5w4i5pw4lh60si7rspvc725xxjpjkvcv"; }; installPhase = '' diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index a2b73f61c27..7bddafc6ff5 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; - makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; + makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; - installFlags = "INSTALL_PREFIX=\${out}"; + installFlags = [ "INSTALL_PREFIX=\${out}" ]; postInstall = '' for i in $out/lib/fpc/*/ppc*; do diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 9306eec817f..533140631a5 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation rec { patchShebangs src/tools patchShebangs bin ''; - buildFlags = "-C src/ocaml-output"; + buildFlags = [ "-C" "src/ocaml-output" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; - installFlags = "-C src/ocaml-output"; + installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 940dec0338c..f635fce972f 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, ncurses5, python27 }: +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; subdir = "6-2017q2"; - 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="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"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; + x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -37,11 +41,11 @@ stdenv.mkDerivation rec { done ''; - meta = { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; - homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; - license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 90f9d5957bb..4944038fde4 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -1,24 +1,26 @@ -{ stdenv, lib, fetchurl, ncurses5, python27 }: - -with lib; +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; subdir = "7-2018q2"; - 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"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; + x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { done ''; - meta = { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; - homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index b2815cc7184..510889dad62 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -1,24 +1,26 @@ -{ stdenv, lib, fetchurl, ncurses5, python27 }: - -with lib; +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "8-2019-q3-update"; subdir = "8-2019q3/RC1.1"; - 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="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - } - 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="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - } - else throw "unsupported platform"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; + x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { done ''; - meta = { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; - homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; maintainers = with maintainers; [ prusnak ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix new file mode 100644 index 00000000000..8ded47d6e37 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "9-2019-q4-major"; + subdir = "9-2019q4/RC2.1"; + + suffix = { + aarch64-linux = "aarch64-linux"; + x86_64-darwin = "mac"; + x86_64-linux = "x86_64-linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83"; + x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0"; + x86_64-linux = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r * $out + ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man + ''; + + dontPatchELF = true; + dontStrip = true; + + preFixup = '' + find $out -type f | while read f; do + patchelf $f > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + done + ''; + + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix deleted file mode 100644 index b86b35525a6..00000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses -, dirName ? null, subdirName ? null }: -with stdenv.lib; -let - versionParts = splitString "-" version; # 4.7 2013q3 20130916 - majorVersion = elemAt versionParts 0; # 4.7 - yearQuarter = elemAt versionParts 1; # 2013q3 - underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916 - yearQuarterParts = splitString "q" yearQuarter; # 2013 3 - year = elemAt yearQuarterParts 0; # 2013 - quarter = elemAt yearQuarterParts 1; # 3 - dirName_ = if dirName != null then dirName else majorVersion; - subdirName_ = if subdirName != null then subdirName - else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update -in -stdenv.mkDerivation { - pname = "gcc-arm-embedded"; - inherit version; - - src = fetchurl { - url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; - sha256 = sha256; - }; - - nativeBuildInputs = [ bzip2 patchelf ]; - - dontPatchELF = true; - - phases = "unpackPhase patchPhase installPhase"; - - installPhase = '' - mkdir -pv $out - cp -r ./* $out - ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man - - for f in $(find $out); do - if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then - patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \ - "$f" || true - fi - done - ''; - - meta = with stdenv.lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)"; - homepage = https://launchpad.net/gcc-arm-embedded; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = [ maintainers.rasendubi ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ae96d5a1ef9..ef697b74bbe 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -225,10 +225,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 5194f607f3b..2f85fc4b7e8 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -231,10 +231,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index cddfd58aa53..f68ddc81f81 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -242,10 +242,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3ac4fa7032a..b1a981cfdf7 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -250,10 +250,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 237cb455f9f..22d772cff6d 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -221,10 +221,7 @@ stdenv.mkDerivation ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index c9302cc4f74..c6b785f84a4 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -208,10 +208,7 @@ stdenv.mkDerivation ({ dontStrip = !stripped; - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9698f4db286..7ff8d7529ca 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -207,10 +207,7 @@ stdenv.mkDerivation ({ dontStrip = !stripped; - installTargets = - if stripped - then "install-strip" - else "install"; + installTargets = optional stripped "install-strip"; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 3b96f432e96..aa0fcb50628 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -153,7 +153,7 @@ let ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) - ++ lib.optional (targetPlatform != hostPlatform) crossConfigureFlags + ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" # Platform-specific flags diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index b5ccbca6f7e..e2ab0976482 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gambit rsync bash ] ++ buildInputs_libraries ++ buildInputs_staticLibraries; - NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix new file mode 100644 index 00000000000..25226d4d0e6 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -0,0 +1,232 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # 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) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # 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; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.10.0.20191210"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/8.10.1-alpha2/ghc-${version}-src.tar.xz"; + sha256 = "1mmv8s9cs41kp7wh1qqnzin5wv32cvs3lmzgda7njz0ssqb0mmvj"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + 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=${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) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 73c7e4708d5..f79200d1199 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -69,7 +69,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -167,9 +167,9 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index f285e271c62..0b565d3705d 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -167,9 +167,9 @@ stdenv.mkDerivation (rec { "--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=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 6872cea4e2a..9197b80224e 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -152,9 +152,9 @@ stdenv.mkDerivation (rec { "--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=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix new file mode 100644 index 00000000000..4ed99a8402a --- /dev/null +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -0,0 +1,232 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # 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) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # 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; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.8.1.20191211"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/8.8.2-rc1/ghc-${version}-src.tar.xz"; + sha256 = "1gl4fzakjbhd94v1saxmr9sfzgk22m1b95jq51rxm93b2g4cixl4"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + 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=${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) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8d22c0a674b..415f6c74ad5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -74,7 +74,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; @@ -161,9 +161,9 @@ stdenv.mkDerivation (rec { configureFlags = [ "--datadir=$doc/share/doc/ghc" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" @@ -173,7 +173,7 @@ stdenv.mkDerivation (rec { "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ "--disable-large-address-space" - ] ++ stdenv.lib.optional enableDwarf [ + ] ++ stdenv.lib.optionals enableDwarf [ "--enable-dwarf-unwind" "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include" "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib" diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 747ea5cf77f..7b6fbc460a9 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -1,4 +1,5 @@ { stdenv +, pkgsHostHost , callPackage , fetchgit , ghcjsSrcJson ? null @@ -14,7 +15,6 @@ , pkgconfig , gcc , lib -, nodePackages , ghcjsDepOverrides ? (_:_:{}) , haskell }: @@ -46,7 +46,7 @@ let enableShared = true; - socket-io = nodePackages."socket.io"; + socket-io = pkgsHostHost.nodePackages."socket.io"; # Relics of the old GHCJS build system stage1Packages = []; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 2080a643959..beef0ce03d9 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { - owner = "lpil"; + owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "17h573fm5b1f71ivyipl76p0vw7injm7j3cbg6plkfizcb1j5m7f"; + sha256 = "1fvy2j6pw1rwm0rg7555q3qg2069cx2b9lk0nsyc3jxsqp9hbn6i"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "04v1gj5nmmcizyrsg6b87qsfzw2zqi57vf1zlnq8680yc54qdah9"; + cargoSha256 = "0zfdsnrnxplvi4f92l7sqdp5yk5p738ra64m41izlcilkwj1j3vp"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 11a94ebcce5..ec81063e67e 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial, python27, setJavaClassPath, +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, which, icu, ruby, bzip2, glibc # gfortran, readline, bzip2, lzma, pcre, curl, ed, tree ## WIP: fastr deps }: let version = "19.1.1"; + mercurial = mercurial_4; truffleMake = ./truffle.make; makeMxGitCache = list: out: '' mkdir ${out} @@ -242,10 +243,7 @@ in rec { 'method->name_and_sig_as_C_string(), p2i(method->native_function()), p2i(entry)' || exit -1 ''; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=format-overflow" # newly detected by gcc7 - "-Wno-error=nonnull" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=nonnull"; buildPhase = '' export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache} diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 7066744bb54..08ba9e46814 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). - cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include"; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; prePatch = '' substituteInPlace ./configure \ diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index fccdf7a978d..e98d7cc27db 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { pname = "iasl"; - version = "20190108"; + version = "20191213"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; + sha256 = "1ip684is3dplf7snkn024vv6bg3dv5msx8v7pz6x9lrnk3gk0j9h"; }; - NIX_CFLAGS_COMPILE = [ - "-O3" - ]; + NIX_CFLAGS_COMPILE = "-O3"; - buildFlags = "iasl"; + buildFlags = [ "iasl" ]; buildInputs = [ bison flex ]; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index a6384c449c8..6ad3f96bf59 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.60"; + version = "1.3.61"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1frgnirrl795m8xydngrbn73np5gwgs7wymr9j81d0gz4gzpry8j"; + sha256 = "073vb402b03llscgr298iih5lc3y1dn1qxyid2i9hiyrsld1a09r"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 03e6fa82b9d..fff6435b29e 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; postUnpack = '' - patchShebangs . + patchShebangs . '' + stdenv.lib.optionalString (!bootstrapVersion) '' @@ -76,47 +76,31 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - - ++ stdenv.lib.optional (!bootstrapVersion) [ - bootstrapLdc python lit - ] - - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) [ - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ] - - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ - llvm_8 - ] - - ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) [ - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - gdb - ] - - ++ stdenv.lib.optional (bootstrapVersion) [ - libconfig llvm_5 - ] - - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); + ++ stdenv.lib.optionals (!bootstrapVersion) [ + bootstrapLdc python lit + ] + ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) + llvm_8 + ++ stdenv.lib.optional (!bootstrapVersion && !stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ++ stdenv.lib.optionals (bootstrapVersion) [ + libconfig llvm_5 + ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin + darwin.apple_sdk.frameworks.Foundation; buildInputs = [ curl tzdata ]; - cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) '' + cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J$PWD" "-DCMAKE_BUILD_TYPE=Release" - ''; - - preConfigure = stdenv.lib.optionalString (!bootstrapVersion) '' - cmakeFlagsArray=( - ${cmakeFlagsString} - ) - ''; + ]; postConfigure = '' export DMD=$PWD/bin/ldmd2 @@ -124,7 +108,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DMD=$DMD" ]; - fixNames = if stdenv.hostPlatform.isDarwin then '' + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' fixDarwinDylibNames() { local flags=() @@ -141,15 +125,11 @@ stdenv.mkDerivation rec { fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") export DYLD_LIBRARY_PATH=$(pwd)/lib - '' - else - ""; + ''; # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = if stdenv.hostPlatform.isDarwin then - "|druntime-test-shared" - else - ""; + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; doCheck = !bootstrapVersion; diff --git a/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch new file mode 100644 index 00000000000..1058cd03176 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/clang/0001-Fix-compilation-w-gcc9.patch @@ -0,0 +1,63 @@ +From 7225c7754cc3431d05df367c60f309f27586f188 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Mon, 30 Dec 2019 01:42:52 +0100 +Subject: [PATCH] Fix compilation w/gcc9 + +Build broken with the following errors: + +``` +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6078:55: error: lambda parameter 'CGF' previously declared as a capture +clang> 6078 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6126:53: error: lambda parameter 'CGF' previously declared as a capture +clang> 6126 | &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6191:56: error: lambda parameter 'CGF' previously declared as a capture +clang> 6191 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +``` + +This was due to a bug about name-collisions fixed in GCC 9.0[1]. + +[1] http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2211 +--- + lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp +index 6a0edbe..96c281c 100644 +--- a/lib/CodeGen/CGOpenMPRuntime.cpp ++++ b/lib/CodeGen/CGOpenMPRuntime.cpp +@@ -6073,7 +6073,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, + // Generate the code for the opening of the data environment. Capture all the + // arguments of the runtime call by reference because they are used in the + // closing of the region. +- auto &&BeginThenGen = [&D, &CGF, &BasePointersArray, &PointersArray, ++ auto &&BeginThenGen = [&D, &BasePointersArray, &PointersArray, + &SizesArray, &MapTypesArray, Device, + &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. +@@ -6121,7 +6121,7 @@ void CGOpenMPRuntime::emitTargetDataCalls(CodeGenFunction &CGF, + }; + + // Generate code for the closing of the data region. +- auto &&EndThenGen = [&CGF, &BasePointersArray, &PointersArray, &SizesArray, ++ auto &&EndThenGen = [&BasePointersArray, &PointersArray, &SizesArray, + &MapTypesArray, Device, + &NumOfPtrs](CodeGenFunction &CGF, PrePostActionTy &) { + assert(BasePointersArray && PointersArray && SizesArray && MapTypesArray && +@@ -6188,7 +6188,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( + "Expecting either target enter, exit data, or update directives."); + + // Generate the code for the opening of the data environment. +- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { ++ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapValuesArrayTy BasePointers; + MappableExprsHandler::MapValuesArrayTy Pointers; +-- +2.23.1 + diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 3d09277ad4c..1666b3d842d 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -27,7 +27,10 @@ let (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"); - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./0001-Fix-compilation-w-gcc9.patch + ]; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp diff --git a/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch b/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch new file mode 100644 index 00000000000..ea934257408 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/clang/0001-Fix-compilation-w-gcc9.patch @@ -0,0 +1,59 @@ +From a2af0b02eba35d0670e3e442ff7c61b3e2304edd Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Mon, 30 Dec 2019 02:11:35 +0100 +Subject: [PATCH] Fix compilation w/gcc9 + +Build broken with the following errors: + +``` +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6275:24: error: lambda parameter 'CGF' previously declared as a capture +clang> 6275 | CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6321:62: error: lambda parameter 'CGF' previously declared as a capture +clang> 6321 | auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, +clang> | ~~~~~~~~~~~~~~~~~^~~ +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp: In lambda function: +clang> /build/clang/lib/CodeGen/CGOpenMPRuntime.cpp:6400:56: error: lambda parameter 'CGF' previously declared as a capture +clang> 6400 | auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { +clang> | ~~~~~~~~~~~~~~~~~^~~ +``` +--- + lib/CodeGen/CGOpenMPRuntime.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/CodeGen/CGOpenMPRuntime.cpp b/lib/CodeGen/CGOpenMPRuntime.cpp +index 4025217..40a73ef 100644 +--- a/lib/CodeGen/CGOpenMPRuntime.cpp ++++ b/lib/CodeGen/CGOpenMPRuntime.cpp +@@ -6271,7 +6271,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( + // Generate the code for the opening of the data environment. Capture all the + // arguments of the runtime call by reference because they are used in the + // closing of the region. +- auto &&BeginThenGen = [&D, &CGF, Device, &Info, &CodeGen, &NoPrivAction]( ++ auto &&BeginThenGen = [&D, Device, &Info, &CodeGen, &NoPrivAction]( + CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapBaseValuesArrayTy BasePointers; +@@ -6318,7 +6318,7 @@ void CGOpenMPRuntime::emitTargetDataCalls( + }; + + // Generate code for the closing of the data region. +- auto &&EndThenGen = [&CGF, Device, &Info](CodeGenFunction &CGF, ++ auto &&EndThenGen = [Device, &Info](CodeGenFunction &CGF, + PrePostActionTy &) { + assert(Info.isValid() && "Invalid data environment closing arguments."); + +@@ -6397,7 +6397,7 @@ void CGOpenMPRuntime::emitTargetDataStandAloneCall( + "Expecting either target enter, exit data, or update directives."); + + // Generate the code for the opening of the data environment. +- auto &&ThenGen = [&D, &CGF, Device](CodeGenFunction &CGF, PrePostActionTy &) { ++ auto &&ThenGen = [&D, Device](CodeGenFunction &CGF, PrePostActionTy &) { + // Fill up the arrays with all the mapped variables. + MappableExprsHandler::MapBaseValuesArrayTy BasePointers; + MappableExprsHandler::MapValuesArrayTy Pointers; +-- +2.23.1 + diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 6b67e2cc856..a90fbe6ae83 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -38,7 +38,10 @@ let ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; - patches = [ ./purity.patch ]; + patches = [ + ./purity.patch + ./0001-Fix-compilation-w-gcc9.patch + ]; postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp diff --git a/pkgs/development/compilers/llvm/4/fix-gcc9.patch b/pkgs/development/compilers/llvm/4/fix-gcc9.patch new file mode 100644 index 00000000000..8ea5ca97085 --- /dev/null +++ b/pkgs/development/compilers/llvm/4/fix-gcc9.patch @@ -0,0 +1,33 @@ +diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp +index f79cb0e6..c6279046 100644 +--- a/lib/Target/Mips/MipsFastISel.cpp ++++ b/lib/Target/Mips/MipsFastISel.cpp +@@ -32,6 +32,7 @@ + #include "llvm/MC/MCSymbol.h" + #include "llvm/Target/TargetInstrInfo.h" + #include "llvm/Support/Debug.h" ++#include <array> + + #define DEBUG_TYPE "mips-fastisel" + +@@ -1268,13 +1269,13 @@ bool MipsFastISel::fastLowerArguments() { + return false; + } + +- const ArrayRef<MCPhysReg> GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, +- Mips::A3}; +- const ArrayRef<MCPhysReg> FGR32ArgRegs = {Mips::F12, Mips::F14}; +- const ArrayRef<MCPhysReg> AFGR64ArgRegs = {Mips::D6, Mips::D7}; +- ArrayRef<MCPhysReg>::iterator NextGPR32 = GPR32ArgRegs.begin(); +- ArrayRef<MCPhysReg>::iterator NextFGR32 = FGR32ArgRegs.begin(); +- ArrayRef<MCPhysReg>::iterator NextAFGR64 = AFGR64ArgRegs.begin(); ++ std::array<MCPhysReg, 4> GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, ++ Mips::A3}}; ++ std::array<MCPhysReg, 2> FGR32ArgRegs = {{Mips::F12, Mips::F14}}; ++ std::array<MCPhysReg, 2> AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; ++ auto NextGPR32 = GPR32ArgRegs.begin(); ++ auto NextFGR32 = FGR32ArgRegs.begin(); ++ auto NextAFGR64 = AFGR64ArgRegs.begin(); + + struct AllocatedReg { + const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 5b5939e094d..317a5ea06f4 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -53,6 +53,13 @@ stdenv.mkDerivation ({ url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; }) + ./fix-gcc9.patch + (fetchpatch { + name = "llvm4-avoid-undefined-behavior-in-unittest.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/D32089-Avoid-undefined-behavior-in-unittest.patch?h=llvm40&id=f459b0bad8aa3b94bc2733d79d176071a32846a6"; + sha256 = "0x5q6a8lk6xg4ns4qh75fxvvmfnifwvyrq17ck85q8c0753i1irf"; + extraPrefix = ""; + }) ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/pkgs/development/compilers/llvm/5/fix-gcc9.patch b/pkgs/development/compilers/llvm/5/fix-gcc9.patch new file mode 100644 index 00000000000..eaf71f1468d --- /dev/null +++ b/pkgs/development/compilers/llvm/5/fix-gcc9.patch @@ -0,0 +1,33 @@ +diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp +index f79cb0e6..c6279046 100644 +--- a/lib/Target/Mips/MipsFastISel.cpp ++++ b/lib/Target/Mips/MipsFastISel.cpp +@@ -70,6 +70,7 @@ + #include <cassert> + #include <cstdint> + #include <new> ++#include <array> + + #define DEBUG_TYPE "mips-fastisel" + +@@ -1309,13 +1310,13 @@ bool MipsFastISel::fastLowerArguments() { + return false; + } + +- const ArrayRef<MCPhysReg> GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, +- Mips::A3}; +- const ArrayRef<MCPhysReg> FGR32ArgRegs = {Mips::F12, Mips::F14}; +- const ArrayRef<MCPhysReg> AFGR64ArgRegs = {Mips::D6, Mips::D7}; +- ArrayRef<MCPhysReg>::iterator NextGPR32 = GPR32ArgRegs.begin(); +- ArrayRef<MCPhysReg>::iterator NextFGR32 = FGR32ArgRegs.begin(); +- ArrayRef<MCPhysReg>::iterator NextAFGR64 = AFGR64ArgRegs.begin(); ++ std::array<MCPhysReg, 4> GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, ++ Mips::A3}}; ++ std::array<MCPhysReg, 2> FGR32ArgRegs = {{Mips::F12, Mips::F14}}; ++ std::array<MCPhysReg, 2> AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; ++ auto NextGPR32 = GPR32ArgRegs.begin(); ++ auto NextFGR32 = FGR32ArgRegs.begin(); ++ auto NextAFGR64 = AFGR64ArgRegs.begin(); + + struct AllocatedReg { + const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 97d0e0d5d84..d26af8438e7 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -50,6 +50,13 @@ stdenv.mkDerivation ({ name = "llvm-gcc8-type-mismatch.patch"; sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; }) + ./fix-gcc9.patch + #(fetchpatch { + # name = "llvm-fix-gcc9.patch"; + # url = "https://reviews.llvm.org/file/data/zs3ck5ryvc5n672fd2kw/PHID-FILE-byoqefzwmkd7qnlip4v2/file"; + # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; + # stripLen = 1; + #}) ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index b556a638f1f..df3d6e796aa 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation ({ "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildPackages.llvm_8}/bin/llvm-tblgen" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index bf9b1a32a83..1b779b118a7 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -9,11 +9,11 @@ let pname = "clang"; inherit version; - src = fetch "cfe" "0426ma80i41qsgzm1qdz81mjskck426diygxi2k5vji2gkpixa3v"; + src = fetch "clang" "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p"; unpackPhase = '' unpackFile $src - mv cfe-${version}* clang + mv clang-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} mv clang-tools-extra-* $sourceRoot/tools/extra @@ -73,7 +73,8 @@ let moveToOutput "lib/libclang.*" "$lib" moveToOutput "lib/libclang-cpp.*" "$lib" substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." mkdir -p $python/bin $python/share/clang/ mv $out/bin/{git-clang-format,scan-view} $python/bin diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 5826f0fbb35..75d0614b514 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "03ni43lbkp63lr3p6sc94dphqmvnz5av5mml0xmk930xvnbcvr2n"; + src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 1590d180c3f..c9e8ce91f0c 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -5,15 +5,15 @@ }: let - release_version = "9.0.0"; + release_version = "9.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "045cldmcfd8s33wyjlviifgpnw52yqicd6v4ysvdg4i96p78c77a"; + clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index daf8ed5a9ae..1166c7bd76c 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "136j3v7il9aq8wyp48klx6sifnl5asj4lf5c8yx08cjx5fbn4h9w"; + src = fetch "libcxx" "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index 7afff991e75..fbc9a3731ef 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "1s9haplqv8ashlsdx2psxiqxh50gqk2jp2vz5yn0djb56mw42l37"; + src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; diff --git a/pkgs/development/compilers/llvm/9/libunwind.nix b/pkgs/development/compilers/llvm/9/libunwind.nix index 5eba9e03c78..883c36baf06 100644 --- a/pkgs/development/compilers/llvm/9/libunwind.nix +++ b/pkgs/development/compilers/llvm/9/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "1chd1nz4bscrs6qa7p8sqgk5df86ll0frv0f451vhks2w44qsslp"; + src = fetch pname "1wb02ha3gl6p0a321hwpll74pz5qvjr11xmjqx62g288f1m10njk"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index c5baef4357e..775dc2e1905 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "14cgd34gr826qpxzhrkbz6qgm8ymds0hrsiznwzp42ax4f5p9iii"; + src = fetch pname "10hckfxpapfnh6y9apjiya2jpw9nmbbmh8ayijx89mrg7snjn9l6"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index ee281384c40..64f111502cc 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "lldb"; inherit version; - src = fetch pname "1507dl0xw03nppxpz2xsq4s30jdbkplx4w14za54ngqm3xm2yk0y"; + src = fetch pname "02gb3fbz09kyw8n71218v5v77ip559x3gqbcp8y3w6n3jpbryywa"; patches = [ ./lldb-procfs.patch ]; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index c8f78f5f7f2..acd3ec92897 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "117ymdz1by2nkfq1c2p9m4050dp848kbjbiv6nsfj8hzy9f5d86n"; - polly_src = fetch "polly" "0cyl2gsibf1dhqvkyw1qb0f8q58ib6cihzyh4f9kj9g77ll95ym4"; + src = fetch pname "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880"; + polly_src = fetch "polly" "1kqg0isv0kicnylrdp5iajlgd6alc0zx1l3cxc9hs8r3z6fwcjls"; unpackPhase = '' unpackFile $src @@ -126,7 +126,7 @@ in stdenv.mkDerivation (rec { "-DCAN_TARGET_i386=false" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" + "-DLLVM_TABLEGEN=${buildPackages.llvm_9}/bin/llvm-tblgen" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index a511aed2eb8..4e0a5535ae3 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "0nrv9np134b7c483jnq786spy3hbpj11d7g21g67cqq66c8ynycr"; + src = fetch pname "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index dee0b351a60..bdb16c92207 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -14,13 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ - "-lcrypto" - "-lpcre" - "-lreadline" - "-lgc" - "-lsqlite3" - ]; + NIX_LDFLAGS = "-lcrypto -lpcre -lreadline -lgc -lsqlite3"; # we could create a separate derivation for the "written in c" version of nim # used for bootstrapping, but koch insists on moving the nim compiler around diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 556aefd3704..a6d2bcd875e 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (rec { prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; - buildFlags = "world bootstrap world.opt"; + buildFlags = [ "world" "bootstrap" "world.opt" ]; buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 4be41490534..f582ef9834a 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -7,10 +7,10 @@ let in stdenv.mkDerivation rec { - + pname = "ocaml"; version = "3.11.2"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-3.11/${pname}-${version}.tar.bz2"; sha256 = "86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; prePatch = '' diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index edb3acdbdb1..1026b1bd8d7 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -7,10 +7,10 @@ let in stdenv.mkDerivation rec { - + pname = "ocaml"; version = "3.12.1"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-3.12/${pname}-${version}.tar.bz2"; sha256 = "13cmhkh7s6srnlvhg3s9qzh3a5dbk2m9qr35jzq922sylwymdkzd"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ]; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 2669e8224bf..a4b21251bd1 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -3,22 +3,22 @@ let useX11 = !stdenv.isAarch32 && !stdenv.isMips; useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "ocaml"; version = "4.00.1"; - + src = fetchurl { url = "https://caml.inria.fr/pub/distrib/ocaml-4.00/${pname}-${version}.tar.bz2"; sha256 = "33c3f4acff51685f5bfd7c260f066645e767d4e865877bf1613c176a77799951"; }; prefixKey = "-prefix "; - configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ]; + configureFlags = [ "-no-tk" ] ++ optionals useX11 [ "-x11lib" xlibsWrapper ]; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; + buildInputs = [ ncurses ] ++ optional useX11 xlibsWrapper; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = '' CAT=$(type -tp cat) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d39c0d86fd5..6980b6e5ff1 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation (args // { ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ; - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses ++ optionals useX11 [ libX11 xorgproto ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; + installTargets = [ "install" ] ++ optional useNativeCompilers "installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index aa50cf225ca..1f53c4f0e78 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation ({ prefixKey = "-prefix "; configureFlags = ["-no-tk" "-x11lib" xlibsWrapper]; - buildFlags = "world bootstrap world.opt"; + buildFlags = [ "world" "bootstrap" "world.opt" ]; buildInputs = [xlibsWrapper ncurses]; installTargets = "install installopt"; patchPhase = '' diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index e365b9b28b3..b8381feef09 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -61,13 +61,13 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; - NIX_LDFLAGS = lib.optionals (!headless) [ + NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 4debf10c0cb..c6b3644fecc 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -140,7 +140,7 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "-Wno-error=deprecated-declarations" @@ -151,13 +151,13 @@ let "-fno-delete-null-pointer-checks" "-std=gnu++98" "-Wno-error" - ]; + ]); - NIX_LDFLAGS= lib.optionals (!headless) [ + NIX_LDFLAGS= toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 03121daf961..b2d511173c4 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -69,13 +69,13 @@ let separateDebugInfo = true; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; - NIX_LDFLAGS = lib.optionals (!headless) [ + NIX_LDFLAGS = toString (lib.optionals (!headless) [ "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" ] ++ lib.optionals (!headless && enableGnome2) [ "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" - ]; + ]); buildFlags = [ "all" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 43fe8ed8387..c6bff396108 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -84,7 +84,7 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; stripDebugList = [ "." ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 356ac4800d9..30c8d36fdfc 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -84,7 +84,7 @@ in makePackage { ''; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; stripDebugList = [ "." ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 33a3a1216dd..f5bcfa20aa0 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { pname = "ponyc"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz"; + sha256 = "0wqbnvxdzzwr9q4v9ha9r9jjymr6y8ba1rb2lkzrng4g9p6xqbxy"; }; buildInputs = [ llvm makeWrapper which libxml2 ]; @@ -54,6 +54,8 @@ stdenv.mkDerivation ( rec { checkTarget = "test-ci"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-move" ]; + preCheck = '' export PONYPATH="$out/lib:${stdenv.lib.makeLibraryPath [ pcre2 libressl ]}" ''; diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix index 99519c53fcd..bf2594b9bf4 100644 --- a/pkgs/development/compilers/rgbds/default.nix +++ b/pkgs/development/compilers/rgbds/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv"; }; nativeBuildInputs = [ bison flex pkg-config libpng ]; - installFlags = "PREFIX=\${out}"; + installFlags = [ "PREFIX=\${out}" ]; meta = with stdenv.lib; { homepage = https://rednex.github.io/rgbds/; diff --git a/pkgs/development/compilers/rust/1_39_0.nix b/pkgs/development/compilers/rust/1_39_0.nix deleted file mode 100644 index cc07590dedc..00000000000 --- a/pkgs/development/compilers/rust/1_39_0.nix +++ /dev/null @@ -1,21 +0,0 @@ -import ./default.nix { - rustcVersion = "1.39.0"; - rustcSha256 = "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.38.0"; - - # fetch hashes by running `print-hashes.sh 1.38.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af"; - x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221"; - arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a"; - armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4"; - aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda"; - i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8"; - x86_64-apple-darwin = "bd301b78ddcd5d4553962b115e1dca5436dd3755ed323f86f4485769286a8a5a"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_39_0; -} diff --git a/pkgs/development/compilers/rust/1_40_0.nix b/pkgs/development/compilers/rust/1_40_0.nix new file mode 100644 index 00000000000..2280605439f --- /dev/null +++ b/pkgs/development/compilers/rust/1_40_0.nix @@ -0,0 +1,29 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# 3. Firefox and Thunderbird should still build on x86_64-linux. +import ./default.nix { + rustcVersion = "1.40.0"; + rustcSha256 = "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.39.0"; + + # fetch hashes by running `print-hashes.sh 1.39.0` + bootstrapHashes = { + i686-unknown-linux-gnu = "36e31b3069c5be4b1fe3c8f7588ca787f13f91ab7170d2b24c6b07285816d0e5"; + x86_64-unknown-linux-gnu = "b10a73e5ba90034fe51f0f02cb78f297ed3880deb7d3738aa09dc5a4d9704a25"; + arm-unknown-linux-gnueabihf = "ea08d78a718cd34e67733526c70f3be460605dec8284bdeda36e0c6dd6222eca"; + armv7-unknown-linux-gnueabihf = "41186745a97e6b76fb7a3a049882fb4869b526e98a66c05a133518515037f0d7"; + aarch64-unknown-linux-gnu = "e27dc8112fe577012bd88f30e7c92dffd8c796478ce386c49465c03b6db8209f"; + i686-apple-darwin = "0ada2ed87cc449ed470dce3b57b15bfd5c8c52b01d6116e6b1edc9a3e97836aa"; + x86_64-apple-darwin = "3736d49c5e9592844e1a5d5452883aeaf8f1e25d671c1bc8f01e81c1766603b5"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_40_0; +} diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 91a31be9f8d..f639d330566 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,4 @@ -{ stdenv, file, curl, pkgconfig, python, openssl, cmake, zlib +{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib , makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2 , CoreFoundation, Security }: @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { dontUpdateAutotoolsGnuConfigScripts = true; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; - buildInputs = [ cacert file curl python openssl zlib libgit2 ] + buildInputs = [ cacert file curl python3 openssl zlib libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ]; LIBGIT2_SYS_USE_PKG_CONFIG = 1; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 75104ac7ad5..60e31c6def4 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -19,17 +19,17 @@ }.${cpu.name} or cpu.name; in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; - makeRustPlatform = { rustc, cargo, ... }: { + makeRustPlatform = { rustc, cargo, ... }: rec { rust = { inherit rustc cargo; }; - buildRustPackage = callPackage ../../../build-support/rust { - inherit rustc cargo; + fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix { + inherit cargo; + }; - fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix { - inherit cargo; - }; + buildRustPackage = callPackage ../../../build-support/rust { + inherit rustc cargo fetchcargo; }; rustcSrc = callPackage ./rust-src.nix { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index ca9bf05b7e7..e5c8a709a90 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,5 +1,5 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget -, fetchurl, file, python2 +, fetchurl, file, python3 , llvm_9, darwin, git, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi @@ -9,7 +9,7 @@ }: let - inherit (stdenv.lib) optional optionalString; + inherit (stdenv.lib) optionals optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { # See: https://github.com/NixOS/nixpkgs/pull/56540#issuecomment-471624656 stripDebugList = [ "bin" ]; - NIX_LDFLAGS = + NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" - ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; + ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -83,12 +83,12 @@ in stdenv.mkDerivation rec { "${setBuild}.cxx=${cxxForBuild}" "${setHost}.cxx=${cxxForHost}" "${setTarget}.cxx=${cxxForTarget}" - ] ++ optional (!withBundledLLVM) [ + ] ++ optionals (!withBundledLLVM) [ "--enable-llvm-link-shared" "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" - ] ++ optional stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ "--enable-profiler" # build libprofiler_builtins ]; @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ - file python2 rustPlatform.rust.rustc git cmake + file python3 rustPlatform.rust.rustc git cmake which libffi removeReferencesTo pkgconfig ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 285f2cd2ebe..23e6c64f3ff 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -7,26 +7,23 @@ assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; + jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; - sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm"; + sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; }; - buildSharedLibs = stdenv.hostPlatform.isLinux; in stdenv.mkDerivation rec { pname = "solc"; - version = "0.5.12"; + version = "0.5.15"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "0b9m9jhdz5lgrhrkngj1xnggxp1f6z8pzh29acsz3298l77kfk3z"; + sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; }; - patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; - postPatch = '' substituteInPlace cmake/jsoncpp.cmake \ --replace "${jsoncppURL}" ${jsoncpp} @@ -34,8 +31,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" - ] ++ stdenv.lib.optionals buildSharedLibs [ - "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" ] ++ stdenv.lib.optionals (!cvc4Support) [ @@ -74,8 +69,6 @@ stdenv.mkDerivation rec { popd ''; - outputs = [ "out" "dev" ]; - meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; homepage = https://github.com/ethereum/solidity; diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch deleted file mode 100644 index 382d49599c7..00000000000 --- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0c05208f..8893648e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,6 +48,22 @@ add_subdirectory(libevmasm) - add_subdirectory(libsolidity) - add_subdirectory(libsolc) - -+install(DIRECTORY libdevcore/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore -+ FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY libevmasm/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevmasm -+ FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY libsolidity/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity -+ FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY libyul/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul -+ FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY liblangutil/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil -+ FILES_MATCHING PATTERN "*.h") -+ - if (NOT EMSCRIPTEN) - add_subdirectory(solc) - add_subdirectory(liblll) -diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt -index fa7e3f48..1f9f52b4 100644 ---- a/libdevcore/CMakeLists.txt -+++ b/libdevcore/CMakeLists.txt -@@ -6,3 +6,4 @@ target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Bo - target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}") - target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS}) - add_dependencies(devcore solidity_BuildInfo.h) -+install(TARGETS devcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt -index 86192c1b..e7f15e93 100644 ---- a/libevmasm/CMakeLists.txt -+++ b/libevmasm/CMakeLists.txt -@@ -3,3 +3,4 @@ file(GLOB headers "*.h") - - add_library(evmasm ${sources} ${headers}) - target_link_libraries(evmasm PUBLIC devcore) -+install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt -index 0bdec4b4..e876177e 100644 ---- a/libsolidity/CMakeLists.txt -+++ b/libsolidity/CMakeLists.txt -@@ -29,6 +29,7 @@ endif() - - add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS}) - target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system) -+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if (${Z3_FOUND}) - target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) ---- a/libyul/CMakeLists.txt -+++ b/libyul/CMakeLists.txt -@@ -43,3 +43,4 @@ endif() - optimiser/VarDeclPropagator.cpp - ) - target_link_libraries(yul PUBLIC evmasm devcore langutil) -+install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ---- a/liblangutil/CMakeLists.txt -+++ b/liblangutil/CMakeLists.txt -@@ -11,3 +11,4 @@ endif() - - add_library(langutil ${sources}) - target_link_libraries(langutil PUBLIC devcore) -+install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix new file mode 100644 index 00000000000..015c955000c --- /dev/null +++ b/pkgs/development/compilers/tinygo/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc +, avrdude, openocd, gcc-arm-embedded, makeWrapper }: + +buildGoModule rec { + pname = "tinygo"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "tinygo-org"; + repo = "tinygo"; + rev = "v${version}"; + sha256 = "03di8500dqk25giiajglcdf2gbc0jidsn8qsw2sxmkmnd1np7gyd"; + }; + + modSha256 = "0r3lfi1bj550sf3b7ysz62c2c33f8zfli8208xixj3jadycb6r3z"; + enableParallelBuilding = true; + subPackages = [ "." ]; + buildInputs = [ llvm clang-unwrapped makeWrapper ]; + propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ]; + + postInstall = '' + mkdir -p $out/share/tinygo + cp -a lib src targets $out/share/tinygo + wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo" + ln -sf $out/bin $out/share/tinygo + ''; + + meta = with lib; { + homepage = "https://tinygo.org/"; + description = "Go compiler for small places"; + license = licenses.bsd3; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 1cc96455be7..e6fdd03bb67 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-tabling=yes" ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index 433b6e6b32c..2d62bfede09 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # we test in checkPhase substituteInPlace Makefile \ --replace 'testsuite bin/z88dk-lib$(EXESUFFIX)' 'bin/z88dk-lib$(EXESUFFIX)'\ - --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' + --replace 'ALL_EXT = bin/zsdcc$(EXESUFFIX)' 'ALL_EXT =' ''; checkPhase = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} ''; - installTargets = "libs install"; + installTargets = [ "libs" "install" ]; meta = with stdenv.lib; { homepage = "https://www.z88dk.org"; diff --git a/pkgs/development/coq-modules/Cheerios/default.nix b/pkgs/development/coq-modules/Cheerios/default.nix index 4e75b9407de..14048d1b0d8 100644 --- a/pkgs/development/coq-modules/Cheerios/default.nix +++ b/pkgs/development/coq-modules/Cheerios/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/InfSeqExt/default.nix b/pkgs/development/coq-modules/InfSeqExt/default.nix index 5df96519e7f..ced2b7ce3db 100644 --- a/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/StructTact/default.nix b/pkgs/development/coq-modules/StructTact/default.nix index 2e4d12478b7..798aaabe677 100644 --- a/pkgs/development/coq-modules/StructTact/default.nix +++ b/pkgs/development/coq-modules/StructTact/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.5"; diff --git a/pkgs/development/coq-modules/Verdi/default.nix b/pkgs/development/coq-modules/Verdi/default.nix index d2e9660a630..3cf3a4e8d4b 100644 --- a/pkgs/development/coq-modules/Verdi/default.nix +++ b/pkgs/development/coq-modules/Verdi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { preConfigure = "patchShebangs ./configure"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ]; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index bffa5172b0e..ee08af40c51 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [./0001-changes-to-work-with-Coq-8.6.patch]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://www.ps.uni-saarland.de/autosubst/; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index fb45e591ec1..0d6d7f17216 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { buildInputs = with coq.ocamlPackages; [ ocaml camlp5 findlib coq ]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { license = licenses.lgpl2; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index defe52987aa..56aa005c4a9 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; buildInputs = [ coq coq.ocaml ] ++ (with coq.ocamlPackages; [ findlib elpi ]); - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 588172aea61..97703922395 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://github.com/coq-ext-lib/coq-ext-lib; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index 6228bd4be9d..aaf867baf25 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bignums ]; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { description = "Library to certify primality using Pocklington certificate and Elliptic Curve Certificate"; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index e5fa11c5cad..97bb884c92e 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { homepage = http://c-corn.github.io/; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 401cb299497..49288d3cb32 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation { mkdir -p $out/bin ''; - installFlags = '' - COQLIB=$(out)/lib/coq/${coq.coq-version}/ - BINDIR=$(out)/bin - ''; + installFlags = [ + "COQLIB=$(out)/lib/coq/${coq.coq-version}/" + "BINDIR=$(out)/bin" + ]; meta = { description = "Build dependency graphs between Coq objects"; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index b6efd3d75a4..9ea9ac21671 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preBuild = "coq_makefile -f _CoqProject -o Makefile"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://mattam82.github.io/Coq-Equations/; diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 03149bab58b..5d3c94c5f5c 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { preBuild = "cd src"; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ]; meta = with stdenv.lib; { homepage = https://www.mpi-sws.org/~gil/Heq/; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 67441e9cdd8..92484f169c1 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { coq.ocamlPackages.camlp5 ; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { description = "A robust and expressive tactic language for Coq"; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 82802b8f30e..7aad4261fd3 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq bignums ]; enableParallelBuilding = true; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { homepage = https://math-classes.github.io; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 3c0a9632c95..647a13afa8f 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -92,7 +92,7 @@ let attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version); enableParallelBuilding = true; - buildFlags = optionalString withDoc "doc"; + buildFlags = optional withDoc "doc"; COQBIN = "${coq}/bin/"; diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index c342c25a411..2df9cbe58c7 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -74,7 +74,7 @@ versions = { core-deps = with coqPackages; [ mathcomp-field_1_9 ]; extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; }; - }; + }; "1.8.0" = { finmap.version = "1.2.1"; bigenough.version = "1.0.0"; @@ -154,7 +154,7 @@ packageGen = { propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; - installFlags = "-f Makefile.coq COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { inherit description; diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a8dd74dd5fb..a57d1bc9088 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) ; - installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; passthru = { compatibleCoqVersions = v: builtins.hasAttr v params; diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index fb966f762bc..119261f412b 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq ]; - installFlags = "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib"; + installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; meta = { homepage = "http://www.chargueraud.org/softs/tlc/"; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index b3c583da51e..1bffb71e8f9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -14,6 +14,10 @@ , modRoot ? "./" # modSha256 is the sha256 of the vendored dependencies +# +# CAUTION: if `null` is used as a value, the derivation won't be a +# fixed-output derivation but disable the build sandbox instead. Don't use +# this in nixpkgs as Hydra won't build those packages. , modSha256 # We want parallel builds by default @@ -84,10 +88,16 @@ let ''; dontFixup = true; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = modSha256; - }; in modArgs // overrideModAttrs modArgs); + }; in modArgs // ( + if modSha256 == null then + { __noChroot = true; } + else + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = modSha256; + } + ) // overrideModAttrs modArgs); package = go.stdenv.mkDerivation (args // { nativeBuildInputs = [ removeReferencesTo go ] ++ nativeBuildInputs; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 41bfb2ef62a..eff4c699625 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { name = "sdl-env"; paths = buildInputs; }; - in "SDLMINUSI=-I${sdl}/include/SDL"; + in [ "SDLMINUSI=-I${sdl}/include/SDL" ]; meta = with stdenv.lib; { description = "Guile bindings for SDL"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90030c0c8d1..7b06628dbc7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -74,7 +74,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 = "04l1yrjq7n4nlzkmkg73xp6p7vpw1iq53mrmyb8162wqb7zapg4f"; + sha256 = "1i4arhwbc05iz8hl7kk843m2f49i3ysby1kxcm9qfhpk7z9nyzj4"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -643,7 +643,7 @@ self: super: { # ideal, but Chris doesn't seem to make official releases any more. structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: { src = pkgs.fetchFromGitHub { - owner = "chrisdone"; + owner = "projectional-haskell"; repo = "structured-haskell-mode"; rev = "7f9df73f45d107017c18ce4835bbc190dfe6782e"; sha256 = "1jcc30048j369jgsbbmkb63whs4wb37bq21jrm3r6ry22izndsqa"; @@ -659,15 +659,6 @@ self: super: { ln -s $lispdir $data/share/emacs/site-lisp ''; }); - descriptive = overrideSrc super.descriptive { - version = "20180514-git"; - src = pkgs.fetchFromGitHub { - owner = "chrisdone"; - repo = "descriptive"; - rev = "c088960113b2add758553e41cbe439d183b750cd"; - sha256 = "17p65ihcvm1ghq23ww6phh8gdj7hwxlypjvh9jabsxvfbp2s8mrk"; - }; - }; # Make elisp files available at a location where people expect it. hindent = (overrideCabal super.hindent (drv: { @@ -754,7 +745,7 @@ self: super: { substituteInPlace conf.py --replace "'.md': CommonMarkParser," "" ''; nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; - makeFlags = "html"; + makeFlags = [ "html" ]; installPhase = '' mv _build/html $out ''; @@ -1057,7 +1048,30 @@ self: super: { generateOptparseApplicativeCompletion "dhall" ( dontCheck super.dhall ); - dhall_1_28_0 = dontCheck super.dhall_1_28_0; + # https://github.com/dhall-lang/dhall-haskell/commit/dedd5e0ea6fd12f87d887af3d2220eebc61ee8af + # This raises the lower bound on prettyprinter to 1.5.1 since + # `removeTrailingWhitespace` is buggy in earlier versions. + # This will probably be able to be removed when we update to LTS-15. + dhall_1_28_0 = + dontCheck (super.dhall_1_28_0.override { + prettyprinter = self.prettyprinter_1_5_1; + prettyprinter-ansi-terminal = + self.prettyprinter-ansi-terminal.override { + prettyprinter = self.prettyprinter_1_5_1; + }; + }); + dhall-bash_1_0_25 = super.dhall-bash_1_0_25.override { dhall = self.dhall_1_28_0; }; + dhall-json_1_6_0 = super.dhall-json_1_6_0.override { + dhall = self.dhall_1_28_0; + prettyprinter = self.prettyprinter_1_5_1; + prettyprinter-ansi-terminal = + self.prettyprinter-ansi-terminal.override { + prettyprinter = self.prettyprinter_1_5_1; + }; + }; + + # Tests for dhall access the network. + dhall_1_27_0 = dontCheck super.dhall_1_27_0; # Missing test files in source distribution, fixed once 1.4.0 is bumped # https://github.com/dhall-lang/dhall-haskell/pull/997 @@ -1322,9 +1336,29 @@ self: super: { # needs newer version of the systemd package spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; }; - # ghcide needs the latest versions of haskell-lsp. - ghcide = super.ghcide.override { haskell-lsp = self.haskell-lsp_0_18_0_0; lsp-test = self.lsp-test_0_8_2_0; }; - haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; }; - lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; }; + # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more + # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi + glirc = doJailbreak super.glirc; + + # apply patches from https://github.com/snapframework/snap-server/pull/126 + # manually until they are accepted upstream + snap-server = overrideCabal super.snap-server (drv: { + patches = [(pkgs.fetchpatch { + # allow compilation with network >= 3 + url = https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch; + sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv"; + }) + (pkgs.fetchpatch { + # prefer fdSocket over unsafeFdSocket + url = https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch; + sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94"; + })]; + }); + + # https://github.com/haskell-servant/servant-blaze/issues/17 + servant-blaze = doJailbreak super.servant-blaze; + + # https://github.com/haskell-servant/servant-ekg/issues/15 + servant-ekg = doJailbreak super.servant-ekg; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix new file mode 100644 index 00000000000..e2164f8686f --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -0,0 +1,44 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # This compiler version needs llvm 9.x. + llvmPackages = pkgs.llvmPackages_9; + + # Disable GHC 8.10.x core libraries. + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghc-heap = null; + ghc-prim = null; + ghci = null; + haskeline = null; + hpc = null; + integer-gmp = null; + libiserv = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + rts = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; + +} diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index b785c531479..02f2f67462d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -91,7 +91,7 @@ self: super: { microlens-th = self.microlens-th_0_4_3_2; network = self.network_3_1_1_1; optparse-applicative = self.optparse-applicative_0_15_1_0; - pandoc = self.pandoc_2_9; + pandoc = self.pandoc_2_9_1; pandoc-types = self.pandoc-types_1_20; prettyprinter = self.prettyprinter_1_5_1; primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 0645db14eb0..ef6eada4c2d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.17 + # LTS Haskell 14.18 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -73,7 +73,7 @@ default-package-overrides: - alarmclock ==0.7.0.2 - alerts ==0.1.2.0 - alex ==3.2.5 - - alg ==0.2.12.0 + - alg ==0.2.13.0 - algebraic-graphs ==0.4 - Allure ==0.9.5.0 - almost-fix ==0.0.2 @@ -202,7 +202,7 @@ default-package-overrides: - bitcoin-types ==0.9.2 - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - - bits-extra ==0.0.1.4 + - bits-extra ==0.0.1.5 - bitvec ==1.0.2.0 - bitx-bitcoin ==0.12.0.0 - blake2 ==0.3.0 @@ -235,7 +235,7 @@ default-package-overrides: - bower-json ==1.0.0.1 - boxes ==0.1.5 - brick ==0.47.1 - - brittany ==0.12.1.0 + - brittany ==0.12.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.3.2.8 - bson-lens ==0.1.1 @@ -266,8 +266,8 @@ default-package-overrides: - cabal2spec ==2.2.2.1 - cabal-doctest ==1.0.8 - cabal-file-th ==0.2.6 - - cabal-rpm ==1.0.1 - - cache ==0.1.2.0 + - cabal-rpm ==1.0.2 + - cache ==0.1.3.0 - cacophony ==0.10.1 - calendar-recycling ==0.0.0.1 - call-stack ==0.1.0 @@ -371,7 +371,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.1.1 + - conduit ==1.3.1.2 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 @@ -523,9 +523,9 @@ default-package-overrides: - diagrams-core ==1.4.2 - diagrams-lib ==1.4.3 - diagrams-postscript ==1.4.1 - - diagrams-rasterific ==1.4.1.1 + - diagrams-rasterific ==1.4.2 - diagrams-solve ==0.1.1 - - diagrams-svg ==1.4.2 + - diagrams-svg ==1.4.3 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.3.4 @@ -595,7 +595,6 @@ default-package-overrides: - elm-bridge ==0.5.2 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm-street ==0.0.1 - emacs-module ==0.1.1 - email-validate ==2.3.2.12 - emd ==0.1.5.1 @@ -662,7 +661,7 @@ default-package-overrides: - fgl ==5.7.0.1 - fib ==0.1 - filecache ==0.4.1 - - file-embed ==0.0.11 + - file-embed ==0.0.11.1 - file-embed-lzma ==0 - filelock ==0.1.1.4 - filemanip ==0.3.6.3 @@ -670,8 +669,8 @@ default-package-overrides: - filepattern ==0.1.1 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - filtrable ==0.1.2.0 - - fin ==0.1 + - filtrable ==0.1.3.0 + - fin ==0.1.1 - FindBin ==0.0.5 - fingertree ==0.1.4.2 - finite-typelits ==0.1.4.2 @@ -718,7 +717,7 @@ default-package-overrides: - free-vl ==0.1.4 - friendly-time ==0.4.1 - frisby ==0.2.2 - - from-sum ==0.2.1.0 + - from-sum ==0.2.2.0 - frontmatter ==0.1.0.2 - fsnotify ==0.3.0.1 - fsnotify-conduit ==0.1.1.1 @@ -854,7 +853,7 @@ default-package-overrides: - HandsomeSoup ==0.4.2 - hapistrano ==0.3.10.0 - happy ==1.19.12 - - hasbolt ==0.1.3.6 + - hasbolt ==0.1.4.0 - hashable ==1.2.7.0 - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 @@ -895,7 +894,7 @@ default-package-overrides: - hedgehog ==1.0.1 - hedgehog-corpus ==0.1.0 - hedgehog-fn ==1.0 - - hedis ==0.12.10 + - hedis ==0.12.11 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1005,7 +1004,7 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==1.6.5 + - http2 ==2.0.3 - HTTP ==4000.3.14 - http-api-data ==0.4.1.1 - http-client ==0.6.4 @@ -1376,7 +1375,8 @@ default-package-overrides: - mono-traversable ==1.0.13.0 - mono-traversable-instances ==0.1.0.0 - mono-traversable-keys ==0.1.0 - - more-containers ==0.2.1.2 + - more-containers ==0.2.2.0 + - morpheus-graphql ==0.8.0 - mountpoints ==1.0.2 - mpi-hs ==0.5.3.0 - msgpack ==1.0.1.0 @@ -1387,12 +1387,12 @@ default-package-overrides: - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.1.3 - - multiset ==0.3.4.1 + - multiset ==0.3.4.3 - multistate ==0.8.0.2 - murmur3 ==1.0.3 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - - mustache ==2.3.0 + - mustache ==2.3.1 - mutable-containers ==0.3.4 - mwc-probability ==2.1.0 - mwc-probability-transition ==0.4 @@ -1558,7 +1558,7 @@ default-package-overrides: - persistable-record ==0.6.0.4 - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.9.2 - - persistent-iproute ==0.2.3 + - persistent-iproute ==0.2.4 - persistent-mysql ==2.9.0 - persistent-mysql-haskell ==0.5.2 - persistent-pagination ==0.1.1.0 @@ -1681,10 +1681,11 @@ default-package-overrides: - pure-zlib ==0.6.6 - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.11 + - PyF ==0.8.1.2 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qnap-decrypt ==0.3.5 - - qrcode-core ==0.9.1 + - qrcode-core ==0.9.2 - qrcode-juicypixels ==0.8.0 - quadratic-irrational ==0.1.0 - QuasiText ==0.1.2.6 @@ -1858,7 +1859,6 @@ default-package-overrides: - serialise ==0.2.1.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - - servant-auth-client ==0.4.0.0 - servant-auth-docs ==0.2.10.0 - servant-auth-server ==0.4.4.0 - servant-auth-swagger ==0.2.10.0 @@ -1923,7 +1923,7 @@ default-package-overrides: - silently ==1.2.5.1 - simple ==0.11.3 - simple-cabal ==0.1.1 - - simple-cmd ==0.2.0.1 + - simple-cmd ==0.2.1 - simple-cmd-args ==0.1.4 - simple-log ==0.9.12 - simple-reflect ==0.3.3 @@ -1986,7 +1986,7 @@ default-package-overrides: - StateVar ==1.2 - static-text ==0.2.0.4 - statistics ==0.15.1.1 - - stb-image-redux ==0.2.1.2 + - stb-image-redux ==0.2.1.3 - step-function ==0.2 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 @@ -2148,6 +2148,7 @@ default-package-overrides: - th-test-utils ==1.0.1 - th-utilities ==0.2.3.1 - thyme ==0.3.5.5 + - tidal ==1.4.5 - tile ==0.3.0.0 - time-compat ==1.9.2.2 - timeit ==2.0 @@ -2278,7 +2279,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.14.1 + - util ==0.1.15.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2341,8 +2342,8 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.28 - - warp-tls ==3.2.8 + - warp ==3.3.5 + - warp-tls ==3.2.9 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2367,7 +2368,6 @@ default-package-overrides: - windns ==0.1.0.1 - winery ==1.1.3 - wire-streams ==0.1.1.0 - - witherable ==0.3.4 - with-location ==0.1.0 - witness ==0.4 - wizards ==1.0.3 @@ -2489,6 +2489,7 @@ extra-packages: - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 + - dhall == 1.27.0 # required for spago 0.13.0. Probably can be removed when next version of spago is available. - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x @@ -2575,6 +2576,8 @@ package-maintainers: - elm-export-persistent - pipes-mongodb - streaming-wai + kiwi: + - glirc psibi: - path-pieces - persistent @@ -5080,7 +5083,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -6438,6 +6440,7 @@ broken-packages: - ip2proxy - ipatch - ipc + - ipfs - ipld-cid - ipopt-hs - ipprint @@ -6530,6 +6533,7 @@ broken-packages: - jmonkey - jni - jobqueue + - jobs-ui - join - join-api - joinlist @@ -7247,6 +7251,8 @@ broken-packages: - mmsyn2 - mmsyn4 - mmsyn6ukr + - mmsyn7h + - mmsyn7ukr - mmtf - mmtl - mmtl-base @@ -8063,7 +8069,6 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed - - postgresql-simple-url - postgresql-typed - postgresql-typed-lifted - postgrest @@ -9199,7 +9204,6 @@ broken-packages: - stack-run-auto - stack-type - stack-wrapper - - stack2cabal - stack2nix - stackage - stackage-build-plan diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 472e4c66fc7..9eedb0fed85 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -115,18 +115,18 @@ self: super: builtins.intersectAttrs super { hzk = overrideCabal super.hzk (drv: { preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper"; + configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ]; }); haskakafka = overrideCabal super.haskakafka (drv: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d haskakafka.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; }); # library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32 hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: { preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal"; - configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka"; + configureFlags = [ "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka" ]; })); # Foreign dependency name clashes with another Haskell package. @@ -592,12 +592,19 @@ self: super: builtins.intersectAttrs super { ''; }); - # On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to - # ensure it uses Nixpkgs' coreutils. git-annex = with pkgs; if (!stdenv.isLinux) then let path = stdenv.lib.makeBinPath [ coreutils ]; in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { + # This is an instance of https://github.com/NixOS/nix/pull/1085 + # Fails with: + # gpg: can't connect to the agent: File name too long + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Test.hs \ + --replace ', testCase "crypto" test_crypto' "" + ''; + # On Darwin, git-annex mis-detects options to `cp`, so we wrap the + # binary to ensure it uses Nixpkgs' coreutils. postFixup = '' wrapProgram $out/bin/git-annex \ --prefix PATH : "${path}" @@ -644,8 +651,8 @@ self: super: builtins.intersectAttrs super { # we can safely jailbreak spago and use the older directory package from # LTS-14. spagoWithOverrides = doJailbreak (super.spago.override { - # spago requires the latest version of dhall. - directory = self.dhall_1_28_0; + # spago requires dhall_1_27_0. + dhall = self.dhall_1_27_0; }); docsSearchAppJsFile = pkgs.fetchurl { @@ -683,13 +690,9 @@ self: super: builtins.intersectAttrs super { ''; }); - # Haddock generation is broken for spago. - # https://github.com/spacchetti/spago/issues/511 - spagoWithoutHaddocks = dontHaddock spagoFixHpack; - # Because of the problem above with pulling in hspec defaults to the # package.yaml file, the tests are disabled. - spagoWithoutChecks = dontCheck spagoWithoutHaddocks; + spagoWithoutChecks = dontCheck spagoFixHpack; in spagoWithoutChecks; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf16e534f3e..2ae33138696 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -40,7 +40,7 @@ in # They must be propagated to the environment of any executable linking with the library , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" -, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile +, platforms ? with stdenv.lib.platforms; all # GHC can cross-compile , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -131,9 +131,13 @@ let ''; crossCabalFlags = [ - "--with-ghc=${ghc.targetPrefix}ghc" + "--with-ghc=${ghcCommand}" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" - "--with-gcc=${stdenv.cc.targetPrefix}cc" + # Pass the "wrong" C compiler rather than none at all so packages that just + # use the C preproccessor still work, see + # https://github.com/haskell/cabal/issues/6466 for details. + "--with-gcc=${(if stdenv.hasCC then stdenv else buildPackages.stdenv).cc.targetPrefix}cc" + ] ++ optionals stdenv.hasCC [ "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" # use the one that comes with the cross compiler. @@ -156,7 +160,9 @@ let "--libsubdir=\\$abi/\\$libname" (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}") (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}") + ] ++ optionals stdenv.hasCC [ "--with-gcc=$CC" # Clang won't work without that extra information. + ] ++ [ "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0ec409dc8ed..ccd570427ca 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1611,8 +1611,8 @@ self: { }: mkDerivation { pname = "BiobaseEnsembl"; - version = "0.1.0.0"; - sha256 = "1knbi8azq5n8kdgmbx4f2d14x6z94vj540ickq4dcspmbvslr0kf"; + version = "0.2.0.0"; + sha256 = "0nfgadp5708rb3yzsq0cgiqkpv0rnh3fqil118zlw8akq61rd1m3"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring cereal containers deepseq directory either-unwrap text vector word8 @@ -12488,6 +12488,8 @@ self: { pname = "ListLike"; version = "4.6.3"; sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx"; + revision = "1"; + editedCabalFile = "1xi5mlk6jm73fdxsjcp41ffr3ygwwykcjf20c122k7hgpkzg1lms"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -13186,10 +13188,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2019.3.29"; - sha256 = "1lix2p2ly6pjag1gkqfjfdm1jnq5rd9hqgr940jbkgyna75hk9a9"; - revision = "1"; - editedCabalFile = "1hiz5g69n1fwknwq7lhq01kzn4cm53zd6l62r747pdc30xm04rqr"; + version = "0.2019.12.13"; + sha256 = "15v5yijhylrwy0lc4n9a8p75dadr9xc57xajgir3jg618l0wh5lc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -14075,7 +14075,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) net_snmp;}; + }) {net_snmp = null;}; "Network-NineP" = callPackage ({ mkDerivation, async, base, binary, bytestring, containers @@ -17571,6 +17571,8 @@ self: { pname = "SciBaseTypes"; version = "0.1.0.0"; sha256 = "1c0cgzxhamgswn1zhrarbx5vrmzl160nk8dadzi6mphwd2rv6lfr"; + revision = "1"; + editedCabalFile = "025v2s4097mzqyf5bzzz2xnxcc4nckcvaz72pnrxs3d8bbszd26i"; libraryHaskellDepends = [ aeson base binary cereal deepseq hashable lens log-domain mtl semirings vector vector-th-unbox @@ -18589,17 +18591,16 @@ self: { }) {}; "StockholmAlignment" = callPackage - ({ mkDerivation, base, colour, diagrams-cairo, diagrams-lib - , directory, either-unwrap, filepath, parsec, ParsecTools, SVGFonts - , text, vector + ({ mkDerivation, base, directory, either-unwrap, filepath, parsec + , ParsecTools, text, vector }: mkDerivation { pname = "StockholmAlignment"; - version = "1.2.0"; - sha256 = "0zz437d771cb4zpjzcddjl8xvz9qxmj1pyxql70lqczvqrk6k78y"; + version = "1.3.0"; + sha256 = "1wc23pmcw246na7zwd6ka6v00kxn754pr3b069y7zn8l0lxby45p"; libraryHaskellDepends = [ - base colour diagrams-cairo diagrams-lib directory either-unwrap - filepath parsec ParsecTools SVGFonts text vector + base directory either-unwrap filepath parsec ParsecTools text + vector ]; description = "Libary for Stockholm aligmnent format"; license = stdenv.lib.licenses.gpl3; @@ -19092,14 +19093,14 @@ self: { "Taxonomy" = callPackage ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl - , graphviz, parsec, text, vector + , parsec, text, vector }: mkDerivation { pname = "Taxonomy"; - version = "2.0.0"; - sha256 = "1b2x0lkg5pgjk1jyanbi8g9rs1sr7llihyjhdfsg6fajklrzh3m9"; + version = "2.1.0"; + sha256 = "1l64ma631q1gh57gwg09mpxz66hkhqbc9f9dn2bhy681p8ia7j50"; libraryHaskellDepends = [ - aeson base bytestring either-unwrap fgl graphviz parsec text vector + aeson base bytestring either-unwrap fgl parsec text vector ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; @@ -23561,16 +23562,17 @@ self: { "aeson-gadt-th" = callPackage ({ mkDerivation, aeson, aeson-qq, base, containers, dependent-map , dependent-sum, dependent-sum-template, hspec, HUnit - , template-haskell, transformers + , template-haskell, th-abstraction, th-extras, transformers }: mkDerivation { pname = "aeson-gadt-th"; - version = "0.2.1.2"; - sha256 = "1azms3ilfkqvyxxm2zjr55wali8vxx294lv924wn4ni5rqxhmjcq"; + version = "0.2.2"; + sha256 = "1nk0897569cldp7fhzc51mj8f93dx3nwk0fxy2pr41wmrbqrxw1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers dependent-sum template-haskell transformers + aeson base containers dependent-sum template-haskell th-abstraction + th-extras transformers ]; executableHaskellDepends = [ aeson base dependent-map dependent-sum dependent-sum-template @@ -24864,8 +24866,21 @@ self: { ({ mkDerivation, base, dual, util }: mkDerivation { pname = "alg"; - version = "0.2.12.0"; - sha256 = "0dglxav21z60jsjh6s14v466bg0z3m3wqx1c78kxk9cziz27dm3s"; + version = "0.2.13.0"; + sha256 = "1xv9nr21jvgk94d0cdc3xlp0fs7v3h4gcrx45aaqm6d2203lshz0"; + libraryHaskellDepends = [ base dual util ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "alg_0_2_13_1" = callPackage + ({ mkDerivation, base, dual, util }: + mkDerivation { + pname = "alg"; + version = "0.2.13.1"; + sha256 = "0764j2njb86qdskck3nvbrh61v99hqdhf8aj9irblm6smdlrv4l3"; libraryHaskellDepends = [ base dual util ]; description = "Algebraic structures"; license = stdenv.lib.licenses.bsd3; @@ -28142,6 +28157,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "amqp_0_19_0" = callPackage + ({ mkDerivation, base, binary, bytestring, clock, connection + , containers, data-binary-ieee754, hspec, hspec-expectations + , monad-control, network, network-uri, split, stm, text, vector + , xml + }: + mkDerivation { + pname = "amqp"; + version = "0.19.0"; + sha256 = "1v2jwf9y6mw9f89a9ca66p42da8g5n1ain89gjr7sv6v6r2jxinj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 monad-control network network-uri split stm + text vector + ]; + executableHaskellDepends = [ base containers xml ]; + testHaskellDepends = [ + base binary bytestring clock connection containers + data-binary-ieee754 hspec hspec-expectations network network-uri + split stm text vector + ]; + description = "Client library for AMQP servers (currently only RabbitMQ)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "amqp-conduit" = callPackage ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec , HUnit, lifted-base, monad-control, mtl, resourcet, text @@ -28166,18 +28209,19 @@ self: { "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, hinotify, magic, network, process, text, time - , tls, unix, x509-system + , data-default-class, directory, hinotify, magic, network, process + , text, time, tls, unix, utf8-string, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.4.1.0"; - sha256 = "1p0pvl88xp9m0b9k7nqxln3702kp4lk05f60mag3swa09rvzcg47"; + version = "0.4.2.0"; + sha256 = "1fycix8q5mbx975jwv659d0ag4h6yk7a6saxn4jy1xi8z8qsvdjr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ amqp base bytestring connection containers data-default-class - hinotify magic network process text time tls unix x509-system + directory hinotify magic network process text time tls unix + utf8-string x509-system ]; description = "Generic Haskell AMQP tools"; license = stdenv.lib.licenses.gpl3; @@ -28215,8 +28259,8 @@ self: { ({ mkDerivation, base, deepseq, parsec }: mkDerivation { pname = "amrun"; - version = "0.0.0.5"; - sha256 = "1y0azhsjarv26lkny1wckdz45bs87wbga29hbg6w59wc2gjkbxqz"; + version = "0.0.0.6"; + sha256 = "01hnjzlww282hjlc6vbn51qps577hx4ll3pz4g5kn0r4h2bylad9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base deepseq parsec ]; @@ -29352,8 +29396,8 @@ self: { }: mkDerivation { pname = "aosd"; - version = "0.2.1"; - sha256 = "0zma3ypjnqn8c9pk4zfyzzwn27l3wb6l6xnjjydn90fxsmpa1vh6"; + version = "0.2.2"; + sha256 = "1lx3afjniaj1dinik8mnqy8aam8ads55k7sr4hjmcqx85xwl4ssx"; libraryHaskellDepends = [ base bindings-DSL cairo colour monad-control pango transformers X11 ]; @@ -30766,8 +30810,8 @@ self: { }: mkDerivation { pname = "archive-sig"; - version = "0.2.0.2"; - sha256 = "0pfznlkw0vj8y1ahsmiy904hkhkf76qgqlp6h3hlgzrmhdy5yz9d"; + version = "0.2.1.2"; + sha256 = "03fwzl7pkb025adzv1jzh96k0h91b1w7arxza7q53i492n96qg8i"; libraryHaskellDepends = [ base bytestring composition-prelude dir-traverse ]; @@ -31094,20 +31138,19 @@ self: { }) {}; "arith-encode" = callPackage - ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers - , fgl, hashable, HUnit-Plus, unordered-containers + ({ mkDerivation, arithmoi, array, base, binary, containers + , hashable, HUnit-Plus, integer-logarithms, unordered-containers }: mkDerivation { pname = "arith-encode"; - version = "1.0.0"; - sha256 = "1wqm2jcc2dac31gvad6pmnq0wbajpj488h93xl93vfipsbak0cm8"; + version = "1.0.1"; + sha256 = "0dpfhn2xwjjf318f431s8xgnr827ayjak8s8cs6672la8rqgfpb5"; libraryHaskellDepends = [ - arithmoi array base binary Cabal containers fgl hashable + arithmoi array base binary containers hashable integer-logarithms unordered-containers ]; testHaskellDepends = [ - arithmoi array base binary Cabal containers fgl hashable HUnit-Plus - unordered-containers + base binary containers hashable HUnit-Plus unordered-containers ]; description = "A practical arithmetic encoding (aka Godel numbering) library"; license = stdenv.lib.licenses.bsd3; @@ -31722,6 +31765,21 @@ self: { broken = true; }) {}; + "ascii-holidays" = callPackage + ({ mkDerivation, base, random, random-shuffle, terminfo, time }: + mkDerivation { + pname = "ascii-holidays"; + version = "0.1.0.1"; + sha256 = "10ply90c2dwfgfz419q9nklm26w2xlxkz6ynqn9qfl7p9j6rhix0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base random random-shuffle terminfo time + ]; + description = "ASCII animations for the holidays!"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -32968,8 +33026,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.4.0.1"; - sha256 = "0lfmlsnxa7fvifqay4xvnkl8cpbx7a6vbfb0szvb5j0nfa8607n6"; + version = "3.4.0.5"; + sha256 = "1hqaz5sybj9cyd17k1883nq936jf6815sprxdgbdrbw7rsfx39al"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -34117,6 +34175,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro-piper" = callPackage + ({ mkDerivation, aeson, avro, base, bytestring, conduit + , conduit-combinators, conduit-extra, hedgehog, hspec + , hw-hspec-hedgehog, hw-kafka-avro, mtl, optparse-applicative + , scientific, stringsearch, text, unordered-containers + }: + mkDerivation { + pname = "avro-piper"; + version = "1.0.1"; + sha256 = "0py25d3y7jx9amcydfnkwipq3rhqpimh18qjvfj1jls8yi9jkvp0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson avro base bytestring conduit conduit-combinators + conduit-extra hw-kafka-avro mtl optparse-applicative scientific + stringsearch text unordered-containers + ]; + executableHaskellDepends = [ + aeson avro base bytestring conduit conduit-combinators + conduit-extra hw-kafka-avro mtl optparse-applicative scientific + stringsearch text unordered-containers + ]; + testHaskellDepends = [ + aeson avro base bytestring conduit conduit-combinators + conduit-extra hedgehog hspec hw-hspec-hedgehog hw-kafka-avro mtl + optparse-applicative scientific stringsearch text + unordered-containers + ]; + description = "Tool for decoding avro"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "avwx" = callPackage ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative , parsers, pretty-show, text @@ -35656,6 +35746,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "barbies-th" = callPackage + ({ mkDerivation, barbies, base, template-haskell }: + mkDerivation { + pname = "barbies-th"; + version = "0"; + sha256 = "12h6yzl1rqi24ybif5bciljazjxnbvhq5wi9iyjg8zhjmklb6sgr"; + libraryHaskellDepends = [ barbies base template-haskell ]; + testHaskellDepends = [ barbies base ]; + description = "Create strippable HKD via TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "barbly" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, mtl , optparse-applicative, shh, text @@ -40281,24 +40383,6 @@ self: { }) {}; "bits-extra" = callPackage - ({ mkDerivation, base, criterion, ghc-prim, hedgehog, hspec - , hspec-discover, hw-hedgehog, hw-hspec-hedgehog, vector - }: - mkDerivation { - pname = "bits-extra"; - version = "0.0.1.4"; - sha256 = "1hkl71661hh8czd7hrfwj48blav4g3jdy3nl06bw2iw8bkl00nz2"; - libraryHaskellDepends = [ base ghc-prim vector ]; - testHaskellDepends = [ - base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; - description = "Useful bitwise operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bits-extra_0_0_1_5" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-discover , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, vector @@ -40316,7 +40400,6 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; description = "Useful bitwise operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bits-extras" = callPackage @@ -40405,8 +40488,8 @@ self: { }: mkDerivation { pname = "bitstream"; - version = "0.2.0.4"; - sha256 = "1j00r6jv9yp0h476gz7yalrlnxhkrdrl1w73d3zl98kyf207q2sy"; + version = "0.3.0.0"; + sha256 = "12cyvrd7za5zh1idi5q4w0qbv0l4kjlsjascz6z4w2877zji7bvh"; libraryHaskellDepends = [ base base-unicode-symbols bytestring vector ]; @@ -42215,6 +42298,8 @@ self: { pname = "boots-app"; version = "0.2.0.1"; sha256 = "0wk177f6ljcqd0ya7cddvx3i6sdwx0wl9fz1idzfa8klb8pnkghh"; + revision = "1"; + editedCabalFile = "0a69kvlilg1nmyxvlbm79hidg0zwjrgd556nnl73k08mgsk2xj1v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43068,45 +43153,6 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.12.1.0"; - sha256 = "1r5nbw63hv5nq02lx6igin70lbzbdglldb2lf1m52jpiwwz5j0i4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty random safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - executableHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate - neat-interpolation pretty safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - testHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate - neat-interpolation parsec pretty safe semigroups strict syb text - transformers uniplate unsafe yaml - ]; - description = "Haskell source code formatter"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "brittany_0_12_1_1" = callPackage - ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs - , containers, czipwith, data-tree-print, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec - , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty - , random, safe, semigroups, strict, syb, text, transformers - , uniplate, unsafe, yaml - }: - mkDerivation { - pname = "brittany"; version = "0.12.1.1"; sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z"; isLibrary = true; @@ -43134,7 +43180,6 @@ self: { ]; description = "Haskell source code formatter"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broadcast-chan" = callPackage @@ -45953,8 +45998,8 @@ self: { }: mkDerivation { pname = "cabal-macosx"; - version = "0.2.4.1"; - sha256 = "01l0m11q5knq1n9vx73515dpzw1mwxf7qin8qfb5ci21yxg91mww"; + version = "0.2.4.2"; + sha256 = "1ah1bj32xcjqc90cqc7y5mkyg985h8ffb6nbbxlzxfr0a3nkzka8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46095,28 +46140,6 @@ self: { "cabal-rpm" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath - , http-client, http-client-tls, http-conduit, process, simple-cabal - , simple-cmd, simple-cmd-args, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "1.0.1"; - sha256 = "0p0z5yar9dzbssqy1flwvj15gnfyi708n9pf8ij8h15bya9qrg3a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal directory filepath http-client - http-client-tls http-conduit process simple-cabal simple-cmd - simple-cmd-args time unix - ]; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "cabal-rpm_1_0_2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, filepath , http-client, http-client-tls, http-conduit, optparse-applicative , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix }: @@ -46648,22 +46671,6 @@ self: { }: mkDerivation { pname = "cache"; - version = "0.1.2.0"; - sha256 = "12mxziwz8qn26v5xkp0bh13jqf9hd8pi9flm68nz82p15vhcs01s"; - libraryHaskellDepends = [ - base clock hashable stm transformers unordered-containers - ]; - testHaskellDepends = [ base clock hspec stm transformers ]; - description = "An in-memory key/value store with expiration support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cache_0_1_3_0" = callPackage - ({ mkDerivation, base, clock, hashable, hspec, stm, transformers - , unordered-containers - }: - mkDerivation { - pname = "cache"; version = "0.1.3.0"; sha256 = "0d75257kvjpnv95ja50x5cs77pj8ccfr0nh9q5gzvcps83qdksa2"; libraryHaskellDepends = [ @@ -46672,7 +46679,6 @@ self: { testHaskellDepends = [ base clock hspec stm transformers ]; description = "An in-memory key/value store with expiration support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached" = callPackage @@ -46874,8 +46880,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.6.1"; - sha256 = "04vjia6pfx5nkrjvxrjj774gsljmhzlyjm8ir88l32ygry2f0rbg"; + version = "0.13.8.0"; + sha256 = "09g93jzackry9yi4xsd5d6h75z0r7mbw2s2w7wd2af4dmp76l2d9"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -47350,8 +47356,8 @@ self: { ({ mkDerivation, base, deepseq, hspec, HUnit, mtl }: mkDerivation { pname = "can-i-haz"; - version = "0.3.0.0"; - sha256 = "0m77szr91q8p7n9c91chafzypiadi565a4k3y949m1cd3r3b0pjr"; + version = "0.3.1.0"; + sha256 = "0pwwl5pawvd1sygc8k7ichfk15inhcy4has40zplqqws5lmm6mz8"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base deepseq hspec HUnit mtl ]; description = "Generic implementation of the Has and CoHas patterns"; @@ -48700,6 +48706,19 @@ self: { broken = true; }) {}; + "category_0_2_5_0" = callPackage + ({ mkDerivation, alg, base, dual, transformers }: + mkDerivation { + pname = "category"; + version = "0.2.5.0"; + sha256 = "0iya7q3b1z1bxv4amsibmc1lrmf7dng76nzcnanwy300jm1n42w7"; + libraryHaskellDepends = [ alg base dual transformers ]; + description = "Categorical types and classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "category-extras" = callPackage ({ mkDerivation, adjunctions, bifunctors, categories, comonad , comonad-extras, comonad-transformers, comonads-fd, contravariant @@ -52483,15 +52502,12 @@ self: { }) {}; "cli-setup" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, process - }: + ({ mkDerivation, base, directory, process }: mkDerivation { pname = "cli-setup"; - version = "0.2.1.2"; - sha256 = "0fh9lp8r73mslhwxcjpfzvm0j0qbq0prr4bkkwq2v16izg14ccda"; - libraryHaskellDepends = [ - base bytestring directory file-embed process - ]; + version = "0.2.1.4"; + sha256 = "09ycy8500si810ysn70khc2np1zy21a1647kva8lkcj4pjbb1bvx"; + libraryHaskellDepends = [ base directory process ]; description = "Helper setup scripts for packaging command-line tools"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53777,8 +53793,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.3"; - sha256 = "0z4im9z5yi18kdw99d50zbcala619hba3iwka7ny5krladnz75ha"; + version = "0.1.2.5"; + sha256 = "1md3dyfaybhmfprw3qdwqvlh0r73wy8smf8j8jkdrlkxqw6vhd1f"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -53801,8 +53817,8 @@ self: { }: mkDerivation { pname = "cobot-tools"; - version = "0.1.2.1"; - sha256 = "0qd3w9y3fps7kkpkvdh3wd54mm9z6ikr16f9f8jvn2gza0xc4l0m"; + version = "0.1.2.2"; + sha256 = "07vazc4k8y867ba0m3pd177087cwdkdjmd5zkj39ravg44yx6hhm"; libraryHaskellDepends = [ array base bytestring cobot containers data-default data-msgpack deepseq lens mtl regex-tdfa text @@ -54138,6 +54154,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "coformat" = callPackage + ({ mkDerivation, aeson, async, async-pool, base, bytestring + , can-i-haz, command-qq, containers, dom-selector, extra + , fast-logger, generic-data, hashable, html-conduit, interpolate + , lens, lens-aeson, monad-logger, mtl, optparse-generic, scientific + , temporary, text, unordered-containers, xml-conduit, yaml + }: + mkDerivation { + pname = "coformat"; + version = "0.2.1.0"; + sha256 = "1s6nh389d6p8ll1v32hifamb1a8vhd194v86ff8r0in7bzc54kfj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async async-pool base bytestring can-i-haz command-qq + containers dom-selector extra fast-logger generic-data hashable + html-conduit interpolate lens lens-aeson monad-logger mtl + optparse-generic scientific temporary text unordered-containers + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson async async-pool base bytestring can-i-haz command-qq + containers dom-selector extra fast-logger generic-data hashable + html-conduit interpolate lens lens-aeson monad-logger mtl + optparse-generic scientific temporary text unordered-containers + xml-conduit yaml + ]; + testHaskellDepends = [ + aeson async async-pool base bytestring can-i-haz command-qq + containers dom-selector extra fast-logger generic-data hashable + html-conduit interpolate lens lens-aeson monad-logger mtl + optparse-generic scientific temporary text unordered-containers + xml-conduit yaml + ]; + description = "Generate clang-format config based on some existing code base"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cofunctor" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -56855,8 +56909,8 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.1.1"; - sha256 = "18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4"; + version = "1.3.1.2"; + sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mono-traversable mtl primitive resourcet text transformers unix unliftio-core vector @@ -59337,8 +59391,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.1"; - sha256 = "1cwypmis5dcdzjasq03wcas4lnml7l4a4ymw1v55aybfmz94mxc3"; + version = "3.1.1"; + sha256 = "0hja6fp7n4zrhm73fvjkisspc7cyp53blhn4maqis8lw27svjq66"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -60046,8 +60100,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.3.6"; - sha256 = "16kx2rlxkai9qswixx3145ajdnz3m0655cmv3gl37njdp3dwa8qf"; + version = "0.2.3.7"; + sha256 = "12hpi46p8fh36jq7xbgv16xihxx6hgpcn0bssc97zv3il4b5zk9m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68741,6 +68795,55 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_27_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, hashable, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-lift-instances + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.27.0"; + sha256 = "04hpf0g8anhynrc3gd96cg1z4qadrk2xg9094qjm68d2kv6zx2g1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring case-insensitive + cborg cborg-json containers contravariant cryptonite data-fix + deepseq Diff directory dotgen either exceptions filepath hashable + haskeline http-client http-client-tls http-types lens-family-core + megaparsec memory mtl network-uri optparse-applicative parsers + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text th-lift-instances + transformers transformers-compat unordered-containers uri-encode + vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random lens-family-core megaparsec + mockery prettyprinter QuickCheck quickcheck-instances scientific + semigroups serialise special-values spoon tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + transformers turtle unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge serialise text + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall_1_28_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers @@ -69696,27 +69799,6 @@ self: { }: mkDerivation { pname = "diagrams-rasterific"; - version = "1.4.1.1"; - sha256 = "0raki8c20s40y5xy2ax8y38xl3y40fb9qv95ax3qgnmi46s8fapp"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels - lens mtl optparse-applicative Rasterific - ]; - testHaskellDepends = [ base diagrams-core diagrams-lib ]; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-rasterific_1_4_2" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity - , hashable, JuicyPixels, lens, mtl, optparse-applicative - , Rasterific - }: - mkDerivation { - pname = "diagrams-rasterific"; version = "1.4.2"; sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l"; libraryHaskellDepends = [ @@ -69727,7 +69809,6 @@ self: { testHaskellDepends = [ base diagrams-core diagrams-lib ]; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -69789,27 +69870,6 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.4.2"; - sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal"; - revision = "2"; - editedCabalFile = "15sn85xaachw4cj56w61bjcwrbf4qmnkfl8mbgdapxi5k0y4f2qv"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl - optparse-applicative semigroups split svg-builder text - ]; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-svg_1_4_3" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, filepath, hashable - , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative - , semigroups, split, svg-builder, text - }: - mkDerivation { - pname = "diagrams-svg"; version = "1.4.3"; sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; libraryHaskellDepends = [ @@ -69819,7 +69879,6 @@ self: { ]; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -70772,14 +70831,14 @@ self: { }) {}; "dir-traverse" = callPackage - ({ mkDerivation, base, criterion, directory, dirstream, pipes - , pipes-safe, system-filepath + ({ mkDerivation, base, criterion, directory, dirstream, filepath + , pipes, pipes-safe, system-filepath }: mkDerivation { pname = "dir-traverse"; - version = "0.2.1.0"; - sha256 = "08xzl64clnx3mfx5bw82kpksagyl4bajkaxmbl1dpnmdc4jz35ks"; - libraryHaskellDepends = [ base directory ]; + version = "0.2.2.2"; + sha256 = "0wckqnfmdmfgp7kkvjc2pzg9610xqfnam5myv9xcq04cr3h3dy8g"; + libraryHaskellDepends = [ base directory filepath ]; benchmarkHaskellDepends = [ base criterion directory dirstream pipes pipes-safe system-filepath ]; @@ -70929,12 +70988,12 @@ self: { broken = true; }) {}; - "directory_1_3_4_0" = callPackage + "directory_1_3_5_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.4.0"; - sha256 = "19akp75rb3zwjfxcjamj05br865rd54y1gbyyfrb3a9506zcpsfm"; + version = "1.3.5.0"; + sha256 = "0lzx67630dsvwf3iraabdsqxbpzal2irbdxav87sq9bj818v1rb9"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -74410,6 +74469,19 @@ self: { broken = true; }) {}; + "dual_0_1_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dual"; + version = "0.1.0.3"; + sha256 = "1w8haw9q7cljiq58nh7fmywbgcxnx8xz33zx8gr9imkagh56gwv3"; + libraryHaskellDepends = [ base ]; + description = "Dual category"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dual-game" = callPackage ({ mkDerivation, base, bifunctors, cereal, gloss, network , websockets @@ -76208,8 +76280,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.10.1"; - sha256 = "047l2knxhzlrmc4n6xaannnwa1zhq7lxr3iswwrji5xcqbbag5xp"; + version = "3.10.2"; + sha256 = "04kk635qiv6y5g6y9gjhlh5x5ds7js127r8p2qdhq4da1yb39pqi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -77175,28 +77247,6 @@ self: { }) {}; "elm-street" = callPackage - ({ mkDerivation, aeson, base, directory, filepath, prettyprinter - , servant, servant-server, text, time, wai, warp - }: - mkDerivation { - pname = "elm-street"; - version = "0.0.1"; - sha256 = "09rc10k6g23wf7b095rk6i2d9h5axlcmfpimhmbpqhm8vyqg72l7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory filepath prettyprinter text time - ]; - executableHaskellDepends = [ - base servant servant-server wai warp - ]; - testHaskellDepends = [ base ]; - doHaddock = false; - description = "Crossing the road between Haskell and Elm"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "elm-street_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , hspec, prettyprinter, servant, servant-server, text, time, wai , warp @@ -77217,7 +77267,26 @@ self: { doHaddock = false; description = "Crossing the road between Haskell and Elm"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "elm-syntax" = callPackage + ({ mkDerivation, base, bound, deriving-compat, prettyprinter + , protolude, text, unordered-containers + }: + mkDerivation { + pname = "elm-syntax"; + version = "0.1.0.0"; + sha256 = "1c8dg5kd0h36j030ig59n1gg1g7y569k92nxg416w4y18z7gir72"; + libraryHaskellDepends = [ + base bound deriving-compat prettyprinter protolude text + unordered-containers + ]; + testHaskellDepends = [ + base bound deriving-compat prettyprinter protolude text + unordered-containers + ]; + description = "Elm syntax and pretty-printing"; + license = stdenv.lib.licenses.bsd3; }) {}; "elm-websocket" = callPackage @@ -77322,19 +77391,21 @@ self: { }) {}; "elocrypt" = callPackage - ({ mkDerivation, base, hlint, MonadRandom, proctest, QuickCheck - , random, tasty, tasty-quickcheck, tasty-th + ({ mkDerivation, base, containers, hlint, MonadRandom, proctest + , QuickCheck, random, tasty, tasty-quickcheck, tasty-th }: mkDerivation { pname = "elocrypt"; - version = "2.0.1"; - sha256 = "1sb0xb4dx39vmr60slrlr85hwi6drmqdibv0faiw7k48rxvcz1ak"; + version = "2.1.0"; + sha256 = "1mz400y28qminfz39zl2wsia6hv2pmvg836gc18z6hakmw80jnmk"; + revision = "1"; + editedCabalFile = "04ciqcmycpms6qvbh04fkq7kli7mcd031x9lqhv2ps46f4v9zx1b"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base MonadRandom random ]; + libraryHaskellDepends = [ base containers MonadRandom random ]; executableHaskellDepends = [ base random ]; testHaskellDepends = [ - base hlint MonadRandom proctest QuickCheck random tasty + base containers hlint MonadRandom proctest QuickCheck random tasty tasty-quickcheck tasty-th ]; description = "Generate easy-to-remember, hard-to-guess passwords"; @@ -78248,19 +78319,17 @@ self: { }) {}; "enumeration" = callPackage - ({ mkDerivation, arith-encode, arithmoi, base, binary, Cabal - , containers, heap, HUnit-Plus + ({ mkDerivation, arith-encode, base, binary, containers, heap + , HUnit-Plus, integer-logarithms }: mkDerivation { pname = "enumeration"; - version = "0.1.0"; - sha256 = "17d7vm2nkyhxw2f0wk6llrw9y5kqzgqlgswv98wrpnpsspwmx0bk"; + version = "0.2.0"; + sha256 = "0lhyvsiibzk70czway3wx5wsm1gjfxip47clf4l5nskq1qxs9q8l"; libraryHaskellDepends = [ - arith-encode arithmoi base binary Cabal containers heap - ]; - testHaskellDepends = [ - arith-encode arithmoi base binary Cabal containers heap HUnit-Plus + arith-encode base binary containers heap integer-logarithms ]; + testHaskellDepends = [ arith-encode base binary HUnit-Plus ]; description = "A practical API for building recursive enumeration procedures and enumerating datatypes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -79930,25 +79999,28 @@ self: { }) {}; "evdev" = callPackage - ({ mkDerivation, base, bytestring, c2hs, composition, containers - , either, evdev, extra, hinotify, posix-paths, process, rawfilepath - , safe, streamly, time, unix + ({ mkDerivation, base, bytestring, c2hs, containers, either, evdev + , extra, hinotify, libevdev, monad-loops, paths, posix-paths + , process, rawfilepath, safe, streamly, streamly-fsnotify, time + , unix }: mkDerivation { pname = "evdev"; - version = "0.2.0.1"; - sha256 = "0b005anc3bxs8ys5zmzzs81n4wmjabvv7fbcj5w62ddsjfq38p62"; + version = "1.2.0.0"; + sha256 = "1sjpqnf6gb8mb4n4sf8d60byx5s0vjpwhp7n0lkf2ikckwlc7y73"; libraryHaskellDepends = [ - base bytestring composition containers either extra hinotify - posix-paths process rawfilepath safe streamly time unix + base bytestring containers either extra hinotify monad-loops paths + posix-paths process rawfilepath safe streamly streamly-fsnotify + time unix ]; librarySystemDepends = [ evdev ]; + libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; description = "Bindings to libevdev"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {evdev = null;}; + }) {evdev = null; inherit (pkgs) libevdev;}; "eve" = callPackage ({ mkDerivation, base, containers, data-default, free, hspec @@ -81563,23 +81635,21 @@ self: { }) {}; "extensible" = callPackage - ({ mkDerivation, aeson, barbies, base, bytestring, cassava, comonad - , constraints, deepseq, exceptions, ghc-prim, hashable, lens - , membership, monad-skeleton, mtl, prettyprinter, primitive - , profunctors, QuickCheck, resourcet, StateVar, tagged - , template-haskell, text, th-lift, transformers + ({ mkDerivation, aeson, base, bytestring, cassava, comonad + , constraints, deepseq, ghc-prim, hashable, lens, membership + , monad-skeleton, prettyprinter, primitive, profunctors, QuickCheck + , StateVar, tagged, template-haskell, text, th-lift, transformers , unordered-containers, vector }: mkDerivation { pname = "extensible"; - version = "0.6.1"; - sha256 = "1h96kn622qyx27xap79ywq4kx4q82x4b3kxviakhqwxlvf2sklg2"; + version = "0.7"; + sha256 = "1nil9qvgrbd42hv198msm7apma67m9dqi5cqgfvjgfcgdms46dk2"; libraryHaskellDepends = [ - aeson barbies base bytestring cassava comonad constraints deepseq - exceptions ghc-prim hashable membership monad-skeleton mtl - prettyprinter primitive profunctors QuickCheck resourcet StateVar - tagged template-haskell text th-lift transformers - unordered-containers vector + aeson base bytestring cassava comonad constraints deepseq ghc-prim + hashable membership monad-skeleton prettyprinter primitive + profunctors QuickCheck StateVar tagged template-haskell text + th-lift transformers unordered-containers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; description = "Extensible, efficient, optics-friendly data types and effects"; @@ -81673,6 +81743,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extensible-skeleton" = callPackage + ({ mkDerivation, base, exceptions, extensible, membership + , monad-skeleton, mtl, profunctors, resourcet, template-haskell + , transformers + }: + mkDerivation { + pname = "extensible-skeleton"; + version = "0"; + sha256 = "0bv6589p8cpzsr167yi98vm0bzkcfgazkxbj35f74ykh8zwqlqfl"; + libraryHaskellDepends = [ + base exceptions extensible membership monad-skeleton mtl + profunctors resourcet template-haskell transformers + ]; + testHaskellDepends = [ base extensible ]; + description = "Operational-based extensible effect library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extensible-sp" = callPackage ({ mkDerivation, base, lens }: mkDerivation { @@ -82169,7 +82257,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fakedata_0_4_0" = callPackage + "fakedata_0_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , exceptions, filepath, gauge, hashable, hspec, hspec-discover , random, template-haskell, text, time, unordered-containers @@ -82177,8 +82265,8 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "0.4.0"; - sha256 = "0q90aa92wraqjnj256bpv34mhsl42wyp31y2g4nv2sgzj7mi9jjg"; + version = "0.5.0"; + sha256 = "0xbdbxbj3phrzhg5ifp0s479sjrkm6p3pvvia2i4j1fmq313d9k7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers directory exceptions filepath hashable @@ -83273,12 +83361,12 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "fedora-dists_1_1_0" = callPackage + "fedora-dists_1_1_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "fedora-dists"; - version = "1.1.0"; - sha256 = "01knh6bvym4d7rsh9mlrn89nwddxp5rsvgsg4271k0z4xkjsr7i8"; + version = "1.1.1"; + sha256 = "10yf8hjbrwjwdsfys87cysim8zfknqp1vv336ym8b5qlx700b2ji"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; license = stdenv.lib.licenses.gpl3; @@ -84268,8 +84356,8 @@ self: { }: mkDerivation { pname = "file-embed"; - version = "0.0.11"; - sha256 = "0l6dkwccbzzyx8rcav03lya2334dgi3vfwk96h7l93l0fc4x19gf"; + version = "0.0.11.1"; + sha256 = "1ml9j5jln9g86qqi7akcxyfy8d2jb46y1sfk817j1s4babzff4x1"; libraryHaskellDepends = [ base bytestring directory filepath template-haskell ]; @@ -84475,8 +84563,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }: mkDerivation { pname = "filepath-bytestring"; - version = "1.4.2.1.0"; - sha256 = "1q2d02p87yfvqbqhgry6lzqkjhscqfacpcxgnc6xz9b1rvg1mwvj"; + version = "1.4.2.1.1"; + sha256 = "06shdskjj391hb9295slm9gg2rbn5fdq5v6fg0mgn3yl5dv8q5dx"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring filepath QuickCheck ]; description = "Library for manipulating RawFilePaths in a cross platform way"; @@ -84700,8 +84788,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "filtrable"; - version = "0.1.2.0"; - sha256 = "1bgy3pydi7paiia63kygrg7fjjs7fm73jqfmlmw4szcbjmv8xq8k"; + version = "0.1.3.0"; + sha256 = "1viazb01xnw7siwrsynaxqcjrgc96gqfgmj4vxl5r3lbnb34wdl0"; libraryHaskellDepends = [ base ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; @@ -84709,22 +84797,6 @@ self: { "fin" = callPackage ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing - , tagged - }: - mkDerivation { - pname = "fin"; - version = "0.1"; - sha256 = "17nv26cznhslrfb1ajcgxa9g3zacvk3prmncr7f8d7rvh42g2gnn"; - revision = "1"; - editedCabalFile = "0kdhmjpifbl1r44jy2spj82gdadd849zz6i0y7mw1ii25w91yb50"; - libraryHaskellDepends = [ base dec deepseq hashable ]; - testHaskellDepends = [ base inspection-testing tagged ]; - description = "Nat and Fin: peano naturals and finite numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fin_0_1_1" = callPackage - ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing , QuickCheck, tagged }: mkDerivation { @@ -84735,7 +84807,6 @@ self: { testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "final" = callPackage @@ -88983,12 +89054,12 @@ self: { }) {}; "from-sum" = callPackage - ({ mkDerivation, base, doctest, Glob, mtl }: + ({ mkDerivation, base, doctest, Glob, transformers }: mkDerivation { pname = "from-sum"; - version = "0.2.1.0"; - sha256 = "0rv66a7mhswb4sqkyarg9kxxfpiymsmrk49gprq8mpwq7d1qmvd1"; - libraryHaskellDepends = [ base mtl ]; + version = "0.2.2.0"; + sha256 = "05fppk2hkxn67xfl6kdzdp2a5mfz63dv4yx7mvr9fbdrarxrf326"; + libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base doctest Glob ]; description = "Canonical fromMaybeM and fromEitherM functions"; license = stdenv.lib.licenses.bsd3; @@ -90247,8 +90318,8 @@ self: { ({ mkDerivation, base, fused-effects, hspec, microlens }: mkDerivation { pname = "fused-effects-lens"; - version = "1.0.0.0"; - sha256 = "0qix94bw9rzv7frwxn4d9l8bz133fbmazzsvmilfz6bm6k8ci6nx"; + version = "1.1.0.0"; + sha256 = "0812yfzy784mr1wdbfd7yi249pgdf5ndm7qsy6vk8rs09arpwwxh"; libraryHaskellDepends = [ base fused-effects microlens ]; testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; @@ -90320,8 +90391,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.13.1"; - sha256 = "0h92q21hg3850f7hv5n497mn90dv3hxp8fa3cl29gwkn0pkaz33b"; + version = "0.13.2"; + sha256 = "0wxhymhwfny03n15g29ydrnqblq23szw6l622ifwxz0mk9h71z1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90481,6 +90552,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fuzzyset_0_2_0" = callPackage + ({ mkDerivation, base, data-default, hspec, ieee754, text + , text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.2.0"; + sha256 = "0wx8bccfr1k5ax97x5w01mzrpjfwns27xgcr12xf6vbyi7q14mfg"; + libraryHaskellDepends = [ + base data-default text text-metrics unordered-containers vector + ]; + testHaskellDepends = [ + base data-default hspec ieee754 text text-metrics + unordered-containers vector + ]; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -94750,6 +94841,8 @@ self: { pname = "ghcide"; version = "0.0.5"; sha256 = "014l2gg7ln2q9c7qpga45iicxi5mcyjzllvyiwb4vd8rmbkvr1bm"; + revision = "2"; + editedCabalFile = "157ch1bk9r66pca8fiywwj1brpg2mbnarvlzic3yl829v6kcmrvj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96253,8 +96346,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.6.1"; - sha256 = "0lj913029v0h035lri2mkkd8ypc3asb30igj5rrcs6miwhfkmbcf"; + version = "0.13.8.0"; + sha256 = "1wx35fm7jba69x33mhp0h6j0lszi62hmmb1inflx7gax0ncmk2n2"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -96379,7 +96472,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, connection, containers , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq , directory, disk-free-space, dlist, edit-distance, exceptions @@ -96400,8 +96493,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20191114"; - sha256 = "1afrn5g3b80f3n6ncfph6pmf9jdpc7a6ay55k2pmkn96pyv4hfmm"; + version = "7.20191218"; + sha256 = "1dy5255x2cx68313p6vchqy5q1l0na8ckf5mkfi080hkhq8vj2q6"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -96431,7 +96524,7 @@ self: { wai-extra warp warp-tls yesod yesod-core yesod-form yesod-static ]; executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which + curl git gnupg lsof openssh perl rsync wget which ]; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = '' @@ -96444,7 +96537,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + }) {inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; @@ -96937,8 +97030,8 @@ self: { }: mkDerivation { pname = "github-backup"; - version = "1.20171126"; - sha256 = "0fk3dp11acgw88rhb7pi8kb98m9x96jwdavcb7gz1jdcx391xy4s"; + version = "1.20191219"; + sha256 = "0yi0i342qh1wm7j81qa6mhyfjp4psbw4vrpp0m1c9zjbymfpcymk"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -97280,8 +97373,8 @@ self: { }: mkDerivation { pname = "gitlab-haskell"; - version = "0.1.4"; - sha256 = "09va5xbb2qya149gzrm3d3q9g6s4axxx6qkv4z764dryqq7fm7ly"; + version = "0.1.5"; + sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw"; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time transformers unliftio unliftio-core @@ -97858,8 +97951,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.7.1"; - sha256 = "1h15ir53wc8l5cp09kr71nhk0zn39nm20bmhx2adgp2m68mj5ypp"; + version = "0.13.8.0"; + sha256 = "18k1drykl3mpmyj43kp9nvkzr9g3allr19ihscmxwc1w9ss6zklw"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -97941,8 +98034,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -101693,8 +101785,8 @@ self: { }: mkDerivation { pname = "gothic"; - version = "0.1.1"; - sha256 = "0bm8m77lcvi9c8smv0z4n23f6gw3aw47g0q47aqjcpipwmjcqvhm"; + version = "0.1.2"; + sha256 = "1glfjcisrm97hyja6ijzikmrkillgvrk3xn0gmsmrnfp8mn5jmjp"; libraryHaskellDepends = [ aeson base binary bytestring connection exceptions hashable http-client http-client-tls http-conduit http-types lens lens-aeson @@ -102584,8 +102676,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.6.0.0"; - sha256 = "0gippn2y1ngykfz33825r4r4m5km7m8qch7ijics1q9d1jnszs5a"; + version = "0.6.1.0"; + sha256 = "0x0526kb29ndrhb9dy9iwxj9r3qij7sy4zjhjqfx3hc7334rdpda"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers megaparsec text transformers @@ -103277,6 +103369,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog_0_11_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, containers, monad-control, mtl, resourcet + , safe-exceptions, scientific, text, time, transformers + , transformers-base, transformers-compat + }: + mkDerivation { + pname = "groundhog"; + version = "0.11.0"; + sha256 = "1kx5jdzi7qrb399z23s5khvvllks5qyjl9y5spwssf6d6n9r6w82"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring containers + monad-control mtl resourcet safe-exceptions scientific text time + transformers transformers-base transformers-compat + ]; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-sqlite, groundhog-th, tasty, tasty-hunit @@ -103320,6 +103432,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-inspector_0_11_0" = callPackage + ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs + , containers, groundhog, groundhog-sqlite, groundhog-th, mtl + , regex-compat, syb, template-haskell, text, time, transformers + }: + mkDerivation { + pname = "groundhog-inspector"; + version = "0.11.0"; + sha256 = "19lvwfg655dg0v6ny64hhdlbdj38w5dbn988kzjyshdjmisswy1r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson-pretty base bytestring containers groundhog groundhog-th + regex-compat syb template-haskell text time transformers + ]; + executableHaskellDepends = [ + base bytestring cmdargs containers groundhog groundhog-sqlite + groundhog-th mtl + ]; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-mysql" = callPackage ({ mkDerivation, base, bytestring, containers, groundhog , monad-control, monad-logger, mysql, mysql-simple, resource-pool @@ -103337,6 +103473,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-mysql_0_11" = callPackage + ({ mkDerivation, base, bytestring, containers, groundhog + , monad-control, monad-logger, mysql, mysql-simple, resource-pool + , resourcet, text, time, transformers + }: + mkDerivation { + pname = "groundhog-mysql"; + version = "0.11"; + sha256 = "0xir9181c0h5f5hrg1drzd2g7cgr77zghg1i7fcwl6h9prpp6ira"; + libraryHaskellDepends = [ + base bytestring containers groundhog monad-control monad-logger + mysql mysql-simple resource-pool resourcet text time transformers + ]; + description = "MySQL backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-postgresql" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , containers, groundhog, monad-control, postgresql-libpq @@ -103356,6 +103510,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-postgresql_0_11" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , groundhog, monad-control, postgresql-libpq, postgresql-simple + , resource-pool, resourcet, text, time, transformers, vector + }: + mkDerivation { + pname = "groundhog-postgresql"; + version = "0.11"; + sha256 = "0c8xqdsv1mi9pp1cnnbj8anf8mb3y6hjg965giw9jsmxf2b4d80x"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers groundhog monad-control + postgresql-libpq postgresql-simple resource-pool resourcet text + time transformers vector + ]; + description = "PostgreSQL backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-sqlite" = callPackage ({ mkDerivation, base, bytestring, containers, direct-sqlite , groundhog, monad-control, resource-pool, resourcet, text @@ -103373,6 +103546,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-sqlite_0_11_0" = callPackage + ({ mkDerivation, base, bytestring, containers, direct-sqlite + , groundhog, monad-control, resource-pool, resourcet, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "groundhog-sqlite"; + version = "0.11.0"; + sha256 = "03vnnja0rbk2v8qws0m37hs6imh001pj5hy00gx5xr7kwayvc13g"; + libraryHaskellDepends = [ + base bytestring containers direct-sqlite groundhog monad-control + resource-pool resourcet text transformers unordered-containers + ]; + description = "Sqlite3 backend for the groundhog library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "groundhog-th" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, groundhog , libyaml, template-haskell, text, time, unordered-containers, yaml @@ -103389,6 +103580,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "groundhog-th_0_11" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, groundhog + , libyaml, template-haskell, text, time, unordered-containers, yaml + }: + mkDerivation { + pname = "groundhog-th"; + version = "0.11"; + sha256 = "1rqzqwcvk9shgprgfvl54s67n3img2wnvq98mvbnmr6pfxgcy2az"; + libraryHaskellDepends = [ + aeson base bytestring containers groundhog libyaml template-haskell + text time unordered-containers yaml + ]; + description = "Type-safe datatype-database mapping library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "group-by-date" = callPackage ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript , pathtype, time, transformers, unix-compat, utility-ht @@ -103675,8 +103883,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.3.1"; - sha256 = "0iqrh6h2r7xr9xqk9w7yg1hilghcs0pp5mqq3s2rwmk2drp255l3"; + version = "0.2.4.1"; + sha256 = "09f6l7j8pax8c07myg3zbla3davgi88aib3g0nb55vnlcs33qrq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103858,8 +104066,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.15.3"; - sha256 = "0lbf79zfpnz273g7ycr8j7im3bsyzn1d5r9mfv6k80nwzr43dw51"; + version = "0.15.4"; + sha256 = "1wm42m4963abqiswkc3ngwf9jm4z9kyyx2h8w064f62ngnkdz84z"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -104042,8 +104250,8 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.5.4"; - sha256 = "1flxsacxwmabzzalhn8558kmj95z01c0lmikrn56nxh7p62nxm25"; + version = "0.13.8.0"; + sha256 = "1645pgrs9cj6imhpdpkbkhr9mn9005wbqlvily5f8iaf02zpvfwd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104196,8 +104404,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.15.3"; - sha256 = "10xkgmgncnwdy0f9f1bkcw68msp575zcwkncw9d2nqpa5cdh2qx7"; + version = "0.15.4"; + sha256 = "17g93j8az1gqgf9kxg1k1lls6c0if45bzgbhrc99qgm8s9f2dr1c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106466,6 +106674,27 @@ self: { broken = true; }) {}; + "haggle" = callPackage + ({ mkDerivation, base, containers, deepseq, fgl, hashable, HUnit + , monad-primitive, primitive, QuickCheck, ref-tf, test-framework + , test-framework-hunit, test-framework-quickcheck2, vector + }: + mkDerivation { + pname = "haggle"; + version = "0.1.0.0"; + sha256 = "0fpbmllp0p23c258gam7xm0dvwphw0zpmydmg9ygl4yl1kiav470"; + libraryHaskellDepends = [ + base containers deepseq hashable monad-primitive primitive ref-tf + vector + ]; + testHaskellDepends = [ + base containers fgl HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "A graph library offering mutable, immutable, and inductive graphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haha" = callPackage ({ mkDerivation, base, containers, time }: mkDerivation { @@ -107634,6 +107863,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hanabi-dealer" = callPackage + ({ mkDerivation, base, containers, random }: + mkDerivation { + pname = "hanabi-dealer"; + version = "0.2.0.0"; + sha256 = "086mvplnkapzc697mmqxi2z4fhm4ix7kjq4fkqzv1yj592qz4q9h"; + libraryHaskellDepends = [ base containers random ]; + description = "Hanabi card game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "handa-data" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -108696,6 +108936,24 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy-dot" = callPackage + ({ mkDerivation, array, base, clock, happy, HUnit, language-dot + , pretty, transformers, xml + }: + mkDerivation { + pname = "happy-dot"; + version = "1.0.0.0"; + sha256 = "1m7i6akv2009g1q5jhrv14fkq12kq5zkk11g8f0zsgflljd4w5a2"; + libraryHaskellDepends = [ array base pretty transformers ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ array base HUnit pretty transformers xml ]; + benchmarkHaskellDepends = [ + array base clock language-dot transformers xml + ]; + description = "Parser for dot made with happy"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "happy-hour" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams }: mkDerivation { @@ -108900,8 +109158,8 @@ self: { }: mkDerivation { pname = "harg"; - version = "0.4.0.0"; - sha256 = "0il36pwzmkc1dj39kybyp6hv4s7d60dl5rx1fkfm23dcg6a9r0dc"; + version = "0.4.1.0"; + sha256 = "1h1hdhlm5fjfm5cr052gf6cxp6r4lnz9a3b68ypj4b716hymir44"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy optparse-applicative split text yaml @@ -109085,8 +109343,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.3.6"; - sha256 = "0sgxvgvxqykslbjslrb5mzmaaar4nbc59p94qhk7rzbjsas01vp2"; + version = "0.1.4.0"; + sha256 = "1varlzj2c0sfxza6wfacrkjxq022qdvbzf8zhi3zbv1fnqqcvz0j"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default mtl network text @@ -109098,6 +109356,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hasbolt_0_1_4_1" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.4.1"; + sha256 = "1p2gffh6ym221sgrhlns209p6s0j3qbmam5a0b3s06663qgzvh5b"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -109106,8 +109385,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.25"; - sha256 = "0cd0c6vcyfzrg3bzs1mv2c7alr7ncz5gkj6r70n2fb41mxnz9i2l"; + version = "0.0.1.0"; + sha256 = "1d5n60nsvzkgf4wf2fy99qgp6bby4bmhldycda0hlgkch1m6lqqc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110680,6 +110959,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-lsp_0_19_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.19.0.0"; + sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -110737,6 +111046,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-lsp-types_0_19_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.19.0.0"; + sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9"; + libraryHaskellDepends = [ + aeson base bytestring data-default deepseq filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -111437,6 +111764,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-to-elm" = callPackage + ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop + , protolude, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-to-elm"; + version = "0.2.0.0"; + sha256 = "0y3ayjfspajnsk6r47fkkqafbf15f9lshgizihndrnb3smkyzgw9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bound elm-syntax generics-sop protolude text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bound elm-syntax generics-sop protolude text time + unordered-containers + ]; + description = "Generate Elm types and JSON encoders and decoders from Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-token-utils" = callPackage ({ mkDerivation, base, containers, Diff, directory, dual-tree, ghc , ghc-mod, ghc-paths, ghc-prim, ghc-syb-utils, haskell-src-exts @@ -112371,8 +112720,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskellish"; - version = "0.1.1"; - sha256 = "1smgr42m4dz6yd8w34dmc3w2l06jllli831bq66l3mdbrfb3964h"; + version = "0.1.2"; + sha256 = "0qsd65pf3nfadf98nnabya0x9li0ldq1b3fpdy36k97pmf44x0qw"; libraryHaskellDepends = [ base haskell-src-exts ]; description = "For parsing Haskell-ish languages"; license = stdenv.lib.licenses.bsd3; @@ -112682,8 +113031,8 @@ self: { }: mkDerivation { pname = "haskoin-bitcoind"; - version = "0.3.0"; - sha256 = "1b46mhjna32n41bj16ca58cijypls1n74aqhk785vla9v9ib9828"; + version = "0.4.1"; + sha256 = "1m5j03brslh0xgc7nm2b0cyk8l2zb140f71y5bcj28aaips3yyr0"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal haskoin-core monad-control mtl network-bitcoin text transformers transformers-base @@ -112836,8 +113185,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.18.9"; - sha256 = "0gfvlah265mdc52nxkb2mlq1qblli0fm7lrxhwbggjjssj0jbp05"; + version = "0.19.2"; + sha256 = "0jrjjxydmm9pncqihks2dl2k22lmryw8cxjdsg3hpkqkzdz8brvi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113504,18 +113853,19 @@ self: { }) {}; "haskus-utils-data" = callPackage - ({ mkDerivation, base, containers, extra, haskus-utils-types, mtl - , recursion-schemes, transformers + ({ mkDerivation, base, containers, doctest, extra, ghc-prim + , haskus-utils-types, mtl, recursion-schemes, transformers }: mkDerivation { pname = "haskus-utils-data"; - version = "1.1.1"; - sha256 = "1igwlprfknz3aydls849a3l7agm5zqn8c90aqw547bc0asjcsnll"; + version = "1.2"; + sha256 = "0dn07zj9v5yl0mpcnblk2y17x30wg8fag4hv9mfp3kn003217f89"; libraryHaskellDepends = [ - base containers extra haskus-utils-types mtl recursion-schemes - transformers + base containers extra ghc-prim haskus-utils-types mtl + recursion-schemes transformers ]; - description = "Haskus utility modules"; + testHaskellDepends = [ base doctest ]; + description = "Haskus data utility modules"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113523,8 +113873,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "haskus-utils-types"; - version = "1.4.1"; - sha256 = "0nypn55fj86llpgdlsbr5qk7jkix5qazz03f8c5a8kn787n2bkpz"; + version = "1.5"; + sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Haskus types utility modules"; @@ -113538,13 +113888,16 @@ self: { }: mkDerivation { pname = "haskus-utils-variant"; - version = "2.6.1"; - sha256 = "1zq76dsp29warrr0ym4lp9lrgar7yairwp91qklf3k6qb8h41qw8"; + version = "3.0"; + sha256 = "128i47aqp1h8j4yganj7l8svdb1ax5vx9h4j55k56wh5yxrg5aan"; libraryHaskellDepends = [ base deepseq exceptions haskus-utils-data haskus-utils-types template-haskell transformers ]; - testHaskellDepends = [ base doctest tasty tasty-quickcheck ]; + testHaskellDepends = [ + base doctest haskus-utils-data haskus-utils-types tasty + tasty-quickcheck + ]; benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ]; description = "Variant and EADT"; license = stdenv.lib.licenses.bsd3; @@ -113996,8 +114349,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.3.0.1"; - sha256 = "03wfzwf3rr83j158757llq23zi17pkpmpracwisbz4acvk0vb3s0"; + version = "0.4"; + sha256 = "0c87l9lf2h6z33apmh13dy9imdv0klpk4p22zmw9i88gg5x91yvw"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -114599,10 +114952,8 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.3"; - sha256 = "1ab422ngg63w91a71j17swzzdxk0y2053fijml0illarcrd77cnj"; - revision = "3"; - editedCabalFile = "1jycnkzcxk6ny3ql5mv438xwmcifxprsrsaxqnbmslm6m43d6yxf"; + version = "3000.11.3.1"; + sha256 = "1wyb848mb0b6idkbi5jarsf6qi1zzl3yh6xd05g228kykii8k9mg"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -116213,8 +116564,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.10"; - sha256 = "0n9rm73h9lgrqavzjlakb95jvpg0lfjhj6grb5rgwpi4rhvqiygb"; + version = "0.12.11"; + sha256 = "1n83zwg011n9w2v1zz4mwpms9jh3c8mk700zya4as1jg83748xww"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors HTTP mtl network network-uri resource-pool scanner stm text time tls @@ -118633,23 +118984,28 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, containers - , cryptohash-sha1, deepseq, directory, extra, file-embed, filepath - , ghc, process, temporary, text, time, transformers, unix-compat + ({ mkDerivation, base, base16-bytestring, bytestring, conduit + , conduit-extra, containers, cryptohash-sha1, deepseq, directory + , extra, file-embed, filepath, ghc, hslogger, process, tasty + , tasty-hunit, temporary, text, time, transformers, unix-compat , unordered-containers, vector, yaml }: mkDerivation { pname = "hie-bios"; - version = "0.2.1"; - sha256 = "12gqchrqscf7qnmid3k8wizxax4157dggg6kr1dipbwn36dczhrv"; + version = "0.3.2"; + sha256 = "1609rvjgh1laqxl4c1bh0j3bq5yysbbaflx6hn8npr0ckq2ckvir"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base16-bytestring bytestring containers cryptohash-sha1 - deepseq directory extra file-embed filepath ghc process temporary - text time transformers unix-compat unordered-containers vector yaml + base base16-bytestring bytestring conduit conduit-extra containers + cryptohash-sha1 deepseq directory extra file-embed filepath ghc + hslogger process temporary text time transformers unix-compat + unordered-containers vector yaml ]; executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory filepath ghc tasty tasty-hunit + ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -121470,19 +121826,18 @@ self: { "hmp3-ng" = callPackage ({ mkDerivation, array, base, binary, bytestring, clock, containers - , directory, hscurses, mersenne-random, monad-extras, mtl, ncurses - , pcre-light, process, unix, utf8-string, zlib + , directory, hscurses, monad-extras, mtl, ncurses, pcre-light + , process, random, unix, utf8-string, zlib }: mkDerivation { pname = "hmp3-ng"; - version = "2.7.3.1"; - sha256 = "1g4r9kkd0cqcarg220bj481b2j1gid68l0dfycy47hl8glqhv2w9"; + version = "2.9.3"; + sha256 = "0h1lg4faffqf86wk2hi68x3f0y2r2nypqcvb879wal24whh31v7v"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base binary bytestring clock containers directory hscurses - mersenne-random monad-extras mtl pcre-light process unix - utf8-string zlib + monad-extras mtl pcre-light process random unix utf8-string zlib ]; executableSystemDepends = [ ncurses ]; description = "A 2019 fork of an ncurses mp3 player written in Haskell"; @@ -121850,15 +122205,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_9_0" = callPackage + "hoauth2_1_9_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, exceptions , http-conduit, http-types, microlens, text, unordered-containers , uri-bytestring, uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "1.9.0"; - sha256 = "1br1g6xp0s73aj8nsx3rjdpji3lvp19b4xaxhn87fqbnnhczg39z"; + version = "1.9.1"; + sha256 = "1pm8124x5zdy5zj6qriv16im067dyz9vx5z2ga8c3x6rx06bs15m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123042,8 +123397,8 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.6.0"; - sha256 = "0wgzjzjnj1f9mw1099l5h2fh8y91v45a243paksb5dp76y27baxg"; + version = "0.7.0"; + sha256 = "1kj72jn0sfvf68lf9n2v7v2qqw1g3kjyr6s6zlyvs6p2k3fw4ync"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; @@ -123059,8 +123414,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.6.0"; - sha256 = "1y10s0lbc0k7vir2h7bgghxmjh3zgja764i6w1j056rr0qh9v5bj"; + version = "0.7.0"; + sha256 = "0v21a3nwk94ggrk8fyjmlb93rnrsh7s3xbqnk1p236h0gycsh1q3"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -123075,8 +123430,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "hoppy-runtime"; - version = "0.6.0"; - sha256 = "0zlh84ibyvyl9wxmiyjgm26s6avjvqphg17bmsls69pqawzzgphy"; + version = "0.7.0"; + sha256 = "0rkyili7kbxj22rvs4056vhcgwpjzgigmwcrj6iph5pfzxnnl40q"; libraryHaskellDepends = [ base Cabal containers directory filepath ]; @@ -123090,8 +123445,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.6.0"; - sha256 = "0z7jmhv9xkmky8gn0qgk6f3l3w943qvfhwlq18p1gf6x7iq1ijdg"; + version = "0.7.0"; + sha256 = "0yr73dalwljp23ls9za07cnabs65aypgbrjjv76zhxbsqqcc82a3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -124597,6 +124952,18 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_8_0_0" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.8.0.0"; + sha256 = "0syhh413qmajv56gaqz7p3b2yb6f0x9cx8zgds6fa3yzcqw7zasc"; + libraryHaskellDepends = [ base syb ]; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -126902,8 +127269,8 @@ self: { }: mkDerivation { pname = "hsinspect"; - version = "0.0.8"; - sha256 = "1lqczihv7qjh1yy51qds4sg95riwaq1i0fd9mgn3kvhgbyx1r9nn"; + version = "0.0.10"; + sha256 = "0ydb0dqy3javffb8a4gfn840wlh2l3ixxxzj7sc53bqanadlg1in"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130362,6 +130729,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-download_0_1_0_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, conduit + , conduit-extra, cryptonite, cryptonite-conduit, directory + , exceptions, filepath, hspec, hspec-discover, http-client + , http-conduit, http-types, memory, path, path-io, retry, rio + , rio-prettyprint + }: + mkDerivation { + pname = "http-download"; + version = "0.1.0.1"; + sha256 = "1f1haybqflprm3gwnxsyi6pyz7k4b5qyiq4wqq81wb7nsrr4h943"; + libraryHaskellDepends = [ + base base64-bytestring bytestring conduit conduit-extra cryptonite + cryptonite-conduit directory exceptions filepath http-client + http-conduit http-types memory path path-io retry rio + rio-prettyprint + ]; + testHaskellDepends = [ + base cryptonite hspec hspec-discover http-client path path-io retry + rio rio-prettyprint + ]; + testToolDepends = [ hspec-discover ]; + description = "Verified downloads with retries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-encodings" = callPackage ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec , text, utf8-string, zlib @@ -130886,37 +131280,6 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base16-bytestring, bytestring, case-insensitive, containers - , criterion, directory, doctest, filepath, Glob, heaps, hspec - , mwc-random, network-byte-order, psqueues, stm, text - , unordered-containers, vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.5"; - sha256 = "1vlmy8vnp6ml2n2pr11aa5fzigldsscgzmibrni64ykgfvpd3sqn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers - network-byte-order psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base base16-bytestring bytestring - case-insensitive containers directory doctest filepath Glob hspec - network-byte-order psqueues stm text unordered-containers vector - word8 - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library including frames, priority queues and HPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http2_2_0_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base16-bytestring, bytestring, case-insensitive, containers , directory, doctest, filepath, gauge, Glob, heaps, hspec , http-types, mwc-random, network, network-byte-order, psqueues , stm, text, time-manager, unordered-containers, vector @@ -130943,7 +131306,6 @@ self: { ]; description = "HTTP/2 library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http2-client" = callPackage @@ -131820,14 +132182,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_4_1_1" = callPackage + "hvega_0_4_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers, vector }: mkDerivation { pname = "hvega"; - version = "0.4.1.1"; - sha256 = "1dmb5w250l11p7hyzi7v9b286s4qdalg41bz1ckahrwaaaz8qa1d"; + version = "0.4.1.2"; + sha256 = "0vf7hwhq8s8w3zjgag80gm54bxk5bm9q0mmriqy1790vrxb51276"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131919,25 +132281,25 @@ self: { broken = true; }) {}; - "hw-balancedparens_0_3_0_2" = callPackage - ({ mkDerivation, base, criterion, deepseq, hedgehog, hspec - , hspec-discover, hw-bits, hw-excess, hw-fingertree - , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, transformers - , vector + "hw-balancedparens_0_3_0_3" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, transformers, vector }: mkDerivation { pname = "hw-balancedparens"; - version = "0.3.0.2"; - sha256 = "1x961b5jq5hal5k3dc98xpldpsillxf4vkbc4m7yw05bmas0smia"; + version = "0.3.0.3"; + sha256 = "07jng6plapizb0kazqfd4x7y5yazhggwvagkwc273a92ynw57bsi"; libraryHaskellDepends = [ base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim hw-rankselect-base vector ]; testHaskellDepends = [ - base hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim - hw-rankselect-base transformers vector + base doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base criterion hedgehog hw-bits hw-prim vector ]; @@ -134359,8 +134721,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "hzenhan"; - version = "0.0.1"; - sha256 = "1n7nrkngr395n6dhgdkqwbx2dmq6hmmfggyv62nr29kxf580hd8k"; + version = "0.0.4"; + sha256 = "1gbrzjjdihgzj63sp2h4762zybyhd5rxa8rpvsjra21qvvch12mx"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base containers QuickCheck text ]; description = "Zenhan library for Haskell"; @@ -135276,6 +135638,8 @@ self: { pname = "ihaskell"; version = "0.10.0.2"; sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb"; + revision = "1"; + editedCabalFile = "0jhgnw5wrpmbp3g6zllwlmmyzyja5ry8i7dss7q8gpbvk2inlfl3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -135435,8 +135799,8 @@ self: { ({ mkDerivation, aeson, base, hvega, ihaskell, text }: mkDerivation { pname = "ihaskell-hvega"; - version = "0.2.0.2"; - sha256 = "0xbv8801wxslcs9fsjssvdldz6nq8zmxm6l4pwkv8zpasqzq4k9q"; + version = "0.2.1.0"; + sha256 = "1zpr00zn3nap5w1baih975r8hvaqqyp7y4acy10p688imicg5wgy"; libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; @@ -135615,6 +135979,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ilist_0_4_0_0" = callPackage + ({ mkDerivation, base, criterion, hspec, lens, loop, transformers + , vector + }: + mkDerivation { + pname = "ilist"; + version = "0.4.0.0"; + sha256 = "105qz5x03fa713ghxvmivawsaq3l9zf5ab4n09j7i7ryj3dwp4nv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec transformers ]; + benchmarkHaskellDepends = [ + base criterion lens loop transformers vector + ]; + description = "Optimised list functions for doing index-related things"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "illuminate" = callPackage ({ mkDerivation, alex, array, base, containers, filemanip, filepath , hscolour, html, utf8-string, xhtml @@ -137648,6 +138030,17 @@ self: { broken = true; }) {}; + "intcode" = callPackage + ({ mkDerivation, base, containers, primitive }: + mkDerivation { + pname = "intcode"; + version = "0.1.0.0"; + sha256 = "0lca33wd0dfrih0si6w5h6wi5rmv6sx3j5kam9q4j0kc1laj268r"; + libraryHaskellDepends = [ base containers primitive ]; + description = "Advent of Code 2019 intcode interpreter"; + license = stdenv.lib.licenses.isc; + }) {}; + "integer-gmp_1_0_2_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { @@ -138206,8 +138599,8 @@ self: { ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { pname = "intmap-graph"; - version = "1.0"; - sha256 = "066js08brg2prmnvqchmpp42i7sd0jn7lxpzsalnvzivi49nkbx4"; + version = "1.0.0.1"; + sha256 = "0mrwimi4r1y60l674w8vavv4c5fzqm6v1f71hkcvxkwa3fpl56m6"; libraryHaskellDepends = [ base containers text vector word8 ]; description = "A graph library that allows to explore edges after their type"; license = stdenv.lib.licenses.bsd3; @@ -138949,6 +139342,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipfs" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-has, directory + , directory-tree, doctest, envy, flow, Glob, http-client, ip, lens + , lens-aeson, monad-logger, QuickCheck, regex-compat, rio + , servant-client, servant-client-core, servant-multipart + , servant-server, swagger2, text, vector, yaml + }: + mkDerivation { + pname = "ipfs"; + version = "1.0.0"; + sha256 = "0grbmjl2dybqp3c8ljgj6ql0g3yivxb0nsbyw3bwk1a4g2c9bd0g"; + libraryHaskellDepends = [ + aeson base bytestring data-has envy flow Glob http-client ip lens + monad-logger regex-compat rio servant-client servant-client-core + servant-multipart servant-server swagger2 text vector + ]; + testHaskellDepends = [ + aeson base bytestring data-has directory directory-tree doctest + envy flow Glob http-client ip lens lens-aeson monad-logger + QuickCheck regex-compat rio servant-client servant-client-core + servant-multipart servant-server swagger2 text vector yaml + ]; + description = "Access IPFS locally and remotely"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ipfs-api" = callPackage ({ mkDerivation, aeson, base, bytestring, http-media, http-types , servant, text @@ -141132,14 +141553,14 @@ self: { }) {}; "jira-wiki-markup" = callPackage - ({ mkDerivation, base, parsec, tasty, tasty-hunit, text }: + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "0.1.1"; - sha256 = "1a6vk4aryppay87fyirxprwklqvpjh6nj9x2k9s3ybrwhapf1wdx"; + version = "1.0.0"; + sha256 = "1sl2jjcsqg61si33mxjwpf8zdn56kbbgcwqqqzbgifx2qbv4wmf8"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base parsec text ]; + libraryHaskellDepends = [ base mtl parsec text ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ base parsec tasty tasty-hunit text ]; description = "Handle Jira wiki markup"; @@ -141312,6 +141733,28 @@ self: { broken = true; }) {}; + "jobs-ui" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq + , digestive-functors, digestive-functors-lucid, file-embed + , http-types, hvect, lucid, mtl, pretty-relative-time, Spock + , Spock-digestive, Spock-lucid, stm, text, time, transformers, warp + }: + mkDerivation { + pname = "jobs-ui"; + version = "0.2.0.0"; + sha256 = "0k5n1nqxlqlqnxcznmwqz9m4sdy8hhg3gv8m1bikc3d5im1rap7j"; + libraryHaskellDepends = [ + base bytestring containers deepseq digestive-functors + digestive-functors-lucid file-embed http-types hvect lucid mtl + pretty-relative-time Spock Spock-digestive Spock-lucid stm text + time transformers warp + ]; + description = "A library for creating a jobs management website running custom jobs"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "join" = callPackage ({ mkDerivation, base, haskell98, multisetrewrite, stm }: mkDerivation { @@ -141561,36 +142004,36 @@ self: { }) {}; "jsaddle" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, containers, deepseq, exceptions, filepath, ghc-prim - , http-types, lens, primitive, process, random, ref-tf, scientific - , stm, text, time, transformers, unliftio-core + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, containers, deepseq, exceptions + , filepath, ghc-prim, http-types, lens, primitive, process, random + , ref-tf, scientific, stm, text, time, transformers, unliftio-core , unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.6.0"; - sha256 = "1ym0h00icxh4dwy3xwvxh985hr3ly7r147vm7spzb44xfn532pa8"; + version = "0.9.7.0"; + sha256 = "1hd1ybacng2qydf23dn4qggls2mmz21aay7q947ifdaxg83mv6aq"; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring containers - deepseq exceptions filepath ghc-prim http-types lens primitive - process random ref-tf scientific stm text time transformers - unliftio-core unordered-containers vector + aeson attoparsec base base-compat base64-bytestring bytestring + containers deepseq exceptions filepath ghc-prim http-types lens + primitive process random ref-tf scientific stm text time + transformers unliftio-core unordered-containers vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; }) {}; "jsaddle-clib" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, jsaddle - , text + ({ mkDerivation, aeson, base, base-compat, bytestring, data-default + , jsaddle, text }: mkDerivation { pname = "jsaddle-clib"; - version = "0.9.6.0"; - sha256 = "0nfdn5s11rzzma5s4rajs1477sy0xsa7wc19q00xfbpfkdq48193"; + version = "0.9.7.0"; + sha256 = "1n1mafr6gnfzmndjs4w7g813dx2khaq4knkhcaqbr2lsbr5yrmg1"; libraryHaskellDepends = [ - aeson base bytestring data-default jsaddle text + aeson base base-compat bytestring data-default jsaddle text ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -141602,10 +142045,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.3.2"; - sha256 = "1qc135w1y4f2mbky36dmb0ggcbwkv1vnmszw5lkhkxhkcag2sf07"; - revision = "1"; - editedCabalFile = "0vhqqbcpbrsnbmix0wkkm1d21qwrpicbzjwy42p48g7whg0lf0d5"; + version = "0.9.4.0"; + sha256 = "0k70x8dv67v585qm9ycb1m32cc47zvr2ka8nbqxazyw09i498h22"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base-compat exceptions jsaddle lens text transformers @@ -141638,8 +142079,8 @@ self: { }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.6.0"; - sha256 = "0j34cix4g5zfbbac6cggcp224s69ijirifg69js8lh3x8n5sgpg5"; + version = "0.9.7.0"; + sha256 = "09pqcnyy2pj48xm8qzs1jyav8a4si0bfw43w0qql74ak137ll60c"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle stm text time transformers wai wai-websockets warp websockets @@ -141665,8 +142106,8 @@ self: { }: mkDerivation { pname = "jsaddle-webkit2gtk"; - version = "0.9.6.0"; - sha256 = "0daw67lxqbbw643mvna5dr9xqrqacqp2i3gqpkarb2xadq5da2lq"; + version = "0.9.7.0"; + sha256 = "1q4sz2s95pknsr6r8cdqrlmw0b64q4nzllrlhb80knpfxamzyjzp"; libraryHaskellDepends = [ aeson base bytestring directory gi-gio gi-glib gi-gtk gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading @@ -141702,8 +142143,8 @@ self: { }: mkDerivation { pname = "jsaddle-wkwebview"; - version = "0.9.6.0"; - sha256 = "1i5pmwj9ijd3rm1gvyp8n64q1gr1qnijj4ry6mk4h8lij4d9ic67"; + version = "0.9.7.0"; + sha256 = "04ni6q8x9c5zqmdm1kfp3yygcflpdf5hx4r568fm5b6rjxi3zhf6"; libraryHaskellDepends = [ aeson base bytestring containers data-default directory jsaddle text @@ -141981,6 +142422,24 @@ self: { broken = true; }) {}; + "json-directory" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, text + , unordered-containers + }: + mkDerivation { + pname = "json-directory"; + version = "0.1.0.0"; + sha256 = "1pkna0f0al0p391s6i3rnylmh5ydf8jphd728cr14gqlvfq3hqy8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory filepath text unordered-containers + ]; + executableHaskellDepends = [ aeson base bytestring ]; + description = "Load JSON from files in a directory structure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "json-encoder" = callPackage ({ mkDerivation, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras @@ -146692,18 +147151,18 @@ self: { }) {}; "language-bash" = callPackage - ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , transformers + ({ mkDerivation, base, directory, filepath, parsec, prettyprinter + , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "language-bash"; - version = "0.8.0"; - sha256 = "16lkqy1skc82cyxsh313184dbm31hrsi3w1729ci8lw8dybmz6ax"; - libraryHaskellDepends = [ base parsec pretty transformers ]; + version = "0.9.0"; + sha256 = "1n4icdd478b1j0rr79qyxx2g4xm8yvsplfw3mkdsskb79zmq5gga"; + libraryHaskellDepends = [ base parsec prettyprinter transformers ]; testHaskellDepends = [ - base parsec process QuickCheck tasty tasty-expected-failure - tasty-hunit tasty-quickcheck + base directory filepath parsec process QuickCheck tasty + tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck ]; description = "Parsing and pretty-printing Bash shell scripts"; license = stdenv.lib.licenses.bsd3; @@ -149937,6 +150396,25 @@ self: { broken = true; }) {}; + "lex-applicative" = callPackage + ({ mkDerivation, base, dlist, gauge, hs-functors + , parser-combinators, regex-applicative, text, ucd + , unicode-transforms, util + }: + mkDerivation { + pname = "lex-applicative"; + version = "0.0.0.1"; + sha256 = "0dc48xgvky480a1rl9zfyz3ychjlxnyssdmpbzkb795kdkmny2nz"; + libraryHaskellDepends = [ + base dlist hs-functors parser-combinators regex-applicative text + ucd unicode-transforms util + ]; + testHaskellDepends = [ base util ]; + benchmarkHaskellDepends = [ base gauge util ]; + description = "See README for more info"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lexer-applicative" = callPackage ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty , tasty-hunit @@ -150155,8 +150633,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.1.2.0"; - sha256 = "00j1xrfwcmfb2dhz04dy4p2aryp751mmp6hpdcbm2xdhzdxrgkjf"; + version = "2.1.3.2"; + sha256 = "1z934rl8dm4ncp7qs6kqm2hiir41k5ysrpp44nb6rgzs8f8x46mr"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -151372,8 +151850,8 @@ self: { }: mkDerivation { pname = "lightstep-haskell"; - version = "0.4.4"; - sha256 = "0y1pvb4ic9q3ma9vjlsg0spw3wq6ll9za8nys88083bm08098wfd"; + version = "0.4.5"; + sha256 = "19bzwx2vklagyddr3cnk33ydlwyjnq12chbmj3djg9a8ar9rsrph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155389,7 +155867,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_8_2_0" = callPackage + "lsp-test_0_9_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl @@ -155398,8 +155876,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.8.2.0"; - sha256 = "1762avrs4fkkd9v8i76giaf6km5f3lds5laickn7la7zq7ysh8a3"; + version = "0.9.0.0"; + sha256 = "0igd27msf3ya4i3pby434d0pa51qpr27vxyfv0q4i38ajj4ndsx4"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -156079,8 +156557,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "0.3.0.1"; - sha256 = "0rq7kafqnv16313ymcq6vcslgf4ls4zjw7n5i73vp7iwsh80pl5d"; + version = "0.3.0.5"; + sha256 = "0mlwcchikmiaq6scs48g2snaiwcznwrcfksn4yij4hagjz734rpq"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring directory hspec ]; @@ -157727,19 +158205,17 @@ self: { }: mkDerivation { pname = "map-reduce-folds"; - version = "0.1.0.1"; - sha256 = "0jvgg1wk8qaxd7w3d5y7hr62xswy7xqs7b12jdjwzxm7d6k47lvq"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.3"; + sha256 = "0hkdsip3d9nvdalsra7bg7ynah3vv46lg07c7f01psv031gkhgik"; libraryHaskellDepends = [ base containers discrimination foldl hashable hashtables parallel profunctors split streaming streamly text unordered-containers vector ]; - executableHaskellDepends = [ - base containers foldl profunctors text unordered-containers + testHaskellDepends = [ + base containers foldl hedgehog profunctors text + unordered-containers ]; - testHaskellDepends = [ base containers foldl hedgehog ]; benchmarkHaskellDepends = [ base containers criterion deepseq foldl profunctors random text unordered-containers @@ -157835,6 +158311,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "maquinitas-tidal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "maquinitas-tidal"; + version = "0.1.0"; + sha256 = "1gdbcjhcdgk1jx674rbh4lr1xbcks18xiygywsh3pv846wh3m0n6"; + libraryHaskellDepends = [ base ]; + description = "library for MIDI control of hardware"; + license = stdenv.lib.licenses.mit; + }) {}; + "marihana" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -162851,8 +163338,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.6.1"; - sha256 = "0z9crc0x1mi467a3b1q5xrj7syp2m8zb1p69w8l9bhjhab780ljy"; + version = "0.1.7.0"; + sha256 = "1laskxwmylmg7mzm4h6z013s7rhfxf9y1mrvy4dp1cc80kq3scg0"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -162864,8 +163351,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.3.0"; - sha256 = "0asxxv2ykwn82lr744ihfip8lhck888l3rvn4qadjdapv1sn3zfx"; + version = "0.1.4.0"; + sha256 = "1i93744jprkg94lwcas2hvb341m6j08ncn1lzlz6d8z2blpd5z4w"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -162876,8 +163363,8 @@ self: { }: mkDerivation { pname = "mmsyn4"; - version = "0.1.2.0"; - sha256 = "0q3lxkfknmw1jfv8kf3vz09zdkxqrqpzdb5zxxmy1v92g8hgvxs6"; + version = "0.1.5.0"; + sha256 = "0bwdngcasppsfk7znijzimgrrbiilapz4cqg45j2xvd5niaqkfkm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -162906,8 +163393,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.5.1.0"; - sha256 = "1jmbfs0yi7r9lmaxq3dfyrw1rrwhknb7v4xfhrz3w7s8jg3vqs2x"; + version = "0.6.2.0"; + sha256 = "1qmyak0srd3ksj8kk8a8dyy6cbg9kdacdlldnpw46778a5792k0m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -162923,6 +163410,50 @@ self: { broken = true; }) {}; + "mmsyn7h" = callPackage + ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 + , mmsyn6ukr, process, vector + }: + mkDerivation { + pname = "mmsyn7h"; + version = "0.2.1.0"; + sha256 = "0ip5w42wrng87lyygawqdfwfi5ba9qam5ryc1mf7mzfcfajpfh3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector + ]; + executableHaskellDepends = [ + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector + ]; + description = "A program and a library that produces a sound recording specified by the Ukrainian text"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mmsyn7ukr" = callPackage + ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 + , mmsyn6ukr, process, vector + }: + mkDerivation { + pname = "mmsyn7ukr"; + version = "0.3.0.1"; + sha256 = "0pl8yhc1c888xxbn5y6yksdfdwakx46c9nr1mwv474ra266fkcmp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector + ]; + executableHaskellDepends = [ + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector + ]; + description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mmtf" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text @@ -165093,6 +165624,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_15_1" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.15.1"; + sha256 = "1psxhfjmpv3y54wy8f8dwa43finlj7aw2mry67pg521gxmwmppy2"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -165546,8 +166101,8 @@ self: { ({ mkDerivation, base, binary, containers, hspec }: mkDerivation { pname = "more-containers"; - version = "0.2.1.2"; - sha256 = "104ffslcjr8rfbsjy2g49v8l3nx9xrfqglmwcsfgar0n0xnh62ds"; + version = "0.2.2.0"; + sha256 = "1i4klvfwgw608sy81mqqvd107b187gkib2rwsz6aqc4rh0vm0a87"; libraryHaskellDepends = [ base binary containers ]; testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; @@ -165608,44 +166163,46 @@ self: { "morley" = callPackage ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude - , base16-bytestring, base58-bytestring, binary, bytestring + , base16-bytestring, base58-bytestring, bimap, binary, bytestring , constraints, containers, cryptonite, data-default, directory - , filepath, fmt, formatting, generic-arbitrary, ghc-prim, hex-text - , hspec, hspec-expectations, HUnit, lens, megaparsec, memory - , morley-prelude, mtl, named, optparse-applicative - , parser-combinators, pretty-simple, qm-interpolated-string - , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances - , singletons, syb, tasty, tasty-ant-xml, tasty-discover - , tasty-hspec, tasty-quickcheck, template-haskell, text, time - , timerep, transformers-compat, vector, vinyl, wl-pprint-text + , filepath, first-class-families, fmt, formatting, ghc-prim, gitrev + , hex-text, hspec, hspec-expectations, HUnit, interpolate, lens + , megaparsec, memory, morley-prelude, mtl, named + , optparse-applicative, parser-combinators, pretty-simple + , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt + , quickcheck-instances, show-type, singletons, spoon, syb, tasty + , tasty-ant-xml, tasty-discover, tasty-hspec, tasty-hunit + , tasty-quickcheck, template-haskell, text, time, timerep + , transformers-compat, unordered-containers, vector, vinyl + , wl-pprint-text }: mkDerivation { pname = "morley"; - version = "0.3.0.1"; - sha256 = "042kzx6n7jc6chqjvm7l14gpyywvy2s193xsnsvax5cisppm752m"; + version = "0.5.0"; + sha256 = "0p84m66iklsqs8hhz33755lrqrjmp7xc9x62qbqj5bdg9mfi6kl2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-options aeson-pretty base-noprelude base16-bytestring - base58-bytestring binary bytestring constraints containers - cryptonite data-default filepath fmt formatting ghc-prim hex-text - hspec lens megaparsec memory morley-prelude mtl named - parser-combinators QuickCheck quickcheck-arbitrary-adt - quickcheck-instances singletons syb tasty tasty-ant-xml - template-haskell text time timerep transformers-compat vector vinyl - wl-pprint-text + base58-bytestring bimap binary bytestring constraints containers + cryptonite data-default first-class-families fmt formatting + ghc-prim gitrev hex-text hspec interpolate lens megaparsec memory + morley-prelude mtl named parser-combinators pretty-terminal + QuickCheck quickcheck-arbitrary-adt quickcheck-instances show-type + singletons syb tasty tasty-ant-xml tasty-hunit template-haskell + text time timerep transformers-compat unordered-containers vector + vinyl wl-pprint-text ]; executableHaskellDepends = [ - base-noprelude data-default directory filepath fmt megaparsec - morley-prelude named optparse-applicative pretty-simple text + base-noprelude fmt morley-prelude named optparse-applicative + pretty-simple ]; testHaskellDepends = [ - aeson base-noprelude bytestring containers data-default directory - filepath fmt formatting generic-arbitrary hex-text hspec - hspec-expectations HUnit lens megaparsec morley-prelude mtl - qm-interpolated-string QuickCheck quickcheck-arbitrary-adt - quickcheck-instances singletons syb tasty tasty-hspec - tasty-quickcheck text + aeson base-noprelude bimap bytestring constraints containers + data-default directory filepath fmt formatting hex-text hspec + hspec-expectations HUnit lens megaparsec morley-prelude QuickCheck + quickcheck-arbitrary-adt quickcheck-instances singletons spoon syb + tasty tasty-hspec tasty-quickcheck text unordered-containers vinyl ]; testToolDepends = [ tasty-discover ]; description = "Developer tools for the Michelson Language"; @@ -165658,8 +166215,8 @@ self: { ({ mkDerivation, base-noprelude, universum }: mkDerivation { pname = "morley-prelude"; - version = "0.2.0.1"; - sha256 = "0dc0hi1gnw5ri7m0fl0pk3frgsnav1al4b6h4kwamhz4qh3av9b2"; + version = "0.3.0"; + sha256 = "1nrwrz54xg0v9v8f1caccpdav1d0nnjqy8r8wmj5cgf9y30jfzjf"; libraryHaskellDepends = [ base-noprelude universum ]; description = "A custom prelude used in Morley"; license = stdenv.lib.licenses.agpl3Plus; @@ -165696,8 +166253,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.7.1"; - sha256 = "1yh49icsq68xbw9gmvqssy4piaqb97cy39jg4a20360j9sfr87dp"; + version = "0.8.0"; + sha256 = "1b2c39mgh66vkgzhz857m8mlb3kymxnfli0v3z9mrj39a75m6imz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec mtl scientific @@ -166363,8 +166920,8 @@ self: { }: mkDerivation { pname = "ms-tds"; - version = "0.4.0.0"; - sha256 = "0smdr7inwix9hbllj5r217pa17i6ha0wbciqnq9cjsjs9wjnybhh"; + version = "0.4.0.1"; + sha256 = "1yjvbn6a50wvcibvi5na6x1d7864zyspqhljvr0dpcfrz3s2yc31"; libraryHaskellDepends = [ array base binary bytestring crypto-random data-default-class mtl network template-haskell text time tls uuid-types x509-store @@ -167464,15 +168021,17 @@ self: { }) {}; "multiset" = callPackage - ({ mkDerivation, base, containers, deepseq, doctest, Glob }: + ({ mkDerivation, base, checkers, containers, deepseq, doctest + , QuickCheck, tasty, tasty-quickcheck + }: mkDerivation { pname = "multiset"; - version = "0.3.4.1"; - sha256 = "05iynv54mgfwil7l81ni8mrhhb5vz3fdls13vm2m3dnwqgp7vzxh"; - revision = "1"; - editedCabalFile = "1ddnvzpa9h21p013dwzf0iv2fvvf8mba6vaccf4anamvwa327kcl"; + version = "0.3.4.3"; + sha256 = "1i0mjjdv8ayfars014nch5p3jlbl1wlr1bbkp7q2iknkllasxz3r"; libraryHaskellDepends = [ base containers deepseq ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ + base checkers doctest QuickCheck tasty tasty-quickcheck + ]; description = "The Data.MultiSet container type"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -168046,8 +168605,8 @@ self: { }: mkDerivation { pname = "mustache"; - version = "2.3.0"; - sha256 = "1q3vadcvv2pxg6rpp92jq5zy784jxphdfpf6xn9y6wg9g3jn7201"; + version = "2.3.1"; + sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170136,8 +170695,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.6.2.1"; - sha256 = "09l9m213x1v7cvrfr039hg2c1pa4dknyhj827h9n0w9pawj61r55"; + version = "0.6.2.2"; + sha256 = "08svb0k43aqycbms2cabng49dgsiwsjw10lqmjsm18iasgr53gk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170899,8 +171458,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.4.0.7"; - sha256 = "1bqdp7g40dxjin5530sb7mv9ga7qi86ppm4y41wfdyv26kl8lc7f"; + version = "0.5.0.0"; + sha256 = "1d3m0ycibbvnjbns4havp25x9i5ri6kirv579k1xnb82by4nkqap"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -170940,20 +171499,21 @@ self: { "network-bitcoin" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cookie, HTTP - , http-client, http-types, network, network-uri, QuickCheck, text - , time, unordered-containers, vector + , http-client, http-types, network, network-uri, QuickCheck, tasty + , tasty-quickcheck, text, time, unordered-containers, vector }: mkDerivation { pname = "network-bitcoin"; - version = "1.8.3"; - sha256 = "1pllz4il53j9sf6xlxjl3ci3r1n348y6mg0vdy19xy19zy1rjz1q"; + version = "1.9.1"; + sha256 = "12ywzix3fpvlrd43v0q03lbm877pi2dz2x9w421sxvb6gvd2q7s0"; libraryHaskellDepends = [ aeson attoparsec base bytestring cookie HTTP http-client http-types network network-uri text time unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base bytestring cookie HTTP http-client http-types - network QuickCheck text time unordered-containers vector + network QuickCheck tasty tasty-quickcheck text time + unordered-containers vector ]; description = "An interface to bitcoind"; license = stdenv.lib.licenses.bsd3; @@ -172619,8 +173179,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.8"; - sha256 = "0nggarlbfc8x5y7rp8n5fdzy3xipykxq4fk6irz1jsz4m6fbi9a4"; + version = "0.2.9"; + sha256 = "1rmmipa33a8nip6fn616ihdiqdax15niblzspfk8ckrz5fpj2476"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -174205,6 +174765,17 @@ self: { broken = true; }) {}; + "numeric-domains" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numeric-domains"; + version = "0.1.0.0"; + sha256 = "0n5wcg2snpivbp6giqrcd1y97215y6n3hbgbnb6w2gi7qsmyyq10"; + libraryHaskellDepends = [ base ]; + description = "Numeric Domains"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numeric-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -174381,21 +174952,20 @@ self: { }) {}; "numhask-array" = callPackage - ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, hedgehog, numhask-hedgehog - , numhask-prelude, protolude, singletons, vector + ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest + , hedgehog, hmatrix, numhask, numhask-hedgehog, numhask-prelude + , protolude, vector }: mkDerivation { pname = "numhask-array"; - version = "0.3.0.1"; - sha256 = "02pcjnj1y3q053czra9697b4xgyq8dr9ynp7yz3lj9ksnn8dpx5n"; + version = "0.5.0.0"; + sha256 = "0gx2p7b7xb1x5nfp5szdvsbylqsci9bmmz5jmy86c4z13srxmkkq"; libraryHaskellDepends = [ - adjunctions base deepseq dimensions distributive numhask-prelude - protolude singletons vector + adjunctions base deepseq distributive hmatrix numhask + numhask-prelude protolude vector ]; testHaskellDepends = [ - adjunctions base dimensions doctest hedgehog numhask-hedgehog - numhask-prelude + base doctest hedgehog numhask-hedgehog numhask-prelude ]; description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; @@ -175896,8 +176466,8 @@ self: { ({ mkDerivation, base, containers, doctest }: mkDerivation { pname = "op"; - version = "0.3.0.0"; - sha256 = "0as0nswa28mbw7qp1p1pjvvr4iv6zd81rka9g51fy2w52260lmpv"; + version = "0.4.0.0"; + sha256 = "17wng5pl4d92nkrmbzwi1c8l3cdh9ms50p6m7vvc4z1x4gnp9lf9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers doctest ]; description = "Common operators encouraging large-scale easy reading"; @@ -178125,23 +178695,23 @@ self: { }) {}; "overloaded" = callPackage - ({ mkDerivation, base, bytestring, containers, fin, generic-lens - , ghc, HUnit, lens, optics-core, record-hasfield, singleton-bool - , sop-core, split, syb, symbols, tasty, tasty-hunit, text, time - , vec + ({ mkDerivation, base, bin, bytestring, containers, fin + , generic-lens, ghc, HUnit, lens, optics-core, ral, record-hasfield + , singleton-bool, sop-core, split, syb, symbols, tasty, tasty-hunit + , text, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.1.3"; - sha256 = "0yz94zzcwdw34c5v9qmqak9bwqz8gq1s80phf9rn8p0bg6a4l0h4"; + version = "0.2"; + sha256 = "1kp3vbdfwp9caicmj2k1qznbsn844pm75sy8ywwm86334f08vshk"; libraryHaskellDepends = [ - base bytestring containers fin ghc optics-core record-hasfield - sop-core split syb symbols text time vec + base bin bytestring containers fin ghc optics-core ral + record-hasfield sop-core split syb symbols text time vec ]; testHaskellDepends = [ - base bytestring containers fin generic-lens HUnit lens optics-core - record-hasfield singleton-bool sop-core symbols tasty tasty-hunit - text time vec + base bin bytestring containers fin generic-lens HUnit lens + optics-core ral record-hasfield singleton-bool sop-core symbols + tasty tasty-hunit text time vec ]; doHaddock = false; description = "Overloaded pragmas as a plugin"; @@ -178823,25 +179393,25 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_9" = callPackage + "pandoc_2_9_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, cmark-gfm, containers, criterion, data-default , deepseq, Diff, directory, doclayout, doctemplates, emojis , exceptions, executable-path, filepath, Glob, haddock-library , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP - , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl - , network, network-uri, pandoc-types, parsec, process, QuickCheck - , random, safe, scientific, SHA, skylighting, skylighting-core - , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-transforms, unix, unordered-containers, vector - , weigh, xml, zip-archive, zlib + , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup + , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec + , process, QuickCheck, random, safe, scientific, SHA, skylighting + , skylighting-core, split, syb, tagsoup, tasty, tasty-golden + , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath + , text, text-conversions, time, unicode-transforms, unix + , unordered-containers, vector, weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.9"; - sha256 = "1j4n7r4rh22ba4m4h3psy2jm3cxfd6pxlbpw0z613z01g30mr90c"; + version = "2.9.1"; + sha256 = "1ywbsx8389vp4a85sxajdgj0vis4v8y6zkq87lla0s1lprk3am0a"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -178852,11 +179422,11 @@ self: { containers data-default deepseq directory doclayout doctemplates emojis exceptions filepath Glob haddock-library hslua hslua-module-system hslua-module-text HsYAML HTTP http-client - http-client-tls http-types ipynb JuicyPixels mtl network - network-uri pandoc-types parsec process random safe scientific SHA - skylighting skylighting-core split syb tagsoup temporary texmath - text text-conversions time unicode-transforms unix - unordered-containers vector xml zip-archive zlib + http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl + network network-uri pandoc-types parsec process random safe + scientific SHA skylighting skylighting-core split syb tagsoup + temporary texmath text text-conversions time unicode-transforms + unix unordered-containers vector xml zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -178978,8 +179548,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.6.0"; - sha256 = "0k1wvkjhlwgr8njsrjiivzyb1pbi17y6nxky4pb5wkkg57fd5847"; + version = "0.3.6.1"; + sha256 = "1fk06lg9hx5gdmjf4qsgl4p34y676v33l8yc0hyrdx81v8yicp5m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179111,8 +179681,8 @@ self: { }: mkDerivation { pname = "pandoc-include-code"; - version = "1.4.0.0"; - sha256 = "0s3dayslfpnivr5h6napcrdh35bay7797z8nxjhr7c78ni7gdax9"; + version = "1.5.0.0"; + sha256 = "07ah6f28sb68wdp3514jmxgh2bdvwqdn60ym8j0qbk98i9gsj0ax"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -179122,7 +179692,7 @@ self: { executableHaskellDepends = [ base pandoc-types ]; testHaskellDepends = [ base hspec hspec-expectations pandoc-types tasty tasty-hspec - tasty-hunit + tasty-hunit text ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; @@ -179449,8 +180019,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.6.1"; - sha256 = "1b17nap158ml58ks0zsdqx6v7gbdwaha1m0rw4bh4if7h0ai9vxp"; + version = "0.13.8.0"; + sha256 = "1skyfj0phd5hzpk86lj7qx0g6n09b1cfijlf759p7v34f47g6w2s"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ @@ -180503,6 +181073,31 @@ self: { license = "GPL"; }) {}; + "parquet-hs" = callPackage + ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring + , conduit, conduit-extra, containers, error-util, filepath + , generic-lens, hspec, http-client, http-conduit, http-types, lens + , lifted-async, monad-logger, mtl, pinch, process, QuickCheck, safe + , serialise, text, unordered-containers + }: + mkDerivation { + pname = "parquet-hs"; + version = "0.1.0.0"; + sha256 = "128fmwz2jnljrbj5zagw4wqqnv7zn0xs4cmaisp6qrxjsfjfiy2j"; + libraryHaskellDepends = [ + aeson base binary binary-conduit bytestring conduit conduit-extra + containers error-util generic-lens http-client http-conduit + http-types lens lifted-async monad-logger mtl pinch safe serialise + text unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bytestring conduit filepath hspec monad-logger + mtl process QuickCheck text + ]; + description = "Streaming Parquet reader"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "parse-dimacs" = callPackage ({ mkDerivation, array, base, bytestring, parsec }: mkDerivation { @@ -183370,24 +183965,6 @@ self: { }: mkDerivation { pname = "persistent-iproute"; - version = "0.2.3"; - sha256 = "1amzxmwispqi29ln50mfj43i1srl53n5iz7lsq8rxhd1x8fa35gm"; - revision = "1"; - editedCabalFile = "1jly9db968q5j5ly75f77hwxrhky3s6xx8ydgsjn5cdr9rc4iz8k"; - libraryHaskellDepends = [ - aeson aeson-iproute base bytestring http-api-data iproute - path-pieces persistent text - ]; - description = "Persistent instances for types in iproute"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistent-iproute_0_2_4" = callPackage - ({ mkDerivation, aeson, aeson-iproute, base, bytestring - , http-api-data, iproute, path-pieces, persistent, text - }: - mkDerivation { - pname = "persistent-iproute"; version = "0.2.4"; sha256 = "1lsprnlgcnj8v38cnbgf2vpj9ivgsvgi3yy3nh1gmvyj7maznkq5"; libraryHaskellDepends = [ @@ -183396,7 +183973,6 @@ self: { ]; description = "Persistent instances for types in iproute"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-map" = callPackage @@ -184320,25 +184896,24 @@ self: { broken = true; }) {}; - "pg-transact_0_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hspec - , hspec-discover, hspec-expectations-lifted, monad-control + "pg-transact_0_3_1_1" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, hspec + , hspec-expectations-lifted, monad-control, postgresql-libpq , postgresql-simple, tmp-postgres, transformers }: mkDerivation { pname = "pg-transact"; - version = "0.2.1.0"; - sha256 = "1wh4qf00ggyx6ff3llpcbnlbhn61c3yqqd3ljjglwv2bfjhrgajh"; + version = "0.3.1.1"; + sha256 = "1z101hbfan8aidq7lcnzzni4b7ji8sbbqx1yar6ykf6wmzmn2pcd"; libraryHaskellDepends = [ base bytestring exceptions monad-control postgresql-simple transformers ]; testHaskellDepends = [ - base bytestring exceptions hspec hspec-discover - hspec-expectations-lifted postgresql-simple tmp-postgres + async base bytestring exceptions hspec hspec-expectations-lifted + postgresql-libpq postgresql-simple tmp-postgres ]; - testToolDepends = [ hspec-discover ]; - description = "Another postgresql-simple transaction monad"; + description = "A postgresql-simple transaction monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -188969,16 +189544,18 @@ self: { }) {inherit (pkgs) acl;}; "posix-api" = callPackage - ({ mkDerivation, base, primitive, primitive-addr, primitive-offset - , primitive-unlifted, tasty, tasty-hunit + ({ mkDerivation, base, byteslice, primitive, primitive-addr + , primitive-offset, primitive-unlifted, systemd, tasty, tasty-hunit }: mkDerivation { pname = "posix-api"; - version = "0.3.2.0"; - sha256 = "1ki45p31cc1zplzsi9kln85rm556rwk5yvwgsb75bcgqwg6xpcl8"; + version = "0.3.3.0"; + sha256 = "0a4npmhgnpq7ya21zijsxhyndr9swlknh6v7rn6y9qbva4q3gjx7"; libraryHaskellDepends = [ - base primitive primitive-addr primitive-offset primitive-unlifted + base byteslice primitive primitive-addr primitive-offset + primitive-unlifted ]; + librarySystemDepends = [ systemd ]; testHaskellDepends = [ base primitive primitive-unlifted tasty tasty-hunit ]; @@ -188986,7 +189563,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) systemd;}; "posix-error-codes" = callPackage ({ mkDerivation, base }: @@ -189779,8 +190356,6 @@ self: { ]; description = "Parse postgres:// url into ConnectInfo"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgresql-syntax" = callPackage @@ -190566,8 +191141,8 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.6.0.0"; - sha256 = "0fk30pn759fg9v2k5gw51hk6vkp2vq4sh574zlqdk4vx6r2r5jrp"; + version = "0.6.0.1"; + sha256 = "1izg98ql496qn8dvn3blz2654bhy8901x7hfh0dxqqzrm1gi5bf4"; libraryHaskellDepends = [ aeson base binary bytestring comonad containers deepseq directory ghc-prim hashable lens mtl pcre-heavy pcre-light pretty @@ -191211,15 +191786,15 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; - "pretty-simple_3_1_1_0" = callPackage + "pretty-simple_3_2_0_0" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest , containers, criterion, doctest, Glob, mtl, QuickCheck , template-haskell, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "3.1.1.0"; - sha256 = "073x8jwnar4p7615dk0x92d76in2xwsgpip3w3hgq948c4ydmv58"; + version = "3.2.0.0"; + sha256 = "0jbxyjiyshbc5q5avbmm5ms8n8m0zm540gl3x7vz8k22pcb65jv8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -192669,21 +193244,26 @@ self: { }) {}; "profunctor-optics" = callPackage - ({ mkDerivation, base, comonad, connections, containers - , distributive, doctest, ilist, mtl, newtype-generics - , profunctor-arrows, profunctors, rings, semigroupoids, tagged - , transformers, unliftio-core + ({ mkDerivation, adjunctions, base, comonad, connections + , containers, distributive, doctest, hedgehog, ilist, mtl + , newtype-generics, profunctor-arrows, profunctors, rings + , semigroupoids, tagged, transformers, unliftio-core }: mkDerivation { pname = "profunctor-optics"; - version = "0.0.0.2"; - sha256 = "0xf7aikcbp1vgdd5bd4rf94w6iavwbxrxbr67prddqanv3jmjqn9"; + version = "0.0.0.4"; + sha256 = "0r3ixf0j1iass289mkxkjrmljxhybqk7bqz3acinf5qh52318kk5"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base comonad connections containers distributive ilist mtl + adjunctions base comonad connections distributive mtl newtype-generics profunctor-arrows profunctors rings semigroupoids tagged transformers unliftio-core ]; - testHaskellDepends = [ base containers doctest mtl ]; + executableHaskellDepends = [ + adjunctions base containers doctest ilist mtl + ]; + testHaskellDepends = [ base connections hedgehog ]; description = "An optics library compatible with the typeclasses in 'profunctors'"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -195793,8 +196373,8 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.1"; - sha256 = "1mklz3r4z2ifzsl061rqjhrnis1a1fyvaxlp6dws4y95dy4slm92"; + version = "0.9.2"; + sha256 = "17a21a65n3hm739q7kgvpd4wvqz3i5y9bdkl6072ch87j0baqmpy"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers dlist primitive text vector @@ -195854,8 +196434,8 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.5.1"; - sha256 = "1pwqc5i6viyk3ik8vh2zd9k25vj9y1r9mmikxwzjhv6jwc8sb5pb"; + version = "0.6.0"; + sha256 = "1v355mfs67rh2rcn71rkai0c16y3aqcb7q33ykhrghcl7238ym9h"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; @@ -195871,8 +196451,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.5.0"; - sha256 = "087sspnaw39zcymkm0xzyzdbc4g96zlpa45b2i6mfshxi4g38af5"; + version = "0.6.0"; + sha256 = "0zak709bgc9r8bydj834hkzix9zripnhi5z792ryr3k7anmyy6fv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -195885,21 +196465,21 @@ self: { }) {}; "qtah-generator" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath - , haskell-src, hoppy-generator, hoppy-std, mtl, process + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , filepath, haskell-src, hoppy-generator, hoppy-std, mtl, process , transformers }: mkDerivation { pname = "qtah-generator"; - version = "0.5.0"; - sha256 = "0kbc3dpmkxxi2ms6a7dga02g19vq9fm0hz53y9x6iyfpnlpk1sy7"; + version = "0.6.0"; + sha256 = "0w7fsn2j5g5miv12gm3d0x52xypbshdmxza6imjnpz01kljhqhpm"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ - base containers directory filepath haskell-src hoppy-generator - hoppy-std mtl process transformers + base bytestring containers directory filepath haskell-src + hoppy-generator hoppy-std mtl process transformers ]; doHaddock = false; description = "Generator for Qtah Qt bindings"; @@ -195915,8 +196495,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.5.1"; - sha256 = "082mz3j3bk7hlagwdw0y399r8jid2wf6xzsdd2wnc4n6z6w6p8gx"; + version = "0.6.0"; + sha256 = "1irinnq1iryphnnqg05l3icirvzkh5xm4cdwhqvshbin7i6gv0bs"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator @@ -199642,6 +200222,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "read-ctags" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, hspec + , optparse-applicative, text + }: + mkDerivation { + pname = "read-ctags"; + version = "0.1.0.0"; + sha256 = "1w6f8p6v3sry42pg8zizfyagknfmpn47vzk3a2c2n2bv1ib0v1hf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory text + ]; + executableHaskellDepends = [ + base bytestring containers directory optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring containers directory hspec text + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "read-editor" = callPackage ({ mkDerivation, base, directory, process }: mkDerivation { @@ -200893,8 +201495,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.6.2.4"; - sha256 = "1gm8w2ri16apy3b13i2f17pk1nsrsi0vbcrkckd1abbm4r4i16cd"; + version = "0.6.3"; + sha256 = "0nrmc86dinkxvfyj1wh57g816hzqxs583ipaqiq9gipadsa2jgcs"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -201011,8 +201613,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.5.2.0"; - sha256 = "01sqql44jcn7d9xcb00br99zgyghiyqzcmncfpz4dgik10dam1hv"; + version = "0.5.3"; + sha256 = "04xnalhrckz5idnx1d4d93nz8fnxnjsd03kciln36wwd895bcmrk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -201074,8 +201676,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.5.2.0"; - sha256 = "1vqd6viqg9di9z0wchi3ffcia4spljf3dal8l21k7qhwcbz4g3jz"; + version = "0.5.3"; + sha256 = "0znymqld4d6fp8l14y0gn86nbffaw8b0ql0y7bj3vnx80crjc32j"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring constraints containers contravariant data-default dependent-map dependent-sum @@ -203173,8 +203775,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "2"; - editedCabalFile = "16kyy7ck3yki0mlcap0bbiadcn18yn6x90m4s2prkasi9ip0pcs8"; + revision = "3"; + editedCabalFile = "17hxj42cm82sac42by78jgbjjn5r3qv7n4919llaq17a2k1np0sw"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -203188,6 +203790,8 @@ self: { pname = "repa-algorithms"; version = "3.4.1.3"; sha256 = "1bhg1vr85j9mqm9lg1577dvlgzdbkh9f48h0ll6h03jfw7knyn6y"; + revision = "1"; + editedCabalFile = "0lvb1sn95qca9m1b8cy0a2j9gjzqm8g5v68ykglffjskv78d0jfm"; libraryHaskellDepends = [ base repa vector ]; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; @@ -203278,8 +203882,8 @@ self: { pname = "repa-examples"; version = "3.4.1.2"; sha256 = "1lqqnk3prvw1pr2wi4rhymb8ij6mjp9mcsvjcllnxv567mz9gr4d"; - revision = "2"; - editedCabalFile = "0aghk6pav63hx13dzmp9v9izq7zv4kdc0vbbv2wr14i234ghljh9"; + revision = "3"; + editedCabalFile = "149wg57xkbnqymcmbd7i20kj37zyz0a4qm9426nkrrhkvs1acx52"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203338,8 +203942,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "3"; - editedCabalFile = "027vn7an0hm3ysnzk19y0dbjpah0wpg96dgb55149x1310vwybxl"; + revision = "4"; + editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -203386,6 +203990,8 @@ self: { pname = "repa-scalar"; version = "4.2.3.3"; sha256 = "1qjzrmz010gm50in0yja817r6wl0n2iybd00dsfpcspdaq91ahvb"; + revision = "1"; + editedCabalFile = "14p7m3fyl3h6asxcb3lh67f3ypw85109fxfag5aycdr39g5xa6rm"; libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; @@ -207636,6 +208242,8 @@ self: { pname = "rvar"; version = "0.2.0.3"; sha256 = "1h3bii1pamkv7656280i6zx7fpdwgbn2ysfijpd2s65szlpsz2np"; + revision = "1"; + editedCabalFile = "1ifwwjlhc3l8ycjmmarw6v1nm7jxpgqw2ly0q35idlj0jc0nbxn6"; libraryHaskellDepends = [ base MonadPrompt mtl random-source transformers ]; @@ -207935,7 +208543,7 @@ self: { broken = true; }) {}; - "safe-json_1_0_0" = callPackage + "safe-json_1_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist , generic-arbitrary, hashable, quickcheck-instances, scientific , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time @@ -207943,8 +208551,8 @@ self: { }: mkDerivation { pname = "safe-json"; - version = "1.0.0"; - sha256 = "0i5wryhfiqdqxgzzk9ywnlh4y8hvanrm2mqa0niavf4jgvkkfalh"; + version = "1.1.0"; + sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -209622,6 +210230,27 @@ self: { broken = true; }) {}; + "schedule" = callPackage + ({ mkDerivation, async, base, checkers, containers, doctest, extra + , lens, primitive, safe, stm, system-time-monotonic, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + }: + mkDerivation { + pname = "schedule"; + version = "0.2.0.0"; + sha256 = "02sfzvkz0r1lyqbsiba866jhcfb5f223z09zj437d31vayn6nzay"; + libraryHaskellDepends = [ + async base containers extra lens primitive safe stm + system-time-monotonic text time transformers + ]; + testHaskellDepends = [ + base checkers doctest primitive tasty tasty-hunit tasty-quickcheck + transformers + ]; + description = "Pure deterministic scheduled computations"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "schedule-planner" = callPackage ({ mkDerivation, aeson, base, bytestring, composition, containers , HTTP, http-types, mtl, options, text, text-icu, transformers, wai @@ -209698,21 +210327,21 @@ self: { "schemas" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring , free, generic-lens, generics-sop, hashable, hspec, lens - , lens-aeson, pretty-simple, profunctors, QuickCheck, scientific - , text, transformers, unordered-containers, vector + , lens-aeson, mtl, pretty-simple, profunctors, QuickCheck + , scientific, text, transformers, unordered-containers, vector }: mkDerivation { pname = "schemas"; - version = "0.3.0.2"; - sha256 = "1rpsnfa98ckiaz5av9m2x6p96a5ilayry45nsplbrf70xaawz4nq"; + version = "0.4.0.0"; + sha256 = "1i8sapi31dwlhjvkhgcznd1mfw1h86hgg310x6zkz2m1wkazy5yr"; libraryHaskellDepends = [ aeson base bifunctors bytestring free generics-sop hashable lens - lens-aeson profunctors scientific text transformers + lens-aeson mtl profunctors scientific text transformers unordered-containers vector ]; testHaskellDepends = [ aeson aeson-pretty base bytestring generic-lens generics-sop hspec - lens pretty-simple QuickCheck text transformers + lens mtl pretty-simple QuickCheck text transformers unordered-containers ]; description = "schema guided serialization"; @@ -211238,6 +211867,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) secp256k1;}; + "secp256k1-haskell_0_1_6" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cereal + , entropy, hashable, hspec, hspec-discover, HUnit, libsecp256k1 + , mtl, QuickCheck, string-conversions + }: + mkDerivation { + pname = "secp256k1-haskell"; + version = "0.1.6"; + sha256 = "1xasiii9g6ypn9y89q7ramkgz7vx87fr21qqbh1657my4aaipv03"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable + QuickCheck string-conversions + ]; + libraryPkgconfigDepends = [ libsecp256k1 ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal entropy hashable hspec + HUnit mtl QuickCheck string-conversions + ]; + testToolDepends = [ hspec-discover ]; + description = "Bindings for secp256k1 library from Bitcoin Core"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {libsecp256k1 = null;}; + "secp256k1-legacy" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal , cryptohash, entropy, HUnit, mtl, QuickCheck, string-conversions @@ -211722,6 +212375,8 @@ self: { pname = "semialign-extras"; version = "0.1.0.0"; sha256 = "0wnaspwfj9rm7g9mz2q9xad5a9rvkfsrjb5lir64csppy3p11276"; + revision = "1"; + editedCabalFile = "0cz85cbv6qiv1rvlhnxxlibfys2qj5bfsjwwhmnkq91wm69scwpy"; libraryHaskellDepends = [ base lens semialign semialign-indexed these witherable ]; @@ -214991,6 +215646,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-to-elm" = callPackage + ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm + , http-types, protolude, servant, text + }: + mkDerivation { + pname = "servant-to-elm"; + version = "0.2.0.0"; + sha256 = "0kj42y6jb5cqylkvj0iwm857vliagfgbh7rgyzbrgz834r7n5cri"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bound elm-syntax haskell-to-elm http-types protolude + servant text + ]; + testHaskellDepends = [ + aeson base bound elm-syntax haskell-to-elm http-types protolude + servant text + ]; + description = "Automatically generate Elm clients for Servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-tracing" = callPackage ({ mkDerivation, aeson, async, base, bytestring, bytestring-lexing , containers, hashable, http-api-data, http-client, HUnit @@ -215219,8 +215896,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.9.4"; - sha256 = "11svl9km810xw4vbn3vd9jqnv9fglf5jqfyfshnjachiz38fdsih"; + version = "0.10.0"; + sha256 = "0ja15985r9jywlkc85r3qchi6i9mbkyjh3b0fkn6vwc8gh644nrk"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -216255,14 +216932,15 @@ self: { "shake" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, filepattern, hashable, heaps, js-dgtable - , js-flot, js-jquery, primitive, process, QuickCheck, random, time - , transformers, unix, unordered-containers, utf8-string + , extra, file-embed, filepath, filepattern, hashable, heaps + , js-dgtable, js-flot, js-jquery, primitive, process, QuickCheck + , random, template-haskell, time, transformers, unix + , unordered-containers, utf8-string }: mkDerivation { pname = "shake"; - version = "0.18.3"; - sha256 = "0ywcdzxly8zvz2p3v5b3lp5bnkwsqxvdas7ysrhgxbhi3bnjvzjf"; + version = "0.18.4"; + sha256 = "0vpgs6f365p1s09h30g2a6qy4y0rxi3pyxcg14kiag9k504af9i0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -216272,9 +216950,10 @@ self: { random time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ - base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-dgtable js-flot js-jquery primitive process - random time transformers unix unordered-containers utf8-string + base binary bytestring deepseq directory extra file-embed filepath + filepattern hashable heaps js-dgtable js-flot js-jquery primitive + process random template-haskell time transformers unix + unordered-containers utf8-string ]; testHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern @@ -216320,8 +216999,8 @@ self: { }: mkDerivation { pname = "shake-cabal"; - version = "0.2.1.1"; - sha256 = "0d3c1v7pj568fj65fz7dd4h72wpnzz75n1k974nmjbx12vphfd1i"; + version = "0.2.2.1"; + sha256 = "1vyz95qa5f6k0lqf24w60dmlszs1sv0sqv2p0sncn8ll7g785sx1"; libraryHaskellDepends = [ base binary Cabal composition-prelude deepseq directory filepath hashable shake @@ -217422,6 +218101,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut-links_0_5_0_0" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "shortcut-links"; + version = "0.5.0.0"; + sha256 = "0y5q3m5sqwwhahq8fx1alc2531jfgr4nng8yfpib8sg57n0wggwf"; + libraryHaskellDepends = [ base text ]; + description = "Link shortcuts for use in text markup"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shorten-strings" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -218056,23 +218747,11 @@ self: { ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.2.0.1"; - sha256 = "0kd0kr27q72ay5jzrnyqnbbfl4q1lyrlq13s74iphxx4s2yzn03p"; - libraryHaskellDepends = [ base directory filepath process unix ]; - description = "Simple String-based process commands"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-cmd_0_2_1" = callPackage - ({ mkDerivation, base, directory, filepath, process, unix }: - mkDerivation { - pname = "simple-cmd"; version = "0.2.1"; sha256 = "1b35hsxr63n3nbpjdf7ailsmp4yk6k8nscx8xxv453v0r3v89hss"; libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-cmd-args" = callPackage @@ -220112,8 +220791,8 @@ self: { }: mkDerivation { pname = "slick"; - version = "1.0.1.0"; - sha256 = "0zmg8k12dd8apjd6bjjhf5vdfc927pq372r5gvyjx5rmrfkcwx4l"; + version = "1.0.1.1"; + sha256 = "1n1a7jpn37dzfmk9z51d6yhg2iaraqw55qnlap0d6zk1lnc3drib"; libraryHaskellDepends = [ aeson base bytestring directory extra mustache pandoc shake text unordered-containers @@ -221341,8 +222020,8 @@ self: { pname = "snap-server"; version = "1.1.1.1"; sha256 = "0lw475wp0lnrbgc3jcfif3qjjc3pmrh2k74d8cgpnc1304g6a2s5"; - revision = "2"; - editedCabalFile = "12yr0yc7xqxsia84756qalr96fa2lz0sd3mfww2i8784ndlbkfwf"; + revision = "3"; + editedCabalFile = "1xma33r1by1q79qqbb70lwf4d846qlqs0f22rzrd3cdzkzcf9qf5"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -223232,24 +223911,26 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell - , type-errors-pretty + ({ mkDerivation, base, hspec, mtl, souffle, template-haskell, text + , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "0.0.1"; - sha256 = "1sz5xaw24fknq4y9a9cpp36h6fm46ipclp3nwmpqpnc5svsslgbz"; + version = "0.1.0"; + sha256 = "0m8p9fx4avv4kf4hbr248rk9k3vixzkx4gqmcslfra3d79akjyad"; libraryHaskellDepends = [ - base mtl template-haskell type-errors-pretty + base mtl template-haskell text type-errors-pretty vector ]; + libraryToolDepends = [ souffle ]; testHaskellDepends = [ - base hspec mtl template-haskell type-errors-pretty + base hspec mtl template-haskell text type-errors-pretty vector ]; + testToolDepends = [ souffle ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) souffle;}; "sound-collage" = callPackage ({ mkDerivation, array, base, Cabal, carray, containers, fft @@ -225907,8 +226588,6 @@ self: { ]; description = "Convert stack projects to cabal.project + cabal.project.freeze"; license = stdenv.lib.licenses.gpl3Plus; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack2nix" = callPackage @@ -227066,7 +227745,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "stb-image-redux" = callPackage + "stb-image-redux_0_2_1_2" = callPackage ({ mkDerivation, base, hspec, vector }: mkDerivation { pname = "stb-image-redux"; @@ -227080,6 +227759,20 @@ self: { broken = true; }) {}; + "stb-image-redux" = callPackage + ({ mkDerivation, base, hspec, vector }: + mkDerivation { + pname = "stb-image-redux"; + version = "0.2.1.3"; + sha256 = "01xm1vlyfmnnvr5vy9ry7cjwv9ffip0s4zlxcyvfnsgja08l5ni4"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec vector ]; + description = "Image loading and writing microlibrary"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "stb-truetype" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -228633,8 +229326,8 @@ self: { }: mkDerivation { pname = "streaming-events"; - version = "1.0.0"; - sha256 = "12rbw1gvcfl2svlsm7x1v01j9bk0fdh6x7j1c0v6a9xjmwq2bgv6"; + version = "1.0.1"; + sha256 = "0cgd3lvxb91jd1nkw4vci5zjp6s6q545cqgd9fq6i4mxrgn7ky7h"; libraryHaskellDepends = [ attoparsec base binary bytestring http-client streaming streaming-attoparsec streaming-bytestring wai-extra @@ -229045,17 +229738,16 @@ self: { }) {}; "strelka-core" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , hashable, mtl, semigroups, text, transformers - , unordered-containers + ({ mkDerivation, base, bytestring, hashable, mmorph, mtl, text + , transformers, unordered-containers }: mkDerivation { pname = "strelka-core"; - version = "0.3.0.1"; - sha256 = "0hksf6p2pjvlvpgyndrcza16n0zyjaykqxzwy0igvylkwg1684qy"; + version = "0.3.1"; + sha256 = "1gy382layyir0cy96igf5kyfsjzvqpb4v8bca5vl911rwmp5095v"; libraryHaskellDepends = [ - base base-prelude bifunctors bytestring hashable mtl semigroups - text transformers unordered-containers + base bytestring hashable mmorph mtl text transformers + unordered-containers ]; description = "Core components of \"strelka\""; license = stdenv.lib.licenses.mit; @@ -229388,6 +230080,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-interpolate_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, formatting + , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + , neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, random-shuffle + , template-haskell, text, text-conversions, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.2.0.0"; + sha256 = "084mkh9xx9dcy7j92kca6rv580v8223n7xgm9csy51mn0h2lg6wq"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode random-shuffle text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion formatting interpolate + interpolatedstring-perl6 neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -230583,23 +231305,49 @@ self: { broken = true; }) {}; + "summoner_1_4_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , directory, filepath, generic-deriving, gitrev, hedgehog, hspec + , neat-interpolation, optparse-applicative, process, relude + , shellmet, text, time, tomland, tree-diff + }: + mkDerivation { + pname = "summoner"; + version = "1.4.0.0"; + sha256 = "0niakfpnk86n69n7kazlv2z00g211b9lgp2b8qphlr4xyz3b7fn0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring containers directory filepath + generic-deriving gitrev neat-interpolation optparse-applicative + process relude shellmet text time tomland + ]; + executableHaskellDepends = [ base relude ]; + testHaskellDepends = [ + base directory filepath hedgehog hspec neat-interpolation relude + text tomland tree-diff + ]; + description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "summoner-tui" = callPackage - ({ mkDerivation, base, base-noprelude, brick, directory, filepath - , microlens, microlens-th, relude, summoner, text, vty + ({ mkDerivation, base, brick, directory, filepath, microlens + , microlens-th, relude, summoner, text, vty }: mkDerivation { pname = "summoner-tui"; - version = "0.1.0"; - sha256 = "0ic9faw55qjljwz8r0nz8jmdw2pcc40nqc0zp07hshqh8qbiswl9"; - revision = "1"; - editedCabalFile = "0rjnrhh62m2jy74dqdiywkk2gqs1dds97h55qxc50qysdiiwmmal"; + version = "1.4.0.0"; + sha256 = "0vz4nd5wwjdk8n9n1lwa5b8xs863fkkcq56rwy0fifp1xr4184si"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base-noprelude brick directory filepath microlens microlens-th - relude summoner text vty + base brick directory filepath microlens microlens-th relude + summoner text vty ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -231283,8 +232031,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.2.0"; - sha256 = "1h3phyq9g7lmw0mf75hlccvixgwffvkfnlyy1g34hwh9i5nj0aqw"; + version = "0.13.2.1"; + sha256 = "19jq5nf3v6774d0imbz5dkajriqx3fa93zvxjyqh1nm5birczaj8"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; @@ -234375,8 +235123,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.1.1.0"; - sha256 = "1vr25n4q4rb5z760dpd247h3z6r8ydqgg5z5hihmps1vhazvxa8c"; + version = "0.1.2.0"; + sha256 = "1kmmlb3d9bfc47lvlv8v3zxp3cymv3v5i2m86m4iglhg0x6lyawp"; libraryHaskellDepends = [ aeson base bytestring process random string-interpolate text time unordered-containers uuid @@ -234841,8 +235589,8 @@ self: { }: mkDerivation { pname = "tasty-rerun"; - version = "1.1.15"; - sha256 = "008pwf3mqn18vxzxym6zbfm7kf4g415g3722r41vdbh972xkz3w2"; + version = "1.1.16"; + sha256 = "1xrm7z5dhg7zfpq7xr1pdwqsgrvxsb5r5ia063lcxlxk2dizrib2"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -235105,24 +235853,24 @@ self: { }) {}; "tcod-haskell" = callPackage - ({ mkDerivation, base, bytestring, containers, inline-c, repa, sdl2 - , tcod, vector + ({ mkDerivation, base, bytestring, containers, inline-c, libtcod + , repa, sdl2, vector }: mkDerivation { pname = "tcod-haskell"; - version = "0.2.0.0"; - sha256 = "131qdd7h2890as35lfb3kx37j3vrz33ajxp5n4cl65rdrdk5vfxc"; + version = "0.3.0.0"; + sha256 = "08pcjzc2kc6aaba7n2j3sbglqpcml47s0mpgfgkbngrnzzs7hrj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers inline-c repa sdl2 vector ]; - librarySystemDepends = [ tcod ]; + libraryPkgconfigDepends = [ libtcod ]; description = "Bindings to libtcod roguelike engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {tcod = null;}; + }) {inherit (pkgs) libtcod;}; "tconfig" = callPackage ({ mkDerivation, base, containers }: @@ -236514,8 +237262,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.1.0.0"; - sha256 = "1asifxkc73n8g30qmr1nr83vpvgx8smi505322n9sknlb1hadgms"; + version = "0.1.0.1"; + sha256 = "0rk1i9pl6x6f58hbij287aaab7ac3iy3ngs2bqb2990zqfh12ir4"; libraryHaskellDepends = [ aeson base bytestring casing containers generic-deriving lens lens-aeson mtl template-haskell text time vector wreq @@ -239453,6 +240201,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_3_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , safe, snap-core, snap-server, stm, template-haskell, text + , transformers, unordered-containers, vault, vector, websockets + , websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.3.1"; + sha256 = "08jmnyaskbfzwzyghs9ccmq6rdfxcgw0si7p6kc5ppi86gxdr5sl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable safe snap-core snap-server + stm template-haskell text transformers unordered-containers vault + vector websockets websockets-snap + ]; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -239650,8 +240423,8 @@ self: { }: mkDerivation { pname = "thumbnail-polish"; - version = "0.0.1.0"; - sha256 = "09b5689anqbll8x7mwcwbcm5qwsxvayglfk3k3p55jwp142z75ir"; + version = "0.0.1.1"; + sha256 = "1bl45s6cb5pak3g5w3p98n7dipg1b8fapq7y5radzlwkgjchp600"; libraryHaskellDepends = [ base bytestring data-default directory filepath friday friday-devil nonce resourcet text @@ -239836,6 +240609,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_1_4_6" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, mwc-random + , network, parsec, primitive, random, text, transformers, vector + , weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.4.6"; + sha256 = "1mgyss58kwvdp39qznqxkks8vvyq5w802g60rvmc26ipilhm1rd9"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + mwc-random network parsec primitive random text transformers vector + ]; + testHaskellDepends = [ base containers microspec parsec ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -241448,7 +242243,7 @@ self: { broken = true; }) {}; - "tmp-postgres_1_31_0_1" = callPackage + "tmp-postgres_1_34_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring , bytestring, containers, criterion, cryptohash-sha1, deepseq , directory, generic-monoid, hspec, mtl, network, port-utils @@ -241457,8 +242252,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "1.31.0.1"; - sha256 = "0nlg0hi0rcfk77jm927i1w63mh4x9y1p4j3fqbd13c2a6pg084vw"; + version = "1.34.0.0"; + sha256 = "0845bjp1vgpkms865p311zv758z1i1y8874s1gmjn0c8jwgi48cs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -241472,7 +242267,7 @@ self: { temporary ]; testHaskellDepends = [ - base containers directory generic-monoid hspec mtl network + async base containers directory generic-monoid hspec mtl network port-utils postgres-options postgresql-simple process temporary unix ]; @@ -241731,6 +242526,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "token-search" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, hashable, hspec + , process, streaming-commons, text, unordered-containers + }: + mkDerivation { + pname = "token-search"; + version = "0.1.0.0"; + sha256 = "1df0yvmwskhw1pr9wxxlhp6p74y1nfxxadaqdjvgfd2sz2kb4v4l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit hashable process streaming-commons text + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring conduit hashable process streaming-commons + text unordered-containers + ]; + testHaskellDepends = [ + base bytestring conduit hashable hspec process streaming-commons + text unordered-containers + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "tokenify" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -242021,6 +242841,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tonatona_0_1_1_0" = callPackage + ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: + mkDerivation { + pname = "tonatona"; + version = "0.1.1.0"; + sha256 = "17hd93m2i79pb39z00x0sdvhfds3b5fgyhld8pr64rlnr9wm039l"; + libraryHaskellDepends = [ base rio tonaparser ]; + testHaskellDepends = [ base doctest Glob rio tonaparser ]; + description = "meta application framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tonatona-google-server-api" = callPackage ({ mkDerivation, base, doctest, Glob, google-server-api , monad-logger, persistent, persistent-sqlite, resource-pool @@ -243657,8 +244490,8 @@ self: { }: mkDerivation { pname = "tree-sitter"; - version = "0.7.1.0"; - sha256 = "1xbgii27xn858373nly4q73y1ghrpv069pxjd5bc30rff611rqvz"; + version = "0.7.2.0"; + sha256 = "1gq30qjywg6cgbzgxxfngkn5c4kbddnij7wdvz8x7k1yb13ra0hd"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects semantic-source split template-haskell text unordered-containers @@ -243671,18 +244504,28 @@ self: { }) {}; "tree-sitter-go" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, hedgehog, pathtype + , semantic-source, tasty, tasty-hedgehog, tasty-hunit + , template-haskell, text, tree-sitter, tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-go"; - version = "0.3.0.0"; - sha256 = "07r8dlx8r3g1sdc23w544clb658wiw5rjl33m967li5sq7g1w1aj"; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + version = "0.4.0.0"; + sha256 = "0i469134jc1i665nr5j3z3al8lgsv74mm5x7rk4gm159kpfm1z1r"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Go"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-haskell" = callPackage ({ mkDerivation, base, template-haskell, tree-sitter }: @@ -243782,46 +244625,76 @@ self: { }) {tree-sitter-test-helpers = null;}; "tree-sitter-ruby" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, hedgehog, pathtype + , semantic-source, tasty, tasty-hedgehog, tasty-hunit + , template-haskell, text, tree-sitter, tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-ruby"; - version = "0.3.1.0"; - sha256 = "0kndnmnhfff4d936irvsc545x3npxqspf21qwwqwn4c5n3ispv2p"; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + version = "0.4.0.0"; + sha256 = "1y26956bryax1n17yf49hqczcig1qd5fk5j39arj93464x142ba9"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for Ruby"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-tsx" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, hedgehog, pathtype + , semantic-source, tasty, tasty-hedgehog, tasty-hunit + , template-haskell, text, tree-sitter, tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-tsx"; - version = "0.3.0.0"; - sha256 = "029dapll3jw4m0fxmbxn3nj4jgi8j777ajyc8zx8m2f12zly3y5i"; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + version = "0.4.0.0"; + sha256 = "0q5v1fm9ia83074gkamz06hlcmdkd4vabjfrjqcra7mrvrj1pqa2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for TSX"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-sitter-typescript" = callPackage - ({ mkDerivation, base, template-haskell, tree-sitter }: + ({ mkDerivation, base, bytestring, hedgehog, pathtype + , semantic-source, tasty, tasty-hedgehog, tasty-hunit + , template-haskell, text, tree-sitter, tree-sitter-test-helpers + }: mkDerivation { pname = "tree-sitter-typescript"; - version = "0.3.0.0"; - sha256 = "0gkhbsmrjkf6q4bwlhws2zmnkhjval7qrbvqlcnmmvx384aiis72"; - libraryHaskellDepends = [ base template-haskell tree-sitter ]; + version = "0.4.0.0"; + sha256 = "0sbvsfipwf2j809kkjcgbqq4k44h69x9dl07dvngjyfimkccv758"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base semantic-source template-haskell tree-sitter + ]; + testHaskellDepends = [ + base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit + text tree-sitter tree-sitter-test-helpers + ]; doHaddock = false; description = "Tree-sitter grammar/parser for TypeScript"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {tree-sitter-test-helpers = null;}; "tree-traversals" = callPackage ({ mkDerivation, base, containers, doctest, mtl }: @@ -244571,12 +245444,12 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.1.0.1"; - sha256 = "12c781fsa1i2iw03ysdh5fpg0912w9kmzgixzq16kb4mdb0crq30"; - isLibrary = true; - isExecutable = true; + version = "0.2.0.0"; + sha256 = "1vl3fp0d9v674gg6zbmafvrb97zqxcjlpp5j77msjn1kl7ki6xs7"; libraryHaskellDepends = [ base bytestring template-haskell text ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; description = "Textual Type Classes"; license = stdenv.lib.licenses.mit; }) {}; @@ -246898,8 +247771,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.6.1"; - sha256 = "1sc74y1nqydshrycf309636f49h0nbc5bfiix991nxrv9grwslpi"; + version = "0.7.6.2"; + sha256 = "0nhb8v17ycjjldcvhyjc1qk7r4hqhqdw6gw9fp0mbvn5cbpi0xrm"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -247736,6 +248609,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unboxed-references" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "unboxed-references"; + version = "0.1.0"; + sha256 = "0qdaf0xxc3a44a7mrfiyz9df8hnaj7bsdvdglsqz8f5andfy4ix9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vector ]; + executableHaskellDepends = [ base vector ]; + description = "A library for reference cells backed by unboxed-vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "unboxing-vector" = callPackage ({ mkDerivation, base, deepseq, HUnit, mono-traversable, primitive , should-not-typecheck, vector @@ -248097,6 +248984,20 @@ self: { broken = true; }) {}; + "unicode-show_0_1_0_4" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "unicode-show"; + version = "0.1.0.4"; + sha256 = "158vnv6d7s1ahm3fr5s8ns585bcds8pf19rsglsyfk33qps3il9i"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "print and show in unicode"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "unicode-symbols" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -250371,6 +251272,19 @@ self: { broken = true; }) {}; + "utf" = callPackage + ({ mkDerivation, base, gauge, util }: + mkDerivation { + pname = "utf"; + version = "0.0.0.0"; + sha256 = "0j441d8k4299798d4w78vbxvs3qh9w124zwl0f91rmydw9q4hg37"; + libraryHaskellDepends = [ base util ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "UTF-8"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utf8-env" = callPackage ({ mkDerivation, base, mtl, utf8-string }: mkDerivation { @@ -250445,13 +251359,25 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "util"; - version = "0.1.14.1"; - sha256 = "17y07674dkhgq8yxrdfqj3ycaw5232rc1dnfh7r0v4ca2fyhx5a8"; + version = "0.1.15.0"; + sha256 = "0ybjl0mibvdmqppknypljaajsjx7ls4js6yqh0viinrwq8ayf0wj"; libraryHaskellDepends = [ base transformers ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; }) {}; + "util_0_1_17_0" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "util"; + version = "0.1.17.0"; + sha256 = "1wyjxrnzianif6msk7qvib92lksy66hx4rkdb7sda0a4h704960c"; + libraryHaskellDepends = [ base transformers ]; + description = "Utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "util-exception" = callPackage ({ mkDerivation, base, basic, control, lifted-base-tf, util }: mkDerivation { @@ -251076,8 +252002,8 @@ self: { }: mkDerivation { pname = "vado"; - version = "0.0.11"; - sha256 = "1cx8qdzfg2wn6q6q3vhkh6lmwqfkyf8ypvbbv6kyjai1smb1qfac"; + version = "0.0.12"; + sha256 = "0qirhdzbcx5mqlbgh24ckcmivi38hqr53im9g6cydzslnk7ys41w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -252542,8 +253468,8 @@ self: { }: mkDerivation { pname = "venzone"; - version = "1.0.0.4"; - sha256 = "1jqhv6xi0yn970h0wlzhlhrfwjr44drpwvys9kvfi4di7cg4pc74"; + version = "1.0.0.5"; + sha256 = "1f8v5xhw6ak6qckrb96rjfpn7h8lm3cq7p0w0k54mrg5ixm4paba"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -252691,23 +253617,24 @@ self: { ({ mkDerivation, alex, array, base, binary, blaze-html, bytestring , Cabal, cabal-doctest, criterion, cryptonite, deepseq, DRBG , exceptions, fgl, fgl-visualize, filepath, gitrev, hedgehog, lens - , lifted-base, memory, monad-control, optparse-applicative, parsec - , prettyprinter, random, recursion-schemes, shakespeare, shelly - , statistics, tasty, tasty-hedgehog, tasty-hunit, template-haskell - , text, time, tomland, transformers, transformers-base - , unordered-containers, vector + , lifted-base, memory, monad-control, mtl, optparse-applicative + , parsec, prettyprinter, random, recursion-schemes, shakespeare + , shelly, statistics, tasty, tasty-hedgehog, tasty-hunit + , template-haskell, text, time, tomland, transformers + , transformers-base, unordered-containers, vector }: mkDerivation { pname = "verismith"; - version = "0.4.0.0"; - sha256 = "1f2yzspw12slmhywvdnqfwzxn3v6qvzwgjm7lsjx72lb3611w4z3"; + version = "0.6.0.2"; + sha256 = "1rjcsdizzhc1lr2mfh0r6dhhabnbz1gjva7xkr3z3mqzsqp9jm5f"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base binary blaze-html bytestring cryptonite deepseq DRBG exceptions fgl fgl-visualize filepath gitrev hedgehog lens - lifted-base memory monad-control optparse-applicative parsec + lifted-base memory monad-control mtl optparse-applicative parsec prettyprinter random recursion-schemes shakespeare shelly statistics template-haskell text time tomland transformers transformers-base unordered-containers vector @@ -255875,40 +256802,6 @@ self: { "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, simple-sendfile, stm, streaming-commons, text, time - , time-manager, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.28"; - sha256 = "0w2w3aiccpb2f8zssqiszcxzqdysihqi5xply23lwif5arz4saw7"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck simple-sendfile stm - streaming-commons text time time-manager transformers unix - unix-compat vault wai word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_3_4" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types , http2, HUnit, iproute, lifted-base, network, process, QuickCheck @@ -255917,8 +256810,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.4"; - sha256 = "0v9r892xgzaf260fsk2gx747ipkf9b2c1fsjgynwy355xrip8z06"; + version = "3.3.5"; + sha256 = "09kd8p61xxwi3jnx7y6idjr03cblfzysssvzcvvv7mfcqr5sf165"; libraryHaskellDepends = [ array async auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types @@ -255938,7 +256831,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -256016,8 +256908,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.2.8"; - sha256 = "1z5jzl40x1gp249fk8h51gkw6m3hzxchm2bp3kbpqdgmw8r5im8y"; + version = "3.2.9"; + sha256 = "1bwd6fi0pfcszz7f7r41bjxmx1vq0594088l3hbj0s23m4lxzhs1"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls tls-session-manager wai warp @@ -256489,31 +257381,29 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay , foldl, generic-lens, interpolatedstring-perl6, javascript-bridge , JuicyPixels, language-javascript, lens, lucid, lucid-svg, mmorph - , mtl, optparse-generic, protolude, scotty, streaming, tasty - , tasty-hspec, text, text-format, transformers - , unordered-containers, wai, wai-extra, wai-middleware-static + , mtl, optparse-generic, scotty, streaming, tasty, tasty-hspec + , text, text-format, transformers, unordered-containers, wai + , wai-extra, wai-middleware-static }: mkDerivation { pname = "web-rep"; - version = "0.1.3"; - sha256 = "174q9zaznsy5v9zypxxf6c5xi5syyhdzmwgi07siqp07in8w1jvf"; + version = "0.2.0"; + sha256 = "0mxsqx9gigi70xj372qrwsfahy1ra17jhagvrv6y7pzzl3g0rfws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors box clay foldl generic-lens interpolatedstring-perl6 javascript-bridge JuicyPixels - language-javascript lens lucid lucid-svg mmorph mtl protolude - scotty streaming text text-format transformers unordered-containers + language-javascript lens lucid lucid-svg mmorph mtl scotty + streaming text text-format transformers unordered-containers wai-middleware-static ]; executableHaskellDepends = [ - attoparsec base box lens lucid optparse-generic protolude scotty - text wai wai-extra wai-middleware-static - ]; - testHaskellDepends = [ - base lens lucid protolude tasty tasty-hspec text + attoparsec base box lens lucid optparse-generic scotty text wai + wai-extra wai-middleware-static ]; - description = "representations of a web pag"; + testHaskellDepends = [ base lens lucid tasty tasty-hspec text ]; + description = "representations of a web page"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -257179,8 +258069,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; - version = "0.14.3.0"; - sha256 = "1gsa7lvv0xidy4i9d8bjqc0hpbzx1vvp9npzj2q8x1l68f9vjj5j"; + version = "0.14.4.0"; + sha256 = "0njp5m8m9qz7ra9z8ni103bnicfshiixxy44na8m3mzjqrchczww"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkitgtk ]; @@ -258233,20 +259123,37 @@ self: { "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable, lens , monoidal-containers, transformers, transformers-compat - , unordered-containers, vector + , unordered-containers, vector, witherable-class }: mkDerivation { pname = "witherable"; - version = "0.3.4"; - sha256 = "19qkb8ww3vp446jr1yd4x4wxqm725lc6n2f3d1n3hb925x2djcd6"; + version = "0.3.5"; + sha256 = "13r4g5fg3fgl3zall0daljivnk4gm1lm2s8qir1izwkmq25081wb"; libraryHaskellDepends = [ base base-orphans containers hashable lens monoidal-containers transformers transformers-compat unordered-containers vector + witherable-class ]; description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; }) {}; + "witherable-class" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable-class"; + version = "0"; + sha256 = "0jb8yq9i0rlbmcd5rbg95m2w26zbmi7iwph5v7wghiari751r2bp"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + description = "Witherable = Traversable + Filterable"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -260137,8 +261044,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.8.1"; - sha256 = "183f7rpckhr3cipwci6hfhrfilqq5jijkwp98r5wi0l43inj29jc"; + version = "0.9.0"; + sha256 = "0nxy4dfwz1wgj6dvg1jp3k4zblwpgiydmv7p20s5scyzgii8jsfk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263101,8 +264008,8 @@ self: { }: mkDerivation { pname = "yarn-lock"; - version = "0.6.1"; - sha256 = "19lkg7qj6m9afy6v6bkkcczz7yp8fsn7q2bpbcnyc06cnkn6hcdn"; + version = "0.6.2"; + sha256 = "06wha8cm7hw83d32fq5r8mpzh5pwmf67dxsw8qxqw26qy8pnby96"; libraryHaskellDepends = [ base containers either megaparsec protolude text ]; @@ -263118,36 +264025,37 @@ self: { }) {}; "yarn2nix" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async-pool, base - , bytestring, containers, data-fix, directory, filepath, hnix, mtl - , neat-interpolation, optparse-applicative, process, protolude + ({ mkDerivation, aeson, async-pool, base, bytestring, containers + , data-fix, directory, filepath, hnix, mtl, neat-interpolation + , optparse-applicative, prettyprinter, process, protolude , regex-tdfa, regex-tdfa-text, stm, tasty, tasty-hunit , tasty-quickcheck, tasty-th, text, transformers, unix , unordered-containers, yarn-lock }: mkDerivation { pname = "yarn2nix"; - version = "0.7.0"; - sha256 = "0rna9z1vm05f99a0dkvvv893als9x2zjifzc4gphwylgkih7d826"; + version = "0.8.0"; + sha256 = "05xwpjyi37qlwfj954zpn6f4iwyvy6hsgc8h5vpckbnnp8ak1ndw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory filepath hnix mtl process protolude regex-tdfa + aeson async-pool base bytestring containers data-fix directory + filepath hnix mtl prettyprinter process protolude regex-tdfa regex-tdfa-text stm text transformers unordered-containers yarn-lock ]; executableHaskellDepends = [ - aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory filepath hnix mtl optparse-applicative process protolude - regex-tdfa regex-tdfa-text stm text transformers unix + aeson async-pool base bytestring containers data-fix directory + filepath hnix mtl optparse-applicative prettyprinter process + protolude regex-tdfa regex-tdfa-text stm text transformers unix unordered-containers yarn-lock ]; testHaskellDepends = [ - aeson ansi-wl-pprint async-pool base bytestring containers data-fix - directory filepath hnix mtl neat-interpolation process protolude - regex-tdfa regex-tdfa-text stm tasty tasty-hunit tasty-quickcheck - tasty-th text transformers unordered-containers yarn-lock + aeson async-pool base bytestring containers data-fix directory + filepath hnix mtl neat-interpolation prettyprinter process + protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit + tasty-quickcheck tasty-th text transformers unordered-containers + yarn-lock ]; description = "Convert yarn.lock files to nix expressions"; license = stdenv.lib.licenses.mit; @@ -266318,8 +267226,8 @@ self: { pname = "yoctoparsec"; version = "0.1.0.0"; sha256 = "0p9kw60glcgrjfx04x3innn3rqnh12yrv4wh0a0fivcx8b9kj1yp"; - revision = "2"; - editedCabalFile = "149a34hpbm6fkkmck70wgqg6792yl91kjirpwf6wdkkr4ga0v514"; + revision = "3"; + editedCabalFile = "1yvbslg8y6kvagdjnm0wbknlf1pigqlk8hiqpvmicmqgaiaaxlb7"; libraryHaskellDepends = [ base free mtl ]; description = "A truly tiny monadic parsing library"; license = stdenv.lib.licenses.mit; @@ -266576,13 +267484,13 @@ self: { }) {}; "yx" = callPackage - ({ mkDerivation, array, base, bytestring, hspec, lattices }: + ({ mkDerivation, array, base, bytestring, hspec, lattices, mtl }: mkDerivation { pname = "yx"; - version = "0.0.3.0"; - sha256 = "068xdmi5dn00cx58qrc5hx6vz6byvnh5cp803j7inlynziw3fcgz"; - libraryHaskellDepends = [ array base bytestring lattices ]; - testHaskellDepends = [ array base bytestring hspec ]; + version = "0.0.4.1"; + sha256 = "0mkizcy996q7vm1d2izcxym8aw3dnzyz5nsrmbcchf0ywijw7xzi"; + libraryHaskellDepends = [ array base bytestring lattices mtl ]; + testHaskellDepends = [ array base bytestring hspec mtl ]; description = "Row-major coordinates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -267257,18 +268165,20 @@ self: { }) {}; "zinza" = callPackage - ({ mkDerivation, base, bytestring, containers, parsec, tasty - , tasty-golden, tasty-hunit, text, transformers + ({ mkDerivation, base, bytestring, containers, parsec, QuickCheck + , quickcheck-instances, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers }: mkDerivation { pname = "zinza"; - version = "0.1"; - sha256 = "0p7m15qkp7lsdhckkj2xz7ck54kkaz8pw0gz9dddll57mqjyy6zk"; + version = "0.2"; + sha256 = "1sy4chm8zan0ixgvvq4vm3fzvhqykn315l333al84768nly9rjv8"; libraryHaskellDepends = [ base containers parsec text transformers ]; testHaskellDepends = [ - base bytestring containers tasty tasty-golden tasty-hunit + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-golden tasty-hunit tasty-quickcheck ]; description = "Typed templates with jinja like syntax"; license = stdenv.lib.licenses.gpl2Plus; @@ -267304,6 +268214,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, directory + , dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.3.0"; + sha256 = "1wcx48fqvhj823sqgr61rv692hlld3ckp2vyahd8wk3h590sncni"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest directory dlist exceptions filepath + monad-control mtl resourcet text time transformers + transformers-base + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 0bb930a8bb3..0f620d46ccc 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,7 +23,8 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, writeText, ghc +{ lib, stdenv, buildPackages +, hoogle, writeText, ghc , packages }: @@ -53,7 +54,7 @@ let (map (lib.getOutput "doc") packages); in -stdenv.mkDerivation { +buildPackages.stdenv.mkDerivation { name = "hoogle-local-0.1"; buildInputs = [ghc hoogle]; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index c292eeec128..9a2ff6f4a2a 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -8,12 +8,12 @@ self: super: { multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed" - + "to haskell-ci, which is now on hackage"); + + " to haskell-ci, which is now on hackage"); # https://github.com/channable/vaultenv/issues/1 vaultenv = self.callPackage ../tools/haskell/vaultenv { }; # spago is not released to Hackage. # https://github.com/spacchetti/spago/issues/512 - spago = self.callPackage ../tools/purescript/spago { }; + spago = self.callPackage ../tools/purescript/spago/spago.nix { }; } diff --git a/pkgs/development/haskell-modules/patches/GLUT.patch b/pkgs/development/haskell-modules/patches/GLUT.patch index 3025812213b..f2b63738611 100644 --- a/pkgs/development/haskell-modules/patches/GLUT.patch +++ b/pkgs/development/haskell-modules/patches/GLUT.patch @@ -6,7 +6,7 @@ index f370d6c..a404e1e 100644 else cpp-options: "-DCALLCONV=ccall" cc-options: "-DUSE_DLSYM" -+ pkgconfig-depends: freeglut ++ pkgconfig-depends: glut executable BOGLGP01-OnYourOwn1 if !flag(BuildExamples) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 49beed8549d..404fd0d9440 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghc, llvmPackages, packages, symlinkJoin, makeWrapper +{ lib, stdenv, ghc, llvmPackages, packages, buildEnv, makeWrapper , withLLVM ? false , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins @@ -51,15 +51,25 @@ let ++ lib.optional stdenv.targetPlatform.isDarwin llvmPackages.clang); in if paths == [] && !withLLVM then ghc else -symlinkJoin { +buildEnv { # this makes computing paths from the name attribute impossible; # if such a feature is needed, the real compiler name should be saved # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; paths = paths ++ [ghc]; + extraOutputsToInstall = ["doc"]; postBuild = '' . ${makeWrapper}/nix-support/setup-hook + # We make changes to ghc binaries in $out/bin. buildEnv gives a + # symlink if only one of the paths has the subdirectory. If so, + # we need to remove it for our new wrappers. + + if [ -L "$out/bin" ]; then + rm -f "$out/bin" + mkdir -p "$out/bin" + fi + # wrap compiler executables with correct env variables for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b7e98af2109..a1186557101 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -10,7 +10,7 @@ } @ args: let - inherit (stdenv.lib) getVersion versionAtLeast; + inherit (stdenv.lib) getVersion versionAtLeast optional; in assert versionAtLeast (getVersion erlang) minimumOTPVersion; @@ -29,9 +29,7 @@ in inherit debugInfo; - buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; + buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 9a1594da933..c0203e5915f 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -24,7 +24,7 @@ , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , buildPhase ? "", preBuild ? "", postBuild ? "" , installPhase ? "", preInstall ? "", postInstall ? "" -, installTargets ? "install install-docs" +, installTargets ? [ "install" "install-docs" ] , checkPhase ? "", preCheck ? "", postCheck ? "" , fixupPhase ? "", preFixup ? "", postFixup ? "" , meta ? {} @@ -121,8 +121,7 @@ in stdenv.mkDerivation ({ tolerance. ''; - # aarch64 is supposed to work but started failing in https://hydra.nixos.org/build/83735973 - platforms = subtractLists [ "aarch64-linux" ] platforms.unix; + platforms = platforms.unix; maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; license = licenses.asl20; } // meta); @@ -142,7 +141,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (installPhase != "") { inherit installPhase; } -// optionalAttrs (installTargets != "") { inherit installTargets; } +// optionalAttrs (installTargets != []) { inherit installTargets; } // optionalAttrs (preInstall != "") { inherit preInstall; } // optionalAttrs (fixupPhase != "") { inherit fixupPhase; } // optionalAttrs (preFixup != "") { inherit preFixup; } diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index c4259091f7b..1cc63788555 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "13fs9fgvdf8bh6vc8xs8qhil0a1qhm4gvv0ici37xh8a94ngsn7h"; + sha256 = "1yzvqf93zz3ncck4dyq2kayp408lm3h6fx0fb212j7h70mlzx984"; }; cargoSha256 = "0g17g12isah4nkqp9i299qr1sz19k4czcc43rm1wbs0y9szaqvwc"; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index 94ec0244382..c2a3556cfea 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ readline gettext ncurses ]; # Needed with GCC 8 - NIX_CFLAGS_COMPILE = with stdenv.lib; (optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = with stdenv.lib; toString ((optionals stdenv.cc.isGNU [ "-Wno-error=int-in-bool-context" "-Wno-error=class-memaccess" "-Wno-error=restrict" "-Wno-error=format-truncation" - ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"; + ]) ++ optional stdenv.cc.isClang "-Wno-error=null-dereference"); patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index be5da812530..3138d1ba3d7 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "13b4haaanlgi8qpwwvf59zf7qsw8p0zdqv7xdxjjyid5yww7jmm2"; + sha256 = "044pqwbpdyn7afij68wxks8drb84kmj31c8ziqsfm5msi2al0rw2"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 09d7fa622fc..d803fe43fd7 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { "--ipv6" ]; - NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]); enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index a9922a38765..9b7f36f4c87 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = ''mkdir -p "$out/bin"''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 6a3aa9f648f..e1ca3ded208 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = http://love2d.org; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 57c1a6ce564..3a6c385ee5f 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { } || true ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${SDL.dev}/include/SDL" "-I${freetype.dev}include/freetype2" "-DGL_GLEXT_PROTOTYPES" # https://community.khronos.org/t/glgenbuffers-was-not-declared-in-this-scope/59283/2 diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 0a60a4cacfe..3629345baf6 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-lua=luajit" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { homepage = http://love2d.org; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 3de21191512..2213ace8f57 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # luckily, they're not really needed so we don't build it. makeFlags = [ "DATA=" ]; - installTargets = "install-exec"; + installTargets = [ "install-exec" ]; meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix new file mode 100644 index 00000000000..3293c4b9f58 --- /dev/null +++ b/pkgs/development/interpreters/micropython/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }: + +stdenv.mkDerivation rec { + pname = "micropython"; + version = "1.12"; + + src = fetchFromGitHub { + owner = "micropython"; + repo = "micropython"; + rev = "v${version}"; + sha256 = "1fsigdahnv5yn0mc7dr1y6h7g8ywg084pcgj6d64kb39w641n8j5"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig python3 ]; + + buildInputs = [ libffi readline ]; + + doCheck = true; + + buildPhase = '' + make -C mpy-cross + make -C ports/unix + ''; + + checkPhase = '' + pushd tests + MICROPY_MICROPYTHON=../ports/unix/micropython ${python3.interpreter} ./run-tests + popd + ''; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 ports/unix/micropython $out/bin/micropython + ''; + + meta = with lib; { + description = "A lean and efficient Python implementation for microcontrollers and constrained systems"; + homepage = "https://micropython.org"; + platforms = [ "x86_64-linux" ]; + license = licenses.mit; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 89979e18bdc..3231c17e8d9 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -91,7 +91,13 @@ let ] ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] ++ optional stdenv.isSunOS "-Dcc=gcc" - ++ optional enableThreading "-Dusethreads"; + ++ optional enableThreading "-Dusethreads" + ++ optionals (!crossCompiling) [ + "-Dprefix=${placeholder "out"}" + "-Dman1dir=${placeholder "out"}/share/man/man1" + "-Dman3dir=${placeholder "out"}/share/man/man3" + ] + ++ optional (stdenv.isAarch32 || stdenv.isMips) "-Dldflags=\"-lm -lrt\""; configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; @@ -102,10 +108,6 @@ let preConfigure = '' substituteInPlace ./Configure --replace '`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`' 'Thu Jan 1 00:00:01 UTC 1970' substituteInPlace ./Configure --replace '$uname -a' '$uname --kernel-name --machine --operating-system' - '' + optionalString (!crossCompiling) '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString (stdenv.isAarch32 || stdenv.isMips) '' - configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' @@ -144,7 +146,7 @@ let substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \ --replace "${libcInc}" /no-such-path \ --replace "${ - if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path" + if stdenv.hasCC then stdenv.cc.cc else "/no-such-path" }" /no-such-path \ --replace "${stdenv.cc}" /no-such-path \ --replace "$man" /no-such-path diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index aa6dbcfccf0..0fa605a4cac 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -95,8 +95,8 @@ let ++ optional postgresqlSupport postgresql ++ optional pdo_odbcSupport unixODBC ++ optional pdo_pgsqlSupport postgresql - ++ optional pdo_mysqlSupport mysqlBuildInputs - ++ optional mysqliSupport mysqlBuildInputs + ++ optionals pdo_mysqlSupport mysqlBuildInputs + ++ optionals mysqliSupport mysqlBuildInputs ++ optional gmpSupport gmp ++ optional gettextSupport gettext ++ optional intlSupport icu @@ -109,14 +109,14 @@ let ++ optional libzipSupport libzip ++ optional valgrindSupport valgrind; - CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; + CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11"; configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ] - ++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" - ++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}" - ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}" + ++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ] + ++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] + ++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] ++ optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ optional withSystemd "--with-fpm-systemd" ++ optionals imapSupport [ @@ -129,7 +129,7 @@ let "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" ] - ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" + ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" ++ optional embedSupport "--enable-embed" ++ optional mhashSupport "--with-mhash" @@ -263,23 +263,23 @@ let in { php72 = generic { - version = "7.2.25"; - sha256 = "17kb7b3wpdmdhnlv23qc0vax0lp2gr1v7dxwdgs8g78gxnqkdcvw"; + version = "7.2.26"; + sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; php73 = generic { - version = "7.3.12"; - sha256 = "0fccmnrwwyy5zvhj8wbyqqlyqr7pr5v4pfiqriw0ahciz4lv05yk"; + version = "7.3.13"; + sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw"; # https://bugs.php.net/bug.php?id=76826 extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; php74 = generic { - version = "7.4.0"; - sha256 = "1h01bahvcm9kgm5jqhm2j9k9d4q4rpfkkpqk00c47rirdblnn85z"; + version = "7.4.1"; + sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b"; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index dc3b08acbd9..1a0a781b918 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -3,10 +3,10 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "picoLisp"; - version = "19.6"; + version = "19.12"; src = fetchurl { url = "https://www.software-lab.de/${pname}-${version}.tgz"; - sha256 = "1ixxl6m5glhwqa4q3fb90pciv7jhhvn9pkh316d4wcv0m13l04gq"; + sha256 = "10np0mhihr47r3201617zccrvzpkhdl1jwvz7zimk8kxpriydq2j"; }; buildInputs = [makeWrapper openssl] ++ optional stdenv.is64bit jdk; patchPhase = '' diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 188058a73b5..9c35fc35497 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex makeWrapper ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; - NIX_LDFLAGS = [ "-lLLVMJIT" ]; + NIX_LDFLAGS = "-lLLVMJIT"; postPatch = '' for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index de980f1ca68..e6b3dff433b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -234,9 +234,6 @@ in with passthru; stdenv.mkDerivation ({ ln -s $out/lib/${libPrefix}/pdb.py $out/bin/pdb${sourceVersion.major}.${sourceVersion.minor} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev # Determinism: Windows installers were not deterministic. diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 43d2d159e36..e75bd0a0987 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -208,9 +208,6 @@ in with passthru; stdenv.mkDerivation { ln -s "$out/include/${executable}m" "$out/include/${executable}" - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ae0ecbf08e7..caf2e13bdf6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -79,10 +79,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy"; + sha256 = "1pj0mz1xl27khi250p29c0y99vxg662js8zp71aprkf8i8wkr0qa"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -92,10 +92,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "5"; + patch = "6"; suffix = ""; }; - sha256 = "154xc6dxww21qkmphg66pfks8987a17cl3vqq5g4hv1xkzm7cnp8"; + sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -105,10 +105,10 @@ in { sourceVersion = { major = "3"; minor = "8"; - patch = "0"; + patch = "1"; suffix = ""; }; - sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk"; + sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -119,9 +119,9 @@ in { major = "3"; minor = "9"; patch = "0"; - suffix = "a1"; + suffix = "a2"; }; - sha256 = "02b337kvzb6ncqab21xnayh562zpz6bqzjmh35iy9l48zgpkvf1n"; + sha256 = "02a301bdcldin05ksdg8xw8xr6gdkpf73p0cabvn9rdl6yhkr3q8"; inherit (darwin) CF configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 861cb38c060..f05b3b1eec6 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -11,6 +11,27 @@ let setuppy = ../run_setup.py; in rec { + eggBuildHook = callPackage ({ }: + makeSetupHook { + name = "egg-build-hook.sh"; + deps = [ ]; + } ./egg-build-hook.sh) {}; + + eggInstallHook = callPackage ({ setuptools }: + makeSetupHook { + name = "egg-install-hook.sh"; + deps = [ setuptools ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./egg-install-hook.sh) {}; + + eggUnpackHook = callPackage ({ }: + makeSetupHook { + name = "egg-unpack-hook.sh"; + deps = [ ]; + } ./egg-unpack-hook.sh) {}; + flitBuildHook = callPackage ({ flit }: makeSetupHook { name = "flit-build-hook"; diff --git a/pkgs/development/interpreters/python/hooks/egg-build-hook.sh b/pkgs/development/interpreters/python/hooks/egg-build-hook.sh new file mode 100644 index 00000000000..d5abc8d55e5 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/egg-build-hook.sh @@ -0,0 +1,15 @@ +# Setup hook to use for eggs +echo "Sourcing egg-build-hook" + +eggBuildPhase() { + echo "Executing eggBuildPhase" + runHook preBuild + + runHook postBuild + echo "Finished executing eggBuildPhase" +} + +if [ -z "${dontUseEggBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using eggBuildPhase" + buildPhase=eggBuildPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/egg-install-hook.sh b/pkgs/development/interpreters/python/hooks/egg-install-hook.sh new file mode 100644 index 00000000000..ae894fb1bde --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/egg-install-hook.sh @@ -0,0 +1,21 @@ +# Setup hook for eggs +echo "Sourcing egg-install-hook" + +eggInstallPhase() { + echo "Executing eggInstallPhase" + runHook preInstall + + mkdir -p "$out/@pythonSitePackages@" + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + + find + @pythonInterpreter@ -m easy_install --prefix="$out" *.egg + + runHook postInstall + echo "Finished executing eggInstallPhase" +} + +if [ -z "${dontUseEggInstall-}" ] && [ -z "${installPhase-}" ]; then + echo "Using eggInstallPhase" + installPhase=eggInstallPhase +fi diff --git a/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh new file mode 100644 index 00000000000..c8ed3dee83b --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/egg-unpack-hook.sh @@ -0,0 +1,17 @@ +# Setup hook to use in case an egg is fetched +echo "Sourcing egg setup hook" + +eggUnpackPhase(){ + echo "Executing eggUnpackPhase" + runHook preUnpack + + cp "$src" "$(stripHash "$src")" + +# runHook postUnpack # Calls find...? + echo "Finished executing eggUnpackPhase" +} + +if [ -z "${dontUseEggUnpack-}" ] && [ -z "${unpackPhase-}" ]; then + echo "Using eggUnpackPhase" + unpackPhase=eggUnpackPhase +fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 700894eda6d..020298cc8e9 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -20,6 +20,9 @@ , setuptoolsBuildHook , setuptoolsCheckHook , wheelUnpackHook +, eggUnpackHook +, eggBuildHook +, eggInstallHook }: { name ? "${attrs.pname}-${attrs.version}" @@ -119,6 +122,8 @@ let pipBuildHook ] ++ lib.optionals (format == "wheel") [ wheelUnpackHook + ] ++ lib.optionals (format == "egg") [ + eggUnpackHook eggBuildHook eggInstallHook ] ++ lib.optionals (!(format == "other") || dontUsePipInstall) [ pipInstallHook ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 8154a87f667..b220bfa0f93 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -137,9 +137,6 @@ in with passthru; stdenv.mkDerivation rec { # verify cffi modules $out/bin/${executable} -c ${if isPy3k then "'import tkinter;import sqlite3;import curses;import lzma'" else "'import Tkinter;import sqlite3;import curses'"} - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py ''; diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh index c7201c7a997..f10ba003432 100644 --- a/pkgs/development/interpreters/python/wrap.sh +++ b/pkgs/development/interpreters/python/wrap.sh @@ -81,7 +81,15 @@ wrapPythonProgramsIn() { # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. - local -a user_args="($makeWrapperArgs)" + # We need to support both the case when makeWrapperArgs + # is an array and a IFS-separated string. + # TODO: remove the string branch when __structuredAttrs are used. + if [[ "${makeWrapperArgs+defined}" == "defined" && "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then + local -a user_args=("${makeWrapperArgs[@]}") + else + local -a user_args="(${makeWrapperArgs:-})" + fi + local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}") wrapProgram "${wrapProgramArgs[@]}" fi diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index 23191b0e6d3..e7f01856ef5 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "quickjs"; - version = "2019-10-27"; + version = "2019-12-21"; src = fetchurl { url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0xm16ja3c0k80jy0xkx0f40r44v2lgx2si4dnaw2w7c5nx7cmkai"; + sha256 = "13hlx6qwrrxmlvvqcr3irxba6zmf05cf54l32vj50wc66s1qd41p"; }; makeFlags = [ "prefix=${placeholder ''out''}" ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d70c7e70f33..58ccf5ae9b4 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -3,7 +3,7 @@ , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix -, makeWrapper, buildRubyGem, defaultGemConfig +, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo } @ args: let @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -27,6 +27,7 @@ let ver = version; tag = ver.gitTag; atLeast25 = lib.versionAtLeast ver.majMin "2.5"; + atLeast27 = lib.versionAtLeast ver.majMin "2.7"; baseruby = self.override { useRailsExpress = false; docSupport = false; @@ -44,6 +45,11 @@ let , groff, docSupport ? true , libyaml, yamlSupport ? true , libffi, fiddleSupport ? true + # ruby -e "puts RbConfig::CONFIG['configure_args']" + # puts a reference to the C compiler in the binary. + # This might be required by some gems at runtime, + # but we allow to strip it out for smaller closure size. + , removeReferencesTo, removeReferenceToCC ? false , autoreconfHook, bison, autoconf , buildEnv, bundler, bundix , libiconv, libobjc, libunwind, Foundation @@ -111,6 +117,12 @@ let cp ${config}/config.sub tool/ ''; + # Force the revision.h generation. Somehow `revision.tmp` is an empty + # file and because we don't add `git` to buildInputs, hence the check is + # always true. + # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae + buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ]; + configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" ++ op (!docSupport) "--disable-install-doc" @@ -139,12 +151,19 @@ let export GEM_HOME="$out/${passthru.gemPath}" ''; - installFlags = stdenv.lib.optionalString docSupport "install-doc"; + installFlags = stdenv.lib.optional docSupport "install-doc"; # Bundler tries to create this directory postInstall = '' # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb - + ${ + lib.optionalString removeReferenceToCC '' + # Get rid of the CC runtime dependency + ${removeReferencesTo}/bin/remove-references-to \ + -t ${stdenv.cc} \ + $out/lib/libruby* + '' + } # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook <<EOF @@ -234,4 +253,12 @@ in { git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j"; }; }; + + ruby_2_7 = generic { + version = rubyVersion "2" "7" "0" ""; + sha256 = { + src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc"; + git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 6fbb33b27fc..4838a1a09e5 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -16,4 +16,6 @@ "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; + "2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25) + ]; } diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 1042caa41ac..3caac2447e2 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,18 +1,23 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "rubygems"; - version = "3.0.6"; + version = "3.1.2"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "1ca1i4xmggizr59m6p28gprlvshczsbx30q8iyzxb2vj4jn8arzx"; + sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd"; }; patches = [ ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + + (fetchpatch { + url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch"; + sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9"; + }) ]; installPhase = '' diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index 97d2b67372a..fe77a27d449 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ./1.8.5-arm-flags.patch ]; - patchFlags = "-p3"; + patchFlags = [ "-p3" ]; # fixes build on gcc8 postPatch = '' diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index 3c585c3f07f..fd84d93ba75 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -31,10 +31,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; - postInstall = '' + postInstall = let + dllExtension = stdenv.hostPlatform.extensions.sharedLibrary; + in '' make install-private-headers ln -s $out/bin/tclsh${release} $out/bin/tclsh - ln -s $out/lib/libtcl${release}.so $out/lib/libtcl.so + ln -s $out/lib/libtcl${release}${dllExtension} $out/lib/libtcl${dllExtension} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch index 56c9879dd6e..3ce3f765988 100644 --- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch +++ b/pkgs/development/interpreters/wasmtime/cargo-lock.patch @@ -1,20 +1,12 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..3b45d5eb +index 00000000..818de492 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2272 @@ +@@ -0,0 +1,2276 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] -+name = "ahash" -+version = "0.2.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "aho-corasick" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -32,7 +24,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "anyhow" -+version = "1.0.19" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -49,17 +41,23 @@ index 00000000..3b45d5eb +] + +[[package]] ++name = "arrayvec" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "atty" -+version = "0.2.13" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.6" ++version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -69,7 +67,7 @@ index 00000000..3b45d5eb +dependencies = [ + "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -78,8 +76,8 @@ index 00000000..3b45d5eb +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -97,12 +95,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "bincode" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -111,7 +108,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -119,12 +116,12 @@ index 00000000..3b45d5eb + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "which 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -134,11 +131,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "blake2b_simd" -+version = "0.5.8" ++version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -147,7 +144,7 @@ index 00000000..3b45d5eb +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -155,7 +152,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "block-padding" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -173,11 +170,10 @@ index 00000000..3b45d5eb + +[[package]] +name = "c2-chacha" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -193,21 +189,21 @@ index 00000000..3b45d5eb +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" -+version = "1.0.46" ++version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cexpr" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -220,12 +216,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "chrono" -+version = "0.4.9" ++version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -235,7 +230,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -245,11 +240,11 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -266,25 +261,7 @@ index 00000000..3b45d5eb +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "const-random" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "const-random-macro" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -297,112 +274,109 @@ index 00000000..3b45d5eb +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-bforest" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen-meta" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-codegen-shared" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cranelift-entity" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-frontend" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-native" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cranelift-wasm" -+version = "0.49.0" ++version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-deque" -+version = "0.7.1" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.7.2" ++version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -410,10 +384,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "crossbeam-queue" -+version = "0.1.2" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -426,12 +401,22 @@ index 00000000..3b45d5eb +] + +[[package]] ++name = "crossbeam-utils" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "ctor" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -465,7 +450,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -477,27 +462,27 @@ index 00000000..3b45d5eb +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dynasm" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dynasmrt" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -514,7 +499,7 @@ index 00000000..3b45d5eb +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -527,7 +512,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -537,21 +522,22 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "faerie" -+version = "0.12.0" ++version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -568,10 +554,10 @@ index 00000000..3b45d5eb +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -595,11 +581,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "filetime" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -624,11 +610,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "getrandom" -+version = "0.1.12" ++version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -637,9 +623,9 @@ index 00000000..3b45d5eb +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -650,7 +636,7 @@ index 00000000..3b45d5eb + "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -661,7 +647,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "goblin" -+version = "0.1.1" ++version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -670,25 +656,19 @@ index 00000000..3b45d5eb +] + +[[package]] -+name = "hashbrown" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "hashbrown" -+version = "0.6.1" ++name = "heck" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "heck" -+version = "0.3.1" ++name = "hermit-abi" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -696,7 +676,7 @@ index 00000000..3b45d5eb +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -706,8 +686,11 @@ index 00000000..3b45d5eb + +[[package]] +name = "indexmap" -+version = "1.2.0" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "indoc" @@ -724,35 +707,35 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "inventory" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inventory-impl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "inventory-impl" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "itertools" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -768,8 +751,8 @@ index 00000000..3b45d5eb +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -785,7 +768,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "libc" -+version = "0.2.64" ++version = "0.2.66" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -793,30 +776,31 @@ index 00000000..3b45d5eb +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "lightbeam" -+version = "0.0.0" ++version = "0.8.0" +dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dynasm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dynasmrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -832,7 +816,7 @@ index 00000000..3b45d5eb +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -845,7 +829,7 @@ index 00000000..3b45d5eb +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -873,9 +857,9 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -902,7 +886,7 @@ index 00000000..3b45d5eb + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -910,8 +894,8 @@ index 00000000..3b45d5eb +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -919,8 +903,8 @@ index 00000000..3b45d5eb +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -928,9 +912,9 @@ index 00000000..3b45d5eb +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -938,25 +922,26 @@ index 00000000..3b45d5eb +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.8" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num_cpus" -+version = "1.10.1" ++version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -969,7 +954,7 @@ index 00000000..3b45d5eb +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -996,9 +981,9 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1013,7 +998,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "ppv-lite86" -+version = "0.2.5" ++version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1021,7 +1006,7 @@ index 00000000..3b45d5eb +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1031,14 +1016,14 @@ index 00000000..3b45d5eb +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "proc-macro2" -+version = "1.0.6" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1046,19 +1031,19 @@ index 00000000..3b45d5eb + +[[package]] +name = "pyo3" -+version = "0.8.1" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inventory 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", + "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3cls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1066,28 +1051,28 @@ index 00000000..3b45d5eb + +[[package]] +name = "pyo3-derive-backend" -+version = "0.8.1" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "pyo3cls" -+version = "0.8.1" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "quick-error" -+version = "1.2.2" ++version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1106,7 +1091,7 @@ index 00000000..3b45d5eb +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1114,12 +1099,12 @@ index 00000000..3b45d5eb +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1127,7 +1112,7 @@ index 00000000..3b45d5eb +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1149,7 +1134,7 @@ index 00000000..3b45d5eb +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1167,7 +1152,7 @@ index 00000000..3b45d5eb +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1175,10 +1160,9 @@ index 00000000..3b45d5eb + +[[package]] +name = "rand_pcg" -+version = "0.2.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1188,30 +1172,30 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rayon" -+version = "1.2.0" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rayon-core" -+version = "1.6.0" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1260,7 +1244,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1279,7 +1263,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1327,9 +1311,9 @@ index 00000000..3b45d5eb +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1347,35 +1331,35 @@ index 00000000..3b45d5eb + +[[package]] +name = "serde" -+version = "1.0.101" ++version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" -+version = "1.0.101" ++version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_json" -+version = "1.0.41" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sha2" -+version = "0.8.0" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1391,7 +1375,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "smallvec" -+version = "1.0.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1409,7 +1393,7 @@ index 00000000..3b45d5eb +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1419,27 +1403,27 @@ index 00000000..3b45d5eb + +[[package]] +name = "strsim" -+version = "0.9.2" ++version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "syn" -+version = "1.0.5" ++version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "synstructure" -+version = "0.12.1" ++version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1454,7 +1438,7 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1470,29 +1454,49 @@ index 00000000..3b45d5eb +] + +[[package]] ++name = "test-programs" ++version = "0.8.0" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common 0.8.0", ++ "wasmtime 0.8.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wasmtime-wasi 0.8.0", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thiserror" -+version = "1.0.5" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.5" ++version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1508,7 +1512,7 @@ index 00000000..3b45d5eb +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1518,7 +1522,7 @@ index 00000000..3b45d5eb +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1528,13 +1532,13 @@ index 00000000..3b45d5eb + +[[package]] +name = "trybuild" -+version = "1.0.17" ++version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1554,12 +1558,12 @@ index 00000000..3b45d5eb + +[[package]] +name = "unicode-segmentation" -+version = "1.3.0" ++version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "unicode-width" -+version = "0.1.6" ++version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1605,12 +1609,12 @@ index 00000000..3b45d5eb +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1619,9 +1623,9 @@ index 00000000..3b45d5eb +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1631,42 +1635,33 @@ index 00000000..3b45d5eb + +[[package]] +name = "wasi-common" -+version = "0.5.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common-cbindgen 0.5.0", -+ "wasmtime 0.1.0", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", -+ "wasmtime-wasi 0.2.0", -+ "wig 0.1.0", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common-cbindgen 0.8.0", ++ "wig 0.8.0", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winx 0.5.0", ++ "winx 0.8.0", +] + +[[package]] +name = "wasi-common-cbindgen" -+version = "0.5.0" ++version = "0.8.0" +dependencies = [ ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1674,7 +1669,7 @@ index 00000000..3b45d5eb +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1682,284 +1677,291 @@ index 00000000..3b45d5eb + +[[package]] +name = "wasmparser" -+version = "0.39.2" ++version = "0.39.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "wasmtime" -+version = "0.1.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.5.0", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", -+ "wasmtime-wasi 0.2.0", -+ "wasmtime-wast 0.2.0", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi-common 0.8.0", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wasmtime-wasi 0.8.0", ++ "wasmtime-wast 0.8.0", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-cli" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.5.0", ++ "test-programs 0.8.0", ++ "wasi-common 0.8.0", + "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime 0.1.0", -+ "wasmtime-debug 0.2.0", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-interface-types 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-obj 0.2.0", -+ "wasmtime-runtime 0.2.0", -+ "wasmtime-wasi 0.2.0", -+ "wasmtime-wasi-c 0.2.0", -+ "wasmtime-wast 0.2.0", -+ "wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime 0.8.0", ++ "wasmtime-debug 0.8.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-interface-types 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-obj 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wasmtime-wasi 0.8.0", ++ "wasmtime-wasi-c 0.8.0", ++ "wasmtime-wast 0.8.0", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-debug" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.8.0", +] + +[[package]] +name = "wasmtime-environ" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ + "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lightbeam 0.0.0", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lightbeam 0.8.0", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-interface-types" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wasmtime-wasi 0.8.0", +] + +[[package]] +name = "wasmtime-jit" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-debug 0.2.0", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-runtime 0.2.0", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-debug 0.8.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-runtime 0.8.0", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-obj" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", ++ "wasmtime-environ 0.8.0", +] + +[[package]] +name = "wasmtime-py" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-interface-types 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", ++ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime 0.8.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-interface-types 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wasmtime-wasi 0.8.0", +] + +[[package]] +name = "wasmtime-runtime" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", ++ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.8.0", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-rust" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-interface-types 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-rust-macro 0.2.0", -+ "wasmtime-wasi 0.2.0", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime 0.8.0", ++ "wasmtime-interface-types 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-rust-macro 0.8.0", ++ "wasmtime-wasi 0.8.0", +] + +[[package]] +name = "wasmtime-rust-macro" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasmtime-wasi" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi-common 0.5.0", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", ++ "wasi-common 0.8.0", ++ "wasmtime 0.8.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", +] + +[[package]] +name = "wasmtime-wasi-c" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ + "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", +] + +[[package]] +name = "wasmtime-wast" -+version = "0.2.0" ++version = "0.8.0" +dependencies = [ -+ "anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)", + "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmtime-environ 0.2.0", -+ "wasmtime-jit 0.2.0", -+ "wasmtime-runtime 0.2.0", -+ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmtime-environ 0.8.0", ++ "wasmtime-jit 0.8.0", ++ "wasmtime-runtime 0.8.0", ++ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wast" ++version = "3.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wast" -+version = "3.0.2" ++version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1967,27 +1969,28 @@ index 00000000..3b45d5eb + +[[package]] +name = "wat" -+version = "1.0.3" ++version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "which" -+version = "3.0.0" ++version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wig" -+version = "0.1.0" ++version = "0.8.0" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "witx 0.4.0", ++ "witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -2028,7 +2031,7 @@ index 00000000..3b45d5eb + +[[package]] +name = "winx" -+version = "0.5.0" ++version = "0.8.0" +dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2037,11 +2040,12 @@ index 00000000..3b45d5eb + +[[package]] +name = "witx" -+version = "0.4.0" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -2057,7 +2061,7 @@ index 00000000..3b45d5eb +version = "2.0.3+zstd.1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -2066,102 +2070,100 @@ index 00000000..3b45d5eb +version = "1.4.15+zstd.1.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[metadata] -+"checksum ahash 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "b35dfc96a657c1842b4eb73180b65e37152d4b94d0eb5cb51708aee7826950b4" +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum anyhow 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "57114fc2a6cc374bce195d3482057c846e706d252ff3604363449695684d7a0d" ++"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" +"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875" ++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -+"checksum bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8ab639324e3ee8774d296864fbc0dbbb256cf1a41c490b94cba90c082915f92" ++"checksum bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf" +"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5850aeee1552f495dd0250014cf64b82b7c8879a89d83b33bbdace2cc4f63182" ++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -+"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" ++"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +"checksum capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "031ba51c39151a1d6336ec859646153187204b0147c7b3f6fe2de636f1b8dbb3" +"checksum capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fae25eddcb80e24f98c35952c37a91ff7f8d0f60dbbdafb9763e8d5cc566b8d7" -+"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c" -+"checksum cexpr 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7fa24eb00d5ffab90eaeaf1092ac85c04c64aaf358ea6f84505b8116d24c6af" ++"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e" ++"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" ++"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" +"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62" -+"checksum const-random 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7b641a8c9867e341f3295564203b1c250eb8ce6cb6126e007941f78c4d2ed7fe" -+"checksum const-random-macro 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c750ec12b83377637110d5a57f5ae08e895b06c4b16e2bdbf1a94ef717428c59" +"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +"checksum cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded" -+"checksum cranelift-bforest 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba29e425110674c89fdc2f79479d767f31003dd9187c29ba2dad57fe4d321670" -+"checksum cranelift-codegen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8cb71c7ce1438c41f3d35383fa41eee26f5adf9815c7f5c2e7029a6c9356df2c" -+"checksum cranelift-codegen-meta 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4aa634fd60290d5047d40172028a0aa86458e32a72c76fcce0a317bbbbcca4e5" -+"checksum cranelift-codegen-shared 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa6cf5c2adc031be07cd5bc88145ebb93d9d2a05a28a93136782b2167eacb62" -+"checksum cranelift-entity 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "932d5f9622b336e10e8cf843ded09a688ec49f32c32b3101d7c5a7b71cad3dc9" -+"checksum cranelift-frontend 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d1a3c105c657cd65c20d9183bbd4f2b16bf3548db4b865c065bf7028f3021de" -+"checksum cranelift-native 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba5e34645453b73a9e2def05561f957a9df17253996379dd59c4afe3cf7db0f1" -+"checksum cranelift-wasm 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23410ae1f5edf7d83e95bf8537e771345ecc2b11e5c7208cbee8151ea3b88e97" -+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" -+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" ++"checksum cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd05aac8cefcde54ce26178df8f36cb1f518ac691db650e7d2440c2b6b41c4dc" ++"checksum cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63d9b6ff8a94f98deabab21880d7fd54996e0e16be687b6f80a3b6bdd9c188d" ++"checksum cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb3df51c2c07d719d02869bfac6cabd8d82ee308d5b29ca62e6528723cc33a4" ++"checksum cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "758f9426b2e22bf83fc1a6b231a9d53cd4830751883c7f0e196ebb3c210467b3" ++"checksum cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff064733df8b98f453060264a8790393d1e807aca6942706b42f79a4f7aae9ed" ++"checksum cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eaafb5fa623dcbe19a28084a8226d7a1b17184a949c1a1f29a46b479867998d" ++"checksum cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90033dbd7293f6fad4cf9dcd769cd621d60df22b1c5a11799e86359b7447a51d" ++"checksum cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54cb82a1071f88822763a583ec1a8688ffe5e2cda02c111d4483dd4376ed14d8" ++"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" ++"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" ++"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" ++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +"checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc" +"checksum cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71" +"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +"checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" +"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" -+"checksum dynasm 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8654f63488a94cd11feac2a609fdcdecd09e02fb582731f635783689fbb429f3" -+"checksum dynasmrt 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0046b083139885c38990f2fb9822d06f6c5902068d93a6ed9e56b63011b9932" ++"checksum dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "42a814e1edeb85dd2a3c6fc0d6bf76d02ca5695d438c70ecee3d90774f3259c5" ++"checksum dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a393aaeb4441a48bcf47b5b6155971f82cc1eb77e22855403ccc0415ac8328d" +"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" +"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e" +"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067" -+"checksum faerie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "01fed63609767c70e34203201032c249d60a24578a67ef0ce7cc13ff010e9cf2" ++"checksum faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f902f2af041f6c7177a2a04f805687cdc71e69c7cbef059a2755d8923f4cd7a8" +"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9" -+"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469" ++"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" +"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" ++"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6" +"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -+"checksum goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6040506480da04a63de51a478e8021892d65d8411f29b2a422c2648bdd8bcb" -+"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" -+"checksum hashbrown 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6587d09be37fb98a11cb08b9000a3f592451c1b1b613ca69d949160e313a430a" ++"checksum goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da" +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" +"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" -+"checksum indexmap 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a61202fbe46c4a951e9404a720a0180bcf3212c750d735cb5c4ba4dc551299f3" ++"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" +"checksum indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9553c1e16c114b8b77ebeb329e5f2876eed62a8d51178c8bc6bff0d65f98f8" +"checksum indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b714fc08d0961716390977cdff1536234415ac37b509e34e5a983def8340fb75" -+"checksum inventory 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f4cece20baea71d9f3435e7bbe9adf4765f091c5fe404975f844006964a71299" -+"checksum inventory-impl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2869bf972e998977b1cb87e60df70341d48e48dca0823f534feb91ea44adaf9" -+"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" ++"checksum inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf98296081bd2cb540acc09ef9c97f22b7e487841520350293605db1b2c7a27" ++"checksum inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8e30575afe28eea36a9a39136b70b2fb6b0dd0a212a5bd1f30a498395c0274" ++"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+"checksum libc 0.2.64 (registry+https://github.com/rust-lang/crates.io-index)" = "74dfca3d9957906e8d1e6a0b641dc9a59848e793f1da2165889fd4f62d10d79c" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" @@ -2178,8 +2180,8 @@ index 00000000..3b45d5eb +"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" +"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" -+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" ++"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" +"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22" +"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" @@ -2187,14 +2189,14 @@ index 00000000..3b45d5eb +"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5" +"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" -+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" +"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" -+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -+"checksum pyo3 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a00f96312ebe4082db7d93ad062df1818f597660002541c1bbae6752ec583244" -+"checksum pyo3-derive-backend 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a7caa60cb986fca5b488e29d078fb25ae228e01dab080b855168ce061bbef0a" -+"checksum pyo3cls 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5ccfa624ed9b5d805079f1ad64b3f1de5d551a946d4cf494f1f032b5572d39f" -+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" ++"checksum pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1bfe257586436fbe1296d917f14a167d4253d0873bf43e2c9b9bdd58a3f9f35" ++"checksum pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4882d8237fd8c7373cc25cb802fe0dab9ff70830fd56f47ef6c7f3f287fcc057" ++"checksum pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf321cfab555f7411298733c86d21e5136f5ded13f5872fabf9de3337beecda" ++"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" @@ -2204,10 +2206,10 @@ index 00000000..3b45d5eb +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rand_pcg 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e196346cbbc5c70c77e7b4926147ee8e383a38ee4d15d58a08098b169e492b6" ++"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf" -+"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123" -+"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b" ++"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" ++"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" @@ -2225,34 +2227,34 @@ index 00000000..3b45d5eb +"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd" -+"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e" -+"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" -+"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" ++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" ++"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" +"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -+"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" ++"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" +"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +"checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" -+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" -+"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203" ++"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" ++"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" ++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +"checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thiserror 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb62ff737e573b1e677459bea6fd023cd5d6e868c3242d3cdf3ef2f0554824" -+"checksum thiserror-impl 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "24069c0ba08aab54289d6a25f5036d94afc61e1538bbc42ae5501df141c9027d" ++"checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e" ++"checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+"checksum trybuild 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "e6851bf8351876984fbab8a2391de6378947b898410d8714edd12164d2137127" ++"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9" -+"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9" -+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" ++"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" @@ -2264,15 +2266,17 @@ index 00000000..3b45d5eb +"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76" +"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1" -+"checksum wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5083b449454f7de0b15f131eee17de54b5a71dcb9adcf11df2b2f78fad0cd82" -+"checksum wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86b52202bd73a756b216bbfea019991ff317b1e5f22677da5cef2964696a3245" -+"checksum wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80db13d155bab63db0f19c24a0e12bf60c3fe346edba8da508ba6962e08c137b" -+"checksum which 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "240a31163872f7e8e49f35b42b58485e35355b07eb009d9f3686733541339a69" ++"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470" ++"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" ++"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372" ++"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192" ++"checksum which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5475d47078209a02e60614f7ba5e645ef3ed60f771920ac1906d7c1cc65024c8" +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" ++"checksum witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d075344afebe51633c0302fc11698c2d6414f9d366c749db1af57710f112561" +"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f" +"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f" +"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8" diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 0cdf1aae3f7..c978f023936 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,18 +1,18 @@ { rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20191111"; + version = "v0.8.0"; src = fetchFromGitHub { owner = "bytecodealliance"; - repo = "wasmtime"; - rev = "0006a2af954eba74c79885cb1fe8cdeb68f531c1"; - sha256 = "0lf3pdkjxcrjmjic7xxyjl5dka3arxi809sp9hm4hih5p2fhf2gw"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "0az893srw49szvs5461bd165ffla4cc98gh42p3dwskwfkhpqjm4"; fetchSubmodules = true; }; - cargoSha256 = "0mnwaipa2az3vpgbz4m9siz6bfyhmzwz174k678cv158m7mxx12f"; + cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i"; cargoPatches = [ ./cargo-lock.patch ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage { LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; meta = with lib; { - description = "Standalone JIT-style runtime for WebAsssembly, using Cranelift"; + description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; homepage = https://github.com/CraneStation/wasmtime; license = licenses.asl20; maintainers = [ maintainers.matthewbauer ]; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index c39dc0f5790..033ba67f661 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -23,7 +23,6 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - broken = stdenv.isDarwin; maintainers = with maintainers; [ jwiegley mudri ]; }; }) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index d9409636bd0..2ce4b77927f 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -23,10 +23,18 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--with-installbuilddir=$dev/share/build") ''; - configureFlags = + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_file__dev_zero=yes" + "ac_cv_func_setpgrp_void=0" + "apr_cv_process_shared_works=1" + "apr_cv_tcp_nodelay_with_cork=1" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 - stdenv.lib.optional (stdenv.hostPlatform.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + "ac_cv_header_windows_h=no" + ]; + + CPPFLAGS=stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 8fe3bd287c1..6544c481187 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] ++ stdenv.lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - patchFlags = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "-p0"; + patchFlags = stdenv.lib.optional stdenv.hostPlatform.isDarwin "-p0"; preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline'"; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index a9fc7d569ef..8dec9827141 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.800.2"; + version = "9.800.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "0mslyfzwb8zdhchhj7szj25qi2ain7cnlsrzccrfm2mr4a6jv5h9"; + sha256 = "16bm1pa5a8wsk497y9s18dyi3hax03z6g2x2z19b6z0bi3ff30d4"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index f6f3493002a..87684a4bbe4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost +{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost , brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl -, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd }: +, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd +, enableShared ? true }: let parquet-testing = fetchFromGitHub { @@ -34,13 +35,16 @@ in stdenv.mkDerivation rec { patches = [ # patch to fix python-test ./darwin.patch + ] ++ lib.optionals (!enableShared) [ + # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic. + ./jemalloc-disable-shared.patch ]; nativeBuildInputs = [ cmake autoconf # for vendored jemalloc flatbuffers - ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ boost brotli @@ -71,21 +75,26 @@ in stdenv.mkDerivation rec { "-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DARROW_PARQUET=ON" "-DARROW_PLASMA=ON" - "-DARROW_PYTHON=ON" + # Disable Python for static mode because openblas is currently broken there. + "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}" "-Duriparser_SOURCE=SYSTEM" - ] ++ stdenv.lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; + ] ++ lib.optionals (!enableShared) [ + "-DARROW_BUILD_SHARED=OFF" + "-DARROW_TEST_LINKAGE=static" + "-DOPENSSL_USE_STATIC_LIBS=ON" + ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; doInstallCheck = true; PARQUET_TEST_DATA = if doInstallCheck then "${parquet-testing}/data" else null; installCheckInputs = [ perl which ]; - installCheckPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + installCheckPhase = (lib.optionalString stdenv.isDarwin '' for f in release/*test{,s}; do install_name_tool -add_rpath "$out"/lib "$f" done '') + (let - excludedTests = stdenv.lib.optionals stdenv.isDarwin [ + excludedTests = lib.optionals stdenv.isDarwin [ # Some plasma tests need to be patched to use a shorter AF_UNIX socket # path on Darwin. See https://github.com/NixOS/nix/pull/1085 "plasma-external-store-tests" @@ -99,8 +108,8 @@ in stdenv.mkDerivation rec { meta = { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ tobim veprbl ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ tobim veprbl ]; }; } diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch new file mode 100644 index 00000000000..0f7955724e1 --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch @@ -0,0 +1,11 @@ +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -1428,6 +1428,7 @@ if(ARROW_JEMALLOC) + "--with-jemalloc-prefix=je_arrow_" + "--with-private-namespace=je_arrow_private_" + "--without-export" ++ "--disable-shared" + # Don't override operator new() + "--disable-cxx" "--disable-libdl" + # See https://github.com/jemalloc/jemalloc/issues/1237 diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index ac8d7873123..c541159a96e 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "1gas6fp0xy57wwdvsdfq1yq2hg4zl2c074b260y7hh92z96pj22j"; + sha256 = "14k8c31xh0v4r34h89ld440j9zri4plblmlhj5ddhdmzqmh4lr9f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 04752fd2951..8d429987ad8 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: +{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { pname = "lilv"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ lv2 python serd sord sratom ]; + nativeBuildInputs = [ pkgconfig python3 wafHook ]; + buildInputs = [ lv2 serd sord sratom ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/lilv; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 50593cab647..ad450b53d12 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: +{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }: stdenv.mkDerivation rec { pname = "lv2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ gtk2 libsndfile python ]; + buildInputs = [ gtk2 libsndfile python3 ]; meta = with stdenv.lib; { homepage = http://lv2plug.in; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 21d6cdfb5d4..d7353af0d3d 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: +{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }: stdenv.mkDerivation rec { pname = "sratom"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ lv2 python serd sord ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; + buildInputs = [ lv2 serd sord ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sratom; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 1ed457aa5fe..680b585643b 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: +{ stdenv, lib, fetchurl, fetchpatch, alsaLib, AudioUnit, CoreServices }: let @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind"; }; + # fix build with gcc9 + NIX_CFLAGS_LINK = lib.optional (stdenv.system == "i686-linux") "-lgcc"; + patches = [ ./gcc-6.patch ./CVE-2015-7747.patch diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 4286eedc87b..b10797d3d56 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -13,10 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ - "-Wno-nullability-extension" - "-Wno-typedef-redefinition" - ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + "-Wno-nullability-extension -Wno-typedef-redefinition"; meta = with lib; { description = "AWS SDK for C common core"; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 037fd198fef..8024f310951 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; + # fix build with gcc9, can be removed after bumping to current version + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + preConfigure = '' rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 1bce315878d..60322f53016 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -88,9 +88,7 @@ stdenv.mkDerivation rec { doCheck = false; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; meta = with stdenv.lib; { description = "Application matching framework"; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index a9d21a1f5a9..1c81dd608cb 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + meta = { inherit version; description = "Utilities library for Linphone"; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 1745614f741..0d3df37d8e0 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index fd0da496fa4..f370e45b5fd 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - buildFlags = "lib info pdf html"; + buildFlags = [ "lib" "info" "pdf" "html" ]; installTargets = [ "install" "install-info" "install-pdf" "install-html" ]; inherit doCheck; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 2d0a5a63d6f..82bcd49592d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation { inherit src version; - patchFlags = ""; + patchFlags = []; patches = patches ++ optional stdenv.isDarwin ( diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index fb25b0a5810..9b722602a65 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison ]; patches = [ ./gcc-4.3.3-fixes.patch ]; configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; doCheck = true; meta = { diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 4a4cba31735..ecf991cb59c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,23 +1,36 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, openssl }: stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.17.1"; + version = "0.17.3"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw"; + sha256 = "187r7vc4kpd0v6bb1y51zwqm9y1lh0m84vkwmrxn8rrp4bwdxlpj"; }; nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + + cmakeFlags = [ + "-DCAF_NO_EXAMPLES:BOOL=TRUE" + ]; + + doCheck = true; + checkTarget = "test"; + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib + ''; + meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; homepage = http://actor-framework.org/; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ bobakker ]; + maintainers = with maintainers; [ bobakker tobim ]; }; } diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 86a5e52353a..cc338e35d83 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.11.0"; + version = "2.11.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="1b07drrclvxj17s67ivypr9vr27rg0m36jqnrbci6f4wsp1b0gbl"; + sha256="1jijj72cas6k5hckkxqppbv1inlwbca37p0ixzs3vzm2jhnd7z31"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ccrtp/1.8.nix b/pkgs/development/libraries/ccrtp/1.8.nix deleted file mode 100644 index db2d177b710..00000000000 --- a/pkgs/development/libraries/ccrtp/1.8.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, openssl, pkgconfig, libgcrypt, commoncpp2 }: - -stdenv.mkDerivation { - name = "ccrtp-1.8.0"; - - src = fetchurl { - url = mirror://gnu/ccrtp/ccrtp-1.8.0.tar.gz; - sha256 = "0wr4dandlfajhmg90nqyvwv61ikn9vdycji001310y3c4zfysprn"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libgcrypt commoncpp2 ]; - - patches = [ ./gcc-4.6-fix.patch ]; - - meta = { - description = "GNU ccRTP is an implementation of RTP, the real-time transport protocol from the IETF"; - homepage = https://www.gnu.org/software/ccrtp/; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # fails to compile with libgcrypt >= 1.6 - }; -} diff --git a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch b/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch deleted file mode 100644 index 49d07a89e52..00000000000 --- a/pkgs/development/libraries/ccrtp/gcc-4.6-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ubr ccrtp-1.8.0-orig/src/ccrtp/sources.h ccrtp-1.8.0/src/ccrtp/sources.h ---- ccrtp-1.8.0-orig/src/ccrtp/sources.h 2010-04-18 20:51:49.000000000 +0200 -+++ ccrtp-1.8.0/src/ccrtp/sources.h 2012-07-07 11:42:50.961179016 +0200 -@@ -45,6 +45,7 @@ - #define CCXX_RTP_SOURCES_H_ - - #include <string> -+#include <cstddef> - #include <ccrtp/rtcppkt.h> - - #ifdef CCXX_NAMESPACES -@@ -406,7 +407,7 @@ - public: - typedef std::forward_iterator_tag iterator_category; - typedef Participant value_type; -- typedef ptrdiff_t difference_type; -+ typedef std::ptrdiff_t difference_type; - typedef const Participant* pointer; - typedef const Participant& reference; - diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix index 7802be9c4f0..03a1f9b3179 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cereal"; - version = "1.2.2"; + version = "1.3.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "USCiLab"; repo = "cereal"; rev = "v${version}"; - sha256 = "1ckr8r03ggg5pyzg8yw40d5ssq40h5najvyqlnxc85fxxp8rnrx4"; + sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"; }; cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ]; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 7576c24024a..4b84f73a258 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # Shared-only build - buildFlags = "shared"; + buildFlags = [ "shared" ]; postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index a7d7a0ea982..2c8ac5113b1 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; - + buildPhase = '' rebar compile ''; @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; license = licenses.mit; + # https://github.com/tonyrog/cl/issues/39 + broken = stdenv.isAarch64; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix deleted file mode 100644 index 0c5ab758583..00000000000 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ fetchurl, stdenv }: - -stdenv.mkDerivation rec { - name = "commoncpp2-1.8.1"; - - src = fetchurl { - url = "mirror://gnu/commoncpp/${name}.tar.gz"; - sha256 = "0kmgr5w3b1qwzxnsnw94q6rqs0hr8nbv9clf07ca2a2fyypx9kjk"; - }; - - doCheck = true; - - preBuild = '' - echo '#include <sys/stat.h>' >> inc/cc++/config.h - ''; - - meta = { - description = "GNU Common C++, a portable, highly optimized C++ class framework"; - - longDescription = - '' GNU Common C++ and GNU uCommon are very portable and highly - optimized class framework for writing C++ applications that need to - use threads and support concurrent sychronization, and that use - sockets, XML parsing, object serialization, thread-optimized String - and data structure classes, etc. This framework offers a class - foundation that hides platform differences from your C++ application - so that you need not write platform specific code. GNU Common C++ - has been ported to compile nativily on most platforms which support - either posix threads, or on maybe be used with Debian hosted mingw32 - to build native threading applications for Microsoft Windows. - ''; - - homepage = https://www.gnu.org/software/commoncpp/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/cpp-hocon/default.nix b/pkgs/development/libraries/cpp-hocon/default.nix index d172ab55fa3..dc742a5c051 100644 --- a/pkgs/development/libraries/cpp-hocon/default.nix +++ b/pkgs/development/libraries/cpp-hocon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index a21b3cc93fa..bb521ba3ec0 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake sqlite libmysqlclient postgresql unixODBC ]; cmakeFlags = [ "--no-warn-unused-cli" ]; - NIX_CFLAGS_COMPILE = [ "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ]; + NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = http://cppcms.com/sql/cppdb/; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 916ec5b703b..a7313c20553 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isAarch64 "-march=armv8-a+crc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; meta = with stdenv.lib; { homepage = https://github.com/google/crc32c; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index b472733f8ee..3fe27748155 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; preInstall = "rm libcryptopp.a"; # built for checks but we don't install static lib into the nix store - installTargets = "install-lib"; + installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; postInstall = optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${versions.majorMinor version} diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 506aa5f475d..9bfff5c4aa8 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, sfml }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation { @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; - rev = "b5facb85d13bff451a5fd2d088a97472a685576c"; - sha256 = "1q716gd7c7jlxzwpq5z4rjj5lsrn71ql2djphccdf9jannllqizn"; + rev = version; + sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm"; }; buildInputs = [ cmake sfml ]; cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 1658f8a6fa7..1c14454af5c 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "18bzvhzx8k24mpcim5669n3wg9hd0sfsxj8zjpbr24hywrlppgc2"; }; - buildFlags = "cutee"; + buildFlags = [ "cutee" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 246dd009820..d9a17aff941 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - NIX_LDFLAGS = [ - "-lbluetooth" - ]; + NIX_LDFLAGS = "-lbluetooth"; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index a050dd8d9ca..68f6a7c5d8b 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext , pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false -, buildPackages, pruneLibtoolFiles }: +, buildPackages, pruneLibtoolFiles, fetchpatch }: with stdenv.lib; stdenv.mkDerivation rec { @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { patches = [ ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519 ./cyrus-sasl-ac-try-run-fix.patch + (fetchpatch { + name = "CVE-2019-19906.patch"; + url = "https://sources.debian.org/data/main/c/cyrus-sasl2/2.1.27+dfsg-1+deb10u1/debian/patches/0021-CVE-2019-19906.patch"; + sha256 = "1n4c5wg7l9j8rlbvx8i605j5d39xmj5wm618k8acxl4fmglcmfls"; + }) ]; configureFlags = [ diff --git a/pkgs/development/libraries/czmq/3.x.nix b/pkgs/development/libraries/czmq/3.x.nix deleted file mode 100644 index 73a51cd2731..00000000000 --- a/pkgs/development/libraries/czmq/3.x.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, zeromq }: - -stdenv.mkDerivation rec { - version = "3.0.2"; - pname = "czmq"; - - src = fetchurl { - url = "http://download.zeromq.org/${pname}-${version}.tar.gz"; - sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; - }; - - patches = [ ./czmq3-gcc7.patch ]; - - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - # Needs to be propagated for the .pc file to work - propagatedBuildInputs = [ zeromq ]; - - meta = with stdenv.lib; { - homepage = http://czmq.zeromq.org/; - description = "High-level C Binding for ZeroMQ"; - license = licenses.mpl20; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/czmq/czmq3-gcc7.patch b/pkgs/development/libraries/czmq/czmq3-gcc7.patch deleted file mode 100644 index 4ab14685a6c..00000000000 --- a/pkgs/development/libraries/czmq/czmq3-gcc7.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/zgossip_engine.inc b/src/zgossip_engine.inc -index 37dbb4eb..727aaa9b 100644 ---- a/src/zgossip_engine.inc -+++ b/src/zgossip_engine.inc -@@ -258,7 +258,7 @@ engine_set_log_prefix (client_t *client, const char *string) - { - if (client) { - s_client_t *self = (s_client_t *) client; -- snprintf (self->log_prefix, sizeof (self->log_prefix) - 1, -+ snprintf (self->log_prefix, sizeof (self->log_prefix), - "%6d:%-33s", self->unique_id, string); - } - } -diff --git a/src/zsys.c b/src/zsys.c -index 4d0bb8a1..f07db9c8 100644 ---- a/src/zsys.c -+++ b/src/zsys.c -@@ -1071,7 +1071,7 @@ zsys_run_as (const char *lockfile, const char *group, const char *user) - } - } - // We record the current process id in the lock file -- char pid_buffer [10]; -+ char pid_buffer [32]; - snprintf (pid_buffer, sizeof (pid_buffer), "%6d\n", getpid ()); - if (write (handle, pid_buffer, strlen (pid_buffer)) != strlen (pid_buffer)) { - zsys_error ("cannot write to lockfile: %s", strerror (errno)); diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/default.nix index 05e499c73d0..05e499c73d0 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/default.nix diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix deleted file mode 100644 index 079eb0806d2..00000000000 --- a/pkgs/development/libraries/czmqpp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: - -stdenv.mkDerivation rec { - pname = "czmqpp"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "zeromq"; - repo = "czmqpp"; - rev = "v${version}"; - sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; - }; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - propagatedBuildInputs = [ czmq ]; - - # https://github.com/zeromq/czmqpp/issues/42 - patches = [ ./socket.patch ]; - - meta = with stdenv.lib; { - inherit (src.meta) homepage; - description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; - license = licenses.lgpl3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ chris-martin ]; - }; -} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch deleted file mode 100644 index 0464bcf7797..00000000000 --- a/pkgs/development/libraries/czmqpp/socket.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- /src/socket.cpp -+++ /src/socket.cpp -@@ -60,12 +60,12 @@ - int socket::bind(const std::string& address) - { - // format-security: format not a string literal and no format arguments. -- return zsocket_bind(self_, address.c_str()); -+ return zsocket_bind(self_, "%s", address.c_str()); - } - int socket::connect(const std::string& address) - { - // format-security: format not a string literal and no format arguments. -- return zsocket_connect(self_, address.c_str()); -+ return zsocket_connect(self_, "%s", address.c_str()); - } - - bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix deleted file mode 100644 index 93e5da5b792..00000000000 --- a/pkgs/development/libraries/dirac/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, doxygen }: - -stdenv.mkDerivation rec { - version = "1.0.2"; - pname = "dirac"; - - src = fetchurl { - url = "mirror://sourceforge/dirac/${pname}-${version}.tar.gz"; - sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1"; - }; - - buildInputs = [ doxygen ]; - enableParallelBuilding = true; - - patches = [ ./dirac-1.0.2.patch ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - postInstall = '' - # keep only necessary binaries - find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete - ''; - - meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/dirac; - description = "A general-purpose video codec based on wavelets"; - platforms = platforms.linux; - license = with licenses; [ mpl11 gpl2 lgpl21 ]; - maintainers = [ maintainers.igsha ]; - }; -} diff --git a/pkgs/development/libraries/dirac/dirac-1.0.2.patch b/pkgs/development/libraries/dirac/dirac-1.0.2.patch deleted file mode 100644 index 3d253b8f6d6..00000000000 --- a/pkgs/development/libraries/dirac/dirac-1.0.2.patch +++ /dev/null @@ -1,362 +0,0 @@ -diff -aur dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp ---- dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp 2008-05-02 09:57:19.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp 2016-02-10 19:39:09.838443767 +0300 -@@ -124,12 +124,9 @@ - - if(prefix==PU_PREFIX) - { -- unsigned char next_parse_code; -- -- next_parse_code = InputUnByte(); -+ (void)InputUnByte(); - // input next unit parse-offsets -- int next_unit_next_parse_offset; -- next_unit_next_parse_offset = ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE); -+ (void)ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE); - - int next_unit_previous_parse_offset; - next_unit_previous_parse_offset = ReadUintLit(PU_PREVIOUS_PARSE_OFFSET_SIZE); -diff -aur dirac-1.0.2/libdirac_common/mot_comp.cpp dirac-1.0.2-modif/libdirac_common/mot_comp.cpp ---- dirac-1.0.2/libdirac_common/mot_comp.cpp 2008-10-01 05:26:47.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/mot_comp.cpp 2016-02-10 19:50:18.453051800 +0300 -@@ -1064,10 +1064,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - - for(int c = 0, uY = ref_start.y,BuY=BChk(uY,trueRefYlen),BuY1=BChk(uY+1,trueRefYlen); -@@ -1116,10 +1116,10 @@ - const ImageCoords ref_start( ( start_pos.x<<1 ) + roundvec.x ,( start_pos.y<<1 ) + roundvec.y ); - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - //An additional stage to make sure the block to be copied does not fall outside - //the reference image. -diff -aur dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp ---- dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp 2008-01-09 13:50:23.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp 2016-02-10 19:59:51.792793538 +0300 -@@ -244,10 +244,10 @@ - // We're 2doing bounds checking because we'll fall off the edge of the reference otherwise. - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - ValueType act_cols1[4], act_cols2[4]; - int uX, uY, c, l; -diff -aur dirac-1.0.2/libdirac_common/mv_codec.cpp dirac-1.0.2-modif/libdirac_common/mv_codec.cpp ---- dirac-1.0.2/libdirac_common/mv_codec.cpp 2008-10-01 05:26:47.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/mv_codec.cpp 2016-02-10 19:51:57.634838245 +0300 -@@ -159,7 +159,7 @@ - // Main code function - void PredModeCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -169,7 +169,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -@@ -334,7 +334,7 @@ - // Main code function - void VectorElementCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -344,7 +344,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -@@ -500,7 +500,7 @@ - // Main code function - void DCCodec::DoWorkCode( MvData& in_data ) - { -- int step,max; -+ int step; - int split_depth; - - for (m_sb_yp = 0, m_sb_tlb_y = 0; m_sb_yp < in_data.SBSplit().LengthY(); ++m_sb_yp, m_sb_tlb_y += 4) -@@ -510,7 +510,7 @@ - split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; - - step = 4 >> (split_depth); -- max = (1 << split_depth); -+ //max = (1 << split_depth); - - //now do all the block modes and mvs in the mb - for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step) -diff -aur dirac-1.0.2/libdirac_common/wavelet_utils.cpp dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp ---- dirac-1.0.2/libdirac_common/wavelet_utils.cpp 2008-10-20 08:21:02.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp 2016-02-10 19:58:16.205006445 +0300 -@@ -198,7 +198,6 @@ - const bool field_coding = encparams.FieldCoding(); - const ChromaFormat cformat = pparams.CFormat(); - const float cpd = encparams.CPD()*cpd_scale_factor; -- const PictureSort psort = pparams.PicSort(); - - int xlen, ylen, xl, yl, xp, yp; - float xfreq, yfreq; -diff -aur dirac-1.0.2/libdirac_encoder/picture_compress.cpp dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp ---- dirac-1.0.2/libdirac_encoder/picture_compress.cpp 2009-01-21 08:20:57.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp 2016-02-10 20:08:17.935731263 +0300 -@@ -413,14 +413,12 @@ - - const int depth=m_encparams.TransformDepth(); - -- PicArray* comp_data[3]; - CoeffArray* coeff_data[3]; - OneDArray<unsigned int>* est_bits[3]; - float lambda[3]; - - // Construction and definition of objects - for (int c=0;c<3;++c){ -- comp_data[c] = &my_picture.Data((CompSort) c ); - coeff_data[c] = &my_picture.WltData((CompSort) c ); - est_bits[c] = new OneDArray<unsigned int>( Range( 1, 3*depth+1 ) ); - }// c -diff -aur dirac-1.0.2/libdirac_encoder/quant_chooser.cpp dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp ---- dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2009-01-21 08:22:05.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp 2016-02-10 20:15:43.792954708 +0300 -@@ -340,7 +340,7 @@ - { - for (int i=cblock.Xstart(); i<cblock.Xend(); ++i ) - { -- if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold ) -+ if ( (int(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) - can_skip = false; - } - } -@@ -349,13 +349,13 @@ - - CoeffType QuantChooser::BlockAbsMax( const Subband& node ) - { -- int val( 0 ); -+ CoeffType val( 0 ); - - for (int j=node.Yp() ; j<node.Yp()+node.Yl(); ++j) - { - for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i) - { -- val = std::max( val , std::abs(m_coeff_data[j][i]) ); -+ val = std::max( val , CoeffType(std::abs(m_coeff_data[j][i])) ); - }// i - }// j - -diff -aur dirac-1.0.2/libdirac_encoder/seq_compress.cpp dirac-1.0.2-modif/libdirac_encoder/seq_compress.cpp ---- dirac-1.0.2/libdirac_encoder/seq_compress.cpp 2008-10-29 05:42:06.000000000 +0300 -+++ dirac-1.0.2-modif/libdirac_encoder/seq_compress.cpp 2016-02-10 20:16:24.108885403 +0300 -@@ -663,7 +663,6 @@ - - int FrameSequenceCompressor::CodedToDisplay( const int cnum ) - { -- int div; - - if (m_L1_sep>0) - { -@@ -672,7 +671,6 @@ - return 0; - else if ((cnum-1)% m_L1_sep==0) - {//we have L1 or subsequent I pictures -- div=(cnum-1)/m_L1_sep; - return cnum+m_L1_sep-1; - } - else//we have L2 pictures -diff -aur dirac-1.0.2/libdirac_motionest/me_utils.cpp dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp ---- dirac-1.0.2/libdirac_motionest/me_utils.cpp 2008-10-21 08:55:46.000000000 +0400 -+++ dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp 2016-02-10 20:04:40.068175649 +0300 -@@ -684,10 +684,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - // weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - const int refXlen( m_ref_data.LengthX() ); - const int refYlen( m_ref_data.LengthY() ); -@@ -848,10 +848,10 @@ - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - - // weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (2 - rmdr.x) * (2 - rmdr.y), //tl -- rmdr.x * (2 - rmdr.y), //tr -- (2 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr.x) * (2 - rmdr.y)), //tl -+ ValueType(rmdr.x * (2 - rmdr.y)), //tr -+ ValueType((2 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - const int refXlen( m_ref_data.LengthX() ); - const int refYlen( m_ref_data.LengthY() ); -@@ -908,10 +908,10 @@ - const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - bool bounds_check( false ); - -@@ -1039,10 +1039,10 @@ - const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts[4] = { (4 - rmdr.x) * (4 - rmdr.y), //tl -- rmdr.x * (4 - rmdr.y), //tr -- (4 - rmdr.x) * rmdr.y, //bl -- rmdr.x * rmdr.y }; //br -+ const ValueType linear_wts[4] = { ValueType((4 - rmdr.x) * (4 - rmdr.y)), //tl -+ ValueType(rmdr.x * (4 - rmdr.y)), //tr -+ ValueType((4 - rmdr.x) * rmdr.y), //bl -+ ValueType(rmdr.x * rmdr.y) }; //br - - bool bounds_check( false ); - -@@ -1403,10 +1403,10 @@ - } - else - { -- const ValueType linear_wts[4] = { (2 - rmdr1.x) * (2 - rmdr1.y), //tl -- rmdr1.x * (2 - rmdr1.y), //tr -- (2 - rmdr1.x) * rmdr1.y, //bl -- rmdr1.x * rmdr1.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr1.x) * (2 - rmdr1.y)), //tl -+ ValueType(rmdr1.x * (2 - rmdr1.y)), //tr -+ ValueType((2 - rmdr1.x) * rmdr1.y), //bl -+ ValueType(rmdr1.x * rmdr1.y) }; //br - - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - for( int y=dparams.Yl(), ry=ref_start1.y, by=BChk(ry,m_ref_data1.LengthY()), by1=BChk(ry+1,m_ref_data1.LengthY()); -@@ -1513,10 +1513,10 @@ - } - else - { -- const ValueType linear_wts[4] = { (2 - rmdr2.x) * (2 - rmdr2.y), //tl -- rmdr2.x * (2 - rmdr2.y), //tr -- (2 - rmdr2.x) * rmdr2.y, //bl -- rmdr2.x * rmdr2.y }; //br -+ const ValueType linear_wts[4] = { ValueType((2 - rmdr2.x) * (2 - rmdr2.y)), //tl -+ ValueType(rmdr2.x * (2 - rmdr2.y)), //tr -+ ValueType((2 - rmdr2.x) * rmdr2.y), //bl -+ ValueType(rmdr2.x * rmdr2.y) }; //br - - // We're doing bounds checking because we'll fall off the edge of the reference otherwise. - for( int y=dparams.Yl(), ry=ref_start2.y, by=BChk(ry,m_ref_data2.LengthY()),by1=BChk(ry+1,m_ref_data2.LengthY()); -@@ -1564,14 +1564,14 @@ - const MVector rmdr2( mv2.x & 3 , mv2.y & 3 ); - - //weights for doing linear interpolation, calculated from the remainder values -- const ValueType linear_wts1[4] = { (4 - rmdr1.x) * (4 - rmdr1.y), //tl -- rmdr1.x * (4 - rmdr1.y), //tr -- (4 - rmdr1.x) * rmdr1.y, //bl -- rmdr1.x * rmdr1.y }; //br -- const ValueType linear_wts2[4] = { (4 - rmdr2.x) * (4 - rmdr2.y), //tl -- rmdr2.x * (4 - rmdr2.y), //tr -- (4 - rmdr2.x) * rmdr2.y, //bl -- rmdr2.x * rmdr2.y }; //br -+ const ValueType linear_wts1[4] = { ValueType((4 - rmdr1.x) * (4 - rmdr1.y)), //tl -+ ValueType(rmdr1.x * (4 - rmdr1.y)), //tr -+ ValueType((4 - rmdr1.x) * rmdr1.y), //bl -+ ValueType(rmdr1.x * rmdr1.y) }; //br -+ const ValueType linear_wts2[4] = { ValueType((4 - rmdr2.x) * (4 - rmdr2.y)), //tl -+ ValueType(rmdr2.x * (4 - rmdr2.y)), //tr -+ ValueType((4 - rmdr2.x) * rmdr2.y), //bl -+ ValueType(rmdr2.x * rmdr2.y) }; //br - - //Where to start in the upconverted images - const ImageCoords ref_start1( ( dparams.Xp()<<1 ) + roundvec1.x ,( dparams.Yp()<<1 ) + roundvec1.y ); -diff -aur dirac-1.0.2/util/conversion/common/bitmap.cpp dirac-1.0.2-modif/util/conversion/common/bitmap.cpp ---- dirac-1.0.2/util/conversion/common/bitmap.cpp 2004-06-30 20:44:52.000000000 +0400 -+++ dirac-1.0.2-modif/util/conversion/common/bitmap.cpp 2016-02-10 20:19:58.355494888 +0300 -@@ -142,14 +142,9 @@ - char signature[2]; - int fileSize; - int dataOffset; -- int size; - int planes; - int bitCount; - int compression; -- int imageSize; -- int xPixelsPerM, yPixelsPerM; -- int coloursUsed; -- int coloursImportant; - //Define buffer to read bytes into. - const int bufferSize = 54; - char buffer[bufferSize]; -@@ -175,7 +170,7 @@ - //Reposition input buffer to skip over extra header data if necessary - //Should check success of operation (see The C++ Stand Lib, Josuttis, p665) - if (dataOffset>54) inbuf.pubseekoff(dataOffset-54, std::ios_base::cur, std::ios_base::in); -- size = read4bytes(buffer+14); -+ (void)read4bytes(buffer+14); // size - w = read4bytes(buffer+18); - h = read4bytes(buffer+22); - if ( fileSize != (dataOffset + height()*lineBufferSize()) ) input.setstate(std::ios::failbit); -@@ -185,11 +180,11 @@ - if ( bitCount != 24 ) input.setstate(std::ios::failbit); - compression = read4bytes(buffer+30); - if ( compression != 0 ) input.setstate(std::ios::failbit); -- imageSize = read4bytes(buffer+34); -- xPixelsPerM = read4bytes(buffer+38); -- yPixelsPerM = read4bytes(buffer+42); -- coloursUsed = read4bytes(buffer+46); -- coloursImportant = read4bytes(buffer+50); -+ (void)read4bytes(buffer+34); // imageSize -+ (void)read4bytes(buffer+38); // xPixelsPerM -+ (void)read4bytes(buffer+42); // yPixelsPerM -+ (void)read4bytes(buffer+46); // coloursUsed -+ (void)read4bytes(buffer+50); // coloursImportant - return input; } - - } // end namespace dirac_vu diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index bc4bc8b2352..4d8f623b36a 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, static ? false }: stdenv.mkDerivation rec { pname = "double-conversion"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; # Case sensitivity issue preConfigure = lib.optionalString stdenv.isDarwin '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; - homepage = https://github.com/google/double-conversion; + homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index aa7b2ee9a05..362607eed18 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python3 , libGL, libX11 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; + nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python3 ]; buildInputs = [ libGL libX11 ]; preConfigure = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix index a29cbb9bbd1..a528ad6f7f6 100644 --- a/pkgs/development/libraries/farbfeld/default.nix +++ b/pkgs/development/libraries/farbfeld/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libjpeg ]; nativeBuildInputs = [ makeWrapper ]; - installFlags = "PREFIX=/ DESTDIR=$(out)"; + installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; postInstall = '' wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin" ''; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index e884bb41e20..763caa811e3 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,11 +1,19 @@ -{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base -, gst-python, gupnp-igd, gobject-introspection -, gst-plugins-good, gst-plugins-bad, gst-libav +{ stdenv +, fetchurl +, fetchpatch +, libnice +, pkgconfig +, autoreconfHook +, gstreamer +, gst-plugins-base +, gupnp-igd +, gobject-introspection +, gst-plugins-good +, gst-plugins-bad +, gst-libav }: -let - inherit (pythonPackages) python pygobject2; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "farstream-0.2.8"; outputs = [ "out" "dev" ]; @@ -15,17 +23,36 @@ in stdenv.mkDerivation rec { sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject2 gupnp-igd libnice ]; + patches = [ + # Python has not been used for ages + (fetchpatch { + url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch"; + sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn"; + }) + ]; + + buildInputs = [ + libnice + gupnp-igd + libnice + ]; - nativeBuildInputs = [ pkgconfig gobject-introspection ]; + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gobject-introspection + ]; propagatedBuildInputs = [ - gstreamer gst-plugins-base gst-python - gst-plugins-good gst-plugins-bad gst-libav + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-libav ]; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/Farstream; + homepage = "https://www.freedesktop.org/wiki/Software/Farstream"; description = "Audio/Video Communications Framework formely known as farsight"; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index afdc6c0f5e8..214da206f56 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -239,11 +239,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf"; + sha256 = "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb"; }; patches = [ ./prefer-libdav1d-over-libaom.patch ]; diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 98ada9a3f09..3b3fc900ede 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (rec { - version = "${branch}.14"; + version = "${branch}.15"; branch = "2.8"; - sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn"; + sha256 = "08gf493a1ici1rn6gda6bxkcsk3fqbs6pdr0phcifjkd3xn7yr1m"; } // args) diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 759fba65587..6c16b55dfe8 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (rec { version = branch; - branch = "3.4.6"; - sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b"; + branch = "3.4.7"; + sha256 = "0hj91gjps92f4w3yyqss89yrs6s75574hbj5gz9g5affd6294yhc"; darwinFrameworks = [ Cocoa CoreMedia ]; } // args) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 387069d1618..31cb0477c21 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.2.1"; + version = "4.2.2"; branch = "4.2"; - sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8"; + sha256 = "0p0f024rxrpk8pgmrprhfywq10rvdhrs0422wwcwlxkgqa3x285n"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 3424493c209..956d2d7223f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -44,7 +44,7 @@ let inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32; - inherit (stdenv.lib) optional optionals optionalString enableFeature; + inherit (stdenv.lib) optional optionals optionalString enableFeature filter; cmpVer = builtins.compareVersions; reqMin = requiredVersion: (cmpVer requiredVersion branch != 1); @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # doesn't accept all and stores configureFlags in libs! configurePlatforms = []; - configureFlags = [ + configureFlags = filter (v: v != null) ([ "--arch=${stdenv.hostPlatform.parsed.cpu.name}" "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" # License @@ -96,13 +96,15 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" "--enable-pic") (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" + ] ++ (if multithreadBuild then ( if stdenv.isCygwin then - "--disable-pthreads --enable-w32threads" + ["--disable-pthreads" "--enable-w32threads"] else # Use POSIX threads by default - "--enable-pthreads --disable-w32threads") + ["--enable-pthreads" "--disable-w32threads"]) else - "--disable-pthreads --disable-w32threads") + ["--disable-pthreads" "--disable-w32threads"]) + ++ [ (ifMinVer "0.9" "--disable-os2threads") # We don't support OS/2 "--enable-network" (ifMinVer "2.4" "--enable-pixelutils") @@ -161,7 +163,7 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" - ] ++ optional stdenv.cc.isClang "--cc=clang"; + ] ++ optional stdenv.cc.isClang "--cc=clang"); nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 07f1c7ec917..3438bfee07b 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Lightweight audio filtering library made from webrtc code"; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index d96ceb5d26b..11e86703616 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "flatbuffers"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1b32kc5jp83l43w2gs1dkw2vqm2j0wi7xfxqa86m18n3l41ca734"; + sha256 = "1gl8pnykzifh7pnnvl80f5prmj5ga60dp44inpv9az2k9zaqx3qr"; }; preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin '' @@ -34,4 +34,12 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; homepage = https://google.github.io/flatbuffers/; }; -} +} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { + # Remove when updating to the next version. + patches = [ + (fetchpatch { + url = "https://github.com/google/flatbuffers/commit/2b52494047fb6e97af03e1801b42adc7ed3fd78a.diff"; + sha256 = "01k07ws0f4w7nnl8nli795wgjm4p94lxd3kva4yf7nf3pg4p8arx"; + }) + ]; +}) diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 945f1d4931f..c0a3d3718f3 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { doCheck = false; # TODO: some issues with temporary files - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 20a80119b13..462d186c72d 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # issues with ntl -- https://github.com/wbhart/flint2/issues/487 - NIX_CXXSTDLIB_COMPILE = [ "-std=c++11" ]; + NIX_CXXSTDLIB_COMPILE = "-std=c++11"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 1d66735569d..635baff796b 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; # Don't try to write to /var/cache/fontconfig at install time. - installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + installFlags = [ "sysconfdir=$(out)/etc" "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; passthru = { # Empty for backward compatibility, there was no versioning before 2.11 diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 5c9a0ecc71b..617e058bd8f 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { doCheck = true; # Don't try to write to /var/cache/fontconfig at install time. - installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; + installFlags = [ "fc_cachedir=$(TMPDIR)/dummy" "RUN_FC_CACHE_TEST=false" ]; postInstall = '' cd "$out/etc/fonts" diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 694b6d567eb..f53d55c2ca9 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -9,24 +9,15 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "0wxa4xs7as7y47h7i6prmk5r0srabdvrlkvza3j50pixir5swgvh"; + sha256 = "1bzlqavbch5smra75znh4ljr490wyx5v6hax8r9rjbgk605i33ns"; }; - patches = [ - # https://github.com/fplll/fpylll/issues/161 - (fetchpatch { - name = "fix-out-of-bounds-access.patch"; - url = "https://github.com/fplll/fplll/pull/398/commits/f68e257228bf073ef380f996326d02197ce7b0e4.patch"; - sha256 = "1rapkcf389lf579va6kbnvhzyv36n4l4d9n0vg2zxprvql8wvm7m"; - }) - ]; - nativeBuildInputs = [ gettext autoreconfHook diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 4cff2245740..611c9faa851 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: stdenv.mkDerivation (rec { name = "gamin-0.1.10"; @@ -10,13 +10,13 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python glib ]; + buildInputs = [ glib ]; # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from # <sys/socket.h> with Glibc 2.9. configureFlags = [ "--disable-debug" - "--with-python=${python}" + "--without-python" # python3 not supported "CPPFLAGS=-D_GNU_SOURCE" ]; @@ -44,4 +44,3 @@ stdenv.mkDerivation (rec { sed -i 's/,--version-script=.*$/\\/' libgamin/Makefile ''; }) - diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index a6574053414..6a086d9c998 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -40,9 +40,7 @@ stdenv.mkDerivation rec { ]; # Allow use of old proj_api.h - NIX_CFLAGS_COMPILE = [ - "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" - ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; # Prevent this: # diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 972e9022235..830a311db70 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -4,9 +4,6 @@ stdenv.mkDerivation rec { pname = "gdbm"; version = "1.18.1"; - # FIXME: remove on update to > 1.18.1 - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null; - src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index c3f62a5df94..0b5e0af84ba 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { cd ../build ''; - cmakeFlags = '' - -DGDCM_BUILD_APPLICATIONS=ON - -DGDCM_BUILD_SHARED_LIBS=ON - -DGDCM_USE_VTK=ON - ''; + cmakeFlags = [ + "-DGDCM_BUILD_APPLICATIONS=ON" + "-DGDCM_BUILD_SHARED_LIBS=ON" + "-DGDCM_USE_VTK=ON" + ]; enableParallelBuilding = true; buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index ca7163af49b..b3e8ec2e178 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -57,6 +57,15 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch"; sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d"; }) + + # Fix test timeout. Downstream debian patch. + (fetchpatch { + url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch"; + sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly"; + }) + + # Remove gegl:simple / backend-file test that times out frequently + ./patches/no-simple-backend-file-test.patch ]; nativeBuildInputs = [ @@ -112,7 +121,7 @@ stdenv.mkDerivation rec { # TODO: Fix missing math symbols in gegl seamless clone. # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = [ "-lm" ]; + NIX_CFLAGS_COMPILE = "-lm"; postPatch = '' chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch new file mode 100644 index 00000000000..bf07572182b --- /dev/null +++ b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch @@ -0,0 +1,10 @@ +diff --git a/tests/simple/meson.build b/tests/simple/meson.build +index 2c735d80a..ae4d50f2a 100644 +--- a/tests/simple/meson.build ++++ b/tests/simple/meson.build +@@ -1,5 +1,4 @@ + testnames = [ +- 'backend-file', + 'buffer-cast', + 'buffer-changes', + 'buffer-extract', diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 97b9ba087e2..1b3d5ba4b7c 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" "-Wno-error=pointer-compare" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 157f801d2f2..c2165a9d9c7 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -86,5 +86,5 @@ stdenv.mkDerivation rec { } // stdenv.lib.optionalAttrs stdenv.isDarwin { - makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + makeFlags = [ "CFLAGS=-D_FORTIFY_SOURCE=0" ]; } diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index b1a2524065a..4697f28bb9f 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,20 +1,25 @@ { stdenv , lib -, fetchurl +, fetchgit +, autoreconfHook , optimize ? false # impure hardware optimizations }: stdenv.mkDerivation rec { pname = "gf2x"; - version = "1.2"; # remember to also update the url + version = "1.3.0"; - src = fetchurl { - # find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/ - # Requested a predictable link: - # https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982 - url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz"; - sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1"; + # upstream has plans to move to gitlab: + # https://github.com/NixOS/nixpkgs/pull/45299#issuecomment-564477936 + src = fetchgit { + url = "https://scm.gforge.inria.fr/anonscm/git/gf2x/gf2x.git"; + rev = "gf2x-${version}"; + sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + nativeBuildInputs = [ + autoreconfHook + ]; + # no actual checks present yet (as of 1.2), but can't hurt trying # for an indirect test, run ntl's test suite doCheck = true; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index 2e818ea94ea..b09936f2924 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, enableShared ? true}: stdenv.mkDerivation rec { pname = "gflags"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { preConfigure = "rm BUILD"; cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=ON" + "-DGFLAGS_BUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" + "-DGFLAGS_BUILD_STATIC_LIBS=ON" ]; doCheck = false; diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix index 5d7b95136dd..e2ff96d366a 100644 --- a/pkgs/development/libraries/giflib/default.nix +++ b/pkgs/development/libraries/giflib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: +{ stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "giflib-5.2.1"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { --replace 'PREFIX = /usr/local' 'PREFIX = ${builtins.placeholder "out"}' ''; + nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; + buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; meta = { diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 514d21def1e..2d89355cffe 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python +{ stdenv, fetchFromGitHub, cmake, pkgconfig, python3 , zlib, libssh2, openssl, http-parser, curl , libiconv, Security }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DTHREADSAFE=ON" ]; - nativeBuildInputs = [ cmake python pkgconfig ]; + nativeBuildInputs = [ cmake python3 pkgconfig ]; buildInputs = [ zlib libssh2 openssl http-parser curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 802a18dfda5..63a773522a0 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.62.1"; + version = "2.62.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "043imcynl3rwdz79wvpdfhkmqmgdhr34z0vac3x7jymdf5kswm9w"; + sha256 = "0i2mw75297ql72h47vyvff3hqa0kcmqybblj52fqrarb0kfbhi06"; }; patches = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 706e99179f5..4a7d6cce90b 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.3"; + version = "2.62.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i2mlrd351dnmpfi465qmx9rhgyff01j29a2x3lczzyky34ss024"; + sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c"; }; patches = optionals stdenv.isDarwin [ @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { "-Ddevbindir=${placeholder ''dev''}/bin" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=nonnull" # Default for release buildtype but passed manually because # we're using plain @@ -138,9 +138,6 @@ stdenv.mkDerivation rec { patchShebangs tests/gen-casemap-txt.py ''; - LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}"; - LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf"; - DETERMINISTIC_BUILD = 1; postInstall = '' diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 50b359da96c..1a17595a1a3 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -5,6 +5,14 @@ , buildPackages }: +let + gdCflags = [ + "-Wno-error=stringop-truncation" + "-Wno-error=missing-attributes" + "-Wno-error=array-bounds" + ]; +in + callPackage ./common.nix { inherit stdenv; } { name = "glibc" + stdenv.lib.optionalString withGd "-gd"; @@ -40,21 +48,21 @@ callPackage ./common.nix { inherit stdenv; } { # limit rebuilds by only disabling pie w/musl ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; - NIX_CFLAGS_COMPILE = - if !stdenv.hostPlatform.isMusl + NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " + (if !stdenv.hostPlatform.isMusl # TODO: This (returning a string or `null`, instead of a list) is to # not trigger a mass rebuild due to the introduction of the # musl-specific flags below. # At next change to non-musl glibc builds, remove this `then` # and the above condition, instead keeping only the `else` below. - then (if withGd then "-Wno-error=stringop-truncation" else null) + then (stdenv.lib.optionals withGd gdCflags) else - builtins.concatLists [ - (stdenv.lib.optional withGd "-Wno-error=stringop-truncation") + (builtins.concatLists [ + (stdenv.lib.optionals withGd gdCflags) # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - ]; + ])); # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 88b33601ee7..d39d6f0d7a3 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -27,9 +27,7 @@ stdenv.mkDerivation rec { cp ${gcc7PlatformPatch} glm/simd/platform.h ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ - "-DGLM_COMPILER=0" - ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; postInstall = '' mkdir -p $doc/share/doc/glm diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 792217043da..7809dc08842 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, perl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, perl, static ? false }: stdenv.mkDerivation rec { pname = "glog"; @@ -20,13 +20,15 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ]; checkInputs = [ perl ]; doCheck = false; # fails with "Mangled symbols (28 out of 380) found in demangle.dm" meta = with stdenv.lib; { - homepage = https://github.com/google/glog; + homepage = "https://github.com/google/glog"; license = licenses.bsd3; description = "Library for application-level logging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 565ef85c1bf..3343c78bea1 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -11,7 +11,7 @@ assert idnSupport -> libidn != null; with stdenv.lib; let - version = "1.0.22"; + version = "1.0.23"; in stdenv.mkDerivation { pname = "gloox"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja"; + sha256 = "12jz8glg9zmyk0iyv1ywf5i0hq93dfq8lvn6lyjgy8730w66mjwp"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index d9ea5a71dd3..4b35f7828fe 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -37,7 +37,9 @@ let self = stdenv.mkDerivation rec { "--build=${stdenv.buildPlatform.config}" ] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions" ++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64" - ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly" + # to build a .dll on windows, we need --disable-static + --enable-shared + # see https://gmplib.org/manual/Notes-for-Particular-Systems.html + ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared" ; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index bc10c9f9bdd..0e985754985 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ - "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable" - ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin + "-D_XOPEN_SOURCE -Wno-aligned-allocation-unavailable"; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 63072273c2e..ed2b5563bd3 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { # fit in the limit. https://github.com/NixOS/nix/pull/1085 ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"); checkInputs = [ which ]; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 2fa76b2e085..abcd3abaf30 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: stdenv.mkDerivation rec { - version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.26.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb"; + sha256 = "1fxydarl00vbhd9q153qn4ax1yc6xrd8wij6bfy9j8chipw1bgir"; fetchSubmodules = true; }; patches = [ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341) (fetchpatch { - url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch"; - sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3"; + url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch"; + sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq"; }) ]; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 1fd086ca23c..966d6a8ffd5 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; # https://lists.gnu.org/archive/html/bug-gsl/2015-11/msg00012.html doCheck = stdenv.hostPlatform.system != "i686-linux" && stdenv.hostPlatform.system != "aarch64-linux"; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index e5772c8772e..ae102ac6030 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html) - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isx86_64 "-mno-fma"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isx86_64 "-mno-fma"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/gsmlib/default.nix b/pkgs/development/libraries/gsmlib/default.nix new file mode 100644 index 00000000000..88bec83e624 --- /dev/null +++ b/pkgs/development/libraries/gsmlib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: +stdenv.mkDerivation rec { + pname = "gsmlib"; + version = "unstable-2017-10-06"; + src = fetchFromGitHub { + owner = "x-logLT"; + repo = "gsmlib"; + rev = "4f794b14450132f81673f7d3570c5a859aecf7ae"; + sha256 = "16v8aj914ac1ipf14a867ljib3gy7fhzd9ypxnsg9l0zi8mm3ml5"; + }; + nativeBuildInputs = [ autoreconfHook ]; + meta = with stdenv.lib; { + description = "Library to access GSM mobile phones through GSM modems"; + homepage = "https://github.com/x-logLT/gsmlib"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = [ maintainers.misuzu ]; + }; +} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 22815c95647..9b2d3d0e247 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -86,13 +86,13 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n"; + sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 6f21839b64c..178f6a1fe89 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"; + sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index bbef0178312..3dd7a547de9 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"; + sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index d62af71d3ae..6e9a604f794 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gstreamer-editing-services"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "10375z5mc3bwfs07mhmfx943sbp55z8m8ihp9xpcknkdks7qg168"; + sha256 = "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 9fa94a02f88..a7c2bcf838e 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkgconfig -, python +, python3 , gst-plugins-base , orc , bzip2 @@ -48,20 +48,20 @@ let in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"; + sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0"; }; patches = [ ./fix_pkgconfig_includedir.patch ]; nativeBuildInputs = [ pkgconfig - python + python3 meson ninja gettext diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 5319de255e7..e36eba37007 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"; + sha256 = "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index e602a96291e..dfb18754c83 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0i01f1nr0921z6z4nrh8icz76s2n7i228aqxg1ihvxl65ynsraxh"; + sha256 = "0vn23nxwvs96g7gcxw5zbnw23hkhky8a8r42wq68411vgf1s41yy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index a117190a9e1..870b4468860 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.16.1"; + version = "1.16.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"; + sha256 = "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 0b47ef2244c..cac56f64cc9 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0fk0nymvbfc04fv63fj2r6q9vvi431svhkrwpr7kdjvq3rphymyb"; + sha256 = "00f6sx700qm1ximi1ag2c27m35dywwhhg6awhz85va34mfqff78r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index ad424641b81..9439ddd94e8 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "gst-validate"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1698arvmpb0cvyi8ll1brvs51vs7i3f3fw19iswh8xhj5adrn1vz"; + sha256 = "1jpfrzg3yc6kp66bgq3jy14xsj3x71mk2zh0k16yf0326awwqqa8"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix new file mode 100644 index 00000000000..c00e8035f18 --- /dev/null +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, wayland +, gtk3 +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "gtk-layer-shell"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "wmww"; + repo = "gtk-layer-shell"; + rev = "v${version}"; + sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + ]; + + buildInputs = [ + wayland gtk3 gobject-introspection + ]; + + mesonFlags = [ + "-Dout=${placeholder "out"}" + ]; + + meta = with stdenv.lib; { + description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + license = licenses.mit; + maintainers = with maintainers; [ eonpatapon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 4286d6a73fb..932527eed09 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ./hooks/drop-icon-theme-cache.sh ]; - nativeBuildInputs = [ setupHooks perl pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = setupHooks ++ [ perl pkgconfig gettext gobject-introspection ]; patches = [ ./patches/2.0-immodules.cache.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7f09b52d51f..60432614433 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -88,10 +88,7 @@ stdenv.mkDerivation rec { # These are the defines that'd you'd get with --enable-debug=minimum (default). # See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options - NIX_CFLAGS_COMPILE = [ - "-DG_ENABLE_DEBUG" - "-DG_DISABLE_CAST_CHECKS" - ]; + NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' files=( @@ -118,8 +115,7 @@ stdenv.mkDerivation rec { pkgconfig python3 sassc - setupHooks - ] ++ optionals withGtkDoc [ + ] ++ setupHooks ++ optionals withGtkDoc [ docbook_xml_dtd_43 docbook_xsl gtk-doc diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 9cc079d6103..18640e923e8 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -1,17 +1,20 @@ -{ fetchurl, stdenv, glib, pkgconfig, gettext }: +{ fetchurl, stdenv, pkgconfig, autoreconfHook, gettext, glib }: stdenv.mkDerivation rec { pname = "gts"; version = "0.7.6"; + outputs = [ "bin" "dev" "out" ]; + src = fetchurl { url = "mirror://sourceforge/gts/${pname}-${version}.tar.gz"; sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gettext ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ gettext ]; + propagatedBuildInputs = [ glib ]; doCheck = false; # fails with "permission denied" diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index ec6b304dc3c..83942c2c1dd 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -1,42 +1,38 @@ { stdenv, hspell }: let - dict = a: stdenv.mkDerivation ({ + dict = variant: a: stdenv.mkDerivation ({ inherit (hspell) src patchPhase nativeBuildInputs; + buildFlags = [ variant ]; + meta = hspell.meta // { broken = true; - description = "${a.buildFlags} Hebrew dictionary"; + description = "${variant} Hebrew dictionary"; } // (if a ? meta then a.meta else {}); } // (removeAttrs a ["meta"])); in { recurseForDerivations = true; - aspell = dict { + aspell = dict "aspell" { name = "aspell-dict-he-${hspell.version}"; - buildFlags = "aspell"; - installPhase = '' mkdir -p $out/lib/aspell cp -v he_affix.dat he.wl $out/lib/aspell''; }; - myspell = dict { + myspell = dict "myspell" { name = "myspell-dict-he-${hspell.version}"; - buildFlags = "myspell"; - installPhase = '' mkdir -p $out/lib/myspell cp -v he.dic he.aff $out/lib/myspell''; }; - hunspell = dict { + hunspell = dict "hunspell" { name = "hunspell-dict-he-${hspell.version}"; - buildFlags = "hunspell"; - installPhase = '' mkdir -p $out/lib cp -rv hunspell $out/lib''; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 76173bc5b99..4b1a695ca55 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error"; patches = [ ./build-shared.patch ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; - buildFlags = "library"; + buildFlags = [ "library" ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix index f7763ba49da..e53e4e3737e 100644 --- a/pkgs/development/libraries/icu/58.nix +++ b/pkgs/development/libraries/icu/58.nix @@ -10,5 +10,5 @@ import ./base.nix { version = "58.2"; sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; patches = [ keywordFix ]; - patchFlags = "-p4"; + patchFlags = [ "-p4" ]; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 47ca63fca99..e51224433e8 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,4 +1,4 @@ -{ version, sha256, patches ? [], patchFlags ? "" }: +{ version, sha256, patches ? [], patchFlags ? [] }: { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index a25a590b370..00cdda1e570 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ automake autoconf libtool which ]; - NIX_CFLAGS_LINK = [ "-pthread" ]; + NIX_CFLAGS_LINK = "-pthread"; patches = [ ./bootstrap.patch diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index f74477eab38..e7f575b04be 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "incrtcl"; - version = "4.0.4"; + version = "4.2.0"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz; - sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3"; + url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.2.0.tar.gz; + sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw"; }; buildInputs = [ tcl ]; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index df016d9fcac..7e24ba901e5 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.13.1"; + name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.1.tar.xz; - sha256 = "0p4cspgbnjsnkjz8nfg092yaxz8qkqi2nkxjdv421d0zrmi0i2al"; + url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 6eb5a1f5355..b0fdca11218 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -38,8 +38,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ unzip pkgconfig ]; buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ]; - NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++ - [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; + NIX_LFLAGS = toString (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) + + " -lX11 -lpango-1.0 -lgdk_pixbuf-2.0 -lglib-2.0"; buildPhase = '' unzip src.zip -d src diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 35fbdfe488a..2dff3bafdd3 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, autoconf }: +{ stdenv, fetchurl, python3, autoconf }: stdenv.mkDerivation rec { name = "jbig2dec-0.17"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf ]; - checkInputs = [ python ]; + checkInputs = [ python3 ]; doCheck = true; meta = { diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index ddf4ba62169..6492077eee4 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; }; + patches = [ + # Can be removed when upgrading beyond 2.2.0 + ./reproducible-manpages.patch + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch new file mode 100644 index 00000000000..68de5a8ae78 --- /dev/null +++ b/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 4ff069b..3b8714a 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,7 @@ cppcheck: + install: + install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 + install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ +- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 ++ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) + install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ + install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index a6eae7a79fa..72158e186ac 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchFromGitHub , cmake , python }: +{ stdenv, fetchFromGitHub, cmake, python, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; + # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 + patches = stdenv.lib.optionals stdenv.isAarch64 [ + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; + sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; + }) + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 3b9ca74bbd0..69ad2fbc737 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, - extra-cmake-modules, gettext, python, + extra-cmake-modules, gettext, python3, qtbase, qtdeclarative, qtscript, }: @@ -11,6 +11,6 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - propagatedNativeBuildInputs = [ gettext python ]; + propagatedNativeBuildInputs = [ gettext python3 ]; buildInputs = [ qtdeclarative qtscript ]; } diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 0af7f29a41f..b7b9b019b63 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=ignored-qualifiers" "-Wno-error=class-memaccess" "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = builtins.toString [ + "-Wno-error=ignored-qualifiers" + "-Wno-error=class-memaccess" + "-Wno-error=catch-value" + "-Wno-error=deprecated-copy" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl ruby ]; @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/leatherman/; + homepage = https://github.com/puppetlabs/leatherman/; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index feeb4de15e1..43cfe2ef251 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -103,7 +103,7 @@ let setOutputFlags = false; # alltools to build smaller tools, incl. aviocat, ismindex, qt-faststart, etc. - buildFlags = "all alltools install-man"; + buildFlags = [ "all" "alltools" "install-man" ]; postInstall = '' diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index c8c58315b64..043f3500b0c 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -10,7 +10,7 @@ let sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c"; }; - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation { pname = "libbladeRF"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0mdj5dkqg69gp0xw6gkhp86nxnm9g7az5rplnncxkp4p1kr35rnl"; + sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 517251e137e..daa349ca630 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional withAACS libaacs; - NIX_LDFLAGS = [ + NIX_LDFLAGS = toString [ (optionalString withAACS "-L${libaacs}/lib -laacs") (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8949ea8e390..7773fe46c0c 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext]; + ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 4d56c0f1403..4949d657669 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error - NIX_CFLAGS_COMPILE = [ "-fno-lto" ]; + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index be418125dfb..03cc3b2beb4 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - makeFlags = "libcef_dll_wrapper"; + makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index ccfe241324e..53ec231dec9 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yfmcx65aqd5l87scha6kmm2s38n85ci3gg0h6qfs16s3jfi6bw7"; }; - cmakeFlags = "-DLCB_NO_MOCK=ON"; + cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libevent openssl ]; diff --git a/pkgs/development/libraries/libctb/default.nix b/pkgs/development/libraries/libctb/default.nix new file mode 100644 index 00000000000..161c7c98c63 --- /dev/null +++ b/pkgs/development/libraries/libctb/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + pname = "libctb"; + version = "0.16"; + src = fetchurl { + url = "https://iftools.com/download/files/legacy/${pname}-${version}.tar.gz"; + sha256 = "027wh89d0qyly3d9m6rg4x7x1gqz3y3cnxlgk0k8xgygcrm05c0w"; + }; + patches = [ + ./include-kbhit.patch + ]; + sourceRoot = "${pname}-${version}/build"; + makeFlags = [ + "prefix=$(out)" + ]; + meta = with stdenv.lib; { + description = "Communications toolbox"; + homepage = "https://iftools.com"; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = [ maintainers.misuzu ]; + }; +} diff --git a/pkgs/development/libraries/libctb/include-kbhit.patch b/pkgs/development/libraries/libctb/include-kbhit.patch new file mode 100644 index 00000000000..76b4e38fadb --- /dev/null +++ b/pkgs/development/libraries/libctb/include-kbhit.patch @@ -0,0 +1,13 @@ +diff --git a/GNUmakefile b/GNUmakefile +index e39a687..026f9c4 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -140,7 +140,7 @@ all: ../lib/libctb$(LIBFLAG)$(GPIBFLAG)-0.16.a ../lib/libctb$(LIBFLAG)$(GPIBFLAG + + install: install_ctb_lib install_ctb_dll + $(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16 +- for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \ ++ for f in ctb.h fifo.h getopt.h $(GPIBINC) iobase.h kbhit.h linux/serport.h linux/timer.h portscan.h serport.h serportx.h timer.h; do \ + if test ! -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f` ; then \ + $(INSTALL) -d $(DESTDIR)$(prefix)/include/ctb-0.16/`dirname $$f`; \ + fi; \ diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index 72c3ca0e2b0..6b4be0db414 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ qt4 ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DWITH_DOC=OFF"; + cmakeFlags = [ "-DWITH_DOC=OFF" ]; meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 2ae4eec99ec..279dcb6bc83 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DWITH_DOC=OFF"; + cmakeFlags = [ "-DWITH_DOC=OFF" ]; meta = with stdenv.lib; { homepage = https://launchpad.net/libdbusmenu-qt; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index a7bfe7f17a2..770e95472ea 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool , glib, dbus-glib, json-glib -, gobject-introspection, vala, gnome-doc-utils +, gobject-introspection, vala , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -18,11 +18,10 @@ stdenv.mkDerivation rec { sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; - nativeBuildInputs = [ vala pkgconfig intltool ]; + nativeBuildInputs = [ vala pkgconfig intltool gobject-introspection ]; buildInputs = [ glib dbus-glib json-glib - gobject-introspection gnome-doc-utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index 3c31ba805d8..918f7675389 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "049g77f6c5sbk1h534zi9akj3y5h8zwnca5c9kqqjkn7f17irk10"; + sha256 = "0svxrhh1pv7xpj75svz0iw1sq5i6z2grj7sc3q11hl63666hzh7d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index 249f3f4f21a..c02a6f9a502 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -16,13 +16,14 @@ stdenv.mkDerivation { "-DDYND_BUILD_BENCHMARKS=OFF" ]; - # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = [ + # added to fix build with gcc7+ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=nonnull" "-Wno-error=tautological-compare" "-Wno-error=class-memaccess" "-Wno-error=parentheses" + "-Wno-error=deprecated-copy" ]; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 56710945ecb..42d3b943569 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libev"; - version="4.27"; + version="4.31"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; - sha256 = "0kil23cgsp0r5shvnwwbsy7fzxb62sxqzqbkbkfp5w54ipy2cm9d"; + sha256 = "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd"; }; meta = { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 47d99f3d6c6..7a61437b5ee 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python }: +{ stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "libevdev"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0"; }; - buildInputs = [ python ]; + buildInputs = [ python3 ]; meta = with stdenv.lib; { description = "Wrapper library for evdev devices"; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 2eee9bafe44..4519cc7dd74 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "AR:=$(AR)" ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; installPhase = '' install -Dm644 execinfo.h stacktraverse.h -t $out/include diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 2de407e8f63..10a0d179d3e 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { unzip ${src} ''; - makeFlags = "-f makefile.u"; + makeFlags = [ "-f" "makefile.u" ]; installPhase = '' mkdir -p $out/include $out/lib diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 196f0e50bef..3c243191543 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXi libXtst xorgproto ]; - NIX_LDFLAGS = [ - "-lX11" - ]; + NIX_LDFLAGS = "-lX11"; meta = with stdenv.lib; { description = "X virtual keyboard library"; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index fd17267b615..0fa5c3a7db0 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.19.1"; + version = "0.19.3"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0cjscv68nnqivzba94xapx1c970j1jbdbm0h3g2ym9i0hgnyyhha"; + sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index f4863eb33f2..97df5107409 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # Darwin gets misdetected as Windows without this - NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-D__unix"; patches = [ (fetchpatch { diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 08ec1d84a3f..3dffbd075e9 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -14,7 +14,7 @@ with stdenv; mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - configureFlags = lib.optional (!isDarwin) [ "--with-async-mode" ]; + configureFlags = lib.optional (!isDarwin) "--with-async-mode"; # allow async mode. from ubuntu. see: # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 1a690ca7aa1..54bf091e5ea 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; - configureFlags = stdenv.lib.optionalString stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; buildInputs = [ glib cairo fontconfig libtiff giflib diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 5df1246a0eb..55b801b0b0d 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python2, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, python3, pkgconfig, libX11, libXext, xorgproto, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "libglvnd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; # The following 3 patches should be removed once libglvnd >1.2.0 is released @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { --replace "-Xlinker --version-script=$(VERSION_SCRIPT)" "-Xlinker" ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" # FHS paths are added so that non-NixOS applications can find vendor files. "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\"" "-Wno-error=array-bounds" - ] ++ lib.optional stdenv.cc.isClang "-Wno-error"; + ] ++ lib.optional stdenv.cc.isClang "-Wno-error"); # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268 configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls"; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 69c236d7220..c02bc7f0ed3 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -39,6 +39,7 @@ in stdenv.mkDerivation (rec { sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h + ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabi.h '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 511af0b613b..bea3c85260c 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/andrewrk/libgroove; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ andrewrk ma27 ]; + maintainers = with maintainers; [ andrewrk ]; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 89a72bba872..a60d3a16533 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: +, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: stdenv.mkDerivation rec { pname = "libgsf"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool libintl ]; - buildInputs = [ gettext bzip2 zlib python ]; + buildInputs = [ gettext bzip2 zlib ]; checkInputs = [ perl ]; propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ]; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 07f2099f11a..8d480c2d882 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; - installFlags = "REALLY_INSTALL=yes"; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index c4f353fb6d5..88736113ee5 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "0.0.11"; + version = "0.0.12"; outputs = [ "out" "dev" "devdoc" "glade" ]; outputBin = "dev"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0"; + sha256 = "09wlknarzsbk9hr5ws6s7x5kibkhx9ayrbhshfqib4zkhq2f76hw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 85174e9c3e6..a6e072ef76f 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.6.0"; + version = "1.6.1"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0im9k2pqghlsppj165kh3nc26c4wx1brckmncdmpy0mcj56jjmba"; + sha256 = "0l3mj11lp4974kaym3aidm4wriqzls13gz22s67l6341yhsc42n6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 903a1a26eb7..69c4b3aeb74 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.6"; + version = "3.0.7"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "181lf07fj36fp0rbcjjmb53yzdvv9i4qxpnbpax8hayjhha8pjh3"; + sha256 = "1ppf8jlpiclq3jprhx889y5lgf6lc2q4d8wy2zavzsxgnsqf67il"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 9c2dd920c9f..44fa395204b 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libimagequant"; - version = "2.12.5"; + version = "2.12.6"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - sha256 = "0cp68w04ja5pv77ssfafsn958w9hh9zb8crrlb5j3gsrcmdc032k"; + sha256 = "00w7fny3xf14cfyhbdnmqyh9ddqdh1irvgzxd35a2z65kp7vnvj0"; }; preConfigure = '' diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 4e9c165e71f..8ed1c9bf92f 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; configureFlags = [] - ++ optional static [ "--enable-static" "--disable-shared" ]; + ++ optionals static [ "--enable-static" "--disable-shared" ]; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 9d935daddad..24de4aa2e4a 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.cc.isClang [ (fetchpatch { url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff"; - sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk"; + sha256 = "0hcxzz9ql1fizyqbsgdchdwi7bvchfr72172j43hpyj53p0yabc6"; }) ]; diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 3786c5e77d3..98875e48f57 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -6,9 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXft libICE pango libjpeg ]; propagatedBuildInputs = [ libX11 libXext libpng ]; - NIX_LDFLAGS = [ - "-lX11" - ]; + NIX_LDFLAGS = "-lX11"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2"; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 46255e276f5..a49e0eaaac6 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.20.2"; + version = "1.20.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm"; + sha256 = "1s6k6vm4hyma7nafm1gjssl9lq9nkkiska462xpiz7xh16j0h9xc"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 57053103417..5655bfe968b 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; - NIX_CFLAGS_COMPILE = [ "-fpermissive"/*gcc7*/ ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; meta = with stdenv.lib; { homepage = https://libmemcached.org; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index c8340626935..ba4d74e4d48 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.68"; + version = "0.9.69"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "0q8bc4hrxn6llml7w2vam6n833x8injs39wgdkhwkawr50m6wwf5"; + sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 321204a0c4f..2351ce2b554 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Otherwise clang fails with 'duplicate symbol ___sputc' - buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89"; + buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { homepage = http://libmpeg2.sourceforge.net/; diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index 9414ebdcc2a..4c3ceee1e56 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; + cmakeFlags = [ + "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" + ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index d9b2df6148a..ffecfcb61d0 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -4,11 +4,11 @@ # the ngspice derivation. stdenv.mkDerivation rec { pname = "libngspice"; - version = "30"; + version = "31"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "15v0jdfy2a2zxp8dmy04fdp7w7a4vwvffcwa688r81b86wphxzh8"; + sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index ff8f200a3bb..b2594d7c1d7 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 4be744e7ba9..416101cad0a 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sourceRoot = "OSM-binary-1.3.3/src"; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; meta = { homepage = https://github.com/scrosby/OSM-binary; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 4f1a5f8a179..73029c76818 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 'install -m 644 $(INCLUDES) $(DESTDIR)$(INCLUDEDIR)' ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index f48c605dafd..3398d3feb94 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { "SYS=${stdenv.hostPlatform.uname.system}" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; meta = with stdenv.lib; { description = "Helper library to program the performance monitoring events"; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index eaa11d1a864..cee6d3f1845 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -12,16 +12,18 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "1.21.0"; + version = "1.29.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "099qwla0yl76qw16lzdx33svyhx84p5gsa50ksy4828b18fy3bgb"; + sha256 = "1ly5bwy0pwgvqigpaak8hnig5hksjwf0pzvj3mdv3j2f6f7ya2zz"; }; + postPatch = "substituteInPlace meson.build --replace 1.29.0 1.29.1"; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index cd841a9d8f8..20b2988417c 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = " - -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 - "; + cmakeFlags = [ + "-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3" + ]; doCheck = true; checkPhase = '' diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c9b08079c38..8d4febcde28 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -11,7 +11,6 @@ , gsettings-desktop-schemas , glib , makeWrapper -, python2 , python3 , SystemConfiguration , CoreFoundation @@ -29,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; }; - outputs = [ "out" "dev" "py2" "py3" ]; + outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ pkgconfig @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ pcre - python2 python3 zlib ] ++ (if stdenv.hostPlatform.isDarwin then [ @@ -55,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_MOZJS=ON" - "-DPYTHON2_SITEPKG_DIR=${placeholder "py2"}/${python2.sitePackages}" + "-DWITH_PYTHON2=OFF" "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 22245f5fa2a..dd6318444e7 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { # Make sure libqtav finds its libGL dependency at both link and run time # by adding libGL to rpath. Not sure why it wasn't done automatically like # the other libraries as `libGL` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGL}/lib"]; + NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; preFixup = '' mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index b9ae1f829a1..3083136526b 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; installFlags = [ "PREFIX=$(out)" ]; - installTargets = if stdenv.isDarwin then "install-osx" else "install"; + installTargets = stdenv.lib.optional stdenv.isDarwin "install-osx"; doCheck = true; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 9ef3d665413..1b0953df4e6 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -50,11 +50,11 @@ else stdenv.mkDerivation { buildInputs = stdenv.lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") unzip; # linux-specific - installFlags = stdenv.lib.optionalString (isLinux) + installFlags = stdenv.lib.optional isLinux "prefix=$(out)"; - patchPhase = stdenv.lib.optionalString (isLinux) + patchPhase = stdenv.lib.optionalString isLinux "${gnused}/bin/sed -i 's/ldconfig//' Makefile"; - postInstall = stdenv.lib.optionalString (isLinux) + postInstall = stdenv.lib.optionalString isLinux "mv -v share $out"; passthru = { diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 5a7fb3395eb..d81f3f82001 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt ''; - cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; + cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ]; buildInputs = [ cmake SDL libGLU libGL upx zlib ]; diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index e9267df5047..76362f8f883 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -33,6 +33,12 @@ let doCheck = false; # hangs, tries to access the net? checkInputs = [ check ]; + postFixup ='' + sed -i $out/lib/pkgconfig/*.pc \ + -e "s|^libdir=.*|libdir=$out/lib|" \ + -e "s|^includedir=.*|includedir=$out/include|" + ''; + meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; homepage = https://tox.chat; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index e0022411221..d6566978a6b 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; # Patches from Gentoo portage patches = [ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 3c4f90edecc..524896b8bfd 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.33.1"; + version = "1.34.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "13w60g9pc6998v8plslwpwn7f1hx3c1y4zhgmw025nyd504h5lak"; + sha256 = "0vcrrqf0zqgsfmgbyl45qhajyab98kxqq66l0w4lkj5say86aln8"; }; postPatch = let diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 792a31bcf9f..e6a57f1e38c 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.isLinux "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau"; - NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 1803ce1dc20..7dd874ebc83 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-2.0.0"; + name = "libvirt-glib-3.0.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l"; + sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz"; }; nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ]; diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index 84bd1847faa..8e190f998d5 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index e8f39754885..61b777a5243 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost librevenge zlib ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-fallthrough" ]; # newly detected by gcc-7 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { homepage = http://libwps.sourceforge.net/; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 9408b0c4587..b088ba198b2 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "1w1x5mrgly2ldiw3q2r6y620zgd89gk7n90ja46775lhaswxzv7a"; }; + patches = [ ./honor-XKB_CONFIG_ROOT.patch ]; + outputs = [ "out" "dev" "devdoc" ]; # TODO: enable xmodmap support, needs xmodmap DB diff --git a/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch b/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch new file mode 100644 index 00000000000..93b768eeb20 --- /dev/null +++ b/pkgs/development/libraries/libxklavier/honor-XKB_CONFIG_ROOT.patch @@ -0,0 +1,89 @@ +From 999a419f4b36764a7269650a7f965d48bd4b73f7 Mon Sep 17 00:00:00 2001 +From: Louis Bettens <louis@bettens.info> +Date: Sat, 28 Dec 2019 14:30:58 +0100 +Subject: [PATCH] honor $XKB_CONFIG_ROOT + +--- + libxklavier/xklavier_config_xkb.c | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) + +diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c +index baec569..00e8de5 100644 +--- a/libxklavier/xklavier_config_xkb.c ++++ b/libxklavier/xklavier_config_xkb.c +@@ -45,6 +45,18 @@ + #define XK_XKB_KEYS + #include <X11/keysymdef.h> + ++static const gchar * ++xkl_xkb_get_base_path(void) ++{ ++ const gchar *base_path; ++ ++ base_path = g_getenv ("XKB_CONFIG_ROOT"); ++ if (!base_path) ++ base_path = XKB_BASE; ++ ++ return base_path; ++} ++ + #ifdef LIBXKBFILE_PRESENT + static XkbRF_RulesPtr xkl_rules; + +@@ -65,7 +77,8 @@ xkl_rules_set_load(XklEngine * engine) + + locale = setlocale(LC_ALL, NULL); + +- g_snprintf(file_name, sizeof file_name, XKB_BASE "/rules/%s", rf); ++ g_snprintf(file_name, sizeof file_name, "%s/rules/%s", ++ xkl_xkb_get_base_path(), rf); + xkl_debug(160, "Loading rules from [%s]\n", file_name); + + rules_set = XkbRF_Load(file_name, locale, True, True); +@@ -98,10 +111,14 @@ gboolean + xkl_xkb_load_config_registry(XklConfigRegistry * config, + gboolean if_extras_needed) + { +- return xkl_config_registry_load_helper(config, ++ const gchar *rules_path = g_strdup_printf("%s/rules", ++ xkl_xkb_get_base_path()); ++ gboolean ok = xkl_config_registry_load_helper(config, + XKB_DEFAULT_RULESET, +- XKB_BASE "/rules", ++ rules_path, + if_extras_needed); ++ g_free(rules_path); ++ return ok; + } + + #ifdef LIBXKBFILE_PRESENT +@@ -249,6 +266,7 @@ xkl_config_get_keyboard(XklEngine * engine, + pid_t cpid, pid; + int status = 0; + FILE *tmpxkb; ++ const gchar *opt_I; + + xkl_debug(150, "tmp XKB/XKM file names: [%s]/[%s]\n", + xkb_fn, xkm_fn); +@@ -296,14 +314,16 @@ xkl_config_get_keyboard(XklEngine * engine, + break; + case 0: + /* child */ ++ opt_I = g_strdup_printf("-I%s", xkl_xkb_get_base_path()); + xkl_debug(160, "Executing %s\n", XKBCOMP); + xkl_debug(160, "%s %s %s %s %s %s %s %s\n", + XKBCOMP, XKBCOMP, "-w0", "-I", +- "-I" XKB_BASE, "-xkm", xkb_fn, ++ opt_I, "-xkm", xkb_fn, + xkm_fn); + execl(XKBCOMP, XKBCOMP, "-w0", "-I", +- "-I" XKB_BASE, "-xkm", xkb_fn, ++ opt_I, "-xkm", xkb_fn, + xkm_fn, NULL); ++ g_free(opt_I); + xkl_debug(0, "Could not exec %s: %d\n", + XKBCOMP, errno); + exit(1); +-- +2.24.1 + diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index f5dcb3357f7..57a7294c887 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; - propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; + propagatedBuildOutputs = [ "out" "bin" ] ++ lib.optional pythonSupport "py"; buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses @@ -64,8 +64,8 @@ stdenv.mkDerivation rec { preInstall = lib.optionalString pythonSupport ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optionalString pythonSupport - ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"''; + installFlags = lib.optional pythonSupport + "pythondir=\"${placeholder ''py''}/lib/${python.libPrefix}/site-packages\""; postFixup = '' moveToOutput bin/xml2-config "$dev" diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 6d782543099..0dec9daee6a 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 830ec7bdaee..25bac68faf6 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; patches = [ ./hardcoded-compiler.patch ]; - patchFlags = "-p3"; + patchFlags = [ "-p3" ]; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index cc86ab19379..3a4b182dd94 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-2.0.4"; + name = "log4cplus-2.0.5"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "0lh2i22znx573jchcfy4n5lrr9yjg2hd3iphhlih61zzmd67p2hc"; + sha256 = "05gb0crf440da3vcaxavglzvsldw8hsvxq3xvvj73mzniv3bz3dk"; }; meta = { diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 1605ec355cc..0204223d127 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -32,10 +32,12 @@ stdenv.mkDerivation rec { ortp libv4l libpcap srtp bctoolbox libXext libmatroska ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" "-Wno-error=cast-function-type" + "-Wno-error=stringop-truncation" + "-Wno-error=stringop-overflow" ]; NIX_LDFLAGS = "-lXext"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 9582e1bf1bf..761d6594bd0 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.2.7"; + version = "19.3.1"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3"; + sha256 = "0ndfpqry08s74yw4x3ydyhim6v4ywg0b4yhaazq7zaankjv1v5fd"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 1e280b64ee5..8ce3473dd32 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001 +From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index a723b5406cf..65a8954291f 100644 +index 626baf3..579c15b 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -330,3 +330,9 @@ option( +@@ -341,6 +341,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -25,11 +25,14 @@ index a723b5406cf..65a8954291f 100644 + value : '', + description : 'Mesa cache key.' +) + option( + 'I-love-half-baked-turnips', + type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 0aa2646a9bb..bd784d38e21 100644 +index 0cd92ca..fc1c173 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -389,8 +389,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -40,7 +43,7 @@ index 0aa2646a9bb..bd784d38e21 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -411,6 +413,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -49,13 +52,13 @@ index 0aa2646a9bb..bd784d38e21 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 397c2228129..77013563e5d 100644 +index f69ebe9..e2bd8e2 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -120,7 +120,12 @@ libmesa_util = static_library( +@@ -158,7 +158,12 @@ _libmesa_util = static_library( [files_mesa_util, format_srgb], include_directories : inc_common, - dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], + dependencies : deps_for_libmesa_util, - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, @@ -67,5 +70,5 @@ index 397c2228129..77013563e5d 100644 ) -- -2.19.2 +2.24.1 diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 5099991c117..b56e33e4024 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlt"; - version = "6.16.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; + sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; }; buildInputs = [ @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" - "--enable-opengl" + "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" ]; enableParallelBuilding = true; @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { description = "Open source multimedia framework, designed for television broadcasting"; homepage = https://www.mltframework.org; license = licenses.gpl3; - maintainers = [ maintainers.tohl ]; + maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f017e4452a6..4d7ecd92e61 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { pname = "mlt"; - version = "6.16.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1362fv63p34kza9v4b71b6wakgvsa2vdx9y0g28x3yh4cp4k97kx"; + sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx"; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { # mlt is unable to cope with our multi-prefix Qt build # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = [ "-I${getDev qtsvg}/include/QtSvg" ]; + NIX_CFLAGS_COMPILE = "-I${getDev qtsvg}/include/QtSvg"; CXXFLAGS = "-std=c++11"; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index ec3b4e20147..8c1f3aea466 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite ]; # needed for 1.116.0 to build with gcc7 - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-implicit-fallthrough" "-Wno-error=clobbered" "-Wno-error=cast-function-type" diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 14b608bb994..7b03c32ada5 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: stdenv.mkDerivation rec { - version = "4.9.0"; + version = "4.9.1"; pname = "nco"; nativeBuildInputs = [ flex which ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "0k371b1w369dchmxskd9191i1p47xcwxqwbxsgmdhs8n477wj74b"; + sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x"; }; meta = { diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index af4f8a5d129..1436fb02127 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -9,11 +9,12 @@ let mpiSupport = hdf5.mpiSupport; mpi = hdf5.mpi; in stdenv.mkDerivation rec { - name = "netcdf-4.6.1"; + pname = "netcdf"; + version = "4.7.3"; src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + sha256 = "12s4w2s96p51hlsa81lw92w56rdx8i3mk21pz2ydwcamw579z34f"; }; postPatch = '' @@ -37,9 +38,12 @@ in stdenv.mkDerivation rec { "--enable-netcdf-4" "--enable-dap" "--enable-shared" + "--disable-dap-remote-tests" ] ++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + doCheck = !mpiSupport; + meta = { description = "Libraries for the Unidata network Common Data Format"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 04018f0e80b..57ed5891275 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.39.2"; + version = "1.40.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj"; + sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2"; }; outputs = [ "bin" "out" "dev" "lib" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 7499750c1f0..2e611c8975d 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.47.1"; + version = "3.48"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1yx68a1ks63s8914zmiz9h1nh0261aqzcblgg1cb4ig33p5x3qqs"; + sha256 = "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ./ckpem.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace nss/coreconf/Darwin.mk --replace '@executable_path/$(notdir $@)' "$out/lib/\$(notdir \$@)" diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 10e59c5117c..a4d1e275a0a 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { pname = "ntl"; - version = "11.4.1"; + version = "11.4.3"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "03k2hb6yn49d1f9cdig2ci7h5ga0x3nb3li60hh19wdqzg28f1m3"; + sha256 = "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp"; }; buildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the # email listed on the homepage. homepage = http://www.shoup.net/ntl/; + # also locally at "${src}/doc/tour-changes.html"; + changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; maintainers = with maintainers; [ timokau ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b79f940affa..803906b1343 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index 15e83cf9d76..c1b065dbf2b 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; buildInputs = [ autoconf automake libtool libX11 xorgproto libXi libXaw diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 224c01e2c50..8fbdf28965b 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; - makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc"; - installFlags = "PREFIX=$(out)"; + installFlags = [ + "PREFIX=${placeholder ''out''}" + ]; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index e9041993657..e4cbfc7f0b4 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "onig"; - version = "6.9.3"; + version = "6.9.4"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "0wzmqpjmxpryk83acbyhl9gwgm43ixbwraga2g5li9kx88mv4k0n"; + sha256 = "11imbhj4p5w8lvrmcczccm1zq014h9j85r51z2ibb8jhf5p3lslh"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 32b13115957..46b03720d16 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { doCheck = false; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-truncation" + "-Wno-error=address-of-packed-member" + ]; + nativeBuildInputs = [ cmake doxygen perl python2Packages.sphinx ]; buildInputs = [ libuuid json_c python2 ]; diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix deleted file mode 100644 index dd19fccd822..00000000000 --- a/pkgs/development/libraries/opal/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, ptlib, srtp, libtheora, speex, gnome3 -, ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC }: - -stdenv.mkDerivation rec { - pname = "opal"; - version = "3.10.10"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ptlib srtp libtheora speex - ffmpeg x264 cyrus_sasl openldap openssl expat unixODBC ]; - propagatedBuildInputs = [ speex ]; - - configureFlags = [ "--enable-h323" ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1 -std=gnu++98"; - - patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; - - meta = with stdenv.lib; { - description = "VoIP library"; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - homepage = "http://www.opalvoip.org/"; - license = with licenses; [ bsdOriginal mpl10 gpl2Plus lgpl21 ]; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; -} - diff --git a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff b/pkgs/development/libraries/opal/disable-samples-ftbfs.diff deleted file mode 100644 index 1b073821607..00000000000 --- a/pkgs/development/libraries/opal/disable-samples-ftbfs.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: opal-3.10.4~dfsg/Makefile.in -=================================================================== ---- opal-3.10.4~dfsg.orig/Makefile.in 2012-02-22 10:08:36.000000000 +1100 -+++ opal-3.10.4~dfsg/Makefile.in 2012-03-08 08:32:44.000000000 +1100 -@@ -45,8 +45,7 @@ - samples/codectest \ - samples/callgen \ - samples/opalecho \ -- samples/faxopal \ -- samples/c_api -+ samples/faxopal - ifeq ($(OPAL_IVR),yes) - SUBDIRS += samples/opalmcu \ - samples/ivropal \ diff --git a/pkgs/development/libraries/opal/libav10.patch b/pkgs/development/libraries/opal/libav10.patch deleted file mode 100644 index 3e02704f899..00000000000 --- a/pkgs/development/libraries/opal/libav10.patch +++ /dev/null @@ -1,208 +0,0 @@ -Description: Fix compilation against libav10 -Author: Reinhard Tartler <siretart@tauware.de> -Bug-Debian: http://bugs.debian.org/739439 - ---- a/plugins/video/H.263-1998/h263-1998.cxx -+++ b/plugins/video/H.263-1998/h263-1998.cxx -@@ -94,7 +94,7 @@ static struct StdSizes { - { CIF16_WIDTH, CIF16_HEIGHT, PLUGINCODEC_CIF16_MPI }, - }; - --static FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H263P); -+static FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H263P); - - - ///////////////////////////////////////////////////////////////////////////// -@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc - PTRACE(4, m_prefix, "Encoder closed"); - } - --bool H263_Base_EncoderContext::Init(CodecID codecId) -+bool H263_Base_EncoderContext::Init(AVCodecID codecId) - { - PTRACE(5, m_prefix, "Opening encoder"); - -@@ -589,7 +589,7 @@ void H263_RFC2190_EncoderContext::RTPCal - - bool H263_RFC2190_EncoderContext::Init() - { -- if (!H263_Base_EncoderContext::Init(CODEC_ID_H263)) -+ if (!H263_Base_EncoderContext::Init(AV_CODEC_ID_H263)) - return false; - - #if LIBAVCODEC_RTP_MODE -@@ -632,7 +632,7 @@ H263_RFC2429_EncoderContext::~H263_RFC24 - - bool H263_RFC2429_EncoderContext::Init() - { -- return H263_Base_EncoderContext::Init(CODEC_ID_H263P); -+ return H263_Base_EncoderContext::Init(AV_CODEC_ID_H263P); - } - - -@@ -656,7 +656,7 @@ H263_Base_DecoderContext::H263_Base_Deco - if (!FFMPEGLibraryInstance.Load()) - return; - -- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H263)) == NULL) { -+ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H263)) == NULL) { - PTRACE(1, m_prefix, "Codec not found for decoder"); - return; - } ---- a/plugins/video/H.264/h264-x264.cxx -+++ b/plugins/video/H.264/h264-x264.cxx -@@ -105,7 +105,7 @@ static struct PluginCodec_information Li - - /////////////////////////////////////////////////////////////////////////////// - --FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_H264); -+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_H264); - - PLUGINCODEC_CONTROL_LOG_FUNCTION_DEF - -@@ -1065,17 +1065,17 @@ class MyDecoder : public PluginCodec<MY_ - allows you to fail the create operation (return false), which cannot - be done in the normal C++ constructor. */ - -- if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL) -+ if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_H264)) == NULL) - return false; - - if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL) - return false; - - m_context->workaround_bugs = FF_BUG_AUTODETECT; -- m_context->idct_algo = FF_IDCT_H264; -+ m_context->idct_algo = FF_IDCT_AUTO; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_SKIP_RD | -+ m_context->flags2 = - #ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE - CODEC_FLAG2_DROP_FRAME_TIMECODE | - #endif ---- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -+++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -@@ -205,7 +205,7 @@ const static struct mpeg4_resolution { - { 0 } - }; - --FFMPEGLibrary FFMPEGLibraryInstance(CODEC_ID_MPEG4); -+FFMPEGLibrary FFMPEGLibraryInstance(AV_CODEC_ID_MPEG4); - - - static bool mpeg4IsIframe (BYTE * frameBuffer, unsigned int frameLen ) -@@ -688,7 +688,7 @@ void MPEG4EncoderContext::ResizeEncoding - - bool MPEG4EncoderContext::OpenCodec() - { -- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -+ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(AV_CODEC_ID_MPEG4)) == NULL){ - PTRACE(1, "MPEG4", "Encoder not found"); - return false; - } -@@ -1390,7 +1390,7 @@ void MPEG4DecoderContext::ResizeDecoding - - bool MPEG4DecoderContext::OpenCodec() - { -- if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_MPEG4)) == NULL) { -+ if ((m_avcodec = FFMPEGLibraryInstance.AvcodecFindDecoder(AV_CODEC_ID_MPEG4)) == NULL) { - PTRACE(1, "MPEG4", "Decoder not found for encoder"); - return false; - } ---- a/plugins/video/H.263-1998/h263-1998.h -+++ b/plugins/video/H.263-1998/h263-1998.h -@@ -115,7 +115,7 @@ class H263_Base_EncoderContext - virtual ~H263_Base_EncoderContext(); - - virtual bool Init() = 0; -- virtual bool Init(CodecID codecId); -+ virtual bool Init(AVCodecID codecId); - - virtual bool SetOptions(const char * const * options); - virtual void SetOption(const char * option, const char * value); ---- a/plugins/video/common/dyna.cxx -+++ b/plugins/video/common/dyna.cxx -@@ -217,14 +217,14 @@ static void logCallbackFFMPEG(void * avc - #endif - - --FFMPEGLibrary::FFMPEGLibrary(CodecID codec) -+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) - { - m_codec = codec; -- if (m_codec==CODEC_ID_H264) -+ if (m_codec==AV_CODEC_ID_H264) - snprintf( m_codecString, sizeof(m_codecString), "H264"); -- if (m_codec==CODEC_ID_H263P) -+ if (m_codec==AV_CODEC_ID_H263P) - snprintf( m_codecString, sizeof(m_codecString), "H263+"); -- if (m_codec==CODEC_ID_MPEG4) -+ if (m_codec==AV_CODEC_ID_MPEG4) - snprintf( m_codecString, sizeof(m_codecString), "MPEG4"); - m_isLoadedOK = false; - } -@@ -268,12 +268,12 @@ bool FFMPEGLibrary::Load() - return true; - } - --AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) -+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) - { - return avcodec_find_encoder(id); - } - --AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) -+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) - { - WaitAndSignal m(processLock); - -@@ -308,13 +308,18 @@ int FFMPEGLibrary::AvcodecClose(AVCodecC - return avcodec_close(ctx); - } - -+#undef FFMAX -+#define FFMAX(a,b) ((a) > (b) ? (a) : (b)) - int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) - { -+ AVPacket pkt = { 0 }; -+ int ret, got_output; - int res; - -- res = avcodec_encode_video(ctx, buf, buf_size, pict); -+ ret = avcodec_encode_video2(ctx, &pkt, pict, &got_output); - -- PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); -+ PTRACE(6, m_codecString, "DYNA\tEncoded into " << ret << " bytes, max " << buf_size); -+ memcpy(buf, pkt.data, FFMAX(pkt.size, buf_size)); - return res; - } - ---- a/plugins/video/common/dyna.h -+++ b/plugins/video/common/dyna.h -@@ -88,13 +88,13 @@ class DynaLink - class FFMPEGLibrary - { - public: -- FFMPEGLibrary(CodecID codec); -+ FFMPEGLibrary(AVCodecID codec); - ~FFMPEGLibrary(); - - bool Load(); - -- AVCodec *AvcodecFindEncoder(enum CodecID id); -- AVCodec *AvcodecFindDecoder(enum CodecID id); -+ AVCodec *AvcodecFindEncoder(enum AVCodecID id); -+ AVCodec *AvcodecFindDecoder(enum AVCodecID id); - AVCodecContext *AvcodecAllocContext(AVCodec*); - AVFrame *AvcodecAllocFrame(void); - int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); -@@ -117,7 +117,7 @@ class FFMPEGLibrary - DynaLink m_libAvcodec; - DynaLink m_libAvutil; - -- CodecID m_codec; -+ AVCodecID m_codec; - char m_codecString[32]; - - bool m_isLoadedOK; diff --git a/pkgs/development/libraries/opal/libav9.patch b/pkgs/development/libraries/opal/libav9.patch deleted file mode 100644 index f91a8c033fe..00000000000 --- a/pkgs/development/libraries/opal/libav9.patch +++ /dev/null @@ -1,543 +0,0 @@ -Description: Backport changes for the libav 9 API - Also replace loading of libavcodec and libavutil via dlopen by linking against - it. -Author: Sebastian Ramacher <sramacher@debian.org> -Bug-Debian: http://bugs.debian.org/720824 -Last-Update: 2013-09-12 - ---- a/plugins/video/H.263-1998/h263-1998.cxx -+++ b/plugins/video/H.263-1998/h263-1998.cxx -@@ -216,7 +216,7 @@ - return false; - } - -- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); - if (m_context == NULL) { - PTRACE(1, m_prefix, "Failed to allocate context for encoder"); - return false; -@@ -312,6 +312,7 @@ - return; - } - -+#ifdef CODEC_FLAG_H263P_UMV - if (STRCMPI(option, H263_ANNEX_D) == 0) { - // Annex D: Unrestructed Motion Vectors - // Level 2+ -@@ -322,6 +323,7 @@ - m_context->flags &= ~CODEC_FLAG_H263P_UMV; - return; - } -+#endif - - #if 0 // DO NOT ENABLE THIS FLAG. FFMPEG IS NOT THREAD_SAFE WHEN THIS FLAG IS SET - if (STRCMPI(option, H263_ANNEX_F) == 0) { -@@ -356,6 +358,7 @@ - return; - } - -+#ifdef CODEC_FLAG_H263P_SLICE_STRUCT - if (STRCMPI(option, H263_ANNEX_K) == 0) { - // Annex K: Slice Structure - // does not work with eyeBeam -@@ -365,7 +368,9 @@ - m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; - return; - } -+#endif - -+#ifdef CODEC_FLAG_H263P_AIV - if (STRCMPI(option, H263_ANNEX_S) == 0) { - // Annex S: Alternative INTER VLC mode - // does not work with eyeBeam -@@ -375,6 +380,7 @@ - m_context->flags &= ~CODEC_FLAG_H263P_AIV; - return; - } -+#endif - - if (STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATION) == 0 || - STRCMPI(option, PLUGINCODEC_MEDIA_PACKETIZATIONS) == 0) { -@@ -450,15 +456,6 @@ - PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); - PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); - -- #define CODEC_TRACER_FLAG(tracer, flag) \ -- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); -- - return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; - } - -@@ -521,7 +518,7 @@ - - // Need to copy to local buffer to guarantee 16 byte alignment - memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); -- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; -+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; - - /* - m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -603,13 +600,19 @@ - m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; - m_context->opaque = this; // used to separate out packets from different encode threads - -+#ifdef CODEC_FLAG_H263P_UMV - m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+#endif - m_context->flags &= ~CODEC_FLAG_4MV; - #if LIBAVCODEC_RTP_MODE - m_context->flags &= ~CODEC_FLAG_H263P_AIC; - #endif -+#ifdef CODEC_FLAG_H263P_AIV - m_context->flags &= ~CODEC_FLAG_H263P_AIV; -+#endif -+#ifdef CODEC_FLAG_H263P_SLICE_STRUCT - m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - - return true; - } -@@ -658,7 +661,7 @@ - return; - } - -- m_context = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec); - if (m_context == NULL) { - PTRACE(1, m_prefix, "Failed to allocate context for decoder"); - return; ---- a/plugins/video/H.264/h264-x264.cxx -+++ b/plugins/video/H.264/h264-x264.cxx -@@ -48,6 +48,7 @@ - #include "shared/h264frame.h" - #include "shared/x264wrap.h" - -+#include <cstdio> - - #define MY_CODEC x264 // Name of codec (use C variable characters) - #define MY_CODEC_LOG "x264" -@@ -1067,18 +1068,17 @@ - if ((m_codec = FFMPEGLibraryInstance.AvcodecFindDecoder(CODEC_ID_H264)) == NULL) - return false; - -- if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext()) == NULL) -+ if ((m_context = FFMPEGLibraryInstance.AvcodecAllocContext(m_codec)) == NULL) - return false; - - m_context->workaround_bugs = FF_BUG_AUTODETECT; -- m_context->error_recognition = FF_ER_AGGRESSIVE; - m_context->idct_algo = FF_IDCT_H264; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_BRDO | -- CODEC_FLAG2_MEMC_ONLY | -+ m_context->flags2 = CODEC_FLAG2_SKIP_RD | -+#ifdef CODEC_FLAG2_DROP_FRAME_TIMECODE - CODEC_FLAG2_DROP_FRAME_TIMECODE | -- CODEC_FLAG2_SKIP_RD | -+#endif - CODEC_FLAG2_CHUNKS; - - if ((m_picture = FFMPEGLibraryInstance.AvcodecAllocFrame()) == NULL) ---- a/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -+++ b/plugins/video/MPEG4-ffmpeg/mpeg4.cxx -@@ -589,17 +589,14 @@ - m_avpicture->quality = m_videoQMin; - - #ifdef USE_ORIG -- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning - m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors - #else - m_avcontext->max_b_frames=0; /*don't use b frames*/ - m_avcontext->flags|=CODEC_FLAG_AC_PRED; -- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; - /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ - m_avcontext->flags|=CODEC_FLAG_4MV; - m_avcontext->flags|=CODEC_FLAG_GMC; - m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; -- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; - #endif - m_avcontext->opaque = this; // for use in RTP callback - } -@@ -691,7 +688,12 @@ - - bool MPEG4EncoderContext::OpenCodec() - { -- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -+ PTRACE(1, "MPEG4", "Encoder not found"); -+ return false; -+ } -+ -+ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); - if (m_avcontext == NULL) { - PTRACE(1, "MPEG4", "Encoder failed to allocate context for encoder"); - return false; -@@ -703,11 +705,6 @@ - return false; - } - -- if((m_avcodec = FFMPEGLibraryInstance.AvcodecFindEncoder(CODEC_ID_MPEG4)) == NULL){ -- PTRACE(1, "MPEG4", "Encoder not found"); -- return false; -- } -- - #if PLUGINCODEC_TRACING - // debugging flags - if (PTRACE_CHECK(4)) { -@@ -804,7 +801,7 @@ - // Should the next frame be an I-Frame? - if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) - { -- m_avpicture->pict_type = FF_I_TYPE; -+ m_avpicture->pict_type = AV_PICTURE_TYPE_I; - } - else // No IFrame requested, let avcodec decide what to do - { -@@ -1325,7 +1322,6 @@ - - void MPEG4DecoderContext::SetStaticDecodingParams() { - m_avcontext->flags |= CODEC_FLAG_4MV; -- m_avcontext->flags |= CODEC_FLAG_PART; - m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations - } - -@@ -1399,7 +1395,7 @@ - return false; - } - -- m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(); -+ m_avcontext = FFMPEGLibraryInstance.AvcodecAllocContext(m_avcodec); - if (m_avcontext == NULL) { - PTRACE(1, "MPEG4", "Decoder failed to allocate context"); - return false; ---- a/plugins/video/common/dyna.cxx -+++ b/plugins/video/common/dyna.cxx -@@ -38,6 +38,13 @@ - * Matthias Schneider (ma30002000@yahoo.de) - */ - #include "dyna.h" -+#include <cstdio> -+#include <cstdarg> -+ -+extern "C" { -+#include <libavcodec/avcodec.h> -+#include <libavutil/mem.h> -+} - - bool DynaLink::Open(const char *name) - { -@@ -228,101 +235,15 @@ - m_libAvutil.Close(); - } - --#define CHECK_AVUTIL(name, func) \ -- (seperateLibAvutil ? \ -- m_libAvutil.GetFunction(name, (DynaLink::Function &)func) : \ -- m_libAvcodec.GetFunction(name, (DynaLink::Function &)func) \ -- ) \ -- -- - bool FFMPEGLibrary::Load() - { - WaitAndSignal m(processLock); - if (IsLoaded()) - return true; - -- bool seperateLibAvutil = false; -- --#ifdef LIBAVCODEC_LIB_NAME -- if (m_libAvcodec.Open(LIBAVCODEC_LIB_NAME)) -- seperateLibAvutil = true; -- else --#endif -- if (m_libAvcodec.Open("libavcodec")) -- seperateLibAvutil = false; -- else if (m_libAvcodec.Open("avcodec-" AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR))) -- seperateLibAvutil = true; -- else { -- PTRACE(1, m_codecString, "Failed to load FFMPEG libavcodec library"); -- return false; -- } -- -- if (seperateLibAvutil && -- !( --#ifdef LIBAVUTIL_LIB_NAME -- m_libAvutil.Open(LIBAVUTIL_LIB_NAME) || --#endif -- m_libAvutil.Open("libavutil") || -- m_libAvutil.Open("avutil-" AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) -- ) ) { -- PTRACE(1, m_codecString, "Failed to load FFMPEG libavutil library"); -- return false; -- } -- -- strcpy(m_libAvcodec.m_codecString, m_codecString); -- strcpy(m_libAvutil.m_codecString, m_codecString); -- -- if (!m_libAvcodec.GetFunction("avcodec_init", (DynaLink::Function &)Favcodec_init)) -- return false; -- -- if (!m_libAvcodec.GetFunction("av_init_packet", (DynaLink::Function &)Fav_init_packet)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_register_all", (DynaLink::Function &)Favcodec_register_all)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_find_encoder", (DynaLink::Function &)Favcodec_find_encoder)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_find_decoder", (DynaLink::Function &)Favcodec_find_decoder)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_alloc_context", (DynaLink::Function &)Favcodec_alloc_context)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_alloc_frame", (DynaLink::Function &)Favcodec_alloc_frame)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_open", (DynaLink::Function &)Favcodec_open)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_close", (DynaLink::Function &)Favcodec_close)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_encode_video", (DynaLink::Function &)Favcodec_encode_video)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_decode_video2", (DynaLink::Function &)Favcodec_decode_video)) -- return false; -- -- if (!m_libAvcodec.GetFunction("avcodec_set_dimensions", (DynaLink::Function &)Favcodec_set_dimensions)) -- return false; -- -- if (!CHECK_AVUTIL("av_free", Favcodec_free)) -- return false; -- -- if(!m_libAvcodec.GetFunction("avcodec_version", (DynaLink::Function &)Favcodec_version)) -- return false; -- -- if (!CHECK_AVUTIL("av_log_set_level", FAv_log_set_level)) -- return false; -- -- if (!CHECK_AVUTIL("av_log_set_callback", FAv_log_set_callback)) -- return false; -- - // must be called before using avcodec lib - -- unsigned libVer = Favcodec_version(); -+ unsigned libVer = avcodec_version(); - if (libVer != LIBAVCODEC_VERSION_INT) { - PTRACE(2, m_codecString, "Warning: compiled against libavcodec headers from version " - << LIBAVCODEC_VERSION_MAJOR << '.' << LIBAVCODEC_VERSION_MINOR << '.' << LIBAVCODEC_VERSION_MICRO -@@ -334,8 +255,7 @@ - << (libVer >> 16) << ((libVer>>8) & 0xff) << (libVer & 0xff)); - } - -- Favcodec_init(); -- Favcodec_register_all (); -+ avcodec_register_all(); - - #if PLUGINCODEC_TRACING - AvLogSetLevel(AV_LOG_DEBUG); -@@ -350,49 +270,49 @@ - - AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) - { -- return Favcodec_find_encoder(id); -+ return avcodec_find_encoder(id); - } - - AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) - { - WaitAndSignal m(processLock); - -- return Favcodec_find_decoder(id); -+ return avcodec_find_decoder(id); - } - --AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(void) -+AVCodecContext *FFMPEGLibrary::AvcodecAllocContext(AVCodec *codec) - { - WaitAndSignal m(processLock); - -- return Favcodec_alloc_context(); -+ return avcodec_alloc_context3(codec); - } - - AVFrame *FFMPEGLibrary::AvcodecAllocFrame(void) - { - WaitAndSignal m(processLock); - -- return Favcodec_alloc_frame(); -+ return avcodec_alloc_frame(); - } - - int FFMPEGLibrary::AvcodecOpen(AVCodecContext *ctx, AVCodec *codec) - { - WaitAndSignal m(processLock); - -- return Favcodec_open(ctx, codec); -+ return avcodec_open2(ctx, codec, NULL); - } - - int FFMPEGLibrary::AvcodecClose(AVCodecContext *ctx) - { - WaitAndSignal m(processLock); - -- return Favcodec_close(ctx); -+ return avcodec_close(ctx); - } - - int FFMPEGLibrary::AvcodecEncodeVideo(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict) - { - int res; - -- res = Favcodec_encode_video(ctx, buf, buf_size, pict); -+ res = avcodec_encode_video(ctx, buf, buf_size, pict); - - PTRACE(6, m_codecString, "DYNA\tEncoded into " << res << " bytes, max " << buf_size); - return res; -@@ -401,35 +321,35 @@ - int FFMPEGLibrary::AvcodecDecodeVideo(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, BYTE *buf, int buf_size) - { - AVPacket avpkt; -- Fav_init_packet(&avpkt); -+ av_init_packet(&avpkt); - avpkt.data = buf; - avpkt.size = buf_size; - -- return Favcodec_decode_video(ctx, pict, got_picture_ptr, &avpkt); -+ return avcodec_decode_video2(ctx, pict, got_picture_ptr, &avpkt); - } - - void FFMPEGLibrary::AvcodecFree(void * ptr) - { - WaitAndSignal m(processLock); - -- Favcodec_free(ptr); -+ av_free(ptr); - } - - void FFMPEGLibrary::AvSetDimensions(AVCodecContext *s, int width, int height) - { - WaitAndSignal m(processLock); - -- Favcodec_set_dimensions(s, width, height); -+ avcodec_set_dimensions(s, width, height); - } - - void FFMPEGLibrary::AvLogSetLevel(int level) - { -- FAv_log_set_level(level); -+ av_log_set_level(level); - } - - void FFMPEGLibrary::AvLogSetCallback(void (*callback)(void*, int, const char*, va_list)) - { -- FAv_log_set_callback(callback); -+ av_log_set_callback(callback); - } - - bool FFMPEGLibrary::IsLoaded() ---- a/plugins/video/common/dyna.h -+++ b/plugins/video/common/dyna.h -@@ -95,7 +95,7 @@ - - AVCodec *AvcodecFindEncoder(enum CodecID id); - AVCodec *AvcodecFindDecoder(enum CodecID id); -- AVCodecContext *AvcodecAllocContext(void); -+ AVCodecContext *AvcodecAllocContext(AVCodec*); - AVFrame *AvcodecAllocFrame(void); - int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); - int AvcodecClose(AVCodecContext *ctx); -@@ -120,26 +120,6 @@ - CodecID m_codec; - char m_codecString[32]; - -- void (*Favcodec_init)(void); -- void (*Fav_init_packet)(AVPacket *pkt); -- -- void (*Favcodec_register_all)(void); -- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); -- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); -- AVCodecContext *(*Favcodec_alloc_context)(void); -- AVFrame *(*Favcodec_alloc_frame)(void); -- int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); -- int (*Favcodec_close)(AVCodecContext *ctx); -- int (*Favcodec_encode_video)(AVCodecContext *ctx, BYTE *buf, int buf_size, const AVFrame *pict); -- int (*Favcodec_decode_video)(AVCodecContext *ctx, AVFrame *pict, int *got_picture_ptr, AVPacket *avpkt); -- unsigned (*Favcodec_version)(void); -- void (*Favcodec_set_dimensions)(AVCodecContext *ctx, int width, int height); -- -- void (*Favcodec_free)(void *); -- -- void (*FAv_log_set_level)(int level); -- void (*FAv_log_set_callback)(void (*callback)(void*, int, const char*, va_list)); -- - bool m_isLoadedOK; - }; - ---- a/plugins/video/common/ffmpeg.h -+++ b/plugins/video/common/ffmpeg.h -@@ -45,11 +45,13 @@ - - #include "platform.h" - --#include "libavcodec/avcodec.h" -+extern "C" { -+#include <libavcodec/avcodec.h> - // AVPacket was declared in avformat.h before April 2009 - #if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(52, 25, 0) --#include "libavformat/avformat.h" -+#include <libavformat/avformat.h> - #endif -+} - - #ifndef LIBAVCODEC_VERSION_INT - #error Libavcodec include is not correct ---- a/plugins/video/H.263-1998/Makefile.in -+++ b/plugins/video/H.263-1998/Makefile.in -@@ -34,8 +34,8 @@ - $(COMMONDIR)/mpi.cxx \ - $(COMMONDIR)/dyna.cxx - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@ - ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes) ---- a/plugins/video/H.264/Makefile.in -+++ b/plugins/video/H.264/Makefile.in -@@ -34,8 +34,8 @@ - $(SHAREDDIR)/x264wrap.cxx \ - $(COMMONDIR)/dyna.cxx \ - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"@VC_PLUGIN_DIR@"' -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - IS_H264_LICENSED:=@IS_H264_LICENSED@ - ifeq ($(IS_H264_LICENSED),yes) ---- a/plugins/video/MPEG4-ffmpeg/Makefile.in -+++ b/plugins/video/MPEG4-ffmpeg/Makefile.in -@@ -30,8 +30,8 @@ - SRCDIR := . - SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx - --CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) --LIBS += @DL_LIBS@ -+CFLAGS += @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ -I$(COMMONDIR) -+LIBS += @DL_LIBS@ @LIBAVCODEC_LIBS@ @LIBAVUTIL_LIBS@ - - # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h> - # Also add libavutil, so ffmpeg headers can #include "log.h". diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 76f2861428d..20528ac9284 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ++ optional pulseSupport libpulseaudio ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - NIX_LDFLAGS = [] + NIX_LDFLAGS = toString ([] ++ optional alsaSupport "-lasound" - ++ optional pulseSupport "-lpulse"; + ++ optional pulseSupport "-lpulse"); meta = { description = "OpenAL alternative"; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 97df84637ef..642facf166a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 408368b89c4..9fffd3d9477 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; # Configure can't find the library without this. OpenBLAS_HOME = lib.optionalString enableOpenblas openblas; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index db8a5e5a41b..ad27742d0b4 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index cd91a132597..fe46d25421a 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,25 +2,23 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "cisco"; - repo = "openh264"; + repo = pname; rev = "v${version}"; - sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4"; + sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r"; }; - buildInputs = [ nasm ]; + nativeBuildInputs = [ nasm ]; - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A codec library which supports H.264 encoding and decoding"; - homepage = http://www.openh264.org; - license = stdenv.lib.licenses.bsd2; + homepage = "https://www.openh264.org"; + license = licenses.bsd2; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 483b3d788e2..840da046170 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -20,21 +20,22 @@ stdenv.mkDerivation rec sourceRoot=$(echo */openvdb) ''; - installTargets = "install_lib"; + installTargets = [ "install_lib" ]; enableParallelBuilding = true; - buildFlags = ''lib - DESTDIR=$(out) - HALF_LIB=-lHalf - TBB_LIB=-ltbb - BLOSC_LIB=-lblosc - LOG4CPLUS_LIB= - BLOSC_INCLUDE_DIR=${c-blosc}/include/ - BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; - - installFlags = ''DESTDIR=$(out)''; + buildFlags = [ + "lib" + "DESTDIR=$(out)" + "HALF_LIB=-lHalf" + "TBB_LIB=-ltbb" + "BLOSC_LIB=-lblosc" + "LOG4CPLUS_LIB=" + "BLOSC_INCLUDE_DIR=${c-blosc}/include/" + "BLOSC_LIB_DIR=${c-blosc}/lib/" + ]; + + installFlags = [ "DESTDIR=$(out)" ]; NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; NIX_LDFLAGS="-lboost_iostreams"; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index 3d5988f8114..a9dbcf9ffb2 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -3,7 +3,7 @@ , systemd }: let - version = "2018-11-13"; + version = "2019-12-08"; in stdenv.mkDerivation { pname = "openzwave"; @@ -14,8 +14,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "home-assistant"; repo = "open-zwave"; - rev = "0679daef6aa5a39e2441a68f7b45cfe022c4d961"; - sha256 = "1d13maj93i6h792cbvqpx43ffss44dxmvbwj2777vzvvjib8m4n8"; + rev = "2cd2137025c529835e4893a7b87c3d56605b2681"; + sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1"; }; nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkgconfig which ]; diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 6a7fd78d514..bc27011c588 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "1kq1cpayflh4xy442q6prrkalm8lcz2cxydrp1fv8ppq1cnq4zr7"; + sha256 = "1zp2rk267dfmfap6qsyn7maivrpid8s3rkicwk1q5v6j20cgh1f8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 7be0e4bb06a..68e890e3368 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; }; + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; + buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix deleted file mode 100644 index 1ae2f1b8132..00000000000 --- a/pkgs/development/libraries/pangox-compat/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }: - -stdenv.mkDerivation rec { - pname = "pangox-compat"; - version = "0.0.2"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib pango libX11 ]; - - meta = { - description = "A compatibility library for pango>1.30.*"; - homepage = "https://gitlab.gnome.org/Archive/pangox-compat"; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index d9267827e77..d79078c2836 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { gst-plugins-bad gst-libav ]); - in [ + in toString [ # This flag should be picked up through pkgconfig, but it isn't. "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" @@ -52,10 +52,6 @@ stdenv.mkDerivation rec { qtx11extras ]; - # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix) - # if DESTDIR is unset - DESTDIR="/"; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 826362cc586..96eb13d11cd 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "1hk3k7dyik640dzg21filpywc2dl862nl2hbpg384hf5pw9syn9z"; + sha256 = "0avkgn19plq593p872hirr0yj2vgjvsi88w68ngarbp55hla1c1h"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 0398175a9a2..c37d4b9d2f1 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.243"; + version = "8.244"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q"; + sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73"; }; buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 8b002ce8195..e962303f5f0 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "QCDNUM"; - version = "17-01-13"; + version = "17-01-15"; src = fetchurl { url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; + sha256 = "0ibk1sppss45qh0g8i2c99alkx82xdbss3p55f5367bxjx4iqvvg"; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix new file mode 100644 index 00000000000..e99ddc3dd08 --- /dev/null +++ b/pkgs/development/libraries/plplot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + pname = "plplot"; + version = "5.15.0"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz"; + sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Cross-platform scientific graphics plotting library"; + homepage = "https://plplot.org"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 92b56467aee..68daece490f 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libjack2 ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - configureFlags = [ "--disable-mac-universal --enable-cxx" ]; + configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix new file mode 100644 index 00000000000..cdce346fe79 --- /dev/null +++ b/pkgs/development/libraries/precice/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python2, python2Packages }: + +stdenv.mkDerivation rec { + pname = "precice"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "precice"; + repo = pname; + rev = "v${version}"; + sha256 = "00631zw6cpm67j35cwad04nwgfcvlxa8p660fwz30pgj2hzdx3d2"; + }; + + preConfigure = '' + cmakeFlags="-DBUILD_SHARED_LIBS=ON -DPETSC=off" + ''; + + nativeBuildInputs = [ cmake gcc ]; + buildInputs = [ boost eigen libxml2 openmpi python2 python2Packages.numpy ]; + installPhase = '' + mkdir -p $out/lib + cp libprecice.so libprecice.so.1.6.1 $out/lib/ + ''; + + meta = { + description = "preCICE stands for Precise Code Interaction Coupling Environment"; + license = with lib.licenses; [ gpl3 ]; + homepage = "https://www.precice.org/"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Scriptkiddi ]; + }; +} + diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index b047322c35e..624b23f4d60 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { "-DUSE_THIRDPARTY_LIBRARIES=OFF" "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include" "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" + "-DBUILD_SHARED_LIBS=ON" ]; - NIX_LDFLAGS = [ "-ldl" ]; + NIX_LDFLAGS = "-ldl"; meta = { description = "Prometheus Client Library for Modern C++"; diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix deleted file mode 100644 index e7abedf3121..00000000000 --- a/pkgs/development/libraries/ptlib/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, unixODBC, gnome3 -, openssl, openldap, cyrus_sasl, kerberos, expat, SDL, libdv, libv4l, alsaLib }: - -stdenv.mkDerivation rec { - pname = "ptlib"; - version = "2.10.11"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jf27mjz8vqnclhrhrpn7niz4c177kcjbd1hc7vn65ihcqfz05rs"; - }; - - NIX_CFLAGS_COMPILE = "-std=gnu++98"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bison flex unixODBC openssl openldap - cyrus_sasl kerberos expat SDL libdv libv4l alsaLib ]; - - enableParallelBuilding = true; - - patches = [ - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/bison-fix; - sha256 = "0vzv9kyn9s628z8wy2gva380gi1rmhxilwlg5pikl5a0wn8p46nw"; - }) - (fetchpatch { url = http://sources.debian.net/data/main/p/ptlib/2.10.11~dfsg-2.1/debian/patches/no-sslv3; - sha256 = "172s1dnnrl54p9sf1nl7s475sm78rpw3p8jxi0pdx6izzl8hcdr0"; - }) - (fetchpatch { - name = "openssl-1.1.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/openssl-1.1.0.patch?h=packages/ptlib&id=1dfa9f55e7e030d261228fca27dda82979ca7f30"; - sha256 = "11hdgyyibycg0wf5ls0wk9hksa4jd434i86xqiccbyg17n4l6lc1"; - }) - ./ptlib-2.10.11-glibc-2.26.patch - ]; - - # fix typedef clashes with unixODBC>=2.3.5 - postPatch = '' - substituteInPlace include/ptlib/unix/ptlib/contain.h \ - --replace "typedef uintptr_t UINT" "typedef unsigned int UINT" \ - --replace "typedef wchar_t WCHAR" "typedef unsigned short WCHAR" - ''; - - meta = with stdenv.lib; { - description = "Portable Tools from OPAL VoIP"; - maintainers = [ maintainers.raskin ]; - homepage = "http://www.opalvoip.org/"; - platforms = platforms.linux; - license = with licenses; [ beerware bsdOriginal mpl10 ]; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/sources/ptlib/"; - }; - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; -} diff --git a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch b/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch deleted file mode 100644 index 300c3736abf..00000000000 --- a/pkgs/development/libraries/ptlib/ptlib-2.10.11-glibc-2.26.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ptlib/unix/channel.cxx b/src/ptlib/unix/channel.cxx -index 3b17dda..2dcaa18 100644 ---- a/src/ptlib/unix/channel.cxx -+++ b/src/ptlib/unix/channel.cxx -@@ -36,7 +36,7 @@ - - #include <ptlib.h> - #include <sys/ioctl.h> -- -+#include <sys/uio.h> - - #include "../common/pchannel.cxx" - diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 564fc70f2b9..3626e15cfc7 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras }: +{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras, pantheon }: mkDerivation rec { pname = "qgnomeplatform"; @@ -30,6 +30,12 @@ mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with lib; { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = https://github.com/FedoraQt/QGnomePlatform; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 0d9ae21e87e..83e904e53eb 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ qt5.qtbase qca2-qt5 ]; nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; - NIX_LDFLAGS = [ "-lqca-qt5" ]; + NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 85e45d3fad0..3e0dc99f81f 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation { buildFlags = [ "lib" "solib" ]; - installTargets = if stdenv.isDarwin - then ["install-staticlib" "install-shlib"] - else "install"; + installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; buildInputs = [ gfortran openblas ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 7c7f8f51de7..25953949eb7 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -93,6 +93,12 @@ stdenv.mkDerivation rec { #}) ./qt4-gcc6.patch ./qt4-openssl-1.1.patch + (fetchpatch { + name = "gcc9-foreach.patch"; + url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/" + + "0d4a3dd61ccb156dee556c214dbe91c04d44a717/debian/patches/gcc9-qforeach.patch"; + sha256 = "0dzn6qxrgxb75rvck9kmy5gspawdn970wsjw56026dhkih8cp3pg"; + }) ] ++ lib.optional gtkStyle (substituteAll ({ src = ./dlopen-gtkstyle.diff; @@ -200,13 +206,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # with gcc7 the warnings blow the log over Hydra's limit [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin) [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + ++ lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"); NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch index 000e345cf13..dfd1d8b893b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch +++ b/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch @@ -5,7 +5,7 @@ # Check gcc's version case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in - 5*|4*|3.4*) -+ 8*|7*|6*|5*|4*|3.4*) ++ 9*|8*|7*|6*|5*|4*|3.4*) ;; 3.3*) canBuildWebKit="no" @@ -14,7 +14,7 @@ COMPILER_VERSION="3.*" ;; - 5*|4.*) -+ 8*|7*|6*|5*|4.*) ++ 9*|8*|7*|6*|5*|4.*) COMPILER_VERSION="4" ;; *) diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix new file mode 100644 index 00000000000..a10c50c9946 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -0,0 +1,179 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. + +*/ + +{ + newScope, + stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, libGL, perl, + gstreamer, gst-plugins-base, gtk3, dconf, + llvmPackages_5, + + # options + developerBuild ? false, + decryptSslTraffic ? false, + debug ? false, +}: + +with stdenv.lib; + +let + + qtCompatVersion = srcs.qtbase.version; + + stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + + mirror = "https://download.qt.io"; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // { + # Community port of the now unmaintained upstream qtwebkit. + qtwebkit = { + src = fetchFromGitHub { + owner = "annulen"; + repo = "webkit"; + rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; + sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; + }; + version = "5.212-alpha-01-26-2018"; + }; + }; + + patches = { + qtbase = [ + ./qtbase.patch + ./qtbase-fixguicmake.patch + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=a52d7861edfb5956"; + sha256 = "0as047qybh6w9xz2wd569kixwsibj3qid5nkd3l5w5v3lk80af3v"; + }) + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ + ./qtscript.patch + # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196 + # fixed in qtscript 5.12.2 + (fetchpatch { + url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff"; + sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi"; + }) + ]; + qtserialport = [ ./qtserialport.patch ]; + qttools = [ ./qttools.patch ]; + qtwebengine = [ + ./qtwebengine-no-build-skip.patch + ./qtwebengine-darwin-no-platform-check.patch + # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707 + # https://bugreports.qt.io/browse/QTBUG-77037 + (fetchpatch { + name = "fix-build-with-pulseaudio-13.0.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; + sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; + }) + ]; + qtwebkit = [ ./qtwebkit.patch ]; + }; + + qtModule = + import ../qtModule.nix + { + inherit perl; + inherit (stdenv) lib; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = + import ../mkDerivation.nix + { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; } + stdenvActual.mkDerivation; + } + { inherit self srcs patches; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + in { + + mkDerivationWith = + import ../mkDerivation.nix + { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; }; + + mkDerivation = mkDerivationWith stdenvActual.mkDerivation; + + qtbase = callPackage ../modules/qtbase.nix { + inherit (srcs.qtbase) src version; + patches = patches.qtbase; + inherit bison cups harfbuzz libGL; + withGtk3 = true; inherit dconf gtk3; + inherit developerBuild decryptSslTraffic; + }; + + qtcharts = callPackage ../modules/qtcharts.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; + qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; + qtimageformats = callPackage ../modules/qtimageformats.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix { }; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; + qtmultimedia = callPackage ../modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; + qtquick1 = null; + qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtscript = callPackage ../modules/qtscript.nix {}; + qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialport = callPackage ../modules/qtserialport.nix {}; + qtspeech = callPackage ../modules/qtspeech.nix {}; + qtsvg = callPackage ../modules/qtsvg.nix {}; + qttools = callPackage ../modules/qttools.nix {}; + qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; + qtwayland = callPackage ../modules/qtwayland.nix {}; + qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; + qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; + qtx11extras = callPackage ../modules/qtx11extras.nix {}; + qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations + qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtwebview qtx11extras qtxmlpatterns + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { + fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh; + }; + } ../hooks/qmake-hook.sh; + + wrapQtAppsHook = makeSetupHook { + deps = + [ self.qtbase.dev makeWrapper ] + ++ optional stdenv.isLinux self.qtwayland.dev; + } ../hooks/wrap-qt-apps-hook.sh; + }; + + self = makeScope newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 95357c096df..2c6333cb020 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -12,9 +12,9 @@ let qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ] ++ (args.qmakeFlags or []); - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( optional (!debug) "-DQT_NO_DEBUG" - ++ lib.toList (args.NIX_CFLAGS_COMPILE or []); + ++ lib.toList (args.NIX_CFLAGS_COMPILE or [])); cmakeFlags = (args.cmakeFlags or []) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3dbdb2a9770..bc23d0f9caf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -2,7 +2,7 @@ stdenv, lib, src, patches, version, qtCompatVersion, - coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python2, + coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python3, which, # darwin support darwin, libiconv, @@ -75,7 +75,8 @@ stdenv.mkDerivation { ); buildInputs = - lib.optionals (!stdenv.isDarwin) + [ python3 ] + ++ lib.optionals (!stdenv.isDarwin) ( [ libinput ] ++ lib.optional withGtk3 gtk3 @@ -86,7 +87,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 which ]; + [ bison flex gperf lndir perl pkgconfig which ]; propagatedNativeBuildInputs = [ lndir ]; @@ -169,11 +170,6 @@ stdenv.mkDerivation { export LD=$CXX ''} - configureFlags+="\ - -plugindir $out/$qtPluginPrefix \ - -qmldir $out/$qtQmlPrefix \ - -docdir $out/$qtDocPrefix" - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\"" ''; @@ -199,20 +195,17 @@ stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = - [ - "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields - ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' - ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' - ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' - ] - - ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error=sign-compare" # freetype-2.5.4 changed signedness of some struct fields + ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' + ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' + ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' + ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' ] - ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"; + ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC"); prefixKey = "-prefix "; @@ -224,6 +217,10 @@ stdenv.mkDerivation { # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ + "-plugindir $(out)/$(qtPluginPrefix)" + "-qmldir $(out)/$(qtQmlPrefix)" + "-docdir $(out)/$(qtDocPrefix)" + "-verbose" "-confirm-license" "-opensource" diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 4951670f896..5b963255b65 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret ; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ] + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) - ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]) ; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 14bfd40a593..529d361f206 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python2Packages, hexio -, which, cmake, bash, arpa2cm, git, asn2quickder, pkgconfig }: +, cmake, bash, arpa2cm, git, asn2quickder }: stdenv.mkDerivation rec { pname = "quickder"; @@ -12,20 +12,17 @@ stdenv.mkDerivation rec { repo = "quick-der"; }; + nativeBuildInputs = [ cmake ]; + buildInputs = with python2Packages; [ arpa2cm asn1ate - bash - cmake - git hexio pyparsing python six - which asn1ate asn2quickder - pkgconfig ]; postPatch = '' @@ -39,9 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNO_TESTING=ON" "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" - "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" - "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" - "-DPACKAGE_NO_PACKAGE_REGISTRY=ON" ]; preConfigure = '' diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 54aa42439d9..af59e50ec5e 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ ./link-against-ncurses.patch ./no-arch_only.patch diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 73ed823d2be..1e5d9a0a664 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -12,13 +12,11 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; - configureFlags = - stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - [ # This test requires running host code - "bash_cv_wcwidth_broken=no" - ]; + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + # This test requires running host code + "bash_cv_wcwidth_broken=no"; patches = [ ./link-against-ncurses.patch diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 11d5c378015..065d6544986 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; upstreamPatches = (let diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index cdc36617c52..7fbef9a986a 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ncurses]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; upstreamPatches = (let diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index ac70d6ec0f2..2d3d1e8d722 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; + cmakeFlags = [ "-DPORTABLE=1" "-DWITH_JEMALLOC=0" diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index f78ed0f7925..1831161979d 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { doCheck = (!stdenv.isDarwin); - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ (fetchpatch { url = "https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/schroedinger/files/patch-testsuite-Makefile.am.diff"; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 35d0914e3f7..53ae70f5bf8 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "13mngf9kl0y2wfxqvkad0smdaag7k8fvw82b4312gx62nwhc1i6r"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; preConfigure = '' cd src diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 0b13696ad5f..7d771414fb0 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended - installFlags = "prefix=$(out)"; + installFlags = [ "prefix=$(out)" ]; preCheck = '' patchShebangs test/ diff --git a/pkgs/development/libraries/science/biology/mirtk/default.nix b/pkgs/development/libraries/science/biology/mirtk/default.nix index e6c58b96e5c..4291e11ed33 100644 --- a/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib }: +{ stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python, vtk, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - cmakeFlags = "-DWITH_VTK=ON -DBUILD_ALL_MODULES=ON"; + cmakeFlags = [ + "-DWITH_VTK=ON" + "-DBUILD_ALL_MODULES=ON" + "-DWITH_TBB=ON" + ]; doCheck = true; @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python vtk zlib ]; + buildInputs = [ boost eigen python vtk zlib tbb ]; meta = with stdenv.lib; { homepage = "https://github.com/BioMedIA/MIRTK"; diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix new file mode 100644 index 00000000000..b5c59a83277 --- /dev/null +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: + +with stdenv.lib; + +let + version = "1.3.0"; + incfile = builtins.toFile "make.inc.custom" '' + CC = g++ + FORT = gfortran + + ARCH = ar + ARCHFLAGS = cr + RANLIB = ranlib + + OPTS = -fPIC -O3 -DADD_ -Wall + FOPTS = -fPIC -O3 -DADD_ -Wall -x f95-cpp-input + F77OPTS = -fPIC -O3 -DADD_ -Wall + LDOPTS = -fPIC + + -include make.check-mkl + -include make.check-clblas + + # Gnu mkl is not available I guess? + #LIB = -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core -lpthread -lm -fopenmp + LIB = -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lm -fopenmp + LIB += -lclBLAS -lOpenCL + + LIBDIR = -L$(MKLROOT)/lib/intel64 \ + -L$(MKLROOT)/../compiler/lib/intel64 \ + -L$(clBLAS)/lib64 + + INC = -I$(clBLAS)/include + #-I$(AMDAPP)/include + ''; +in stdenv.mkDerivation { + name = "clmagma-${version}"; + src = fetchurl { + url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; + name = "clmagma-${version}.tar.gz"; + }; + + buildInputs = [ + gfortran + clblas + opencl-headers + ocl-icd + mkl + intel-ocl + ]; + + enableParallelBuilding=true; + + MKLROOT = "${mkl}"; + clBLAS = "${clblas}"; + + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, + # which is not available. + OPENCL_VENDOR_PATH="${intel-ocl}/etc/OpenCL/vendors"; + + preBuild = '' + # By default it tries to use GPU, and thus fails for CPUs + sed -i "s/CL_DEVICE_TYPE_GPU/CL_DEVICE_TYPE_DEFAULT/" interface_opencl/clmagma_runtime.cpp + sed -i "s%/usr/local/clmagma%/$out%" Makefile.internal + cp ${incfile} make.inc + ''; + + meta = with stdenv.lib; { + description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; + license = licenses.bsd3; + homepage = http://icl.cs.utk.edu/magma/index.html; + platforms = platforms.linux; + maintainers = with maintainers; [ volhovm ]; + }; +} diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index a93ede63a26..2bb284477e6 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -142,26 +142,27 @@ stdenv.mkDerivation { numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ]; patches = [ ./unicode.patch ]; - cmakeFlags = "-DDOLFIN_CXX_FLAGS=-std=c++11" - + " -DDOLFIN_AUTO_DETECT_MPI=OFF" - + " -DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF") - + " -DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_PARMETIS=OFF" - + " -DDOLFIN_ENABLE_PETSC4PY=OFF" - + " -DDOLFIN_ENABLE_PETSC=OFF" - + " -DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF") - + " -DDOLFIN_ENABLE_SCOTCH=OFF" - + " -DDOLFIN_ENABLE_SLEPC4PY=OFF" - + " -DDOLFIN_ENABLE_SLEPC=OFF" - + " -DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF") - + " -DDOLFIN_ENABLE_TRILINOS=OFF" - + " -DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF") - + " -DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"); + cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11" + "-DDOLFIN_AUTO_DETECT_MPI=OFF" + ("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF")) + "-DDOLFIN_ENABLE_PARMETIS=OFF" + "-DDOLFIN_ENABLE_PETSC4PY=OFF" + "-DDOLFIN_ENABLE_PETSC=OFF" + ("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF")) + "-DDOLFIN_ENABLE_SCOTCH=OFF" + "-DDOLFIN_ENABLE_SLEPC4PY=OFF" + "-DDOLFIN_ENABLE_SLEPC=OFF" + ("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF")) + "-DDOLFIN_ENABLE_TRILINOS=OFF" + ("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF")) + ("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF")) + ]; checkPhase = '' make runtests ''; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 382d2c303e3..604413c96d8 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin }: +{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }: /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. @@ -46,12 +46,28 @@ in stdenvNoCC.mkDerivation { tar xzvf $f done '' else '' - rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm - rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm + # Common stuff rpmextract rpm/intel-mkl-core-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-common-c-${rpm-ver}.noarch.rpm + rpmextract rpm/intel-mkl-common-f-${rpm-ver}.noarch.rpm + + # Dynamic libraries + rpmextract rpm/intel-mkl-cluster-rt-${rpm-ver}.x86_64.rpm rpmextract rpm/intel-mkl-core-rt-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-f-rt-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-rt-${rpm-ver}.x86_64.rpm + + # Intel OpenMP runtime rpmextract rpm/intel-openmp-${openmp-ver}.x86_64.rpm - ''; + '' + (if enableStatic then '' + # Static libraries + rpmextract rpm/intel-mkl-cluster-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-${rpm-ver}.x86_64.rpm + rpmextract rpm/intel-mkl-gnu-f-${rpm-ver}.x86_64.rpm + '' else '' + # Take care of installing dynamic-only PkgConfig files during the installPhase + '' + ); installPhase = '' for f in $(find . -name 'mkl*.pc') ; do @@ -80,16 +96,21 @@ in stdenvNoCC.mkDerivation { cp -r compilers_and_libraries_${version}/mac/mkl/bin/pkgconfig/* $out/lib/pkgconfig '' else '' mkdir -p $out/lib + cp license.txt $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/include $out/ + mkdir -p $out/lib/pkgconfig + '') + + (if enableStatic then '' cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/* $out/lib/ - cp license.txt $out/lib/ - - mkdir -p $out/lib/pkgconfig cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/* $out/lib/pkgconfig - ''); + '' else '' + cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ + cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig + ''); # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f8d392691ab..a26cf38a9d0 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -8,6 +8,7 @@ # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null , enableStatic ? false +, enableShared ? true }: with stdenv.lib; @@ -60,7 +61,7 @@ let TARGET = setTarget "ATHLON"; DYNAMIC_ARCH = true; NO_AVX512 = true; - USE_OPENMP = true; + USE_OPENMP = !stdenv.hostPlatform.isMusl; }; }; in @@ -115,6 +116,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl which + ]; + + depsBuildBuild = [ buildPackages.gfortran buildPackages.stdenv.cc ]; @@ -126,6 +130,7 @@ stdenv.mkDerivation rec { NUM_THREADS = 64; INTERFACE64 = blas64; NO_STATIC = !enableStatic; + NO_SHARED = !enableShared; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 6fc96623a33..e4a3241c1f3 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "0a5fpm8nra5ldhjk0cqd2rx1qh32wiarkxmcqcm5xl8z7l4kjm6l"; + sha256 = "18q6mrq4agvlpvhix2k13qcyvqqzh30vj7b329dva64035rzg68n"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 1cc80e78a10..6dc7e746fd3 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { ++ lib.optionals withCplex [ "--with-cplex-incdir=${cplex}/cplex/include/ilcplex" "--with-cplex-lib=-lcplex${cplex.libSuffix}" ]; NIX_LDFLAGS = - lib.optional withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; + lib.optionalString withCplex "-L${cplex}/cplex/bin/${cplex.libArch}"; - # Compile errors - NIX_CFLAGS_COMPILE = [ "-Wno-cast-qual" ]; + # Compile errors + NIX_CFLAGS_COMPILE = "-Wno-cast-qual"; hardeningDisable = [ "format" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index faa219044bd..46709ff218a 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "7.4"; + version = "7.5"; nativeBuildInputs = [cmake]; src = fetchurl { url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz"; - sha256 = "16930d021ai8cl3gsnn2v6l30n6mklwwqd53z51cddd3dj69x6zz"; + sha256 = "0g60br3p8di92jx3pr2bb51xh15gg57l7qvwzwn7xf7l585hgi7v"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 63b6ae94a38..c390603c51d 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, wafHook }: +{ stdenv, fetchurl, pkgconfig, python3, wafHook }: stdenv.mkDerivation rec { pname = "serd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; - nativeBuildInputs = [ pkgconfig python wafHook ]; + nativeBuildInputs = [ pkgconfig python3 wafHook ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/serd; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 5f14a7bb5ee..596ea1cfaf8 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; - installFlags = "INSTBASEDIR=$(out)"; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with stdenv.lib; { description = "A library for displaying messages"; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index dbac4c85961..985ee59348b 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; - installFlags = "INSTBASEDIR=$(out)"; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with stdenv.lib; { description = "A library for parsing command line options"; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index a7ffc146f41..4d74ee7ca06 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { homepage = http://icculus.org/smpeg/; diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index f35f5bfc55a..0ad1a4b2898 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, static ? false }: stdenv.mkDerivation rec { pname = "snappy"; @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ]; postInstall = '' substituteInPlace "$out"/lib/cmake/Snappy/SnappyTargets.cmake \ @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://google.github.io/snappy/; + homepage = "https://google.github.io/snappy/"; license = licenses.bsd3; description = "Compression/decompression library for very high speeds"; platforms = platforms.all; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index c1c22cb910d..2113d7bd49b 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: +{ stdenv, fetchurl, pkgconfig, python3, serd, pcre, wafHook }: stdenv.mkDerivation rec { pname = "sord"; - version = "0.16.2"; + version = "0.16.4"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; + sha256 = "1mwh4qvp9q4vgrgg5bz9sgjhxscncrylf2b06h0q55ddwzs9hndi"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ python serd pcre ]; + nativeBuildInputs = [ pkgconfig python3 wafHook ]; + buildInputs = [ serd pcre ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/sord; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 2708e49eb2b..83eef355f2d 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ "-lsqlite3" ]; + NIX_LDFLAGS = "-lsqlite3"; meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index a18edc0a6df..51583fdbbcd 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }: +{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libbsd, libuuid, numactl, openssl }: stdenv.mkDerivation rec { pname = "spdk"; - version = "19.04"; + version = "19.10"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "10mzal1hspnh26ws5d7sc54gyjfzkf6amr0gkd7b368ng2a9z8s6"; + sha256 = "16v2vswn3rnnj7ak5w5rsak6r8f9b85gyhyll4ac1k4xpyj488hj"; }; + patches = [ ./spdk-dpdk-meson.patch ]; + nativeBuildInputs = [ python ]; - buildInputs = [ cunit dpdk libaio libuuid numactl openssl ]; + buildInputs = [ cunit dpdk libaio libbsd libuuid numactl openssl ]; postPatch = '' patchShebangs . @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" ]; - NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile. + NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. enableParallelBuilding = true; diff --git a/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch b/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch new file mode 100644 index 00000000000..9cc6d89ce50 --- /dev/null +++ b/pkgs/development/libraries/spdk/spdk-dpdk-meson.patch @@ -0,0 +1,17 @@ +1. dpdk built with meson generates rte_build_config.h rather than rte_config.h. +2. dpdk configured with libbsd requires that dependents link with libbsd. + +--- a/lib/env_dpdk/env.mk ++++ b/lib/env_dpdk/env.mk +@@ -140,6 +140,9 @@ endif + +-ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h)) +-ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h)) ++ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_build_config.h)) ++ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_build_config.h)) + ENV_LINKER_ARGS += -lnuma + endif ++ifneq (,$(shell grep -e "define RTE_USE_LIBBSD 1" $(DPDK_INC_DIR)/rte_build_config.h)) ++ENV_LINKER_ARGS += -lbsd ++endif + endif diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 9365ee006d1..d187187246b 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "1wpymql2ps4k2qkfa5mdifihb1n815xlz7imcd8ri1gn2qla8q8i"; + sha256 = "0s1aiwl61nl3b4ym4v050wlbbx0iypknqsj3ar12dw5hljlzx6f8"; }; buildInputs = [ readline ncurses openssl tcl ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 529b3ba9e71..d904637fcd3 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.30.0"; + version = "3.30.1"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0n7w839y55dc3qqf2zv8xk6238cc6mpx24q4w5amwic7g96cza70"; + sha256 = "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc"; }; outputs = [ "bin" "dev" "out" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" "-DSQLITE_ENABLE_JSON1" diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index cf8bffe0736..953ba9484fa 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1rmswx4x3p9pdgnd7vvl3vwgh9rynakjhv1mipy2yid5rb61ajlj"; + sha256 = "01xaq44j95kbgqfl41pnybvqy0yq6wd4wdw88ckylzf0nzp977xz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index b8e7518cd33..010838efab5 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit patches; buildInputs = [ libX11 libXaw ]; - buildFlags = "without_doc"; + buildFlags = [ "without_doc" ]; postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index 5e0f37bbb52..d1d4ee806b8 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { if stdenv.hostPlatform.system == "x86_64-freebsd" then "bsd" else if stdenv.hostPlatform.system == "x686-freebsd" then "bsd" else throw "Don't know what arch to select for tachyon build"; - makeFlags = arch; + makeFlags = [ arch ]; patches = [ # Remove absolute paths in Make-config (and unset variables so they can be set in preBuild) ./no-absolute-paths.patch diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 0ec5d8ad15d..18f9e541acd 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -11,10 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec { sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj"; }; - makeFlags = concatStringsSep " " ( - optional (compiler != null) "compiler=${compiler}" ++ - optional (stdver != null) "stdver=${stdver}" - ); + makeFlags = optional (compiler != null) "compiler=${compiler}" + ++ optional (stdver != null) "stdver=${stdver}"; patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 6c480db9d60..997b874ac5b 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: let - version = "4.2.1"; + version = "4.3.1"; pname = "tepl"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vib1ljgqwy2fhiwq8z3pcd68qy7v72l4f35p1d1w1k9z8sy677k"; + sha256 = "08y6vss29b65pqzv708cyqmbszgxsqqgw7g0vh6f1389ayi2lvs0"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index ecdb831fcfa..b1b66ed052f 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison -, flex, twisted -}: +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkgconfig +, bison, flex, twisted, static ? false }: stdenv.mkDerivation rec { pname = "thrift"; @@ -11,27 +10,36 @@ stdenv.mkDerivation rec { sha256 = "0yai9c3bdsrkkjshgim7zk0i7malwfprg00l9774dbrkh2w4ilvs"; }; - #enableParallelBuilding = true; problems on hydra - # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - boost zlib libevent openssl python bison flex twisted - ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ boost zlib libevent openssl python bison flex ] + ++ stdenv.lib.optional (!static) twisted; preConfigure = "export PY_PREFIX=$out"; - # TODO: package boost-test, so we can run the test suite. (Currently it fails - # to find libboost_unit_test_framework.a.) - configureFlags = [ "--enable-tests=no" ]; - doCheck = false; + cmakeFlags = [ + # FIXME: Fails to link in static mode with undefined reference to + # `boost::unit_test::unit_test_main(bool (*)(), int, char**)' + "-DBUILD_TESTING:BOOL=${if static then "OFF" else "ON"}" + ] ++ stdenv.lib.optionals static [ + "-DWITH_STATIC_LIB:BOOL=ON" + "-DOPENSSL_USE_STATIC_LIBS=ON" + ]; + + doCheck = !static; + checkPhase = '' + runHook preCheck + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib ctest -E PythonTestSSLSocket + runHook postCheck + ''; + enableParallelChecking = false; meta = with stdenv.lib; { description = "Library for scalable cross-language services"; - homepage = http://thrift.apache.org/; + homepage = "http://thrift.apache.org/"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 605307e080e..395dd6952f6 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "07wh9q72vsaf5j2m2c6cfmllwhr3m9f8xzg8h0i6mhd7d0wr4lna"; + sha256 = "00ykfc7p6n0nc97lvjnqjar95xyv8b2b77cjqczy03wh5i4gmifj"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index cc7c996f7c3..0cc4038b64e 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = - stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; + stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; buildInputs = [ unzip ]; buildPhase = '' diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 0bff95f02a7..6195c80e24b 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -1,16 +1,25 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps -, uthash, which }: +, uthash, which +}: stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1ryy6da3s91ks3m66y3xp6yh3v096kny0f9br74mxf2635n5g5kh"; + sha256 = "19jg09sxy3aj4dc1yv32jjv0m62cnmhjlw02jbh4d4pk2439m4l2"; }; + patches = [ + # Fix test failure. see https://github.com/tpm2-software/tpm2-tss/pull/1585 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tss/pull/1585.patch"; + sha256 = "0ak3l588ahzv3yx1gfa4sa6p74lsffxzkr23ppznm34wvlcci86n"; + }) + ]; + nativeBuildInputs = [ doxygen perl pkgconfig # For unit tests and integration tests. diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index e257088c41f..1c0b70f6896 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; - maintainers = with maintainers; [ ndowens ]; + maintainers = with maintainers; []; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix index 73ca55cffd0..dca24c7f9ea 100644 --- a/pkgs/development/libraries/unibilium/default.nix +++ b/pkgs/development/libraries/unibilium/default.nix @@ -1,15 +1,15 @@ { stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }: stdenv.mkDerivation rec { - pname = "unibilium"; + pname = "unibilium-unstable"; - version = "2.0.0"; + version = "20190811"; src = fetchFromGitHub { - owner = "mauke"; + owner = "neovim"; repo = "unibilium"; - rev = "v${version}"; - sha256 = "1wa9a32wzqnxqh1jh554afj13dzjr6mw2wzqzw8d08nza9pg2ra2"; + rev = "92d929fabaf94ea4feb48149bbc3bbea77c4fab0"; + sha256 = "1l8p3fpdymba62x1f5d990v72z3m5f5g2yf505g0rlf2ysc5r1di"; }; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/development/libraries/unicorn-emu/default.nix b/pkgs/development/libraries/unicorn-emu/default.nix index 96f318ff0ef..7917b695406 100644 --- a/pkgs/development/libraries/unicorn-emu/default.nix +++ b/pkgs/development/libraries/unicorn-emu/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configurePhase = '' patchShebangs make.sh ''; - buildPhase = '' ./make.sh ''; + buildPhase = '' ./make.sh '' + stdenv.lib.optionalString stdenv.isDarwin "macos-universal-no"; installPhase = '' env PREFIX=$out ./make.sh install ''; nativeBuildInputs = [ pkgconfig python ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Lightweight multi-platform CPU emulator library"; homepage = "http://www.unicorn-engine.org"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 78f85afca91..6cfaef5ef99 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -100,16 +100,16 @@ sqlite = stdenv.mkDerivation rec { pname = "sqlite-connector-odbc"; version = "0.9993"; - + src = fetchurl { url = "http://www.ch-werner.de/sqliteodbc/sqliteodbc-${version}.tar.gz"; sha256 = "0dgsj28sc7f7aprmdd0n5a1rmcx6pv7170c8dfjl0x1qsjxim6hs"; }; - + buildInputs = [ unixODBC sqlite zlib libxml2 ]; - + configureFlags = [ "--with-odbc=${unixODBC}" ]; - + installTargets = [ "install-3" ]; # move libraries to $out/lib where they're expected to be @@ -117,7 +117,7 @@ mkdir -p "$out/lib" mv "$out"/*.* "$out/lib" ''; - + passthru = { fancyName = "SQLite"; driver = "lib/libsqlite3odbc.so"; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 61246748ac7..5e5f4c9e8ca 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "148361pixrm94q6v04k13s1msa04bx9yc3djb0lxpa7dlw19vhcd"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=parentheses" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=parentheses"; nativeBuildInputs = [ cmake doxygen ]; diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 2eee80a7696..8e43135196c 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "002yik1x7kn0427xahvnhjby2np14a6xqw7c3dx530n9h5d9rg47"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 4e9336172ad..a02e540173d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { # with gcc8, -Wclass-memaccess became part of -Wall and causes logging limit # to be exceeded - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-Wno-class-memaccess"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-class-memaccess"; nativeBuildInputs = [ gn ninja pkgconfig python ] ++ stdenv.lib.optionals stdenv.isDarwin [ xcbuild darwin.DarwinTools ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 9651e9a5f80..17d11d4fb74 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -11,14 +11,17 @@ stdenv.mkDerivation { buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; - # BUILD_OUL wants old linux headers for videodev.h, not available - # in stdenv linux headers - # BUILD_BRL fails to find open() - cmakeFlags = "-DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " - + (if stdenv.hostPlatform.system == "x86_64-linux" then - "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" - else - ""); + cmakeFlags = [ + # BUILD_OUL wants old linux headers for videodev.h, not available + # in stdenv linux headers + "-DBUILD_OUL=OFF" + # BUILD_BRL fails to find open() + "-DBUILD_BRL=OFF" + "-DBUILD_CONTRIB=OFF" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DCMAKE_C_FLAGS=-fPIC" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 1bad9c5eb2a..438b40d9140 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "16s7jx2brgii6jbpmr30ggkc7rrf388jl26g357sm7ggwliiwask"; + sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 38ee4376ac2..73dac47307a 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. - NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; + NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 25c5bf45888..a8c751330b7 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-soap" ]; # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 - NIX_LDFLAGS = [ "-lgcrypt" ]; + NIX_LDFLAGS = "-lgcrypt"; postInstall = '' moveToOutput "bin/xmlsec1-config" "$dev" diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index e4d0c0fde17..3a5b1690f2d 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; prePatch = lib.optional stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index db5d90e2f02..1a8f07a3ae0 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails all the tests (ctest) - cmakeFlags = if enableDrafts then [ "-DENABLE_DRAFTS=ON" ] else null; + cmakeFlags = stdenv.lib.optional enableDrafts "-DENABLE_DRAFTS=ON"; meta = with stdenv.lib; { branch = "4"; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 4f69c1c8079..127ea4f7162 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c"; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation"; buildInputs = [ zookeeper bash ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 9139befe020..fd99a70de3a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -42,7 +42,8 @@ with super; ]; # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null; + NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin + "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua @@ -253,7 +254,7 @@ with super; # Upstreams: # 5.1: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/luuid.tar.gz # 5.2: http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.2/luuid.tar.gz - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; patches = [ ./luuid.patch ]; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index c3bf3217b6a..a3a4573c0ae 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix new file mode 100644 index 00000000000..00e35b64f5f --- /dev/null +++ b/pkgs/development/misc/h3/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "h3"; + version = "3.6.2"; + + src = fetchFromGitHub { + owner = "uber"; + repo = "h3"; + rev = "v${version}"; + sha256 = "0mlv3jk0j340l0bhr3brxm3hbdcfmyp86h7d85537c81cl64y7kg"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_LINTING=OFF" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/uber/h3"; + description = "Hexagonal hierarchical geospatial indexing system"; + license = licenses.asl20; + maintainers = [ maintainers.kalbasit ]; + }; +} diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix index 8abe4b2550e..38b1df3ca3b 100644 --- a/pkgs/development/misc/qmk_firmware/default.nix +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { --replace arm-none-eabi arm-none-eabihf rm keyboards/handwired/frenchdev/rules.mk keyboards/dk60/rules.mk ''; - buildFlags = "all:default"; + buildFlags = [ "all:default" ]; doCheck = true; checkTarget = "test:all"; installPhase = '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 976ef141627..9e273468cd3 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/lldb.nix b/pkgs/development/mobile/androidenv/lldb.nix index d812a679c02..e8a158c01ec 100644 --- a/pkgs/development/mobile/androidenv/lldb.nix +++ b/pkgs/development/mobile/androidenv/lldb.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl.out pkgs.ncurses5 ]; + ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.zlib pkgs.openssl_1_0_2.out pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib autoPatchelf $packageBaseDir/lib diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index 5b4cad1f264..c39d966959a 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + ++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 8a479924d46..f79696207d3 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -21,7 +21,7 @@ nodePackages // { }; dat = nodePackages.dat.override { - buildInputs = [ nodePackages.node-gyp-build ]; + buildInputs = [ nodePackages.node-gyp-build pkgs.libtool pkgs.autoconf pkgs.automake ]; }; dnschain = nodePackages.dnschain.override { @@ -31,6 +31,10 @@ nodePackages // { ''; }; + bitwarden-cli = pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: { + name = "bitwarden-cli-${drv.version}"; + }); + ios-deploy = nodePackages.ios-deploy.override (drv: { nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.buildPackages.rsync ]; preRebuild = '' diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 5b95e26be14..d5f7b95ab97 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -2,6 +2,7 @@ "@angular/cli" , "@antora/cli" , "@antora/site-generator-default" +, "@bitwarden/cli" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" @@ -15,7 +16,6 @@ , "bower2nix" , "browserify" , "castnow" -, { "texlab-citeproc-build-deps": "../tools/misc/texlab/citeproc" } , "clean-css" , "coffee-script" , "coinmon" @@ -103,7 +103,9 @@ , "peerflix-server" , "pnpm" , "prettier" +, "pscid" , "pulp" +, "purescript-psa" , "react-native-cli" , "react-tools" , "reveal.js" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index ef0d9cf2a14..d5bc3f18c43 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -4,6 +4,15 @@ let sources = { + "2-thenable-1.0.0" = { + name = "2-thenable"; + packageName = "2-thenable"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/2-thenable/-/2-thenable-1.0.0.tgz"; + sha512 = "HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw=="; + }; + }; "@akryum/winattr-3.0.0" = { name = "_at_akryum_slash_winattr"; packageName = "@akryum/winattr"; @@ -13,31 +22,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.803.18" = { + "@angular-devkit/architect-0.803.21" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.803.18"; + version = "0.803.21"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.18.tgz"; - sha512 = "/oNutcuUduXH/4nxHSDRTYK3VGP0PkVUniPdo0yjpg8c2dbfoNkt1ILIV82LPaC8sDwjuXGLx0EH70ETtcnBwg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.21.tgz"; + sha512 = "E2K/YexIWVyKM/xmyxvDjkJf+wX9u4c8YYpNaK4htsRzA06juc7N1MhlL/jURZiRl5b/K9sapYeq3tMX76saxA=="; }; }; - "@angular-devkit/core-8.3.18" = { + "@angular-devkit/core-8.3.21" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.3.18"; + version = "8.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.18.tgz"; - sha512 = "SPlQmBlrcaKZeE9srvuFElcen9iOled4lkD3M4cGwe56u6YoJ71oTAtmGiw9nofTtW0PghGVq8WdDQG5BRqX8Q=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.21.tgz"; + sha512 = "BYyVbrbys535FplX0+GVOlYBg/cyk1U5SRhSxRRFZYi9epVlEBBPk8/6wV4cQPGb6EwXkVj7YtPWXjXcGfzWmA=="; }; }; - "@angular-devkit/schematics-8.3.18" = { + "@angular-devkit/schematics-8.3.21" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.3.18"; + version = "8.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.18.tgz"; - sha512 = "J9sf/6cSUx2kdXppo/69uZ1gBeM5fcXfnP7MCJCVnsk09QCD9Kr+Xeh8h4WEmLtne7XzI9dcCttHQ5WDNuRulA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.21.tgz"; + sha512 = "+wH0362CRr/SijVX4w2baY2ANZ4scQ1k2xO8lT+NMeZQkw3IJQPOfwk1IaqiAs2xuBJZcSDH1Gn80+Jh4Dit7w=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -148,22 +157,31 @@ let sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; }; }; - "@apollo/federation-0.10.2" = { + "@apollo/federation-0.11.2" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.10.2"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.10.2.tgz"; - sha512 = "N+JoD7YraGAgDJq1GTkAzRRPUA+FgclFgAUcUDng9ICA4N147nuGUrbrpQdgLnE59nCLJAhcFvOgQRs177XMWw=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.11.2.tgz"; + sha512 = "MSMBGOS9lAE0K4VmV/3mkd2qfLQTGt2OcsryRNbGMXr9gUVZDtM9quD5JUQoENkz9YFwcOY9jI+i/X5J+Fcw6A=="; }; }; - "@apollographql/apollo-tools-0.4.0" = { + "@apollo/protobufjs-1.0.3" = { + name = "_at_apollo_slash_protobufjs"; + packageName = "@apollo/protobufjs"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.3.tgz"; + sha512 = "gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw=="; + }; + }; + "@apollographql/apollo-tools-0.4.2" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.0.tgz"; - sha512 = "7wEO+S+zgz/wVe3ilFQqICufRBYYDSNUkd1V03JWvXuSydbYq2SM5EgvWmFF+04iadt+aQ0XCCsRzCzRPQODfQ=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.2.tgz"; + sha512 = "/kTaguTNSowXR/zWU4hjeL41yAdEbQO05f882c6cRIrVE7xIgJcBNEcYz2kzi94eaUbE2YY3SSxDJ6vPeV07OQ=="; }; }; "@apollographql/graphql-language-service-interface-2.0.2" = { @@ -238,13 +256,13 @@ let sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; }; }; - "@babel/core-7.7.2" = { + "@babel/core-7.7.7" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.7.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz"; - sha512 = "eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz"; + sha512 = "jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -256,157 +274,157 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.6.4" = { + "@babel/generator-7.7.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.6.4"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.4.tgz"; - sha512 = "jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz"; + sha512 = "m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg=="; }; }; - "@babel/generator-7.7.2" = { + "@babel/generator-7.7.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.7.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz"; - sha512 = "WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz"; + sha512 = "/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ=="; }; }; - "@babel/helper-annotate-as-pure-7.7.0" = { + "@babel/helper-annotate-as-pure-7.7.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz"; - sha512 = "k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz"; + sha512 = "2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.7.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz"; - sha512 = "Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz"; + sha512 = "Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ=="; }; }; - "@babel/helper-builder-react-jsx-7.7.0" = { + "@babel/helper-builder-react-jsx-7.7.4" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz"; - sha512 = "LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.4.tgz"; + sha512 = "kvbfHJNN9dg4rkEM4xn1s8d1/h6TYNvajy9L1wx4qLn9HFg0IkTsQi4rfBe92nxrPUFcMsHoMV+8rU7MJb3fCA=="; }; }; - "@babel/helper-call-delegate-7.7.0" = { + "@babel/helper-call-delegate-7.7.4" = { name = "_at_babel_slash_helper-call-delegate"; packageName = "@babel/helper-call-delegate"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz"; - sha512 = "Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw=="; + url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz"; + sha512 = "8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA=="; }; }; - "@babel/helper-create-class-features-plugin-7.7.0" = { + "@babel/helper-create-class-features-plugin-7.7.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz"; - sha512 = "MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz"; + sha512 = "l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.7.2" = { + "@babel/helper-create-regexp-features-plugin-7.7.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.7.2"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz"; - sha512 = "pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz"; + sha512 = "Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A=="; }; }; - "@babel/helper-define-map-7.7.0" = { + "@babel/helper-define-map-7.7.4" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz"; - sha512 = "kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz"; + sha512 = "v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg=="; }; }; - "@babel/helper-explode-assignable-expression-7.7.0" = { + "@babel/helper-explode-assignable-expression-7.7.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz"; - sha512 = "CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz"; + sha512 = "2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg=="; }; }; - "@babel/helper-function-name-7.7.0" = { + "@babel/helper-function-name-7.7.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz"; - sha512 = "tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz"; + sha512 = "AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ=="; }; }; - "@babel/helper-get-function-arity-7.7.0" = { + "@babel/helper-get-function-arity-7.7.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz"; - sha512 = "tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz"; + sha512 = "QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA=="; }; }; - "@babel/helper-hoist-variables-7.7.0" = { + "@babel/helper-hoist-variables-7.7.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz"; - sha512 = "LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz"; + sha512 = "wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.7.0" = { + "@babel/helper-member-expression-to-functions-7.7.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz"; - sha512 = "QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz"; + sha512 = "9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw=="; }; }; - "@babel/helper-module-imports-7.7.0" = { + "@babel/helper-module-imports-7.7.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz"; - sha512 = "Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz"; + sha512 = "dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ=="; }; }; - "@babel/helper-module-transforms-7.7.0" = { + "@babel/helper-module-transforms-7.7.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.7.0"; + version = "7.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz"; - sha512 = "rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz"; + sha512 = "A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw=="; }; }; - "@babel/helper-optimise-call-expression-7.7.0" = { + "@babel/helper-optimise-call-expression-7.7.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz"; - sha512 = "48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz"; + sha512 = "VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg=="; }; }; "@babel/helper-plugin-utils-7.0.0" = { @@ -427,58 +445,58 @@ let sha512 = "CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw=="; }; }; - "@babel/helper-remap-async-to-generator-7.7.0" = { + "@babel/helper-remap-async-to-generator-7.7.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz"; - sha512 = "pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz"; + sha512 = "Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw=="; }; }; - "@babel/helper-replace-supers-7.7.0" = { + "@babel/helper-replace-supers-7.7.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz"; - sha512 = "5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz"; + sha512 = "pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg=="; }; }; - "@babel/helper-simple-access-7.7.0" = { + "@babel/helper-simple-access-7.7.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz"; - sha512 = "AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz"; + sha512 = "zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A=="; }; }; - "@babel/helper-split-export-declaration-7.7.0" = { + "@babel/helper-split-export-declaration-7.7.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz"; - sha512 = "HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz"; + sha512 = "guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug=="; }; }; - "@babel/helper-wrap-function-7.7.0" = { + "@babel/helper-wrap-function-7.7.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz"; - sha512 = "sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz"; + sha512 = "VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg=="; }; }; - "@babel/helpers-7.7.0" = { + "@babel/helpers-7.7.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz"; - sha512 = "VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz"; + sha512 = "ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg=="; }; }; "@babel/highlight-7.5.0" = { @@ -490,13 +508,13 @@ let sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; }; }; - "@babel/parser-7.7.3" = { + "@babel/parser-7.7.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.7.3"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz"; - sha512 = "bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz"; + sha512 = "WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -508,490 +526,490 @@ let sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.7.0" = { + "@babel/plugin-proposal-async-generator-functions-7.7.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz"; - sha512 = "ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz"; + sha512 = "1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw=="; }; }; - "@babel/plugin-proposal-class-properties-7.7.0" = { + "@babel/plugin-proposal-class-properties-7.7.4" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz"; - sha512 = "tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz"; + sha512 = "EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.7.0" = { + "@babel/plugin-proposal-dynamic-import-7.7.4" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz"; - sha512 = "7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz"; + sha512 = "StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.2.0" = { + "@babel/plugin-proposal-json-strings-7.7.4" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; - sha512 = "MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz"; + sha512 = "wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.6.2" = { + "@babel/plugin-proposal-object-rest-spread-7.7.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.6.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz"; - sha512 = "LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz"; + sha512 = "3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.2.0" = { + "@babel/plugin-proposal-optional-catch-binding-7.7.4" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; - sha512 = "mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz"; + sha512 = "DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.7.0" = { + "@babel/plugin-proposal-unicode-property-regex-7.7.7" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.7.0"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz"; - sha512 = "mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz"; + sha512 = "80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w=="; }; }; - "@babel/plugin-syntax-async-generators-7.2.0" = { + "@babel/plugin-syntax-async-generators-7.7.4" = { name = "_at_babel_slash_plugin-syntax-async-generators"; packageName = "@babel/plugin-syntax-async-generators"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; - sha512 = "1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz"; + sha512 = "Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g=="; }; }; - "@babel/plugin-syntax-dynamic-import-7.2.0" = { + "@babel/plugin-syntax-dynamic-import-7.7.4" = { name = "_at_babel_slash_plugin-syntax-dynamic-import"; packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; - sha512 = "mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz"; + sha512 = "jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg=="; }; }; - "@babel/plugin-syntax-flow-7.7.0" = { + "@babel/plugin-syntax-flow-7.7.4" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.0.tgz"; - sha512 = "vQMV07p+L+jZeUnvX3pEJ9EiXGCjB5CTTvsirFD9rpEuATnoAvLBLoYbw1v5tyn3d2XxSuvEKi8cV3KqYUa0vQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.4.tgz"; + sha512 = "2AMAWl5PsmM5KPkB22cvOkUyWk6MjUaqhHNU5nSPUl/ns3j5qLfw2SuYP5RbVZ0tfLvePr4zUScbICtDP2CUNw=="; }; }; - "@babel/plugin-syntax-json-strings-7.2.0" = { + "@babel/plugin-syntax-json-strings-7.7.4" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; - sha512 = "5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz"; + sha512 = "QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg=="; }; }; - "@babel/plugin-syntax-jsx-7.2.0" = { + "@babel/plugin-syntax-jsx-7.7.4" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha512 = "VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz"; + sha512 = "wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg=="; }; }; - "@babel/plugin-syntax-object-rest-spread-7.2.0" = { + "@babel/plugin-syntax-object-rest-spread-7.7.4" = { name = "_at_babel_slash_plugin-syntax-object-rest-spread"; packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; - sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz"; + sha512 = "mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg=="; }; }; - "@babel/plugin-syntax-optional-catch-binding-7.2.0" = { + "@babel/plugin-syntax-optional-catch-binding-7.7.4" = { name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; - sha512 = "bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz"; + sha512 = "4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ=="; }; }; - "@babel/plugin-syntax-top-level-await-7.7.0" = { + "@babel/plugin-syntax-top-level-await-7.7.4" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz"; - sha512 = "hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz"; + sha512 = "wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg=="; }; }; - "@babel/plugin-syntax-typescript-7.3.3" = { + "@babel/plugin-syntax-typescript-7.7.4" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.3.3"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; - sha512 = "dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz"; + sha512 = "77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ=="; }; }; - "@babel/plugin-transform-arrow-functions-7.2.0" = { + "@babel/plugin-transform-arrow-functions-7.7.4" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; - sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz"; + sha512 = "zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.7.0" = { + "@babel/plugin-transform-async-to-generator-7.7.4" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz"; - sha512 = "vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz"; + sha512 = "zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.2.0" = { + "@babel/plugin-transform-block-scoped-functions-7.7.4" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; - sha512 = "ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz"; + sha512 = "kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.6.3" = { + "@babel/plugin-transform-block-scoping-7.7.4" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.6.3"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz"; - sha512 = "7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz"; + sha512 = "2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg=="; }; }; - "@babel/plugin-transform-classes-7.7.0" = { + "@babel/plugin-transform-classes-7.7.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz"; - sha512 = "/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz"; + sha512 = "sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg=="; }; }; - "@babel/plugin-transform-computed-properties-7.2.0" = { + "@babel/plugin-transform-computed-properties-7.7.4" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; - sha512 = "kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz"; + sha512 = "bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ=="; }; }; - "@babel/plugin-transform-destructuring-7.6.0" = { + "@babel/plugin-transform-destructuring-7.7.4" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.6.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz"; - sha512 = "2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz"; + sha512 = "4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.7.0" = { + "@babel/plugin-transform-dotall-regex-7.7.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.7.0"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz"; - sha512 = "3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz"; + sha512 = "b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.5.0" = { + "@babel/plugin-transform-duplicate-keys-7.7.4" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.5.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; - sha512 = "igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz"; + sha512 = "g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.2.0" = { + "@babel/plugin-transform-exponentiation-operator-7.7.4" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; - sha512 = "umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz"; + sha512 = "MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.6.3" = { + "@babel/plugin-transform-flow-strip-types-7.7.4" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.6.3"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.6.3.tgz"; - sha512 = "l0ETkyEofkqFJ9LS6HChNIKtVJw2ylKbhYMlJ5C6df+ldxxaLIyXY4yOdDQQspfFpV8/vDiaWoJlvflstlYNxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.7.4.tgz"; + sha512 = "w9dRNlHY5ElNimyMYy0oQowvQpwt/PRHI0QS98ZJCTZU2bvSnKXo5zEiD5u76FBPigTm8TkqzmnUTg16T7qbkA=="; }; }; - "@babel/plugin-transform-for-of-7.4.4" = { + "@babel/plugin-transform-for-of-7.7.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.4.4"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; - sha512 = "9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz"; + sha512 = "zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA=="; }; }; - "@babel/plugin-transform-function-name-7.7.0" = { + "@babel/plugin-transform-function-name-7.7.4" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz"; - sha512 = "P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz"; + sha512 = "E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g=="; }; }; - "@babel/plugin-transform-literals-7.2.0" = { + "@babel/plugin-transform-literals-7.7.4" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; - sha512 = "2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz"; + sha512 = "X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.2.0" = { + "@babel/plugin-transform-member-expression-literals-7.7.4" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; - sha512 = "HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz"; + sha512 = "9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA=="; }; }; - "@babel/plugin-transform-modules-amd-7.5.0" = { + "@babel/plugin-transform-modules-amd-7.7.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.5.0"; + version = "7.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; - sha512 = "n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz"; + sha512 = "CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.7.0" = { + "@babel/plugin-transform-modules-commonjs-7.7.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.7.0"; + version = "7.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz"; - sha512 = "KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz"; + sha512 = "9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.7.0" = { + "@babel/plugin-transform-modules-systemjs-7.7.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz"; - sha512 = "ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz"; + sha512 = "y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw=="; }; }; - "@babel/plugin-transform-modules-umd-7.7.0" = { + "@babel/plugin-transform-modules-umd-7.7.4" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz"; - sha512 = "u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz"; + sha512 = "u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.7.0" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.7.4" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz"; - sha512 = "+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz"; + sha512 = "jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw=="; }; }; - "@babel/plugin-transform-new-target-7.4.4" = { + "@babel/plugin-transform-new-target-7.7.4" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.4.4"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; - sha512 = "r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz"; + sha512 = "CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg=="; }; }; - "@babel/plugin-transform-object-super-7.5.5" = { + "@babel/plugin-transform-object-super-7.7.4" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.5.5"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; - sha512 = "un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz"; + sha512 = "ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg=="; }; }; - "@babel/plugin-transform-parameters-7.4.4" = { + "@babel/plugin-transform-parameters-7.7.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.4.4"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; - sha512 = "oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz"; + sha512 = "OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew=="; }; }; - "@babel/plugin-transform-property-literals-7.2.0" = { + "@babel/plugin-transform-property-literals-7.7.4" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; - sha512 = "9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz"; + sha512 = "MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ=="; }; }; - "@babel/plugin-transform-react-jsx-7.7.0" = { + "@babel/plugin-transform-react-jsx-7.7.7" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.7.0"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz"; - sha512 = "mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.7.tgz"; + sha512 = "SlPjWPbva2+7/ZJbGcoqjl4LsQaLpKEzxW9hcxU7675s24JmdotJOSJ4cgAbV82W3FcZpHIGmRZIlUL8ayMvjw=="; }; }; - "@babel/plugin-transform-regenerator-7.7.0" = { + "@babel/plugin-transform-regenerator-7.7.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.7.0"; + version = "7.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz"; - sha512 = "AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz"; + sha512 = "/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw=="; }; }; - "@babel/plugin-transform-reserved-words-7.2.0" = { + "@babel/plugin-transform-reserved-words-7.7.4" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; - sha512 = "fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz"; + sha512 = "OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ=="; }; }; - "@babel/plugin-transform-runtime-7.6.2" = { + "@babel/plugin-transform-runtime-7.7.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.6.2"; + version = "7.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz"; - sha512 = "cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz"; + sha512 = "tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.2.0" = { + "@babel/plugin-transform-shorthand-properties-7.7.4" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; - sha512 = "QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz"; + sha512 = "q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q=="; }; }; - "@babel/plugin-transform-spread-7.6.2" = { + "@babel/plugin-transform-spread-7.7.4" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.6.2"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz"; - sha512 = "DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz"; + sha512 = "8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q=="; }; }; - "@babel/plugin-transform-sticky-regex-7.2.0" = { + "@babel/plugin-transform-sticky-regex-7.7.4" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; - sha512 = "KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz"; + sha512 = "Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A=="; }; }; - "@babel/plugin-transform-template-literals-7.4.4" = { + "@babel/plugin-transform-template-literals-7.7.4" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.4.4"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; - sha512 = "mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz"; + sha512 = "sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.2.0" = { + "@babel/plugin-transform-typeof-symbol-7.7.4" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.2.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; - sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz"; + sha512 = "KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg=="; }; }; - "@babel/plugin-transform-typescript-7.7.2" = { + "@babel/plugin-transform-typescript-7.7.4" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.7.2"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz"; - sha512 = "UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz"; + sha512 = "X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg=="; }; }; - "@babel/plugin-transform-unicode-regex-7.7.0" = { + "@babel/plugin-transform-unicode-regex-7.7.4" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz"; - sha512 = "RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz"; + sha512 = "N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw=="; }; }; - "@babel/polyfill-7.6.0" = { + "@babel/polyfill-7.7.0" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.6.0.tgz"; - sha512 = "q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz"; + sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.7.1" = { + "@babel/preset-env-7.7.7" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.7.1"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz"; - sha512 = "/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.7.tgz"; + sha512 = "pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg=="; }; }; - "@babel/preset-flow-7.0.0" = { + "@babel/preset-flow-7.7.4" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.0.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; - sha512 = "bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.7.4.tgz"; + sha512 = "6LbUqcHD8BcRtXMOp5bc5nJeU8RlKh6q5U8TgZeCrf9ebBdW8Wyy5ujAUnbJfmzQ56Kkq5XtwErC/5+5RHyFYA=="; }; }; "@babel/preset-stage-2-7.0.0" = { @@ -1003,67 +1021,58 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/preset-typescript-7.7.2" = { + "@babel/preset-typescript-7.7.7" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.7.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.7.2.tgz"; - sha512 = "1B4HthAelaLGfNRyrWqJtBEjXX1ulThCrLQ5B2VOtEAznWFIFXFJahgXImqppy66lx/Oh+cOSCQdJzZqh2Jh5g=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.7.7.tgz"; + sha512 = "Apg0sCTovsSA+pEaI8efnA44b9x4X/7z4P8vsWMiN8rSUaM4y4+Shl5NMWnMl6njvt96+CEb6jwpXAKYAVCSQA=="; }; }; - "@babel/register-7.7.0" = { + "@babel/register-7.7.7" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.7.0.tgz"; - sha512 = "HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg=="; - }; - }; - "@babel/runtime-7.6.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.6.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.2.tgz"; - sha512 = "EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.7.7.tgz"; + sha512 = "S2mv9a5dc2pcpg/ConlKZx/6wXaEwHeqfo7x/QbXsdCAZm+WJC1ekVvL1TVxNsedTs5y/gG63MhJTEsmwmjtiA=="; }; }; - "@babel/runtime-7.7.2" = { + "@babel/runtime-7.7.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.7.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz"; - sha512 = "JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz"; + sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA=="; }; }; - "@babel/runtime-corejs2-7.7.2" = { + "@babel/runtime-corejs2-7.7.7" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.7.2"; + version = "7.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz"; - sha512 = "GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.7.7.tgz"; + sha512 = "P91T3dFYQL7aj44PxOMIAbo66Ag3NbmXG9fseSYaXxapp3K9XTct5HU9IpTOm2D0AoktKusgqzN5YcSxZXEKBQ=="; }; }; - "@babel/template-7.7.0" = { + "@babel/template-7.7.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.7.0"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz"; - sha512 = "OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz"; + sha512 = "qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw=="; }; }; - "@babel/traverse-7.7.2" = { + "@babel/traverse-7.7.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.7.2"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz"; - sha512 = "TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz"; + sha512 = "P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1075,22 +1084,13 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.6.3" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.6.3.tgz"; - sha512 = "CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA=="; - }; - }; - "@babel/types-7.7.2" = { + "@babel/types-7.7.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.7.2"; + version = "7.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz"; - sha512 = "YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz"; + sha512 = "cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA=="; }; }; "@calebboyd/semaphore-1.3.1" = { @@ -1309,13 +1309,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@hapi/address-2.1.2" = { + "@hapi/address-2.1.4" = { name = "_at_hapi_slash_address"; packageName = "@hapi/address"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz"; - sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q=="; + url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz"; + sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; }; }; "@hapi/bourne-1.3.2" = { @@ -1363,103 +1363,103 @@ let sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; }; }; - "@ionic/cli-framework-3.0.0" = { + "@ionic/cli-framework-3.0.5" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; - version = "3.0.0"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-3.0.0.tgz"; - sha512 = "Pm7Kq2xg/Zas1eU98UC9Ghb4l2kUQh2/IH06SUof5dpB+YpK9mh78IRAcppPnYC5d7SNDYy8fWeo6m+NR9il/w=="; + url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-3.0.5.tgz"; + sha512 = "pskdkbWlEM+QO4qN5Oj+SQMEPx1oyFtbqKUsUE3v7StWK1E4ovl6YsG+y4CBnYF2qDj3Vs+Yh52osarN8jM8jg=="; }; }; - "@ionic/cli-framework-prompts-1.0.1" = { + "@ionic/cli-framework-prompts-1.0.4" = { name = "_at_ionic_slash_cli-framework-prompts"; packageName = "@ionic/cli-framework-prompts"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-1.0.1.tgz"; - sha512 = "jYFc8pA9Vk64CX5S0wJ6Mq/WtowsZcebfvQe0X2JRwMkwpiOa2ZqK00CYrw1ytS9jeUzJChNX6n1hBUdarwlsw=="; + url = "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-1.0.4.tgz"; + sha512 = "mII1sPCWDsQYxOSBFjQBPzis2UJuM59T6O1/6EelCQGilHEMZ39bFNb8O2f3Irnx6y6sX/4VVTy2BQwDHMK1yA=="; }; }; - "@ionic/discover-2.0.6" = { + "@ionic/discover-2.0.7" = { name = "_at_ionic_slash_discover"; packageName = "@ionic/discover"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz"; - sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg=="; + url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.7.tgz"; + sha512 = "2pPhSqzD6tSi2BvQehnXxhlFZ1eTgHlRyS7A5yjZ85c5LMj1GsMxrD69EhhurINCKSmtrr/Bl2erW6mpwsKuUQ=="; }; }; - "@ionic/utils-array-1.2.1" = { + "@ionic/utils-array-1.2.2" = { name = "_at_ionic_slash_utils-array"; packageName = "@ionic/utils-array"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz"; - sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg=="; + url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.2.tgz"; + sha512 = "t9FkPHw1OfWkbGobvr2z5bMfpQT3WE/LEFGLraNFiygtOrS3JQnjmqgUHQXk+WVf9RAt5pMUKcmNRCd+AUCvwQ=="; }; }; - "@ionic/utils-fs-2.0.8" = { + "@ionic/utils-fs-2.0.9" = { name = "_at_ionic_slash_utils-fs"; packageName = "@ionic/utils-fs"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.8.tgz"; - sha512 = "7yuU+L+tlt9NIwA6nb/3A+zPr7NIKuvIAo5ijVdHX3VTAdw/x5JXJgGl0BApKcqT1cTJImNt5tc2O4CB1cnhKA=="; + url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.9.tgz"; + sha512 = "koOcdQlMHLIncPVZYQ+GkBHFhu7CJd0PdzDf9EfQBpOZwY66muS7UAlzVtoeY6tURYYniJlQsmg3auTIgVy9bQ=="; }; }; - "@ionic/utils-network-1.0.5" = { + "@ionic/utils-network-1.0.6" = { name = "_at_ionic_slash_utils-network"; packageName = "@ionic/utils-network"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz"; - sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q=="; + url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.6.tgz"; + sha512 = "a7W44S+1ACuRAle9o6YuyTtt6MgxcKhK65Qf1M6rVpzfhW/rJ9gpyACbICHXst5jh2k7ngp5CT9Jyw5fByHNlQ=="; }; }; - "@ionic/utils-object-1.0.5" = { + "@ionic/utils-object-1.0.6" = { name = "_at_ionic_slash_utils-object"; packageName = "@ionic/utils-object"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz"; - sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ=="; + url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.6.tgz"; + sha512 = "3defzcaHsdZQgQMKIDMki4Klp9hDKVbRfDCet6f6Xpmd8ycgIgW4wBbtcJRkasps2KJYJLs810mvI/1szOYrSA=="; }; }; - "@ionic/utils-process-1.0.5" = { + "@ionic/utils-process-1.0.8" = { name = "_at_ionic_slash_utils-process"; packageName = "@ionic/utils-process"; - version = "1.0.5"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz"; - sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw=="; + url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.8.tgz"; + sha512 = "N6T6fwZczPW0+BAxiE6UgrlSXpb2di02D91aRkTM5aX2mQJ3kHI/O7nJ6uasksyipcwr3ou0HWtRMjcu+demYg=="; }; }; - "@ionic/utils-stream-2.0.4" = { + "@ionic/utils-stream-2.0.5" = { name = "_at_ionic_slash_utils-stream"; packageName = "@ionic/utils-stream"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz"; - sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ=="; + url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.5.tgz"; + sha512 = "GOjEsgEyFTpX5Y6MpDDograU7PgPcclKvrhe1Lhft7VSg6RzeEzmZykzkDK89visw2Qb45G0gfyOuxLlq+WetA=="; }; }; - "@ionic/utils-subprocess-1.0.9" = { + "@ionic/utils-subprocess-1.0.12" = { name = "_at_ionic_slash_utils-subprocess"; packageName = "@ionic/utils-subprocess"; - version = "1.0.9"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.9.tgz"; - sha512 = "rNT5/aVsstNebIGM+sq/iibKe1q07NMShKODeRSq1DUVSs8SVQdJGKPZ4/3rGFT5CYsqCZVPQDk/VzDhjQoHMA=="; + url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.12.tgz"; + sha512 = "up+C4u96xJ4Bnr2R8BehnteUZdROxVVOOxcaghbRd2A4xvPe6pEHK9cAmIIO1qMdDWfz2ET28/AgdqRgpA5wOw=="; }; }; - "@ionic/utils-terminal-1.0.5" = { + "@ionic/utils-terminal-1.1.2" = { name = "_at_ionic_slash_utils-terminal"; packageName = "@ionic/utils-terminal"; - version = "1.0.5"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz"; - sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw=="; + url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.1.2.tgz"; + sha512 = "ODXbta2kvFNkMIEGwl7KX5gJTcZZHkzSLoBh3wND2H+EsG0KpIqOZKWMtkj+suuPut85wyLZ7fGfARnrNf7dtA=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -1471,31 +1471,31 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.18.4" = { + "@lerna/add-3.19.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.18.4"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.18.4.tgz"; - sha512 = "R+9RmYrSbcmnmaFL2aB0HJtTq95ePEa0FMS4r4NnA7Xw07l5buVBPOfxv6P8kFrVvIcNpaa7S0Eo/KkbycMhKA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.19.0.tgz"; + sha512 = "qzhxPyoczvvT1W0wwCK9I0iJ4B9WR+HzYsusmRuzM3mEhWjowhbuvKEl5BjGYuXc9AvEErM/S0Fm5K0RcuS39Q=="; }; }; - "@lerna/bootstrap-3.18.4" = { + "@lerna/bootstrap-3.18.5" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.4.tgz"; - sha512 = "mvqMyionPSqhbeGhoUQYEBTgbJ47LkONHfQ1AKBET0fJOjIZf6x0pWC17KvfCjsiE017325ySLKDH23z1Kb9ww=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.5.tgz"; + sha512 = "9vD/BfCz8YSF2Dx7sHaMVo6Cy33WjLEmoN1yrHgNkHjm7ykWbLHG5wru0f4Y4pvwa0s5Hf76rvT8aJWzGHk9IQ=="; }; }; - "@lerna/changed-3.18.4" = { + "@lerna/changed-3.18.5" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.4.tgz"; - sha512 = "Ui4UsneDk9gCuJRfTpR5js+Ctt9Je+j+3Q4z7H7HhBn6WeWDTp6FBGJZ7SfrBCdQ47EKK27Mr95LbJ4I77xFfQ=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.5.tgz"; + sha512 = "IXS7VZ5VDQUfCsgK56WYxd42luMBxL456cNUf1yBgQ1cy1U2FPVMitIdLN4AcP7bJizdPWeG8yDptf47jN/xVw=="; }; }; "@lerna/check-working-tree-3.16.5" = { @@ -1516,22 +1516,22 @@ let sha512 = "vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg=="; }; }; - "@lerna/clean-3.18.4" = { + "@lerna/clean-3.18.5" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.4.tgz"; - sha512 = "puuL0sBHIv3Tvq8cdu3kCGfRpdsXuaDGIRha33GVmRPfMBi2GN8nPPysVyWmP99PfgfafO6eT5R3jqXjvASAZA=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.5.tgz"; + sha512 = "tHxOj9frTIhB/H2gtgMU3xpIc4IJEhXcUlReko6RJt8TTiDZGPDudCcgjg6i7n15v9jXMOc1y4F+y5/1089bfA=="; }; }; - "@lerna/cli-3.18.0" = { + "@lerna/cli-3.18.5" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.0.tgz"; - sha512 = "AwDyfGx7fxJgeaZllEuyJ9LZ6Tdv9yqRD9RX762yCJu+PCAFvB9bp6OYuRSGli7QQgM0CuOYnSg4xVNOmuGKDA=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-3.18.5.tgz"; + sha512 = "erkbxkj9jfc89vVs/jBLY/fM0I80oLmJkFUV3Q3wk9J3miYhP14zgVEBsPZY68IZlEjT6T3Xlq2xO1AVaatHsA=="; }; }; "@lerna/collect-uncommitted-3.16.5" = { @@ -1552,31 +1552,31 @@ let sha512 = "LJMKgWsE/var1RSvpKDIxS8eJ7POADEc0HM3FQiTpEczhP6aZfv9x3wlDjaHpZm9MxJyQilqxZcasRANmRcNgw=="; }; }; - "@lerna/command-3.18.0" = { + "@lerna/command-3.18.5" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-3.18.0.tgz"; - sha512 = "JQ0TGzuZc9Ky8xtwtSLywuvmkU8X62NTUT3rMNrUykIkOxBaO+tE0O98u2yo/9BYOeTRji9IsjKZEl5i9Qt0xQ=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-3.18.5.tgz"; + sha512 = "36EnqR59yaTU4HrR1C9XDFti2jRx0BgpIUBeWn129LZZB8kAB3ov1/dJNa1KcNRKp91DncoKHLY99FZ6zTNpMQ=="; }; }; - "@lerna/conventional-commits-3.16.4" = { + "@lerna/conventional-commits-3.18.5" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "3.16.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.16.4.tgz"; - sha512 = "QSZJ0bC9n6FVaf+7KDIq5zMv8WnHXnwhyL5jG1Nyh3SgOg9q2uflqh7YsYB+G6FwaRfnPaKosh6obijpYg0llA=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-3.18.5.tgz"; + sha512 = "qcvXIEJ3qSgalxXnQ7Yxp5H9Ta5TVyai6vEor6AAEHc20WiO7UIdbLDCxBtiiHMdGdpH85dTYlsoYUwsCJu3HQ=="; }; }; - "@lerna/create-3.18.0" = { + "@lerna/create-3.18.5" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-3.18.0.tgz"; - sha512 = "y9oS7ND5T13c+cCTJHa2Y9in02ppzyjsNynVWFuS40eIzZ3z058d9+3qSBt1nkbbQlVyfLoP6+bZPsjyzap5ig=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-3.18.5.tgz"; + sha512 = "cHpjocbpKmLopCuZFI7cKEM3E/QY8y+yC7VtZ4FQRSaLU8D8i2xXtXmYaP1GOlVNavji0iwoXjuNpnRMInIr2g=="; }; }; "@lerna/create-symlink-3.16.2" = { @@ -1597,22 +1597,22 @@ let sha512 = "c01+4gUF0saOOtDBzbLMFOTJDHTKbDFNErEY6q6i9QaXuzy9LNN62z+Hw4acAAZuJQhrVWncVathcmkkjvSVGw=="; }; }; - "@lerna/diff-3.18.0" = { + "@lerna/diff-3.18.5" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.0.tgz"; - sha512 = "3iLNlpurc2nV9k22w8ini2Zjm2UPo3xtQgWyqdA6eJjvge0+5AlNAWfPoV6cV+Hc1xDbJD2YDSFpZPJ1ZGilRw=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-3.18.5.tgz"; + sha512 = "u90lGs+B8DRA9Z/2xX4YaS3h9X6GbypmGV6ITzx9+1Ga12UWGTVlKaCXBgONMBjzJDzAQOK8qPTwLA57SeBLgA=="; }; }; - "@lerna/exec-3.18.4" = { + "@lerna/exec-3.18.5" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.4.tgz"; - sha512 = "BpBFxyCQXcfess9Nmj/OwQ9e1IhzPzNxqF5JK7dPIjko5oBn5Hm2EWVAcgUGSHKPZGLiOWPu3Wx/C92NtDBS1w=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.5.tgz"; + sha512 = "Q1nz95MeAxctS9bF+aG8FkjixzqEjRpg6ujtnDW84J42GgxedkPtNcJ2o/MBqLd/mxAlr+fW3UZ6CPC/zgoyCg=="; }; }; "@lerna/filter-options-3.18.4" = { @@ -1687,49 +1687,49 @@ let sha512 = "WL7LycR9bkftyqbYop5rEGJ9sRFIV55tSGmbN1HLrF9idwOCD7CLrT64t235t3t4O5gehDnwKI5h2U3oxTrF8Q=="; }; }; - "@lerna/import-3.18.0" = { + "@lerna/import-3.18.5" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-3.18.0.tgz"; - sha512 = "2pYIkkBTZsEdccfc+dPsKZeSw3tBzKSyl0b2lGrfmNX2Y41qqOzsJCyI1WO1uvEIP8aOaLy4hPpqRIBe4ee7hw=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-3.18.5.tgz"; + sha512 = "PH0WVLEgp+ORyNKbGGwUcrueW89K3Iuk/DDCz8mFyG2IG09l/jOF0vzckEyGyz6PO5CMcz4TI1al/qnp3FrahQ=="; }; }; - "@lerna/init-3.18.0" = { + "@lerna/init-3.18.5" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-3.18.0.tgz"; - sha512 = "/vHpmXkMlSaJaq25v5K13mcs/2L7E32O6dSsEkHaZCDRiV2BOqsZng9jjbE/4ynfsWfLLlU9ZcydwG72C3I+mQ=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-3.18.5.tgz"; + sha512 = "oCwipWrha98EcJAHm8AGd2YFFLNI7AW9AWi0/LbClj1+XY9ah+uifXIgYGfTk63LbgophDd8936ZEpHMxBsbAg=="; }; }; - "@lerna/link-3.18.0" = { + "@lerna/link-3.18.5" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-3.18.0.tgz"; - sha512 = "FbbIpH0EpsC+dpAbvxCoF3cn7F1MAyJjEa5Lh3XkDGATOlinMFuKCbmX0NLpOPQZ5zghvrui97cx+jz5F2IlHw=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-3.18.5.tgz"; + sha512 = "xTN3vktJpkT7Nqc3QkZRtHO4bT5NvuLMtKNIBDkks0HpGxC9PRyyqwOoCoh1yOGbrWIuDezhfMg3Qow+6I69IQ=="; }; }; - "@lerna/list-3.18.4" = { + "@lerna/list-3.18.5" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.18.4.tgz"; - sha512 = "bgtlhAwhjHOTLq0iIuPs30abeuLbwZvVB60Ym8kPp+chh939obKU3vy2KMyX+Gpxf8pzuQG+k986YXcUBvXVsw=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.18.5.tgz"; + sha512 = "qIeomm28C2OCM8TMjEe/chTnQf6XLN54wPVQ6kZy+axMYxANFNt/uhs6GZEmhem7GEVawzkyHSz5ZJPsfH3IFg=="; }; }; - "@lerna/listable-3.18.4" = { + "@lerna/listable-3.18.5" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.4.tgz"; - sha512 = "EKSsnST5k3dZfw+UTwBH1/sHQ1YfgjYjGxXCabyn55mMgc2GjoDekODMYzZ1TNF2NNy6RgIZ24X2JI8G22nZUw=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.5.tgz"; + sha512 = "Sdr3pVyaEv5A7ZkGGYR7zN+tTl2iDcinryBPvtuv20VJrXBE8wYcOks1edBTcOWsPjCE/rMP4bo1pseyk3UTsg=="; }; }; "@lerna/log-packed-3.16.0" = { @@ -1750,13 +1750,13 @@ let sha512 = "HbO3DUrTkCAn2iQ9+FF/eisDpWY5POQAOF1m7q//CZjdC2HSW3UYbKEGsSisFxSfaF9Z4jtrV+F/wX6qWs3CuA=="; }; }; - "@lerna/npm-dist-tag-3.18.1" = { + "@lerna/npm-dist-tag-3.18.5" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "3.18.1"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.1.tgz"; - sha512 = "vWkZh2T/O9OjPLDrba0BTWO7ug/C3sCwjw7Qyk1aEbxMBXB/eEJPqirwJTWT+EtRJQYB01ky3K8ZFOhElVyjLw=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-3.18.5.tgz"; + sha512 = "xw0HDoIG6HreVsJND9/dGls1c+lf6vhu7yJoo56Sz5bvncTloYGLUppIfDHQr4ZvmPCK8rsh0euCVh2giPxzKQ=="; }; }; "@lerna/npm-install-3.16.5" = { @@ -1768,13 +1768,13 @@ let sha512 = "hfiKk8Eku6rB9uApqsalHHTHY+mOrrHeWEs+gtg7+meQZMTS3kzv4oVp5cBZigndQr3knTLjwthT/FX4KvseFg=="; }; }; - "@lerna/npm-publish-3.16.2" = { + "@lerna/npm-publish-3.18.5" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "3.16.2"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.16.2.tgz"; - sha512 = "tGMb9vfTxP57vUV5svkBQxd5Tzc+imZbu9ZYf8Mtwe0+HYfDjNiiHLIQw7G95w4YRdc5KsCE8sQ0uSj+f2soIg=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-3.18.5.tgz"; + sha512 = "3etLT9+2L8JAx5F8uf7qp6iAtOLSMj+ZYWY6oUgozPi/uLqU0/gsMsEXh3F0+YVW33q0M61RpduBoAlOOZnaTg=="; }; }; "@lerna/npm-run-script-3.16.5" = { @@ -1786,13 +1786,13 @@ let sha512 = "1asRi+LjmVn3pMjEdpqKJZFT/3ZNpb+VVeJMwrJaV/3DivdNg7XlPK9LTrORuKU4PSvhdEZvJmSlxCKyDpiXsQ=="; }; }; - "@lerna/otplease-3.16.0" = { + "@lerna/otplease-3.18.5" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "3.16.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.16.0.tgz"; - sha512 = "uqZ15wYOHC+/V0WnD2iTLXARjvx3vNrpiIeyIvVlDB7rWse9mL4egex/QSgZ+lDx1OID7l2kgvcUD9cFpbqB7Q=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-3.18.5.tgz"; + sha512 = "S+SldXAbcXTEDhzdxYLU0ZBKuYyURP/ND2/dK6IpKgLxQYh/z4ScljPDMyKymmEvgiEJmBsPZAAPfmNPEzxjog=="; }; }; "@lerna/output-3.13.0" = { @@ -1822,13 +1822,13 @@ let sha512 = "2lHBWpaxcBoiNVbtyLtPUuTYEaB/Z+eEqRS9duxpZs6D+mTTZMNy6/5vpEVSCBmzvdYpyqhqaYjjSLvjjr5Riw=="; }; }; - "@lerna/package-graph-3.18.0" = { + "@lerna/package-graph-3.18.5" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.0.tgz"; - sha512 = "BLYDHO5ihPh20i3zoXfLZ5ZWDCrPuGANgVhl7k5pCmRj90LCvT+C7V3zrw70fErGAfvkcYepMqxD+oBrAYwquQ=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-3.18.5.tgz"; + sha512 = "8QDrR9T+dBegjeLr+n9WZTVxUYUhIUjUgZ0gvNxUBN8S1WB9r6H5Yk56/MVaB64tA3oGAN9IIxX6w0WvTfFudA=="; }; }; "@lerna/prerelease-id-from-version-3.16.0" = { @@ -1849,22 +1849,22 @@ let sha512 = "+LDwvdAp0BurOAWmeHE3uuticsq9hNxBI0+FMHiIai8jrygpJGahaQrBYWpwbshbQyVLeQgx3+YJdW2TbEdFWA=="; }; }; - "@lerna/prompt-3.13.0" = { + "@lerna/prompt-3.18.5" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "3.13.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.13.0.tgz"; - sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-3.18.5.tgz"; + sha512 = "rkKj4nm1twSbBEb69+Em/2jAERK8htUuV8/xSjN0NPC+6UjzAwY52/x9n5cfmpa9lyKf/uItp7chCI7eDmNTKQ=="; }; }; - "@lerna/publish-3.18.4" = { + "@lerna/publish-3.18.5" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.4.tgz"; - sha512 = "Q+MqM5DUZvk+uT6hdEyO3khXET6LwED0YEuCu8fRwtHad03HkZ9i8PtTY5h8Sn6D6RCyCOlHTuf8O0KKAUy3ow=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.5.tgz"; + sha512 = "ifYqLX6mvw95T8vYRlhT68UC7Al0flQvnf5uF9lDgdrgR5Bs+BTwzk3D+0ctdqMtfooekrV6pqfW0R3gtwRffQ=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1876,13 +1876,13 @@ let sha512 = "1SOHpy7ZNTPulzIbargrgaJX387csN7cF1cLOGZiJQA6VqnS5eWs2CIrG8i8wmaUavj2QlQ5oEbRMVVXSsGrzA=="; }; }; - "@lerna/query-graph-3.18.0" = { + "@lerna/query-graph-3.18.5" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.0.tgz"; - sha512 = "fgUhLx6V0jDuKZaKj562jkuuhrfVcjl5sscdfttJ8dXNVADfDz76nzzwLY0ZU7/0m69jDedohn5Fx5p7hDEVEg=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-3.18.5.tgz"; + sha512 = "50Lf4uuMpMWvJ306be3oQDHrWV42nai9gbIVByPBYJuVW8dT8O8pA3EzitNYBUdLL9/qEVbrR0ry1HD7EXwtRA=="; }; }; "@lerna/resolve-symlink-3.16.0" = { @@ -1903,13 +1903,13 @@ let sha512 = "bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA=="; }; }; - "@lerna/run-3.18.4" = { + "@lerna/run-3.18.5" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.18.4.tgz"; - sha512 = "u2ZNO2fVk5kVEpbpn4DLJZZxZ08LFnIFuaXJMAhxvOgvm12ZF2rabA9kZc3NXp5+DedG5nHHgyoyLVVbStKzBA=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.18.5.tgz"; + sha512 = "1S0dZccNJO8+gT5ztYE4rHTEnbXVwThHOfDnlVt2KDxl9cbnBALk3xprGLW7lSzJsxegS849hxrAPUh0UorMgw=="; }; }; "@lerna/run-lifecycle-3.16.2" = { @@ -1921,13 +1921,13 @@ let sha512 = "RqFoznE8rDpyyF0rOJy3+KjZCeTkO8y/OB9orPauR7G2xQ7PTdCpgo7EO6ZNdz3Al+k1BydClZz/j78gNCmL2A=="; }; }; - "@lerna/run-topologically-3.18.0" = { + "@lerna/run-topologically-3.18.5" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "3.18.0"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.0.tgz"; - sha512 = "lrfEewwuUMC3ioxf9Z9NdHUakN6ihekcPfdYbzR2slmdbjYKmIA5srkWdrK8NwOpQCAuekpOovH2s8X3FGEopg=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-3.18.5.tgz"; + sha512 = "6N1I+6wf4hLOnPW+XDZqwufyIQ6gqoPfHZFkfWlvTQ+Ue7CuF8qIVQ1Eddw5HKQMkxqN10thKOFfq/9NQZ4NUg=="; }; }; "@lerna/symlink-binary-3.17.0" = { @@ -1966,13 +1966,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.18.4" = { + "@lerna/version-3.18.5" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.18.4"; + version = "3.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.18.4.tgz"; - sha512 = "+gR9H89qSP8iqzNi4tRVQUbWlFMOlhbY6+5TXkP72Ibb/z87O+C46DBqizSMVaPQYdSYjS1c9Xfa1oOhEWxGaw=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.18.5.tgz"; + sha512 = "eSMxLIDuVxZIq0JZKNih50x1IZuMmViwF59uwOGMx0hHB84N3waE8HXOF9CJXDSjeP6sHB8tS+Y+X5fFpBop2Q=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -1993,58 +1993,58 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@node-red/editor-api-1.0.2" = { + "@node-red/editor-api-1.0.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.2.tgz"; - sha512 = "yUvTU5b7gDL35NIC2qC54NY0uuIAewVzcPWsc+Rbjy9YpY1DUD2Gt5Ub9gR2QPWYtVPG4zSPOBtPhZEcZvBSxQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.3.tgz"; + sha512 = "q/AFIIo7oORS5D3Tf94FniTNxRlPtdy4W/bp58UDzPpKamsgNbqdTFU0XG8vm87zDrYZeW3ZSuHQaYR6qMpxKQ=="; }; }; - "@node-red/editor-client-1.0.2" = { + "@node-red/editor-client-1.0.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.2.tgz"; - sha512 = "BhgzwWjxjrQJnZC/BMIZvco4H5ksZl+qh+3hy40ReDrNpp8xSc3mDIFoB785CZrYBtFMhasE2q0kqdYuNKE/Zw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.3.tgz"; + sha512 = "qCMDsyL5rKzw7vjwUUw53zBEnfzk0mOFufLVb3eEICuXRzFfQ9nNGr4r3W/ed29eLNZSAXOqOF4NZXeGdh3cbA=="; }; }; - "@node-red/nodes-1.0.2" = { + "@node-red/nodes-1.0.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.2.tgz"; - sha512 = "o5N0FZnLAEd1lF2ArLGoETosukFVI+nPTHWKUOoSd069eLuaS262BOTbbnk/oY4H2DEWQzjGZ2KKBItWlhbpXQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.3.tgz"; + sha512 = "vSyeQCKKeX1lmlsseF3KmQVW/vP+kvWJa1l07F/26dCAKmfD85P06Bw+H8coBtmEjh/oMoecW1SSO9pfan6AWg=="; }; }; - "@node-red/registry-1.0.2" = { + "@node-red/registry-1.0.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.2.tgz"; - sha512 = "i6TZvVriini0732IN2DVMofkG8RmiaLKpkHaP1aRceHvweDQB4yorcQsPDxqU+uiJo3lQlc1oB5j13X3mdq8DQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.3.tgz"; + sha512 = "zSlW8lnS6Bgez8Sbr+1XPVI4NG0LuQj+IQ2Ra0WU805nDNjwzcfLPOx2fjSXeKIgGjT3pU/K63oeNuzkcMfnEg=="; }; }; - "@node-red/runtime-1.0.2" = { + "@node-red/runtime-1.0.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.2.tgz"; - sha512 = "YMKu5HA4WWYdf2PinysONiEFkmoz+PHD4u9ormREBXPr4iCWmZ2+XqL4QRGAc/RA8FJQ8liCr2rLDUvAuSSVOQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.3.tgz"; + sha512 = "wpFbylDo6ekIY48CptoYq5q55Ota4CjbvIaE7XNX/jF0D3YakzxLsAe0z7RGXI6NiFVfhmnhzWK6fIEFlm6ZRA=="; }; }; - "@node-red/util-1.0.2" = { + "@node-red/util-1.0.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.2.tgz"; - sha512 = "DwaS8ZDcIFcMUQCWpMEVt38Pr6H2JBCeghZEs5v6nH+pnemUi1x6Mi+CSvwywVc4WN4uzGhVr8dWxFh1Q6/iEQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.3.tgz"; + sha512 = "55NKHIU6l1Rl6GtZus/rtcgdLJmXN40cXqNuj6JV1JyMz6t/K0FEQwHRhjIpoxFVznctAL+vt3UmgeU+MpnYWg=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -2110,22 +2110,22 @@ let sha512 = "cyP1at3l42kQHZtqDS3KfTeyMvxITGwXwH1qk9ktBYvqgMp5h4vHT+cOD74ld3RqJUOZY/+Zi9lb4Tbza3BtuA=="; }; }; - "@oclif/plugin-autocomplete-0.1.4" = { + "@oclif/plugin-autocomplete-0.1.5" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.1.4.tgz"; - sha512 = "ZyxJyL6jSt9Df68Smeu14xhZZwELE9IB5twhie1/56rt62nG6TJB4CZhaMqRk+33MDfU3JyWxNbIDMNMESlGqg=="; + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.1.5.tgz"; + sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-help-2.2.1" = { + "@oclif/plugin-help-2.2.2" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.1.tgz"; - sha512 = "psEA3t41MSGBErLk6xCaAq2jKrRtx3Br+kHpd43vZeGEeZ7Gos4wgK0JAaHBbvhvUQskCHg8dzoqv4XEeTWeVQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-2.2.2.tgz"; + sha512 = "Xh4o3TKEg5CsIpQx1XzzV0RYCShfksFuFF0CBodv5Eh1boAw06cBGv225LYdAX8lcSo9qklw/tuz2RsAsH0o9A=="; }; }; "@oclif/plugin-not-found-1.2.3" = { @@ -2200,22 +2200,22 @@ let sha512 = "DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg=="; }; }; - "@octokit/rest-16.35.0" = { + "@octokit/rest-16.36.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.35.0"; + version = "16.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.35.0.tgz"; - sha512 = "9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.36.0.tgz"; + sha512 = "zoZj7Ya4vWBK4fjTwK2Cnmu7XBB1p9ygSvTk2TthN6DVJXM4hQZQoAiknWFLJWSTix4dnA3vuHtjPZbExYoCZA=="; }; }; - "@octokit/types-2.0.1" = { + "@octokit/types-2.0.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.0.1.tgz"; - sha512 = "YDYgV6nCzdGdOm7wy43Ce8SQ3M5DMKegB8E5sTB/1xrxOdo2yS/KgUgML2N2ZGD621mkbdrAglwTyA4NDOlFFA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.0.2.tgz"; + sha512 = "StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2263,13 +2263,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@primer/octicons-9.2.0" = { + "@primer/octicons-9.3.1" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "9.2.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.2.0.tgz"; - sha512 = "3vv7bBqVUHhU7ChpmQhmzz3WmHEKKSk9z/xEK5KnU8Egh96RoqKIim07geRj825ISa+IWj9cPdOA1ShqW5k3Yw=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.3.1.tgz"; + sha512 = "E0Knv/hUfwpfJOVh7cPXXJf6gfNiIMBtMbhnqjkWHnpT/+bPJk4Q3l/YG6sCWELZ05KYpHBunpHNOlTyw3mbwg=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -2380,22 +2380,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-8.3.18" = { + "@schematics/angular-8.3.21" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.3.18"; + version = "8.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.18.tgz"; - sha512 = "3cQYcmzsWD/MnqauoSozIu1R7DJvty13BH6+XIorEfguWqOwOwgNIWLMsa0iIcy0+TV3vWFI0KZpCKup2u/I1Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.21.tgz"; + sha512 = "KahQ+dHvTsGOZwY6IdzqJZLDEn0G89rrK3OY+7okZujoaLM+LXhxlPoznW1udnZJVTa3VNxYGx11fkgLtRJRqA=="; }; }; - "@schematics/update-0.803.18" = { + "@schematics/update-0.803.21" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.803.18"; + version = "0.803.21"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.18.tgz"; - sha512 = "vJxyL1pbn2lcgSH6HUqgA373iJRXQWxdrxuUaQ56qyq1EoicG7EppKz7OlGyKs+nHR9HhtK0eJc35E7I0lEWgA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.21.tgz"; + sha512 = "D3BRvEBF2cJEgogvFaNOfqtTFHHv/ctSRfOeAYWjUxILtb+2DpuZ9h5QYDFhN9MPgz/vRaOqFORa3sEZCRkX4g=="; }; }; "@serverless/cli-1.4.0" = { @@ -2425,13 +2425,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.2.3" = { + "@serverless/enterprise-plugin-3.2.6" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.2.3"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.3.tgz"; - sha512 = "YBk+Fa+u2zrS6/3t7bEsSpHPoZ7ubac1snibxS81IcrhJTCX6zYVsnvgoSMdKkor5QW/vPaK7p/M9wWP3sWc4w=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.6.tgz"; + sha512 = "4KDHMhGx5qdoEBGlWqOr/IMAQoz1HdMLbS7VamdZ8AEFsczuIiGKVMoBsN0Wd87CYH3K7SFeEF2ozg+bJvrMaQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2506,6 +2506,15 @@ let sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg=="; }; }; + "@snyk/cli-interface-2.3.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; + sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; + }; + }; "@snyk/cocoapods-lockfile-parser-3.0.0" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; @@ -2866,13 +2875,13 @@ let sha1 = "394dbe0bb5fee46b38d896735e8b68ef2390d00d"; }; }; - "@types/connect-3.4.32" = { + "@types/connect-3.4.33" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.32"; + version = "3.4.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz"; - sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; + sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; }; }; "@types/cookiejar-2.1.1" = { @@ -2938,13 +2947,13 @@ let sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w=="; }; }; - "@types/express-serve-static-core-4.16.11" = { + "@types/express-serve-static-core-4.17.1" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.16.11"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.11.tgz"; - sha512 = "K8d2M5t3tBQimkyaYTXxtHYyoJPUEhy2/omVRnTAKw5FEdT+Ft6lTaTOpoJdHeG+mIwQXXtqiTcYZ6IR8LTzjQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.1.tgz"; + sha512 = "9e7jj549ZI+RxY21Cl0t8uBnWyb22HzILupyHZjYEVK//5TT/1bZodU+yUbLnPdoYViBBnNWbxp4zYjGV0zUGw=="; }; }; "@types/form-data-0.0.33" = { @@ -2965,15 +2974,6 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; - "@types/fs-extra-5.1.0" = { - name = "_at_types_slash_fs-extra"; - packageName = "@types/fs-extra"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.1.0.tgz"; - sha512 = "AInn5+UBFIK9FK5xc9yP5e3TQSPNNgjHByqYcj9g5elVBnDQcQL7PlO1CIRy2gWlbwK7UPYqi7vRvFA44dCmYQ=="; - }; - }; "@types/glob-7.1.1" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; @@ -3019,13 +3019,13 @@ let sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878"; }; }; - "@types/koa-2.0.52" = { + "@types/koa-2.11.0" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.0.52"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.52.tgz"; - sha512 = "cp/GTOhOYwomlSKqEoG0kaVEVJEzP4ojYmfa7EKaGkmkkRwJ4B/1VBLbQZ49Z+WJNvzXejQB/9GIKqMo9XLgFQ=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.0.tgz"; + sha512 = "Hgx/1/rVlJvqYBrdeCsS7PDiR2qbxlMt1RnmNWD4Uxi5FF9nwkYqIldo7urjc+dfNpk+2NRGcnAYd4L5xEhCcQ=="; }; }; "@types/koa-compose-3.2.5" = { @@ -3037,13 +3037,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.146" = { + "@types/lodash-4.14.149" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.146"; + version = "4.14.149"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.146.tgz"; - sha512 = "JzJcmQ/ikHSv7pbvrVNKJU5j9jL9VLf3/gqs048CEnBVVVEv4kve3vLxoPHGvclutS+Il4SBIuQQ087m1eHffw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz"; + sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="; }; }; "@types/long-4.0.0" = { @@ -3073,31 +3073,49 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.17.5" = { + "@types/minimist-1.2.0" = { + name = "_at_types_slash_minimist"; + packageName = "@types/minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; + sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; + }; + }; + "@types/node-10.17.12" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.17.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.17.12.tgz"; + sha512 = "SSB4O9/0NVv5mbQ5/MabnAyFfcpVFRVIJj1TZkG21HHgwXQGjosiQB3SBWC9pMCMUTNpWL9gUe//9mFFPQAdKw=="; + }; + }; + "@types/node-11.15.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.5"; + version = "11.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.5.tgz"; - sha512 = "RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.15.3.tgz"; + sha512 = "5RzvXVietaB8S4dwDjxjltAOHtTO87fiksjqjWGZih97j6KSrdCDaRfmYMNrgrLM87odGBrsTHAl6N3fLraQaw=="; }; }; - "@types/node-11.15.2" = { + "@types/node-12.12.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "11.15.2"; + version = "12.12.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-11.15.2.tgz"; - sha512 = "BqCU9uIFkUH9Sgo2uLYbmIiFB1T+VBiM8AI/El3LIAI5KzwtckeSG+3WOYZr9aMoX4UIvRFBWBeSaOu6hFue2Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.22.tgz"; + sha512 = "r5i93jqbPWGXYXxianGATOxTelkp6ih/U0WVnvaqAvTqM+0U6J3kw6Xk6uq/dWNRkEVw/0SLcO5ORXbVNz4FMQ=="; }; }; - "@types/node-12.12.7" = { + "@types/node-13.1.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.7"; + version = "13.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz"; - sha512 = "E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.1.0.tgz"; + sha512 = "zwrxviZS08kRX40nqBrmERElF2vpw4IUTd5khkhBTfFH8AOaeoLVx48EC4+ZzS2/Iga7NevncqnsUSYjM4OWYA=="; }; }; "@types/node-6.14.9" = { @@ -3127,6 +3145,15 @@ let sha512 = "8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ=="; }; }; + "@types/normalize-package-data-2.4.0" = { + name = "_at_types_slash_normalize-package-data"; + packageName = "@types/normalize-package-data"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + }; + }; "@types/q-1.5.2" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -3244,13 +3271,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/webpack-4.39.8" = { + "@types/webpack-4.41.0" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.39.8"; + version = "4.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.39.8.tgz"; - sha512 = "lkJvwNJQUPW2SbVwAZW9s9whJp02nzLf2yTNwMULa4LloED9MYS1aNnGeoBCifpAI1pEBkTpLhuyRmBnLEOZAA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.0.tgz"; + sha512 = "tWkdf9nO0zFgAY/EumUKwrDUhraHKDqCPhwfFR/R8l0qnPdgb9le0Gzhvb7uzVpouuDGBgiE//ZdY+5jcZy2TA=="; }; }; "@types/webpack-sources-0.1.5" = { @@ -3262,13 +3289,13 @@ let sha512 = "zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w=="; }; }; - "@types/ws-6.0.3" = { + "@types/ws-6.0.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz"; - sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; "@types/xml2js-0.4.3" = { @@ -3289,40 +3316,40 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@vue/cli-shared-utils-4.0.5" = { + "@vue/cli-shared-utils-4.1.1" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.0.5.tgz"; - sha512 = "NlNZ4Dx5QcP5uO5fCOLgkN2tbhNan5EcptPvXawW/md18cIpMlKbph6L6lEfJj8vrSvTUf2i/FyoFSh1rV53hw=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.1.1.tgz"; + sha512 = "nsxNW8Sy9y2yx/r9DqgZoYg/DoygvASIQl0XXG+imQUDWEXKmD6UZA6y5ANfStCljzZ/wd7WgWP+txmjy6exOw=="; }; }; - "@vue/cli-ui-4.0.5" = { + "@vue/cli-ui-4.1.1" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.0.5.tgz"; - sha512 = "pnK0qRMEocjhL965o2Zxw9iYYwwCDOIxAl7jg6pmQybgmz68ipi/gXDTe3IyDzyEJraVIsGDScvJL9/IbRLDZw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.1.1.tgz"; + sha512 = "uXrIX4IJeXBDEchY+AeoeKf9FiYlHILFR4JjJvI6p6nq7tHhCN3UFt7/XScWzEfYyGRuHVtY3MCejMIR9LaKvA=="; }; }; - "@vue/cli-ui-addon-webpack-4.0.5" = { + "@vue/cli-ui-addon-webpack-4.1.1" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.0.5.tgz"; - sha512 = "BMRW+g374RnqQNFLyUGHg099lADoZbYEjycCKZzBI4v+QCqUXEnn70l02/7H3sEee6PqR/dfquSJiZqxhSIJmQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.1.1.tgz"; + sha512 = "AKWt4ahv19gB3oV12lTb1G7AlimpTudCuWuMOL3BlaWZNNbspseFegq1I7mSJQHK45z3iy6GysIAsn9fHCAKvg=="; }; }; - "@vue/cli-ui-addon-widgets-4.0.5" = { + "@vue/cli-ui-addon-widgets-4.1.1" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.0.5.tgz"; - sha512 = "55KgyH0yDiStE0j04+5z+UTLATReQjIc1s7n9aVGsRte+nnt9bN74pBg9//CW8EWpD1OmEpTtsidn2NafuaxLQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.1.1.tgz"; + sha512 = "M98L2PcC6LStUV9IftXS6jjwjM0BXIan/7T+FBN1U69WyTRRSNbbGmhicn9HzcfmAiHbS9Ac5Pk3nz3KXafNTQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -3802,13 +3829,13 @@ let sha1 = "5faad9c2c07f60dd76770f71cf025b62a63cfd4e"; }; }; - "abab-2.0.2" = { + "abab-2.0.3" = { name = "abab"; packageName = "abab"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz"; - sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz"; + sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg=="; }; }; "abbrev-1.1.1" = { @@ -3946,13 +3973,13 @@ let sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; }; }; - "acorn-6.3.0" = { + "acorn-6.4.0" = { name = "acorn"; packageName = "acorn"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz"; - sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz"; + sha512 = "gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw=="; }; }; "acorn-7.1.0" = { @@ -4081,13 +4108,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.14.0" = { + "addons-linter-1.19.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.14.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.14.0.tgz"; - sha512 = "Of7A53J2ltaIZzD8RPH1hVxOR+DmLDuHBtwfhXJw8JTXwzpDIvOKn/i6XDtPgfFlj5wIWxpUGV+tFb/kE/K9gg=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.19.0.tgz"; + sha512 = "pnfrdQqatZeEnBcRcMq9KWZJRmS9YiPyWu3gZbJl12Ee3dUlvke+2C0DcYhNfm4hciRB4wrr4OiQTYAXh1CyzA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4477,13 +4504,13 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; - "ansi-escapes-4.2.1" = { + "ansi-escapes-4.3.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz"; - sha512 = "Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; + sha512 = "EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg=="; }; }; "ansi-gray-0.1.1" = { @@ -4729,49 +4756,49 @@ let sha1 = "ee49736b639b4f108b6e9e626c6da99306b41692"; }; }; - "apollo-2.21.0" = { + "apollo-2.21.2" = { name = "apollo"; packageName = "apollo"; - version = "2.21.0"; + version = "2.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.21.0.tgz"; - sha512 = "S0PzWA6Ja3E68/LjG3D4wbOW5BiWo+PdST/TZD7n4TjRKV4eeMONEd95OSv5OzMMYaLtHSRq8xZmQEDe4l0NsA=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.21.2.tgz"; + sha512 = "RhiH3ffaIvobyDf3jXUmeIWvFCfxXwCYTU84hfRClRaL4bTaTd8T2/J5eVbcsd3AhPRbi4HJPxJBge4ewMepVw=="; }; }; - "apollo-cache-1.3.2" = { + "apollo-cache-1.3.4" = { name = "apollo-cache"; packageName = "apollo-cache"; - version = "1.3.2"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.2.tgz"; - sha512 = "+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg=="; + url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.4.tgz"; + sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA=="; }; }; - "apollo-cache-control-0.8.5" = { + "apollo-cache-control-0.8.9" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.8.5"; + version = "0.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.5.tgz"; - sha512 = "2yQ1vKgJQ54SGkoQS/ZLZrDX3La6cluAYYdruFYJMJtL4zQrSdeOCy11CQliCMYEd6eKNyE70Rpln51QswW2Og=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.9.tgz"; + sha512 = "EFRAEL13QkMbXhl0NSABVS0wfiKYIVV4sDR+XNtRy3EWf2rWw7xulYFDMPiujjtElF2qjTswzcpLtYOXgOZN9A=="; }; }; - "apollo-cache-inmemory-1.6.3" = { + "apollo-cache-inmemory-1.6.5" = { name = "apollo-cache-inmemory"; packageName = "apollo-cache-inmemory"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz"; - sha512 = "S4B/zQNSuYc0M/1Wq8dJDTIO9yRgU0ZwDGnmlqxGGmFombOZb9mLjylewSfQKmjNpciZ7iUIBbJ0mHlPJTzdXg=="; + url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.5.tgz"; + sha512 = "koB76JUDJaycfejHmrXBbWIN9pRKM0Z9CJGQcBzIOtmte1JhEBSuzsOUu7NQgiXKYI4iGoMREcnaWffsosZynA=="; }; }; - "apollo-client-2.6.4" = { + "apollo-client-2.6.8" = { name = "apollo-client"; packageName = "apollo-client"; - version = "2.6.4"; + version = "2.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz"; - sha512 = "oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ=="; + url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.8.tgz"; + sha512 = "0zvJtAcONiozpa5z5zgou83iEKkBaXhhSSXJebFHRXs100SecDojyUWKjwTtBPn9HbM6o5xrvC5mo9VQ5fgAjw=="; }; }; "apollo-codegen-0.20.2" = { @@ -4792,13 +4819,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.35.7" = { + "apollo-codegen-core-0.35.9" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.35.7"; + version = "0.35.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.35.7.tgz"; - sha512 = "Aj8bzwUnnsILaOxjPLJKpkzb4yNNQCpY21Atj0NZYGi6Zzfl9EK/PZn7BE2/4pyNpomErjd2C7X3m9bdvndTAg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.35.9.tgz"; + sha512 = "HBBv15ILH8Yiy65jtoZRmupT2pLY8dAGLbF4sZixmbPwI9D0wFq3Kt8zEaS2EHU9FBlPtR2fsx0/beUeftHqzA=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -4810,13 +4837,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.33.32" = { + "apollo-codegen-flow-0.33.34" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.33.32"; + version = "0.33.34"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.33.32.tgz"; - sha512 = "/DWh6/8/BKYlwPg5/kQQQU78skC3TCRxhg4rUaR0s23px/N3YiLCcqmcV6HzcMKpjNE+dIxpha+WLNMAtb4ypg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.33.34.tgz"; + sha512 = "UseAJlQfjTvLEpmRRP2JOVsuZQL/wyXSOXmK06iiZwednwWC54VbARS+fO2tfublB5q0i2d6GWXYBy9sIe6MQw=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -4837,13 +4864,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.34.32" = { + "apollo-codegen-scala-0.34.34" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.34.32"; + version = "0.34.34"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.34.32.tgz"; - sha512 = "c41a6NdEsPo/uRSY1FBbEJ2MUfM+NKlLVe3hBulc3huqaStz3PuQuOtQ5ZA0XjCwL8GhLFgC1D8TAiuDCA5+tQ=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.34.34.tgz"; + sha512 = "uYgGNmzZklynvB+d+grbsyGsXBMnfgM5EXlRjKJZN/Ss3Nz5l/bBtK7v+Ob3r/85P0rS0jreWL8Ddc6TLazRRQ=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -4855,13 +4882,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.35.12" = { + "apollo-codegen-swift-0.35.14" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.35.12"; + version = "0.35.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.35.12.tgz"; - sha512 = "pbeUwkLEpfr/hkCLnwmxfxroib5QFP0xz7cvORN3Hh9xxtpqfd0SdnrbXS8RpRxBN2jTbV78ubA6hDFm4B0BCA=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.35.14.tgz"; + sha512 = "dt6F4DAzq7Icy0BNg5QaRZLVBSJ8GXEW5cKbofKJjMNzIScXUS9Bp1u6+iWFajtsJCJjmTuTu863cn5SvrFSag=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -4873,13 +4900,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.35.7" = { + "apollo-codegen-typescript-0.35.9" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.35.7"; + version = "0.35.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.35.7.tgz"; - sha512 = "r5MzXwWVPvkuyWfUV5kWzIsezoiDw2o459L3i07iM2JwOl7AW88/wkPsp/GrKh5q/Y2HRABg4oSqEiaQtrVazQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.35.9.tgz"; + sha512 = "C2Q0U/htb4iIrGgkzGoepJGDcVf/FZ34b9IGtqPCWmrdQADMzgccI0h4rwXrjZGTQBr9+vHvlV/YFs+lriOR2g=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -4900,49 +4927,49 @@ let sha512 = "gRYyFVpJgHE2hhS+VxMeOerxXQ/QYxWG7T6QddfugJWYAG9DRCl65e2b7txcGq2NP3r+O1iCm4GNwhRBDJbd8A=="; }; }; - "apollo-engine-reporting-1.4.7" = { + "apollo-engine-reporting-1.4.12" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.4.7"; + version = "1.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.7.tgz"; - sha512 = "qsKDz9VkoctFhojM3Nj3nvRBO98t8TS2uTgtiIjUGs3Hln2poKMP6fIQ37Nm2Q2B3JJst76HQtpPwXmRJd1ZUg=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.4.12.tgz"; + sha512 = "W1PpXaXSrqZu4Ae9NrjWXtTL9HFbQPynQLiGDAsDmCsL/wRAVyl6qRhVteSj7drwgXgAH5TwtUCnjJgSI+ixlg=="; }; }; - "apollo-engine-reporting-protobuf-0.4.1" = { + "apollo-engine-reporting-protobuf-0.4.4" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.4.1"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.1.tgz"; - sha512 = "d7vFFZ2oUrvGaN0Hpet8joe2ZG0X0lIGilN+SwgVP38dJnOuadjsaYMyrD9JudGQJg0bJA5wVQfYzcCVy0slrw=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz"; + sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; }; }; - "apollo-env-0.5.1" = { + "apollo-env-0.6.0" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.5.1"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.5.1.tgz"; - sha512 = "fndST2xojgSdH02k5hxk1cbqA9Ti8RX4YzzBoAB4oIe1Puhq7+YlhXGXfXB5Y4XN0al8dLg+5nAkyjNAR2qZTw=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.0.tgz"; + sha512 = "DttHOpLISRej8STjbXjQCXq3YeE2pATaC4UEd2YE7TjjYhQmp9yxohlkHfSR78BvPzczhyDs6WQQEzasHv0M0A=="; }; }; - "apollo-graphql-0.3.4" = { + "apollo-graphql-0.3.6" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.4.tgz"; - sha512 = "w+Az1qxePH4oQ8jvbhQBl5iEVvqcqynmU++x/M7MM5xqN1C7m1kyIzpN17gybXlTJXY4Oxej2WNURC2/hwpfYw=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.6.tgz"; + sha512 = "PUBfW6t20U4CgPODTZB+3Z1Z+qhca8SNEHMPreiw+qEjXwEJF7SZItOIAs93HO0mA2K7eiZjCtZQZknaaQRZNA=="; }; }; - "apollo-language-server-1.17.0" = { + "apollo-language-server-1.17.2" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.17.0"; + version = "1.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.17.0.tgz"; - sha512 = "x/CfKYl+GSFGLxLDx6d3aWLzpQssnHUdwczZxTHyU/RkQlfnNyLdZXodCmWBRpSj2Ifkuzii+uxwj4kjWG6jOA=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.17.2.tgz"; + sha512 = "ml865Z9jzI5Y+48c5jsoSJCKz6ofOy45gCa+8SrJ/FyhOaIEEaXTfV4IgMIm/O4nz18zg4xPFu8dn4UCEr7O4w=="; }; }; "apollo-link-1.2.13" = { @@ -5026,13 +5053,13 @@ let sha512 = "l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw=="; }; }; - "apollo-server-core-2.9.7" = { + "apollo-server-core-2.9.14" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.9.7"; + version = "2.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.7.tgz"; - sha512 = "EqKyROy+21sM93YHjGpy6wlnzK/vH0fnZh7RCf3uB69aQ3OjgdP4AQ5oWRQ62NDN+aoic7OLhChSDJeDonq/NQ=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.9.14.tgz"; + sha512 = "Vc8TicXFFZGuEgo5AY1Ey0XuvHn7NQS1y7WxOQnr85KJ2zeRa6uIT8tU+73ZObzan3nlm9ysYtfSXh2QL21oyg=="; }; }; "apollo-server-env-2.4.3" = { @@ -5053,40 +5080,40 @@ let sha512 = "Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA=="; }; }; - "apollo-server-express-2.9.7" = { + "apollo-server-express-2.9.14" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.9.7"; + version = "2.9.14"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.7.tgz"; - sha512 = "+DuJk1oq34Zx0bLYzgBgJH/eXS0JNxw2JycHQvV0+PAQ0Qi01oomJRA2r1S5isnfnSAnHb2E9jyBTptoHdw3MQ=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.9.14.tgz"; + sha512 = "ai+VKPlOUzJsbSQcazjATNtWwdgcvZBWBCbTF7ZUC9Uo6FfSlKOmP3raQAq+gKqsnFwv34p4k17c/Asw5ZjSMQ=="; }; }; - "apollo-server-plugin-base-0.6.5" = { + "apollo-server-plugin-base-0.6.9" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.6.5"; + version = "0.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.5.tgz"; - sha512 = "z2ve7HEPWmZI3EzL0iiY9qyt1i0hitT+afN5PzssCw594LB6DfUQWsI14UW+W+gcw8hvl8VQUpXByfUntAx5vw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.9.tgz"; + sha512 = "75rorl0y07PK7A/U1Oe9unLIGgbmy1T6uaCQ5zl8zy+mtmFFcH1nYERfXZha1eTDWLCx0F/xNI6YJmWxSisc5w=="; }; }; - "apollo-server-types-0.2.5" = { + "apollo-server-types-0.2.9" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.2.5"; + version = "0.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.5.tgz"; - sha512 = "6iJQsPh59FWu4K7ABrVmpnQVgeK8Ockx8BcawBh+saFYWTlVczwcLyGSZPeV1tPSKwFwKZutyEslrYSafcarXQ=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.9.tgz"; + sha512 = "Iu9twx3lycH41F8shmrb33b4y0mNBz1chBdTIaSgIMmNwPDR4xs4eB6iyTK5swnaYC1eW+c+t5lHRUk7yexs/g=="; }; }; - "apollo-tracing-0.8.5" = { + "apollo-tracing-0.8.9" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.8.5"; + version = "0.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.5.tgz"; - sha512 = "lZn10/GRBZUlMxVYLghLMFsGcLN0jTYDd98qZfBtxw+wEWUx+PKkZdljDT+XNoOm/kDvEutFGmi5tSLhArIzWQ=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.9.tgz"; + sha512 = "DYHPUW0rFcxxtI8+qU3leNU+fKfq9NPTjgPMr/AJmxKfsdOI6QgfVzVP/khiik0kU0+BMl5zBplwEDDdgbkUlg=="; }; }; "apollo-upload-client-11.0.0" = { @@ -5098,13 +5125,13 @@ let sha512 = "JChTrBi1VSF8u6OPrkWUApJlyUvzwhw98kqRB3fSi7/CU6z0OUD42Mee9s5h8mfjKEfOanK6GNZhF4t2tIPXSw=="; }; }; - "apollo-utilities-1.3.2" = { + "apollo-utilities-1.3.3" = { name = "apollo-utilities"; packageName = "apollo-utilities"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.2.tgz"; - sha512 = "JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg=="; + url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.3.tgz"; + sha512 = "F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw=="; }; }; "app-builder-5.2.0" = { @@ -5287,13 +5314,13 @@ let sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; - "arg-4.1.1" = { + "arg-4.1.2" = { name = "arg"; packageName = "arg"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz"; - sha512 = "SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw=="; + url = "https://registry.npmjs.org/arg/-/arg-4.1.2.tgz"; + sha512 = "+ytCkGcBtHZ3V2r2Z06AncYO8jz46UEamcspGoU8lHcEbpn6J77QK0vdWvChsclg/tM5XIJC5tnjmPp7Eq6Obg=="; }; }; "argparse-0.1.15" = { @@ -5512,13 +5539,13 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "array-includes-3.0.3" = { + "array-includes-3.1.1" = { name = "array-includes"; packageName = "array-includes"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz"; + sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="; }; }; "array-initial-1.1.0" = { @@ -5899,6 +5926,15 @@ let sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; "async-0.1.22" = { name = "async"; packageName = "async"; @@ -6196,13 +6232,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.569.0" = { + "aws-sdk-2.596.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.569.0"; + version = "2.596.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.569.0.tgz"; - sha512 = "9i4n/8kR1cq+Ge1n9FzqEBE1kpF8uLEI24wssy0dQD1fks+eNoZ6b3bGMCR1OfYB0KVgIN7ZkUrng1Zu9M4fcA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.596.0.tgz"; + sha512 = "Bp+gyqhLw8tK4sgM1v1PDSw26H1mSXs6yhQInmGzDKqXJor6UyUb9JskFv0zC/bA84XizlshN1BBIgINqk6pNg=="; }; }; "aws-sign2-0.6.0" = { @@ -6223,13 +6259,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.8.0" = { + "aws4-1.9.0" = { name = "aws4"; packageName = "aws4"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; }; }; "axios-0.17.1" = { @@ -6682,15 +6718,6 @@ let sha1 = "be241ca81404030678b748717322b89d0c8fe280"; }; }; - "babel-polyfill-6.16.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.16.0.tgz"; - sha1 = "2d45021df87e26a374b6d4d1a9c65964d17f2422"; - }; - }; "babel-polyfill-6.26.0" = { name = "babel-polyfill"; packageName = "babel-polyfill"; @@ -7123,6 +7150,15 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; + "big-integer-1.6.36" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.36"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz"; + sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; + }; + }; "big-integer-1.6.48" = { name = "big-integer"; packageName = "big-integer"; @@ -7492,13 +7528,13 @@ let sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="; }; }; - "bluebird-3.7.1" = { + "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz"; - sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg=="; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; "blueimp-md5-2.10.0" = { @@ -7519,13 +7555,13 @@ let sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="; }; }; - "bn.js-5.0.0" = { + "bn.js-5.1.1" = { name = "bn.js"; packageName = "bn.js"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.0.0.tgz"; - sha512 = "bVwDX8AF+72fIUNuARelKAlQUNtPOfG2fRxorbVvFk4zpHbqLrPdOGfVg5vrKwVzLLePqPBiATaOZNELQzmS0A=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz"; + sha512 = "IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA=="; }; }; "bncode-0.2.3" = { @@ -7600,13 +7636,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-2.0.3" = { + "boolean-3.0.0" = { name = "boolean"; packageName = "boolean"; - version = "2.0.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-2.0.3.tgz"; - sha512 = "iHzXeFCXWrpjYE7DToXGCBPGZf0eVISqzL+4sgrOSYEKXnb59WHPFvGTTyCj6zJ/MuuLAxEn8zPkrTHHzlt3IA=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz"; + sha512 = "OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ=="; }; }; "boom-2.10.1" = { @@ -7708,13 +7744,13 @@ let sha512 = "cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A=="; }; }; - "boxen-4.1.0" = { + "boxen-4.2.0" = { name = "boxen"; packageName = "boxen"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.1.0.tgz"; - sha512 = "Iwq1qOkmEsl0EVABa864Bbj3HCL4186DRZgFW/NrFs5y5GMM3ljsxzMLgOHdWISDRvcM8beh8q4tTNzXz+mSKg=="; + url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; + sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; }; }; "bplist-creator-0.0.6" = { @@ -7951,13 +7987,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.7.2" = { + "browserslist-4.8.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.7.2"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.7.2.tgz"; - sha512 = "uZavT/gZXJd2UTi9Ov7/Z340WOSQ3+m1iBVRUknf+okKxonL9P83S3ctiBDtuRmRu8PiCHjqyueqQ9HYlJhxiw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.2.tgz"; + sha512 = "+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA=="; }; }; "btoa-lite-1.0.0" = { @@ -7996,6 +8032,15 @@ let sha512 = "HniEmRONcLP8qKJEw/DXZGwyHfRedYX1HGqhNZ5N2zhn+xIrAjhptkAbXRBGV0GhPb+YTbzObGn3GlAHaBiVnQ=="; }; }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + }; "buffer-4.9.2" = { name = "buffer"; packageName = "buffer"; @@ -8401,6 +8446,15 @@ let sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw=="; }; }; + "cacache-13.0.1" = { + name = "cacache"; + packageName = "cacache"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz"; + sha512 = "5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -8446,13 +8500,13 @@ let sha512 = "5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg=="; }; }; - "cachedir-2.2.0" = { + "cachedir-2.3.0" = { name = "cachedir"; packageName = "cachedir"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cachedir/-/cachedir-2.2.0.tgz"; - sha512 = "VvxA0xhNqIIfg0V9AmJkDg91DaJwryutH5rVEZAhcNi4iJFj9f+QxmAjgK1LT9I8OgToX27fypX6/MeCXVbBjQ=="; + url = "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"; + sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; "call-me-maybe-1.0.1" = { @@ -8635,13 +8689,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001008" = { + "caniuse-lite-1.0.30001016" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001008"; + version = "1.0.30001016"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001008.tgz"; - sha512 = "b8DJyb+VVXZGRgJUa30cbk8gKHZ3LOZTBLaUEEVr2P4xpmFigOCc62CO4uzquW641Ouq1Rm9N+rWLWdSYDaDIw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz"; + sha512 = "yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA=="; }; }; "capture-stack-trace-1.0.1" = { @@ -8833,6 +8887,15 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -9076,13 +9139,13 @@ let sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg=="; }; }; - "chokidar-3.3.0" = { + "chokidar-3.3.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; - sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; + sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; }; }; "chownr-0.0.2" = { @@ -9130,13 +9193,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.11.2" = { + "chrome-launcher-0.12.0" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.11.2.tgz"; - sha512 = "jx0kJDCXdB2ARcDMwNCtrf04oY1Up4rOmVu+fqJ5MTPOOIG8EhRcEU9NZfXZc6dMw9FU8o1r21PNp8V2M0zQ+g=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.12.0.tgz"; + sha512 = "rBUP4tvWToiileDi3UR0SbWKoUoDCYTRmVND2sdoBL1xANBgVz8V9h1yQluj3MEQaBJg0fRw7hW82uOPrJus7A=="; }; }; "chrome-net-3.3.3" = { @@ -9265,13 +9328,13 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; - "citeproc-2.2.27" = { + "citeproc-2.2.30" = { name = "citeproc"; packageName = "citeproc"; - version = "2.2.27"; + version = "2.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/citeproc/-/citeproc-2.2.27.tgz"; - sha512 = "AQIxcXD6ZZch5V9BPaMpwRTjiRgyOvw80OS9bLWEIHwm7E9b5CXoLj9s7LS+cjkD1iuWGYf1qRK1pd40ymzNmQ=="; + url = "https://registry.npmjs.org/citeproc/-/citeproc-2.2.30.tgz"; + sha512 = "8EFCQiKCh4MC5mKgNiME/8tco4sehq2iZDvkX7NlI3tAS8fhUGlnbQZopeHVdHnj/LD69OEsj/yjiNZYPjHHCw=="; }; }; "class-utils-0.3.6" = { @@ -9409,6 +9472,15 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; + "cli-progress-3.4.0" = { + name = "cli-progress"; + packageName = "cli-progress"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.4.0.tgz"; + sha512 = "35zcc1FsbPfN2dVonxUQwEnqMnI5kDFx2G4qGFGWgIDYqZ6+3t4/GjX/Vk0tq6bNgI9dEFcWLJ6AaLN17NLBDA=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -9481,13 +9553,13 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.3.3" = { + "cli-ux-5.4.1" = { name = "cli-ux"; packageName = "cli-ux"; - version = "5.3.3"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.3.3.tgz"; - sha512 = "a16g+BTjASUH41s1pevai4P3JKwhx85wkOSm6sXWsk6KkdSmDeJ16pSCn2x3nqK7W8n35igOu2YiW+qFkqLRJg=="; + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.1.tgz"; + sha512 = "x5CJXJPKBrEo6o8Uy/Upajb9OWYMhTzOpRvKZyZ68kkHysiGd9phGP71WyHZfLUkhwdvpNUFkY2tsDr0ogyocg=="; }; }; "cli-width-1.1.1" = { @@ -9607,6 +9679,15 @@ let sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; }; }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; "clivas-0.1.4" = { name = "clivas"; packageName = "clivas"; @@ -9688,6 +9769,15 @@ let sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; }; }; + "clone-deep-4.0.1" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"; + sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="; + }; + }; "clone-regexp-1.0.1" = { name = "clone-regexp"; packageName = "clone-regexp"; @@ -10093,6 +10183,15 @@ let sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; }; }; + "combined-stream-1.0.6" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; + sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; + }; + }; "combined-stream-1.0.8" = { name = "combined-stream"; packageName = "combined-stream"; @@ -10192,6 +10291,15 @@ let sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; }; }; + "commander-2.18.0" = { + name = "commander"; + packageName = "commander"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz"; + sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; + }; + }; "commander-2.19.0" = { name = "commander"; packageName = "commander"; @@ -10516,6 +10624,15 @@ let sha512 = "CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="; }; }; + "configstore-5.0.0" = { + name = "configstore"; + packageName = "configstore"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz"; + sha512 = "eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ=="; + }; + }; "connect-1.9.2" = { name = "connect"; packageName = "connect"; @@ -10795,13 +10912,13 @@ let sha512 = "/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ=="; }; }; - "conventional-changelog-writer-4.0.10" = { + "conventional-changelog-writer-4.0.11" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.10"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.10.tgz"; - sha512 = "vtO9vBAVh7XnSpGLTB1BOGgsGTz1MdvFjzbSXLrtapWCHWwuVOZFgwdLhlS0MaXwlF1dksWdEb6tnr42Ie2INw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz"; + sha512 = "g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw=="; }; }; "conventional-commits-filter-2.0.2" = { @@ -10813,13 +10930,13 @@ let sha512 = "WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ=="; }; }; - "conventional-commits-parser-3.0.7" = { + "conventional-commits-parser-3.0.8" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.7.tgz"; - sha512 = "4mx/FRC92z0yIiXGyRVYQFhn0jWDwvxnj2UuLaUi3hJSG4Thall6GXA8YOPHQK2qvotciJandJIVmuSvLgDLbQ=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz"; + sha512 = "YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ=="; }; }; "conventional-recommended-bump-5.0.1" = { @@ -11074,31 +11191,40 @@ let sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; - "core-js-2.6.10" = { + "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz"; - sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; + sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-3.4.1" = { + "core-js-3.6.0" = { name = "core-js"; packageName = "core-js"; - version = "3.4.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz"; - sha512 = "KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz"; + sha512 = "AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q=="; }; }; - "core-js-compat-3.4.1" = { + "core-js-3.6.1" = { + name = "core-js"; + packageName = "core-js"; + version = "3.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz"; + sha512 = "186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="; + }; + }; + "core-js-compat-3.6.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.4.1"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz"; - sha512 = "YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.1.tgz"; + sha512 = "2Tl1EuxZo94QS2VeH28Ebf5g3xbPZG/hj/N5HDDy4XMP/ImR0JIer/nggQRiMN91Q54JVkGbytf42wO29oXVHg=="; }; }; "core-util-is-1.0.2" = { @@ -11173,22 +11299,22 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-6.2.0" = { + "cp-file-7.0.0" = { name = "cp-file"; packageName = "cp-file"; - version = "6.2.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; - sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz"; + sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; }; }; - "cpy-7.3.0" = { + "cpy-8.0.0" = { name = "cpy"; packageName = "cpy"; - version = "7.3.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-7.3.0.tgz"; - sha512 = "auvDu6h/J+cO1uqV40ymL/VoPM0+qPpNGaNttTzkYVXO/+GeynuyAK/MwFcWgU/P82ezcZw7RaN34CIIWajKLA=="; + url = "https://registry.npmjs.org/cpy/-/cpy-8.0.0.tgz"; + sha512 = "iTjLUqtVr45e17GFAyxA0lqFinbGMblMCTtAqrPzT/IETNtDuyyhDDk8weEZ08MiCc6EcuyNq2KtGH5J2BIAoQ=="; }; }; "crc-0.2.0" = { @@ -11299,13 +11425,13 @@ let sha512 = "fxVZGER1+o5HTBtGYuQEtaYe4uTvplCoPm28uu/7nMzMdBdPvZJlA5qyONJUEevJQGssWJxcmrGMOOCbv25CeA=="; }; }; - "cron-1.7.1" = { + "cron-1.7.2" = { name = "cron"; packageName = "cron"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.7.1.tgz"; - sha512 = "gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; "cross-env-5.2.0" = { @@ -11434,6 +11560,15 @@ let sha1 = "a230f64f568310e1498009940790ec99545bca7e"; }; }; + "crypto-random-string-2.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + }; "csrf-3.1.0" = { name = "csrf"; packageName = "csrf"; @@ -12109,6 +12244,15 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; + "dayjs-1.8.18" = { + name = "dayjs"; + packageName = "dayjs"; + version = "1.8.18"; + src = fetchurl { + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.18.tgz"; + sha512 = "JBMJZghNK8TtuoPnKNIzW9xavVVigld/zmZNpZSyQbkb2Opp55YIfZUpE4OEqPF/iyUVQTKcn1bC2HtC8B7s3g=="; + }; + }; "de-indent-1.0.2" = { name = "de-indent"; packageName = "de-indent"; @@ -12118,13 +12262,13 @@ let sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; }; - "deasync-0.1.15" = { + "deasync-0.1.19" = { name = "deasync"; packageName = "deasync"; - version = "0.1.15"; + version = "0.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz"; - sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.19.tgz"; + sha512 = "oh3MRktfnPlLysCPpBpKZZzb4cUC/p0aA3SyRGp15lN30juJBTo/CiD0d4fR+f1kBtUQoJj1NE9RPNWQ7BQ9Mg=="; }; }; "death-1.1.0" = { @@ -12190,15 +12334,6 @@ let sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; }; }; - "debug-0.8.1" = { - name = "debug"; - packageName = "debug"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }; - }; "debug-1.0.5" = { name = "debug"; packageName = "debug"; @@ -12424,22 +12559,22 @@ let sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; }; }; - "deep-equal-1.0.1" = { + "deep-equal-1.1.1" = { name = "deep-equal"; packageName = "deep-equal"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; + sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-1.1.0" = { + "deep-equal-2.0.1" = { name = "deep-equal"; packageName = "deep-equal"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz"; - sha512 = "ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.1.tgz"; + sha512 = "7Et6r6XfNW61CPPCIYfm1YPGSmh6+CliYeL4km7GWJcpX5LTAflGF8drLLR+MZX+2P3NZfAfSduutBbSWqER4g=="; }; }; "deep-extend-0.2.11" = { @@ -12496,13 +12631,13 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deepcopy-0.6.3" = { + "deepcopy-2.0.0" = { name = "deepcopy"; packageName = "deepcopy"; - version = "0.6.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-0.6.3.tgz"; - sha1 = "634780f2f8656ab771af8fa8431ed1ccee55c7b0"; + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.0.0.tgz"; + sha512 = "d5ZK7pJw7F3k6M5vqDjGiiUS9xliIyWkdzBjnPhnSeRGjkYOGZMCFkdKVwV/WiHOe0NwzB8q+iDo7afvSf0arA=="; }; }; "deepmerge-2.1.0" = { @@ -12532,15 +12667,6 @@ let sha512 = "GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA=="; }; }; - "deepmerge-4.0.0" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz"; - sha512 = "YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww=="; - }; - }; "deepmerge-4.2.2" = { name = "deepmerge"; packageName = "deepmerge"; @@ -12595,13 +12721,13 @@ let sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; }; }; - "defer-to-connect-1.1.0" = { + "defer-to-connect-1.1.1" = { name = "defer-to-connect"; packageName = "defer-to-connect"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.0.tgz"; - sha512 = "WE2sZoctWm/v4smfCAdjYbrfS55JiMRdlY9ZubFhsYbteCK9+BvAx4YV7nPjYM6ZnX5BcoVKwfmyx9sIFTgQMQ=="; + url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.1.tgz"; + sha512 = "J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ=="; }; }; "deferred-0.7.11" = { @@ -12829,13 +12955,13 @@ let sha1 = "bd5a96d45dbed3011bb81bdf68ddf54be8e1bd4e"; }; }; - "des.js-1.0.0" = { + "des.js-1.0.1" = { name = "des.js"; packageName = "des.js"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; + sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; }; }; "destroy-1.0.3" = { @@ -13180,13 +13306,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.40.0" = { + "dispensary-0.48.1" = { name = "dispensary"; packageName = "dispensary"; - version = "0.40.0"; + version = "0.48.1"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.40.0.tgz"; - sha512 = "ttKDQvGBf+ygQ4rXuLBLErp3kMJIS+Gfmy+nJ6N/EfV8/RQdjd9SORpc729YK5SYAI+IuBo88S2xGUjKjU2jYw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.48.1.tgz"; + sha512 = "oC9ItJ7YtO/DKsp24T90k7z0NxfkZQkvJ3USTxUoVjBKrfMRz1/kMd+NcFgDG+KrJg14GChiv1sbdFdxeKRUUw=="; }; }; "diveSync-0.3.0" = { @@ -13585,13 +13711,13 @@ let sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; }; - "dotnet-deps-parser-4.5.2" = { + "dotnet-deps-parser-4.9.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.5.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.5.2.tgz"; - sha512 = "bk5Q1luEwQ10rrBwZbtTxUNadaLz2dM6xzOLoTK+oUBcaq6saCeELmkIgdG+Fwkn58XRgLQvOySVS0gp4OG6RA=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.9.0.tgz"; + sha512 = "V0O+7pI7Ei+iL5Kgy6nYq1UTwzrpqci5K/zf8cXyP5RWBSQBUl/JOE9I67zLUkKiwOdfPhbMQgcRj/yGA+NL1A=="; }; }; "downgrade-root-1.2.2" = { @@ -13765,13 +13891,13 @@ let sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; }; }; - "eachr-3.2.0" = { + "eachr-3.3.0" = { name = "eachr"; packageName = "eachr"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz"; - sha1 = "2c35e43ea086516f7997cf80b7aa64d55a4a4484"; + url = "https://registry.npmjs.org/eachr/-/eachr-3.3.0.tgz"; + sha512 = "yKWuGwOE283CTgbEuvqXXusLH4VBXnY2nZbDkeWev+cpAXY6zCIADSPLdvfkAROc0t8S4l07U1fateCdEDuuvg=="; }; }; "easy-stack-1.0.0" = { @@ -13828,22 +13954,13 @@ let sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; - "editions-1.3.4" = { - name = "editions"; - packageName = "editions"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz"; - sha512 = "gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg=="; - }; - }; - "editions-2.2.0" = { + "editions-2.3.0" = { name = "editions"; packageName = "editions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-2.2.0.tgz"; - sha512 = "RYg3iEA2BDLCNVe8PUkD+ox5vAKxB9XS/mAhx1bdxGCF0CpX077C0pyTA9t5D6idCYA3avl5/XDHKPsHFrygfw=="; + url = "https://registry.npmjs.org/editions/-/editions-2.3.0.tgz"; + sha512 = "jeXYwHPKbitU1l14dWlsl5Nm+b1Hsm7VX73BsrQ4RVwEcAQQIPFHTZAbVtuIGxZBrpdT2FXd8lbtrNBrzZxIsA=="; }; }; "editor-1.0.0" = { @@ -13900,22 +14017,22 @@ let sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; }; }; - "ejs-2.7.1" = { + "ejs-2.7.4" = { name = "ejs"; packageName = "ejs"; - version = "2.7.1"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz"; - sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; + url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; + sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.306" = { + "electron-to-chromium-1.3.322" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.306"; + version = "1.3.322"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz"; - sha512 = "frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz"; + sha512 = "Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA=="; }; }; "elegant-spinner-1.0.1" = { @@ -13945,13 +14062,13 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; - "elliptic-6.5.1" = { + "elliptic-6.5.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz"; - sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz"; + sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw=="; }; }; "email-validator-2.0.4" = { @@ -14360,22 +14477,13 @@ let sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA=="; }; }; - "envinfo-7.3.1" = { + "envinfo-7.5.0" = { name = "envinfo"; packageName = "envinfo"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.3.1.tgz"; - sha512 = "GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A=="; - }; - }; - "envinfo-7.4.0" = { - name = "envinfo"; - packageName = "envinfo"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.4.0.tgz"; - sha512 = "FdDfnWnCVjxTTpWE3d6Jgh5JDIA3Cw7LCgpM/pI7kK1ORkjaqI2r6NqQ+ln2j0dfpgxY00AWieSvtkiZQKIItA=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz"; + sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; "epidemic-broadcast-trees-7.0.0" = { @@ -14396,13 +14504,13 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; - "errlop-1.1.2" = { + "errlop-2.0.0" = { name = "errlop"; packageName = "errlop"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-1.1.2.tgz"; - sha512 = "djkRp+urJ+SmqDBd7F6LUgm4Be1TTYBxia2bhjNdFBuBDQtJDHExD2VbxR6eyst3h1TZy3qPRCdqb6FBoFttTA=="; + url = "https://registry.npmjs.org/errlop/-/errlop-2.0.0.tgz"; + sha512 = "z00WIrQhtOMUnjdTG0O4f6hMG64EVccVDBy2WwgjcF8S4UB1exGYuc2OFwmdQmsJwLQVEIHWHPCz/omXXgAZHw=="; }; }; "errno-0.1.7" = { @@ -14441,13 +14549,22 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.16.0" = { + "es-abstract-1.17.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.16.0"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz"; + sha512 = "yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug=="; + }; + }; + "es-get-iterator-1.0.2" = { + name = "es-get-iterator"; + packageName = "es-get-iterator"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz"; - sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg=="; + url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.0.2.tgz"; + sha512 = "ZHb4fuNK3HKHEOvDGyHPKf5cSWh/OvAMskeM/+21NMnTuvqFvz8uHatolu+7Kf6b6oK9C+3Uo1T37pSGPWv0MA=="; }; }; "es-to-primitive-1.2.1" = { @@ -14459,13 +14576,13 @@ let sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; - "es5-ext-0.10.52" = { + "es5-ext-0.10.53" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.52"; + version = "0.10.53"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz"; - sha512 = "bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; }; }; "es5-ext-0.8.2" = { @@ -14486,15 +14603,6 @@ let sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; }; }; - "es6-error-4.0.0" = { - name = "es6-error"; - packageName = "es6-error"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz"; - sha1 = "f094c7041f662599bb12720da059d6b9c7ff0f40"; - }; - }; "es6-error-4.1.1" = { name = "es6-error"; packageName = "es6-error"; @@ -14756,13 +14864,13 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-6.6.0" = { + "eslint-6.8.0" = { name = "eslint"; packageName = "eslint"; - version = "6.6.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz"; - sha512 = "PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -14891,15 +14999,6 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "espree-6.1.1" = { - name = "espree"; - packageName = "espree"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz"; - sha512 = "EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ=="; - }; - }; "espree-6.1.2" = { name = "espree"; packageName = "espree"; @@ -14981,6 +15080,15 @@ let sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; }; }; + "essentials-1.1.1" = { + name = "essentials"; + packageName = "essentials"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/essentials/-/essentials-1.1.1.tgz"; + sha512 = "SmaxoAdVu86XkZQM/u6TYSu96ZlFGwhvSk1l9zAkznFuQkMb9mRDS2iq/XWDow7R8OwBwdYH8nLyDKznMD+GWw=="; + }; + }; "esshorten-1.1.1" = { name = "esshorten"; packageName = "esshorten"; @@ -15314,24 +15422,6 @@ let sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; }; }; - "execa-0.4.0" = { - name = "execa"; - packageName = "execa"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; - }; - }; - "execa-0.6.3" = { - name = "execa"; - packageName = "execa"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.6.3.tgz"; - sha1 = "57b69a594f081759c69e5370f0d17b9cb11658fe"; - }; - }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -15368,13 +15458,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-3.3.0" = { + "execa-3.4.0" = { name = "execa"; packageName = "execa"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz"; - sha512 = "j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg=="; + url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz"; + sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; }; }; "execall-1.0.0" = { @@ -15548,6 +15638,15 @@ let sha512 = "oy0sRsdw6n93E9wpCNWKRnSsxYnSDX9Dnr9mhZgqUEEorzcq5nshGYSZ4ZReHFhKQ80WI5iVUUSPW7u3GaKauw=="; }; }; + "express-session-1.17.0" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.0.tgz"; + sha512 = "t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg=="; + }; + }; "express-urlrewrite-1.2.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -15566,13 +15665,13 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; - "ext-1.2.0" = { + "ext-1.4.0" = { name = "ext"; packageName = "ext"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.2.0.tgz"; - sha512 = "0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA=="; + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; }; }; "ext-list-2.2.2" = { @@ -15719,13 +15818,13 @@ let sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w=="; }; }; - "extract-opts-3.3.1" = { + "extract-opts-3.4.0" = { name = "extract-opts"; packageName = "extract-opts"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.3.1.tgz"; - sha1 = "5abbedc98c0d5202e3278727f9192d7e086c6be1"; + url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.4.0.tgz"; + sha512 = "M7Y+1cJDkzOWqvGH5F/V2qgkD6+uitW3NV9rQGl+pLSVuXZ4IDDQgxxMeLPKcWUyfypBWczIILiroSuhXG7Ytg=="; }; }; "extract-stack-1.0.0" = { @@ -15899,6 +15998,15 @@ let sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; }; }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; "fast-levenshtein-1.0.7" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; @@ -15917,13 +16025,13 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-1.5.0" = { + "fast-redact-2.0.0" = { name = "fast-redact"; packageName = "fast-redact"; - version = "1.5.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-1.5.0.tgz"; - sha512 = "Afo61CgUjkzdvOKDHn08qnZ0kwck38AOGcMlvSGzvJbIab6soAP5rdoQayecGCDsD69AiF9vJBXyq31eoEO2tQ=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-2.0.0.tgz"; + sha512 = "zxpkULI9W9MNTK2sJ3BpPQrTEXFNESd2X6O1tXMFpK/XM0G5c5Rll2EVYZH2TqI3xRGK/VaJ+eEOt7pnENJpeA=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -16268,13 +16376,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "filter-obj-1.1.0" = { + "filter-obj-2.0.1" = { name = "filter-obj"; packageName = "filter-obj"; - version = "1.1.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; - sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + url = "https://registry.npmjs.org/filter-obj/-/filter-obj-2.0.1.tgz"; + sha512 = "yDEp513p7+iLdFHWBVdZFnRiOYwg8ZqmpaAiZCMjzqsbo7tCS4Qm4ulXOht337NGzkukKa9u3W4wqQ9tQPm3Ug=="; }; }; "finalhandler-0.3.3" = { @@ -16430,13 +16538,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-1.2.0" = { + "firefox-profile-1.3.0" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.2.0.tgz"; - sha512 = "TTEFfPOkyaz4EWx/5ZDQC1mJAe3a+JgVcchpIfD4Tvx1UspwlTJRJxOYA35x/z2iJcxaF6aW2rdh6oj6qwgd2g=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.0.tgz"; + sha512 = "3d7JPnFC3GrwGW8wonAqy2E4YCI7A8MO7yVDkqS09uQ3tLvMLCY3Ytt4ntvVXvyzjVMRmrLW9W/CubnnzrdLCA=="; }; }; "first-chunk-stream-1.0.0" = { @@ -16583,13 +16691,13 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; - "flow-parser-0.111.3" = { + "flow-parser-0.114.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.111.3"; + version = "0.114.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.111.3.tgz"; - sha512 = "iEjGZ94OBMcESxnLorXNjJmtd/JtQYXUVrQpfwvtAKkuyawRmv+2LM6nqyOsOJkISEYbyY6ziudRE0u4VyPSVA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.114.0.tgz"; + sha512 = "Qt9HT3v507bCerJfp4FX4N5E7ysinBzxjpK1rL7bJ/Bw12puF6lva2MAIXYS1d83bV7BT/F7EDk+faJQY5MpRA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -16655,13 +16763,13 @@ let sha512 = "73LAN0qF4zVMHMExYhK0z1swDo6FEh/bt1HF5/UnWkgI5JsECXOK2bTokWVU1levtr9bd+IxYChnJKJNnEzD0A=="; }; }; - "flumeview-level-3.0.13" = { + "flumeview-level-3.0.14" = { name = "flumeview-level"; packageName = "flumeview-level"; - version = "3.0.13"; + version = "3.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.13.tgz"; - sha512 = "K8sM6AoWVGWps5H/MiqEHxWd0Ts3NtcWEsBjGmC3LD2EPOhrTcDQFn4dVpGAdiZma3RGFRVHE7OTperHrfJnkA=="; + url = "https://registry.npmjs.org/flumeview-level/-/flumeview-level-3.0.14.tgz"; + sha512 = "Nl0gJOgrDGpJGZDkP6gvo6s1Q9WmRynbHUvI/JY3eQ81YgzUUa2FKLlfu6OHV5ho5NeXP+00F+0K1yBVaEgJOQ=="; }; }; "flumeview-query-6.3.0" = { @@ -16844,6 +16952,15 @@ let sha1 = "33c183acf193276ecaa98143a69e94bfee1750d1"; }; }; + "form-data-2.3.2" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; + sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; + }; + }; "form-data-2.3.3" = { name = "form-data"; packageName = "form-data"; @@ -17222,22 +17339,13 @@ let sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; }; }; - "fsevents-1.2.9" = { + "fsevents-1.2.11" = { name = "fsevents"; packageName = "fsevents"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz"; - sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw=="; - }; - }; - "fsevents-2.0.7" = { - name = "fsevents"; - packageName = "fsevents"; - version = "2.0.7"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz"; - sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz"; + sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw=="; }; }; "fsevents-2.1.2" = { @@ -17294,13 +17402,13 @@ let sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d"; }; }; - "fullname-3.3.0" = { + "fullname-4.0.1" = { name = "fullname"; packageName = "fullname"; - version = "3.3.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fullname/-/fullname-3.3.0.tgz"; - sha1 = "a08747d6921229610b8178b7614fce10cb185f5a"; + url = "https://registry.npmjs.org/fullname/-/fullname-4.0.1.tgz"; + sha512 = "jVT8q9Ah9JwqfIGKwKzTdbRRthdPpIjEe9kgvxM104Tv+q6SgOAQqJMVP90R0DBRAqejGMHDRWJtl3Ats6BjfQ=="; }; }; "function-bind-1.1.1" = { @@ -17618,15 +17726,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gettext-parser-1.1.0" = { - name = "gettext-parser"; - packageName = "gettext-parser"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gettext-parser/-/gettext-parser-1.1.0.tgz"; - sha1 = "2c5a6638d893934b9b55037d0ad82cb7004b2679"; - }; - }; "git-apply-delta-0.0.7" = { name = "git-apply-delta"; packageName = "git-apply-delta"; @@ -17654,13 +17753,13 @@ let sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664"; }; }; - "git-diff-tree-1.0.0" = { + "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-diff-tree/-/git-diff-tree-1.0.0.tgz"; - sha1 = "141e5641769d065997a6b94c3a2c60e062b54da8"; + url = "https://registry.npmjs.org/git-diff-tree/-/git-diff-tree-1.1.0.tgz"; + sha512 = "PdNkH2snpXsKIzho6OWMZKEl+KZG6Zm+1ghQIDi0tEq1sz/S1tDjvNuYrX2ZpomalHAB89OUQim8O6vN+jesNQ=="; }; }; "git-packidx-parser-1.0.0" = { @@ -17717,6 +17816,15 @@ let sha1 = "4468406c7e6c3ba4cf4587999e1adb28d9d1af55"; }; }; + "git-rev-sync-2.0.0" = { + name = "git-rev-sync"; + packageName = "git-rev-sync"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-2.0.0.tgz"; + sha512 = "vnHFv2eocTmt/wHqZm3ksxtVshK4vptT0cEoumk6hAYRFx3do6Qo7xHBTBCv29+r3ZZCQOQ1i328MUCsYF7AUw=="; + }; + }; "git-semver-tags-2.0.3" = { name = "git-semver-tags"; packageName = "git-semver-tags"; @@ -17726,13 +17834,13 @@ let sha512 = "tj4FD4ww2RX2ae//jSrXZzrocla9db5h0V7ikPl1P/WwoZar9epdUhwR7XHXSgc+ZkNq72BEEerqQuicoEQfzA=="; }; }; - "git-spawned-stream-0.1.1" = { + "git-spawned-stream-1.0.1" = { name = "git-spawned-stream"; packageName = "git-spawned-stream"; - version = "0.1.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/git-spawned-stream/-/git-spawned-stream-0.1.1.tgz"; - sha1 = "38927da02e52d862396861bf996557452643802b"; + url = "https://registry.npmjs.org/git-spawned-stream/-/git-spawned-stream-1.0.1.tgz"; + sha512 = "W2Zo3sCiq5Hqv1/FLsNmGomkXdyimmkHncGzqjBHh7nWx+CbH5dkWGb6CiFdknooL7wfeZJ3gz14KrXl/gotCw=="; }; }; "git-ssb-web-2.8.0" = { @@ -17870,13 +17978,13 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "glob-7.1.4" = { + "glob-7.1.5" = { name = "glob"; packageName = "glob"; - version = "7.1.4"; + version = "7.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; - sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; + sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; }; }; "glob-7.1.6" = { @@ -17987,13 +18095,13 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-agent-2.1.6" = { + "global-agent-2.1.7" = { name = "global-agent"; packageName = "global-agent"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.6.tgz"; - sha512 = "fL+xfraAlc1MXU8Gs0DAg/eHH+H1CjxbK+BLU3Qt55dAVMAQ8fH8k/UrLwV4A+Vk/hl/TePWuTxFnqJzCV1/Kw=="; + url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.7.tgz"; + sha512 = "ooK7eqGYZku+LgnbfH/Iv0RJ74XfhrBZDlke1QSzcBt0bw1PmJcnRADPAQuFE+R45pKKDTynAr25SBasY2kvow=="; }; }; "global-dirs-0.1.1" = { @@ -18005,6 +18113,15 @@ let sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; }; }; + "global-dirs-2.0.1" = { + name = "global-dirs"; + packageName = "global-dirs"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz"; + sha512 = "5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A=="; + }; + }; "global-https://github.com/component/global/archive/v2.0.1.tar.gz" = { name = "global"; packageName = "global"; @@ -18096,6 +18213,15 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; + "globals-12.3.0" = { + name = "globals"; + packageName = "globals"; + version = "12.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz"; + sha512 = "wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw=="; + }; + }; "globals-9.18.0" = { name = "globals"; packageName = "globals"; @@ -18105,13 +18231,13 @@ let sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="; }; }; - "globalthis-1.0.0" = { + "globalthis-1.0.1" = { name = "globalthis"; packageName = "globalthis"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz"; - sha512 = "vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg=="; + url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz"; + sha512 = "mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw=="; }; }; "globalyzer-0.1.4" = { @@ -18177,13 +18303,13 @@ let sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; }; }; - "globule-1.2.1" = { + "globule-1.3.0" = { name = "globule"; packageName = "globule"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz"; - sha512 = "g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ=="; + url = "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz"; + sha512 = "YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg=="; }; }; "glogg-1.0.2" = { @@ -18312,6 +18438,15 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; + "graceful-fs-4.1.15" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; + }; + }; "graceful-fs-4.2.1" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -18375,13 +18510,13 @@ let sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; }; }; - "graphlib-2.1.7" = { + "graphlib-2.1.8" = { name = "graphlib"; packageName = "graphlib"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz"; - sha512 = "TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w=="; + url = "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz"; + sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; "graphql-0.13.2" = { @@ -18402,13 +18537,13 @@ let sha512 = "MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg=="; }; }; - "graphql-anywhere-4.2.4" = { + "graphql-anywhere-4.2.6" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.4.tgz"; - sha512 = "rN6Op5vle0Ucqo8uOVPuFzRz1L/MB+ZVa+XezhFcQ6iP13vy95HOXRysrRtWcu2kQQTLyukSGmfU08D8LXWSIw=="; + url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.6.tgz"; + sha512 = "re4fqaii3l0fCsC3qFKQrmwffephI9rinrwXAy+4EnWip2YkGlV8wC4en42eW8KI2nlWBh9lkJPfR/5TZf/l1w=="; }; }; "graphql-cli-prepare-1.4.19" = { @@ -18447,13 +18582,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.10.4" = { + "graphql-extensions-0.10.8" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.10.4"; + version = "0.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.4.tgz"; - sha512 = "lE6MroluEYocbR/ICwccv39w+Pz4cBPadJ11z1rJkbZv5wstISEganbDOwl9qN21rcZGiWzh7QUNxUiFUXXEDw=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.8.tgz"; + sha512 = "cUcc014vz+pfwcER8pc4ts/WWhDCrC9jhNFIiWYYntd2TshS+tZFsZ362i4P2VYLbpYCgFiO+xRY1f2mylyz5A=="; }; }; "graphql-import-0.4.5" = { @@ -18546,13 +18681,13 @@ let sha512 = "jHLQw8x3xmSNRBCsaZqelXXsFfUSUSktSCUP8KYHiX1Z9qEuwcMpAf+FkdBzk8aTAFqOlPdNZ3OI4DKKqGKUqg=="; }; }; - "graphql-type-json-0.3.0" = { + "graphql-type-json-0.3.1" = { name = "graphql-type-json"; packageName = "graphql-type-json"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.0.tgz"; - sha512 = "lnxg5HiB95yxy+/5cDKtP6pZo0zgntsOmqsjeCBXFGJ4YoMF3+1YaSEKWJntNTu+VsAm3zf6lPxFpp1kxzofLA=="; + url = "https://registry.npmjs.org/graphql-type-json/-/graphql-type-json-0.3.1.tgz"; + sha512 = "1lPkUXQ2L8o+ERLzVAuc3rzc/E6pGF+6HnjihCVTK0VzR0jCuUd92FqNxoHdfILXqOn2L6b4y47TBxiPyieUVA=="; }; }; "graphql-upload-8.1.0" = { @@ -18717,13 +18852,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "handlebars-4.5.1" = { + "handlebars-4.5.3" = { name = "handlebars"; packageName = "handlebars"; - version = "4.5.1"; + version = "4.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz"; - sha512 = "C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz"; + sha512 = "3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA=="; }; }; "har-schema-1.0.5" = { @@ -18762,15 +18897,6 @@ let sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; - "har-validator-5.0.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz"; - sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd"; - }; - }; "har-validator-5.1.3" = { name = "har-validator"; packageName = "har-validator"; @@ -18780,6 +18906,15 @@ let sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; }; }; + "hard-rejection-2.1.0" = { + name = "hard-rejection"; + packageName = "hard-rejection"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + }; "has-1.0.3" = { name = "has"; packageName = "has"; @@ -18897,6 +19032,15 @@ let sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; "has-generators-1.0.1" = { name = "has-generators"; packageName = "has-generators"; @@ -18933,13 +19077,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.0" = { + "has-symbols-1.0.1" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; + sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -19239,13 +19383,13 @@ let sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; - "highlight.js-9.16.2" = { + "highlight.js-9.17.1" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.16.2"; + version = "9.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz"; - sha512 = "feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.17.1.tgz"; + sha512 = "TA2/doAur5Ol8+iM3Ov7qy3jYcr/QiJ2eDTdRF4dfbjG7AaaB99J5G+zSl11ljbl6cIcahgPY6SKb3sC3EJ0fw=="; }; }; "hipchatter-0.3.2" = { @@ -19329,6 +19473,15 @@ let sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="; }; }; + "hosted-git-info-3.0.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.2.tgz"; + sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw=="; + }; + }; "hsl-regex-1.0.0" = { name = "hsl-regex"; packageName = "hsl-regex"; @@ -19500,13 +19653,13 @@ let sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="; }; }; - "http-call-5.2.5" = { + "http-call-5.3.0" = { name = "http-call"; packageName = "http-call"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-call/-/http-call-5.2.5.tgz"; - sha512 = "SfJ9j2xfi8zhQuJxcBCN1AhPCUAvPhipNaoeHWHfHiV0gz4uf9RUt2kl+xu9mxJLKxhNP7We87aRGbaSGPjr8A=="; + url = "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz"; + sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w=="; }; }; "http-errors-1.6.3" = { @@ -19582,15 +19735,6 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-proxy-1.17.0" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz"; - sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g=="; - }; - }; "http-proxy-1.18.0" = { name = "http-proxy"; packageName = "http-proxy"; @@ -19681,13 +19825,13 @@ let sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; }; }; - "https-proxy-agent-2.2.2" = { + "https-proxy-agent-2.2.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "2.2.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; - sha512 = "c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz"; + sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ=="; }; }; "https-proxy-agent-2.2.4" = { @@ -20050,13 +20194,13 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.1.0" = { + "import-fresh-3.2.1" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz"; - sha512 = "PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; + sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; "import-global-0.1.0" = { @@ -20392,13 +20536,13 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; - "inquirer-7.0.0" = { + "inquirer-7.0.1" = { name = "inquirer"; packageName = "inquirer"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz"; - sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz"; + sha512 = "V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw=="; }; }; "inquirer-autocomplete-prompt-1.0.1" = { @@ -20428,13 +20572,13 @@ let sha512 = "YOncxSN6Omh+1Oqxt+OJAvJVMDKw7l6IEG0wT2cTMGxjsTcroOGW4IR926QDzxg/uZHcFZ2cZbckDWdZhc2pZw=="; }; }; - "inspect-custom-symbol-1.1.0" = { + "inspect-custom-symbol-1.1.1" = { name = "inspect-custom-symbol"; packageName = "inspect-custom-symbol"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.0.tgz"; - sha512 = "vtI2YXBRZBkU6DlfHfd0GtZENfiEiTacAXUd0ZY6HA+X7aPznpFfPmzSC+tHKXAkz9KDSdI4AYfwAMXR5t+isg=="; + url = "https://registry.npmjs.org/inspect-custom-symbol/-/inspect-custom-symbol-1.1.1.tgz"; + sha512 = "GOucsp9EcdlLdhPUyOTvQDnbFJtp2WBWZV1Jqe+mVnkJQBL3w96+fB84C+JL+EKXOspMdB0eMDQPDp5w9fkfZA=="; }; }; "inspect-function-0.2.2" = { @@ -20851,6 +20995,15 @@ let sha1 = "f02ad0259a0921cd199ff21ce1b09e0f6b4e3929"; }; }; + "is-bigint-1.0.0" = { + name = "is-bigint"; + packageName = "is-bigint"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.0.tgz"; + sha512 = "t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g=="; + }; + }; "is-binary-path-1.0.1" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -20869,6 +21022,15 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; + "is-boolean-object-1.0.1" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.1.tgz"; + sha512 = "TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ=="; + }; + }; "is-buffer-1.1.6" = { name = "is-buffer"; packageName = "is-buffer"; @@ -20887,13 +21049,13 @@ let sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; }; }; - "is-callable-1.1.4" = { + "is-callable-1.1.5" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz"; - sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; + sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; }; }; "is-canonical-base64-1.1.1" = { @@ -20959,13 +21121,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.1" = { + "is-date-object-1.0.2" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; + sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; "is-decimal-1.0.3" = { @@ -21211,6 +21373,15 @@ let sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; }; }; + "is-installed-globally-0.3.1" = { + name = "is-installed-globally"; + packageName = "is-installed-globally"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.1.tgz"; + sha512 = "oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg=="; + }; + }; "is-interactive-1.0.0" = { name = "is-interactive"; packageName = "is-interactive"; @@ -21238,6 +21409,15 @@ let sha1 = "7e147be4768dc466db3bfb21cc60b31e6ad69393"; }; }; + "is-map-2.0.1" = { + name = "is-map"; + packageName = "is-map"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz"; + sha512 = "T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw=="; + }; + }; "is-mergeable-object-1.1.1" = { name = "is-mergeable-object"; packageName = "is-mergeable-object"; @@ -21310,6 +21490,15 @@ let sha512 = "wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA=="; }; }; + "is-npm-4.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; + sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; + }; + }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -21346,6 +21535,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-object-1.0.4" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; + sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + }; + }; "is-obj-1.0.1" = { name = "is-obj"; packageName = "is-obj"; @@ -21400,6 +21598,15 @@ let sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; }; }; + "is-path-inside-3.0.2" = { + name = "is-path-inside"; + packageName = "is-path-inside"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="; + }; + }; "is-plain-obj-1.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -21472,13 +21679,13 @@ let sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; }; }; - "is-regex-1.0.4" = { + "is-regex-1.0.5" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; + sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; }; }; "is-regexp-1.0.0" = { @@ -21562,6 +21769,15 @@ let sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; }; }; + "is-set-2.0.1" = { + name = "is-set"; + packageName = "is-set"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz"; + sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="; + }; + }; "is-ssh-1.3.1" = { name = "is-ssh"; packageName = "is-ssh"; @@ -21589,13 +21805,13 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; - "is-string-1.0.4" = { + "is-string-1.0.5" = { name = "is-string"; packageName = "is-string"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz"; - sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; }; }; "is-supported-regexp-flag-1.0.1" = { @@ -21616,13 +21832,13 @@ let sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; }; }; - "is-symbol-1.0.2" = { + "is-symbol-1.0.3" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz"; - sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; + sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; }; }; "is-text-path-1.0.1" = { @@ -21724,6 +21940,24 @@ let sha1 = "110f9ff74c37f663e1ec7915eb451f2db93ac9df"; }; }; + "is-weakmap-2.0.1" = { + name = "is-weakmap"; + packageName = "is-weakmap"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; + sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; + }; + }; + "is-weakset-2.0.1" = { + name = "is-weakset"; + packageName = "is-weakset"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.1.tgz"; + sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; + }; + }; "is-whitespace-character-1.0.3" = { name = "is-whitespace-character"; packageName = "is-whitespace-character"; @@ -21823,6 +22057,15 @@ let sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; }; }; + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; "isbinaryfile-3.0.3" = { name = "isbinaryfile"; packageName = "isbinaryfile"; @@ -22300,6 +22543,15 @@ let sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw=="; }; }; + "jsdom-13.2.0" = { + name = "jsdom"; + packageName = "jsdom"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz"; + sha512 = "cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw=="; + }; + }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -22399,6 +22651,15 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; + "json-parse-even-better-errors-2.0.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.0.1.tgz"; + sha512 = "XFY2Mbnmg+8r7MRsxfArVkZcfjxGlF/NjM3LsPXVeCX/GBF/1FTCv+idHBYC4qLPtK7q8HC8bapLoWqnhP/bXw=="; + }; + }; "json-parse-helpfulerror-1.0.3" = { name = "json-parse-helpfulerror"; packageName = "json-parse-helpfulerror"; @@ -22498,13 +22759,13 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; - "json-schema-typed-7.0.2" = { + "json-schema-typed-7.0.3" = { name = "json-schema-typed"; packageName = "json-schema-typed"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.2.tgz"; - sha512 = "40FRIcBSz4y0Ego3gMpbkhtIgebpxKRgW/7i1FfDNL4/xEPQKBM12tKSiCZFNQvad5K4IS3I5Sc8cxza/KSwog=="; + url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz"; + sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; }; }; "json-stable-stringify-0.0.1" = { @@ -22588,15 +22849,6 @@ let sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ=="; }; }; - "jsonata-1.6.5" = { - name = "jsonata"; - packageName = "jsonata"; - version = "1.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.6.5.tgz"; - sha512 = "iRx9U6AkvsjrRdFf9MMbQmGVAL3bXVANR12vbVxjgXouMPU9VJQEcFnLWUCaW8IDmOzdxsaxK4Xe7SGlBYr5Bg=="; - }; - }; "jsonata-1.7.0" = { name = "jsonata"; packageName = "jsonata"; @@ -22705,15 +22957,6 @@ let sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; }; }; - "jsonwebtoken-8.2.1" = { - name = "jsonwebtoken"; - packageName = "jsonwebtoken"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz"; - sha512 = "l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw=="; - }; - }; "jsonwebtoken-8.5.1" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -23408,22 +23651,22 @@ let sha512 = "ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q=="; }; }; - "level-js-4.0.1" = { + "level-js-4.0.2" = { name = "level-js"; packageName = "level-js"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/level-js/-/level-js-4.0.1.tgz"; - sha512 = "m5JRIyHZn5VnCCFeRegJkn5bQd3MJK5qZX12zg3Oivc8+BUIS2yFS6ANMMeHX2ieGxucNvEn6/ZnyjmZQLLUWw=="; + url = "https://registry.npmjs.org/level-js/-/level-js-4.0.2.tgz"; + sha512 = "PeGjZsyMG4O89KHiez1zoMJxStnkM+oBIqgACjoo5PJqFiSUUm3GNod/KcbqN5ktyZa8jkG7I1T0P2u6HN9lIg=="; }; }; - "level-packager-5.1.0" = { + "level-packager-5.1.1" = { name = "level-packager"; packageName = "level-packager"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/level-packager/-/level-packager-5.1.0.tgz"; - sha512 = "3pbJmDgGvp/lUQNULPoYQZtUbhMI8KoViYDw7Sa0kWl1mPeHWWJF7T/9upWI/NTMuEikkEE/cd6wBvmrW1+ZnQ=="; + url = "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz"; + sha512 = "HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ=="; }; }; "level-post-1.0.7" = { @@ -23624,13 +23867,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.4.6" = { + "link-check-4.4.7" = { name = "link-check"; packageName = "link-check"; - version = "4.4.6"; + version = "4.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.4.6.tgz"; - sha512 = "83RPcCsgZ1BsSuUtcdEOYv7zndQ3fbZCuoKIrKCuUfDhBWqBzWnU+Un1WdGuveMGAOHahL0LHLFUr6KqZ2Mrzg=="; + url = "https://registry.npmjs.org/link-check/-/link-check-4.4.7.tgz"; + sha512 = "E5MJf3+4OiHJzqDw9CQpOeJT3yOoKUxLHVaPPzNPXvaYPJ20C5MRzk1lPoojWnf5xwoRZjK+ydzfq2kPTwJr/g=="; }; }; "linkify-it-2.2.0" = { @@ -24614,6 +24857,15 @@ let sha1 = "4fb54f816652e5ae10e8f72f717a388c7326538a"; }; }; + "lodash.omit-4.5.0" = { + name = "lodash.omit"; + packageName = "lodash.omit"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz"; + sha1 = "6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -25235,6 +25487,15 @@ let sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5"; }; }; + "lunr-2.3.3" = { + name = "lunr"; + packageName = "lunr"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.3.tgz"; + sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; + }; + }; "lynx-0.2.0" = { name = "lynx"; packageName = "lynx"; @@ -25406,13 +25667,22 @@ let sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; }; }; - "make-fetch-happen-5.0.1" = { + "make-fetch-happen-5.0.2" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "5.0.1"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz"; + sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; + }; + }; + "make-fetch-happen-6.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.1.tgz"; - sha512 = "b4dfaMvUDR67zxUq1+GN7Ke9rH5WvGRmoHuMH7l+gmUCR2tCXFP6mpeJ9Dp+jB6z8mShRopSf1vLRBhRs8Cu5w=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-6.1.0.tgz"; + sha512 = "Q/RHcHofC+BnleSGDiO3SQQX2mCvXz639s+kJ7+loR4RPT487itVJ8RWIyBEfnqpnkaUFaWgNyV6CxT7eyDdEA=="; }; }; "make-iterator-1.0.1" = { @@ -25703,6 +25973,15 @@ let sha512 = "nlmfSlgHBFx36j/Pl/KQPbIaqE8Zf0TqmSMjsuddHDg6PMSVgmyW9HpkLs0o0M1n2GIZ/S2BZBLIww/xjhiGng=="; }; }; + "matcher-2.1.0" = { + name = "matcher"; + packageName = "matcher"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz"; + sha512 = "o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ=="; + }; + }; "matcher-collection-1.1.2" = { name = "matcher-collection"; packageName = "matcher-collection"; @@ -25721,16 +26000,6 @@ let sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; }; }; - "mathjax-full-git://github.com/mathjax/MathJax-src.git" = { - name = "mathjax-full"; - packageName = "mathjax-full"; - version = "3.0.0"; - src = fetchgit { - url = "git://github.com/mathjax/MathJax-src.git"; - rev = "1e1a30f0a89e52fa7764dbb510763145a4da49f1"; - sha256 = "e44c97d2d7ade5ac91d13456a631778a9f2f3d73ef7e4cffc2b5e7bffa02164b"; - }; - }; "mathjs-5.10.3" = { name = "mathjs"; packageName = "mathjs"; @@ -25794,13 +26063,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-0.0.94" = { + "mdn-browser-compat-data-1.0.1" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "0.0.94"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.94.tgz"; - sha512 = "O3zJqbmehz0Hn3wpk62taA0+jNF7yn6BDWqQ9Wh2bEoO9Rx1BYiTmNX565eNVbW0ixfQkY6Sp9FvY/rr79Qmyg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.1.tgz"; + sha512 = "FxRIu4UYu4rRdFs5JFf6del6J+OpbOq2tYfIEK7N/PtEtz6yGVcWcytmh5L5hZxe58kuxUzjgR8+/0TRyRzRqA=="; }; }; "mdn-data-2.0.4" = { @@ -26055,6 +26324,15 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; + "meow-6.0.0" = { + name = "meow"; + packageName = "meow"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-6.0.0.tgz"; + sha512 = "x4rYsjigPBDAxY+BGuK83YLhUIqui5wYyZoqb6QJCUOs+0fiYq+i/NV4Jt8OgIfObZFxG9iTyvLDu4UTohGTFw=="; + }; + }; "merge-1.2.1" = { name = "merge"; packageName = "merge"; @@ -26361,6 +26639,15 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -26406,6 +26693,15 @@ let sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; }; }; + "min-indent-1.0.0" = { + name = "min-indent"; + packageName = "min-indent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz"; + sha1 = "cfc45c37e9ec0d8f0a0ec3dd4ef7f7c3abe39256"; + }; + }; "minicap-prebuilt-2.3.0" = { name = "minicap-prebuilt"; packageName = "minicap-prebuilt"; @@ -26523,6 +26819,15 @@ let sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; }; }; + "minimist-options-4.0.2" = { + name = "minimist-options"; + packageName = "minimist-options"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.0.2.tgz"; + sha512 = "seq4hpWkYSUh1y7NXxzucwAN9yVlBc3Upgdjz8vLCP97jG8kaOmzYrVH/m7tQ1NYD1wdtZbSLfdy4zFmRWuc/w=="; + }; + }; "minimisted-2.0.0" = { name = "minimisted"; packageName = "minimisted"; @@ -26550,6 +26855,60 @@ let sha512 = "UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w=="; }; }; + "minipass-collect-1.0.2" = { + name = "minipass-collect"; + packageName = "minipass-collect"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; + }; + }; + "minipass-fetch-1.2.1" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz"; + sha512 = "ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg=="; + }; + }; + "minipass-flush-1.0.5" = { + name = "minipass-flush"; + packageName = "minipass-flush"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; + }; + }; + "minipass-json-stream-1.0.1" = { + name = "minipass-json-stream"; + packageName = "minipass-json-stream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"; + sha512 = "ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg=="; + }; + }; + "minipass-pipeline-1.2.2" = { + name = "minipass-pipeline"; + packageName = "minipass-pipeline"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha512 = "3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA=="; + }; + }; + "minipass-sized-1.0.3" = { + name = "minipass-sized"; + packageName = "minipass-sized"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; + sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; + }; + }; "minitouch-prebuilt-1.2.0" = { name = "minitouch-prebuilt"; packageName = "minitouch-prebuilt"; @@ -26631,15 +26990,6 @@ let sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; }; }; - "mj-context-menu-0.2.0" = { - name = "mj-context-menu"; - packageName = "mj-context-menu"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.2.0.tgz"; - sha512 = "yJxrWBHCjFZEHsZgfs7m5g9OSCNzsVYadW6f6lX3pgZL67vmodtSW/4zhsYmuDKweXfHs0M1kJge1uQIasWA+g=="; - }; - }; "mkdirp-0.3.0" = { name = "mkdirp"; packageName = "mkdirp"; @@ -26703,13 +27053,22 @@ let sha512 = "xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw=="; }; }; - "module-deps-6.2.1" = { + "module-alias-2.2.2" = { + name = "module-alias"; + packageName = "module-alias"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz"; + sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; + }; + }; + "module-deps-6.2.2" = { name = "module-deps"; packageName = "module-deps"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.1.tgz"; - sha512 = "UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A=="; + url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz"; + sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w=="; }; }; "mold-source-map-0.4.0" = { @@ -26937,13 +27296,13 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multiblob-1.13.4" = { + "multiblob-1.13.6" = { name = "multiblob"; packageName = "multiblob"; - version = "1.13.4"; + version = "1.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.4.tgz"; - sha512 = "2uv89W7I5brTx6ETpE7kXv0dGC3iA+xrAxNtwjwb3lwBTXIYrJ4jhhVX5UyNaRWHdmfLe0dJeEvJm9uoekkmag=="; + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.6.tgz"; + sha512 = "1yKhCPwLXitdw3b3OF+SE0+vD06NGcL/7yumKWCrPkJaMdNv2gaO0lCukZaFKYyu05GimwXEynxGWPNBv5qbBA=="; }; }; "multiblob-http-1.0.0" = { @@ -27189,13 +27548,13 @@ let sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; }; }; - "muxrpc-6.4.2" = { + "muxrpc-6.4.8" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.4.2"; + version = "6.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.2.tgz"; - sha512 = "1wRnouHgHO3JYN3xbyzQGTFsd/wo12/zaikmQusP8ma+lmL+ewNvuvuwKSEJasKQTRnbTwbzh/OPdt9N76CA4g=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.4.8.tgz"; + sha512 = "9oLoLbiAWZAhgxQzquApj0eSfiTYPWLq4AV5mvCBjsicJKWOJlxAAxypHdlnmHeUbOxrPRweneHI7l+nzY/+aQ=="; }; }; "muxrpc-usage-2.1.0" = { @@ -27243,15 +27602,6 @@ let sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; }; }; - "mz-2.5.0" = { - name = "mz"; - packageName = "mz"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.5.0.tgz"; - sha1 = "2859025df03d46b57bb317174b196477ce64cec1"; - }; - }; "mz-2.7.0" = { name = "mz"; packageName = "mz"; @@ -27333,13 +27683,13 @@ let sha512 = "IMVIZkHP7Ep01foXurcJR59Hj/0yyApNK3JWpVHq2QVdLgo8wGU/ZsodlpL7jJ/m24+lxT0eyavrLCEuYQK2fg=="; }; }; - "nanoid-2.1.6" = { + "nanoid-2.1.8" = { name = "nanoid"; packageName = "nanoid"; - version = "2.1.6"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.6.tgz"; - sha512 = "2NDzpiuEy3+H0AVtdt8LoFi7PnqkOnIzYmJQp7xsEU6VexLluHQwKREuiz57XaQC5006seIadPrIZJhyS2n7aw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.8.tgz"; + sha512 = "g1z+n5s26w0TGKh7gjn7HCqurNKMZWzH08elXzh/gM/csQHd/UqDV6uxMghQYg9IvqRPm1QpeMk50YMofHvEjQ=="; }; }; "nanolru-1.0.0" = { @@ -27886,13 +28236,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.12.0" = { + "node-abi-2.13.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.12.0.tgz"; - sha512 = "VhPBXCIcvmo/5K8HPmnWJyyhvgKxnHTUMXR/XwGHV68+wrgkzST4UmQrY/XszSWA5dtnXpNp528zkcyJ/pzVcw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz"; + sha512 = "9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA=="; }; }; "node-addon-api-1.7.1" = { @@ -28004,6 +28354,15 @@ let sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; }; }; + "node-fetch-2.2.0" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz"; + sha512 = "OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="; + }; + }; "node-fetch-2.6.0" = { name = "node-fetch"; packageName = "node-fetch"; @@ -28049,13 +28408,13 @@ let sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; }; }; - "node-gyp-5.0.5" = { + "node-gyp-5.0.7" = { name = "node-gyp"; packageName = "node-gyp"; - version = "5.0.5"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.5.tgz"; - sha512 = "WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.7.tgz"; + sha512 = "K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw=="; }; }; "node-gyp-build-3.7.0" = { @@ -28202,13 +28561,13 @@ let sha512 = "OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ=="; }; }; - "node-red-node-rbe-0.2.5" = { + "node-red-node-rbe-0.2.6" = { name = "node-red-node-rbe"; packageName = "node-red-node-rbe"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.5.tgz"; - sha512 = "WPwIOZIdDprgfqOe8bEun47wkFFc+5Uw/1w3O/kZn/kS2IpI1q+wijUDK+Hw8q4d8KgA58B30wh+10UvXzsPDA=="; + url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.2.6.tgz"; + sha512 = "3shW4Q6sHbqNQZPbfKx7HdcUuytgfJQGXwR4wdNH03q8JwAwPeuA0Z+FLOy/PcZeLDawIrV4IoqwbLsSfGAqmQ=="; }; }; "node-red-node-tail-0.0.3" = { @@ -28220,13 +28579,13 @@ let sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ=="; }; }; - "node-releases-1.1.39" = { + "node-releases-1.1.44" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.39"; + version = "1.1.44"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.39.tgz"; - sha512 = "8MRC/ErwNCHOlAFycy9OPca46fQYUjbJRDcZTHVWIGXIjYLM73k70vv3WkYutVnM4cCo4hE0MqBVVZjP6vjISA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz"; + sha512 = "NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw=="; }; }; "node-request-by-swagger-1.1.4" = { @@ -28310,13 +28669,13 @@ let sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e"; }; }; - "node.extend-2.0.0" = { + "node.extend-2.0.2" = { name = "node.extend"; packageName = "node.extend"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.0.tgz"; - sha1 = "7525a2875677ea534784a5e10ac78956139614df"; + url = "https://registry.npmjs.org/node.extend/-/node.extend-2.0.2.tgz"; + sha512 = "pDT4Dchl94/+kkgdwyS2PauDFjZG0Hk0IcHIB+LkW27HLDtdoeMxHTxZh39DYbPP8UflWXWj9JcdDozF+YDOpQ=="; }; }; "nodebmc-0.0.7" = { @@ -28517,13 +28876,13 @@ let sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg=="; }; }; - "npm-bundled-1.0.6" = { + "npm-bundled-1.1.1" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.0.6"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; }; }; "npm-conf-1.1.3" = { @@ -28553,6 +28912,15 @@ let sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A=="; }; }; + "npm-normalize-package-bin-1.0.1" = { + name = "npm-normalize-package-bin"; + packageName = "npm-normalize-package-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -28571,13 +28939,22 @@ let sha512 = "qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg=="; }; }; - "npm-packlist-1.4.6" = { + "npm-package-arg-7.0.0" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz"; + sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; + }; + }; + "npm-packlist-1.4.7" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.6.tgz"; - sha512 = "u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz"; + sha512 = "vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ=="; }; }; "npm-path-2.0.4" = { @@ -28616,6 +28993,15 @@ let sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw=="; }; }; + "npm-pick-manifest-4.0.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-4.0.0.tgz"; + sha512 = "SsYReLe/16UgSL6GKX6GO4o3RVBthVy1uuHq6kZ9mkPeQXpOHbrLZoV13i8fr3LQtET+pLPSfD13e4RIYfkX5Q=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -28652,6 +29038,15 @@ let sha512 = "Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A=="; }; }; + "npm-registry-fetch-5.0.1" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-5.0.1.tgz"; + sha512 = "GK7SUx188KSkPvbceOGO59L3FGHLBYoP0YEhUAKYjAypL15v5xmoempZ9rIJS2R/1eOS0KS1Y9AQe79YfgNxaw=="; + }; + }; "npm-run-4.1.2" = { name = "npm-run"; packageName = "npm-run"; @@ -28661,15 +29056,6 @@ let sha1 = "1030e1ec56908c89fcc3fa366d03a2c2ba98eb99"; }; }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; "npm-run-path-2.0.2" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -28688,13 +29074,13 @@ let sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; }; }; - "npm-run-path-4.0.0" = { + "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.0.tgz"; - sha512 = "8eyAOAH+bYXFPSnNnKr3J+yoybe8O87Is5rtAQ8qRczJz1ajcsjg8l2oZqP+Ppx15Ii3S1vUTjQN2h4YO2tWWQ=="; + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; }; "npm-which-3.0.1" = { @@ -28959,15 +29345,6 @@ let sha512 = "wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw=="; }; }; - "object-inspect-1.6.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz"; - sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; - }; - }; "object-inspect-1.7.0" = { name = "object-inspect"; packageName = "object-inspect"; @@ -28977,13 +29354,13 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; - "object-is-1.0.1" = { + "object-is-1.0.2" = { name = "object-is"; packageName = "object-is"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; + sha512 = "Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="; }; }; "object-keys-0.4.0" = { @@ -29049,13 +29426,13 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.getownpropertydescriptors-2.0.3" = { + "object.getownpropertydescriptors-2.1.0" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; }; }; "object.map-1.0.1" = { @@ -29094,13 +29471,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.0" = { + "object.values-1.1.1" = { name = "object.values"; packageName = "object.values"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz"; - sha512 = "8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; + sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; }; }; "objectorarray-1.0.3" = { @@ -29364,13 +29741,13 @@ let sha512 = "pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="; }; }; - "opener-1.4.3" = { + "opener-1.5.1" = { name = "opener"; packageName = "opener"; - version = "1.4.3"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz"; - sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; + url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz"; + sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; }; }; "openid-2.0.6" = { @@ -29544,13 +29921,13 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.2" = { + "ora-4.0.3" = { name = "ora"; packageName = "ora"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.2.tgz"; - sha512 = "YUOZbamht5mfLxPmk4M35CD/5DuOkAacxlEUbStVXpBAt4fyhBf+vZHI/HRkI++QUp3sNoeA2Gw4C+hi4eGSig=="; + url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz"; + sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; }; }; "orchestrator-0.3.8" = { @@ -29688,13 +30065,22 @@ let sha512 = "0RFgy9TDsgTF/1UJ8bSQ4heTYRatDz3HOXXh8d3WyXReqeOU+edgkbG4ERMFPdzFnA+SgqKTnPRg+2pduZsmSQ=="; }; }; - "p-any-1.1.0" = { + "p-all-2.1.0" = { + name = "p-all"; + packageName = "p-all"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz"; + sha512 = "HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA=="; + }; + }; + "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; - version = "1.1.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz"; - sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g=="; + url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz"; + sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; }; }; "p-cancelable-0.3.0" = { @@ -29724,6 +30110,15 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; + "p-cancelable-2.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + }; + }; "p-debounce-1.0.0" = { name = "p-debounce"; packageName = "p-debounce"; @@ -29751,6 +30146,15 @@ let sha512 = "NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA=="; }; }; + "p-event-4.1.0" = { + name = "p-event"; + packageName = "p-event"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-event/-/p-event-4.1.0.tgz"; + sha512 = "4vAd06GCsgflX4wHN1JqrMzBh/8QZ4j+rzp0cd2scXRwuBEv+QR3wrVA5aLhWDLw4y2WgDKvzWF3CCLmVM1UgA=="; + }; + }; "p-finally-1.0.0" = { name = "p-finally"; packageName = "p-finally"; @@ -29841,6 +30245,15 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; + "p-map-3.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"; + sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ=="; + }; + }; "p-map-series-1.0.0" = { name = "p-map-series"; packageName = "p-map-series"; @@ -29886,13 +30299,13 @@ let sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; }; - "p-some-2.0.1" = { + "p-some-4.1.0" = { name = "p-some"; packageName = "p-some"; - version = "2.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz"; - sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06"; + url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz"; + sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; "p-timeout-1.2.1" = { @@ -30021,22 +30434,22 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-9.5.5" = { + "pacote-10.2.1" = { name = "pacote"; packageName = "pacote"; - version = "9.5.5"; + version = "10.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz"; - sha512 = "jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA=="; + url = "https://registry.npmjs.org/pacote/-/pacote-10.2.1.tgz"; + sha512 = "sPHVOF7uKY8yDivKYimb5l3D8BvNNjR+9FmzkThOTtftkddGY/C6uENVkgc3HQtOpCX8R2qztkSAOI369bgLEA=="; }; }; - "pacote-9.5.9" = { + "pacote-9.5.5" = { name = "pacote"; packageName = "pacote"; - version = "9.5.9"; + version = "9.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.5.9.tgz"; - sha512 = "S1nYW9ly+3btn3VmwRAk2LG3TEh8mkrFdY+psbnHSk8oPODbZ28uG0Z0d3yI0EpqcpLR6BukoVRf3H4IbGCkPQ=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz"; + sha512 = "jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA=="; }; }; "pad-0.0.5" = { @@ -30075,6 +30488,15 @@ let sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="; }; }; + "papaparse-4.6.0" = { + name = "papaparse"; + packageName = "papaparse"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/papaparse/-/papaparse-4.6.0.tgz"; + sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; + }; + }; "parallel-transform-1.2.0" = { name = "parallel-transform"; packageName = "parallel-transform"; @@ -30210,13 +30632,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.2" = { + "parse-headers-2.0.3" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.2.tgz"; - sha512 = "/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg=="; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz"; + sha512 = "QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA=="; }; }; "parse-help-1.0.0" = { @@ -30489,6 +30911,15 @@ let sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811"; }; }; + "passport-0.4.1" = { + name = "passport"; + packageName = "passport"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz"; + sha512 = "IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg=="; + }; + }; "passport-http-bearer-1.0.1" = { name = "passport-http-bearer"; packageName = "passport-http-bearer"; @@ -30543,13 +30974,13 @@ let sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; }; }; - "passwd-user-2.1.0" = { + "passwd-user-3.0.0" = { name = "passwd-user"; packageName = "passwd-user"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/passwd-user/-/passwd-user-2.1.0.tgz"; - sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e"; + url = "https://registry.npmjs.org/passwd-user/-/passwd-user-3.0.0.tgz"; + sha512 = "Iu90rROks+uDK00ppSewoZyqeCwjGR6W8PcY0Phl8YFWju/lRmIogQb98+vSb5RUeYkONL3IC4ZLBFg4FiE0Hg=="; }; }; "password-prompt-1.1.2" = { @@ -30651,15 +31082,6 @@ let sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; - }; - }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -30669,13 +31091,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-key-3.1.0" = { + "path-key-3.1.1" = { name = "path-key"; packageName = "path-key"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz"; - sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="; + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; "path-loader-1.0.10" = { @@ -31029,13 +31451,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.13.3" = { + "pino-5.14.0" = { name = "pino"; packageName = "pino"; - version = "5.13.3"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.13.3.tgz"; - sha512 = "FL12DKlPwBlbhztlUz6kseR03PRR8nD+wvLdN/Sji9UiBYYfSjX+k8ocU7/NwW55JdFRONTn3iACoelXnMFVVQ=="; + url = "https://registry.npmjs.org/pino/-/pino-5.14.0.tgz"; + sha512 = "Vj1f2wAojTGesogT0hsA/ua8ALltCOBCcA1nkEoDfnTsVWpgBu5UVSY7OdjiGmrMOKHBm24nd3nKXzyPUYJ3ig=="; }; }; "pino-std-serializers-2.4.2" = { @@ -31281,15 +31703,6 @@ let sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; }; }; - "po2json-0.4.5" = { - name = "po2json"; - packageName = "po2json"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/po2json/-/po2json-0.4.5.tgz"; - sha1 = "47bb2952da32d58a1be2f256a598eebc0b745118"; - }; - }; "portfinder-1.0.25" = { name = "portfinder"; packageName = "portfinder"; @@ -31336,22 +31749,22 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.18" = { + "postcss-7.0.24" = { name = "postcss"; packageName = "postcss"; - version = "7.0.18"; + version = "7.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.18.tgz"; - sha512 = "/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz"; + sha512 = "Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA=="; }; }; - "postcss-7.0.21" = { + "postcss-7.0.25" = { name = "postcss"; packageName = "postcss"; - version = "7.0.21"; + version = "7.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz"; - sha512 = "uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.25.tgz"; + sha512 = "NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg=="; }; }; "postcss-calc-7.0.1" = { @@ -31921,13 +32334,13 @@ let sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="; }; }; - "private-box-0.3.0" = { + "private-box-0.3.1" = { name = "private-box"; packageName = "private-box"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/private-box/-/private-box-0.3.0.tgz"; - sha512 = "zsK6DDEC+cnNiunYamcVbx4ZCLbKnzTOZa09K4Pj3/tH3nQFPUO9K2QoYy4kfxLqmoyw6RPDtACN9OYviMQZ2Q=="; + url = "https://registry.npmjs.org/private-box/-/private-box-0.3.1.tgz"; + sha512 = "abAuk3ZDyQvPLY6MygtwaDTUBIZ0C5wMMuX1jXa0svazV+keTwn7cPobRv4WYA9ctsDUztm/9CYu4y2TPL08xw=="; }; }; "probe-image-size-5.0.0" = { @@ -32362,13 +32775,13 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "psl-1.4.0" = { + "psl-1.6.0" = { name = "psl"; packageName = "psl"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; - sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz"; + sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA=="; }; }; "pstree.remy-1.1.7" = { @@ -33073,13 +33486,13 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "purgecss-1.4.1" = { + "purgecss-1.4.2" = { name = "purgecss"; packageName = "purgecss"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/purgecss/-/purgecss-1.4.1.tgz"; - sha512 = "5jONV/D/3nfa+lC425+LA+OWe5/LDn4a79cac+TnzJq3VczwnWlpIDdW275hHsGhkzIlqATQsYFLW7or0cSwNQ=="; + url = "https://registry.npmjs.org/purgecss/-/purgecss-1.4.2.tgz"; + sha512 = "hkOreFTgiyMHMmC2BxzdIw5DuC6kxAbP/gGOGd3MEsF3+5m69rIvUEPaxrnoUtfODTFKe9hcXjGwC6jcjoyhOw=="; }; }; "push-stream-10.1.2" = { @@ -33631,15 +34044,6 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-2.0.5" = { - name = "rc-config-loader"; - packageName = "rc-config-loader"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-2.0.5.tgz"; - sha512 = "T464K2MQlnNWOblUDIglpFhyN+zYJq7jSlL++/N0hUkcmIXeNFumwXFVdtf8qhUGohn4RYQ0wdi74R575I44PQ=="; - }; - }; "rc-config-loader-3.0.0" = { name = "rc-config-loader"; packageName = "rc-config-loader"; @@ -33658,13 +34062,13 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "react-is-16.11.0" = { + "react-is-16.12.0" = { name = "react-is"; packageName = "react-is"; - version = "16.11.0"; + version = "16.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.11.0.tgz"; - sha512 = "gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw=="; + url = "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz"; + sha512 = "rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q=="; }; }; "read-1.0.7" = { @@ -33721,13 +34125,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "read-package-json-2.1.0" = { + "read-package-json-2.1.1" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz"; - sha512 = "KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz"; + sha512 = "dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A=="; + }; + }; + "read-package-json-fast-1.1.1" = { + name = "read-package-json-fast"; + packageName = "read-package-json-fast"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.1.tgz"; + sha512 = "vDw3wiWLwUXhYBCVvjAQJGCI5+DcgwGSYlFETCV9m/b107/yNBnYfCkoVrwHj7338j1z24/dxUXvtrXVjVjL1Q=="; }; }; "read-package-tree-5.3.1" = { @@ -33775,6 +34188,15 @@ let sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; }; }; + "read-pkg-5.2.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + }; "read-pkg-up-1.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -33811,6 +34233,15 @@ let sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; }; }; + "read-pkg-up-7.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + }; "read-torrent-1.3.1" = { name = "read-torrent"; packageName = "read-torrent"; @@ -33847,6 +34278,15 @@ let sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; }; }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; "readable-stream-2.3.6" = { name = "readable-stream"; packageName = "readable-stream"; @@ -33883,13 +34323,13 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.2.0" = { + "readdirp-3.3.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; - sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; + sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; }; }; "readline2-0.1.1" = { @@ -33991,6 +34431,15 @@ let sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; }; }; + "redent-3.0.0" = { + name = "redent"; + packageName = "redent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; + }; + }; "redeyed-1.0.1" = { name = "redeyed"; packageName = "redeyed"; @@ -34090,15 +34539,6 @@ let sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; }; }; - "regenerator-runtime-0.9.6" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; - }; - }; "regenerator-transform-0.14.1" = { name = "regenerator-transform"; packageName = "regenerator-transform"; @@ -34126,13 +34566,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.2.0" = { + "regexp.prototype.flags-1.3.0" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha512 = "ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha512 = "2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ=="; }; }; "regexpp-1.1.0" = { @@ -34243,13 +34683,13 @@ let sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; }; }; - "regjsparser-0.6.0" = { + "regjsparser-0.6.2" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz"; - sha512 = "RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz"; + sha512 = "E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q=="; }; }; "rehype-sort-attribute-values-2.0.1" = { @@ -34522,15 +34962,6 @@ let sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; - "request-2.87.0" = { - name = "request"; - packageName = "request"; - version = "2.87.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz"; - sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw=="; - }; - }; "request-2.88.0" = { name = "request"; packageName = "request"; @@ -34702,22 +35133,13 @@ let sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; }; }; - "resolve-1.11.1" = { + "resolve-1.14.1" = { name = "resolve"; packageName = "resolve"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz"; - sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw=="; - }; - }; - "resolve-1.12.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.12.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; - sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz"; + sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg=="; }; }; "resolve-1.7.1" = { @@ -34945,13 +35367,13 @@ let sha512 = "Gesb0Act9oeJ5N0KztREitP2E0zo7euzgTu2X4HLP6IJmcrRbRnqNwV11tzNy5JFJzKB1JTJFc7KseojTeGwOA=="; }; }; - "rethinkdb-2.3.3" = { + "rethinkdb-2.4.2" = { name = "rethinkdb"; packageName = "rethinkdb"; - version = "2.3.3"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.3.tgz"; - sha1 = "3dc6586e22fa1dabee0d254e64bd0e379fad2f72"; + url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.4.2.tgz"; + sha512 = "6DzwqEpFc8cqesAdo07a845oBRxLiHvWzopTKBo/uY2ypGWIsJQFJk3wjRDtSEhczxJqLS0jnf37rwgzYAw8NQ=="; }; }; "retry-0.10.1" = { @@ -35152,13 +35574,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.14.4" = { + "roarr-2.14.6" = { name = "roarr"; packageName = "roarr"; - version = "2.14.4"; + version = "2.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.14.4.tgz"; - sha512 = "QMzRAQGZFPgnx4nNWp4Q+WHfiZh2HTSEjNaxFLrEIj3PmcQ1GHL5OjaaIyF9ybUDD2aZ9t3Awc/obrRPils9ng=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.14.6.tgz"; + sha512 = "qjbw0BEesKA+3XFBPt+KVe1PC/Z6ShfJ4wPlx2XifqH5h2Lj8/KQT5XJTsy3n1Es5kai+BwKALaECW3F70B1cg=="; }; }; "rollup-0.67.0" = { @@ -35566,6 +35988,15 @@ let sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; "sax-1.2.4" = { name = "sax"; packageName = "sax"; @@ -35629,13 +36060,22 @@ let sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; }; }; - "secret-stack-6.3.0" = { + "secret-stack-6.3.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.0.tgz"; - sha512 = "abIfcP1tlJ3gbfgAkp6mgqEc7M70GvXVTyE//iHDXMQz21zQxOD5WcWAiMg1Lgw5FgLfHM1WF+c8PqFNNE3WOg=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.3.1.tgz"; + sha512 = "SyYRGgjxq8lbQyqdIbaNfteZ77B3Bd2TH+k5WpI6gHjTCOKZZmD8aiat+bUfhjsiqf0LMQauRH3KD6vIMdDPLg=="; + }; + }; + "secure-compare-3.0.1" = { + name = "secure-compare"; + packageName = "secure-compare"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz"; + sha1 = "f1a0329b308b221fae37b9974f3d578d0ca999e3"; }; }; "secure-keys-1.0.0" = { @@ -35809,6 +36249,24 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; + "semver-7.0.0" = { + name = "semver"; + packageName = "semver"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; + }; + }; + "semver-7.1.1" = { + name = "semver"; + packageName = "semver"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz"; + sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -35827,6 +36285,15 @@ let sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; }; }; + "semver-diff-3.1.1" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + }; + }; "semver-greatest-satisfied-range-1.1.0" = { name = "semver-greatest-satisfied-range"; packageName = "semver-greatest-satisfied-range"; @@ -35935,13 +36402,13 @@ let sha512 = "QnpHNykm4nI4T6mT+NoVayh9Ixl5DohYCSVqMgPJsO2WejOcqaYTh4HQOkmzaDzXH3NO5pif4z/hpo2NGtgNlg=="; }; }; - "sentence-splitter-3.1.0" = { + "sentence-splitter-3.2.0" = { name = "sentence-splitter"; packageName = "sentence-splitter"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.1.0.tgz"; - sha512 = "S8ye/Ic5ryKynwgjcS0ggncqhVJW3mgmo/gFNIcKKU1cdLjYzqtQ/PCkD7l0rZtSSfcjLqqVjfdMVN6FKkwUuQ=="; + url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-3.2.0.tgz"; + sha512 = "lKX2tZ1rsA9Tu0gW8vRmMDmIEJoZ1d7cKpzcbFZdUrSpCR6gy/7OPPh7jjT/6Oc6Z79ToUmC2l8tyTEGanVmiA=="; }; }; "separator-escape-0.0.0" = { @@ -35971,22 +36438,22 @@ let sha512 = "/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA=="; }; }; - "serialize-javascript-1.9.1" = { + "serialize-javascript-2.1.2" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "1.9.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ=="; }; }; - "serialize-to-js-3.0.0" = { + "serialize-to-js-3.0.2" = { name = "serialize-to-js"; packageName = "serialize-to-js"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-to-js/-/serialize-to-js-3.0.0.tgz"; - sha512 = "WdGgi0jGnWCQXph2p3vkxceDnTfvfyXfYxherQMRcZjSaJzMQdMBAW6i0nojsBKIZ3fFOztZKKVbbm05VbIdRA=="; + url = "https://registry.npmjs.org/serialize-to-js/-/serialize-to-js-3.0.2.tgz"; + sha512 = "o5FqeMyxGx1wkp8p14q9QqGXh1JjXtIDYTr15N/B4ThM5ULqlpXdtOO84m950jFGvBkeRD1utW+WyNKvao2ybQ=="; }; }; "serializerr-1.0.3" = { @@ -36160,6 +36627,15 @@ let sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; }; }; + "shallow-clone-3.0.1" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA=="; + }; + }; "shallow-copy-0.0.1" = { name = "shallow-copy"; packageName = "shallow-copy"; @@ -36169,13 +36645,13 @@ let sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; }; }; - "sharp-0.23.2" = { + "sharp-0.23.4" = { name = "sharp"; packageName = "sharp"; - version = "0.23.2"; + version = "0.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/sharp/-/sharp-0.23.2.tgz"; - sha512 = "BSo0tq6Jtzwa6GDKvVMNNPCP/HLczrFLGVcorYv7OtxlKx4UPHy7x9DdfT8F+PK7FCFDemVRwtsjWpvaJI9v6w=="; + url = "https://registry.npmjs.org/sharp/-/sharp-0.23.4.tgz"; + sha512 = "fJMagt6cT0UDy9XCsgyLi0eiwWWhQRxbwGmqQT6sY8Av4s0SVsT/deg8fobBQCTDU5iXRgz0rAeXoE2LBZ8g+Q=="; }; }; "shasum-1.0.2" = { @@ -36313,6 +36789,15 @@ let sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; }; }; + "side-channel-1.0.2" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz"; + sha512 = "7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA=="; + }; + }; "sigmund-1.0.1" = { name = "sigmund"; packageName = "sigmund"; @@ -36322,13 +36807,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-0.3.1" = { + "sign-addon-2.0.4" = { name = "sign-addon"; packageName = "sign-addon"; - version = "0.3.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-0.3.1.tgz"; - sha512 = "feaoG7+8IXr9SymOEd8VTZCSlVZArWcBDZ33IIdfXlU5NWWzXdCxCjPDqAkLQplFa7RRZr1S4lSmgMPn80Ze1A=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.4.tgz"; + sha512 = "QKfE558nIQ2o9VACAIMQBI4I+IhlL+k9bxhVsQUb4B6Bu+tC8IDSlnHrydcYPf3AB6K+g+BVzbDD1JlSw4bRDg=="; }; }; "signal-exit-3.0.2" = { @@ -36394,13 +36879,13 @@ let sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; }; }; - "simple-git-1.126.0" = { + "simple-git-1.129.0" = { name = "simple-git"; packageName = "simple-git"; - version = "1.126.0"; + version = "1.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-1.126.0.tgz"; - sha512 = "47mqHxgZnN8XRa9HbpWprzUv3Ooqz9RY/LSZgvA7jCkW8jcwLahMz7LKugY91KZehfG0sCVPtgXiU72hd6b1Bw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.129.0.tgz"; + sha512 = "XbzNmugMTeV2crZnPl+b1ZJn+nqXCUNyrZxDXpLM0kHL3B85sbPlpd8q9I4qtAHI9D2FxTB6w4BuiAGKYtyzKw=="; }; }; "simple-markdown-0.4.4" = { @@ -36421,13 +36906,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.6.1" = { + "simple-peer-9.6.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.6.1"; + version = "9.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.1.tgz"; - sha512 = "/8IOtaXnnVhCkgHFBQKZ+hfx/s0+Ybo0Ijon7OrKUuEf8dEcRZJrrfjkNNgzogLM/mixI2EvnTSpOiKR6cts+w=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz"; + sha512 = "EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig=="; }; }; "simple-sha1-2.1.2" = { @@ -36466,13 +36951,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-8.1.0" = { + "simple-websocket-8.1.1" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.0.tgz"; - sha512 = "24cIbqvC+E2VTgfDqRCWMTthAeZwzwvl5VoehQku6DJE8sYb/s7V/GXr0JplR92mhwsMxAeXnj0UBnyVfLfGhg=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.1.tgz"; + sha512 = "06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg=="; }; }; "single-line-log-0.4.1" = { @@ -36601,6 +37086,15 @@ let sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; + "slice-ansi-3.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; + }; + }; "sliced-1.0.1" = { name = "sliced"; packageName = "sliced"; @@ -36763,13 +37257,13 @@ let sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ=="; }; }; - "snyk-gradle-plugin-3.2.0" = { + "snyk-gradle-plugin-3.2.2" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.0.tgz"; - sha512 = "0fopfp3g7xzs2D20pQBZgP2x4jugyr0cASv/Px3WEfsQR+bJlfk6h67euhH24lOl0fhdTYfz4oiteWPskb39sg=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.2.tgz"; + sha512 = "ijIWsypbtpdTuRcYTFsnEWbaBnhCc7q0iIg0A4OcOW/xLyInPwyfBMnip4ubNfHAS/PrvzgfwwwJhttcQD0ZaQ=="; }; }; "snyk-module-1.9.1" = { @@ -36781,31 +37275,31 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.4.0" = { + "snyk-mvn-plugin-2.7.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.4.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.4.0.tgz"; - sha512 = "Fmt6Mjx6zZz+4q6PnBkhuNGhEX++q/pKMI26ls4p3JPkx4KxBz89oncpkmf7P8YCkoaka8oHhtDEv/R4Z9LleQ=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.7.0.tgz"; + sha512 = "DLBt+6ZvtoleXE7Si3wAa6gdPSWsXdIQEY6m2zW2InN9WiaRwIEKMCY822eFmRPZVNNmZNRUIeQsoHZwv/slqQ=="; }; }; - "snyk-nodejs-lockfile-parser-1.16.1" = { + "snyk-nodejs-lockfile-parser-1.17.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.16.1.tgz"; - sha512 = "MEQImB2XU35D66wYve6g1RcDuD9vyoxGvYtM+ngSd5ItujzjIpyF26W7niqHwBRGLamqjsKF5cOlbmHs+wsx/Q=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.17.0.tgz"; + sha512 = "i4GAYFj9TJLOQ8F+FbIJuJWdGymi8w/XcrEX0FzXk7DpYUCY3mWibyKhw8RasfYBx5vLwUzEvRMaQuc2EwlyfA=="; }; }; - "snyk-nuget-plugin-1.13.1" = { + "snyk-nuget-plugin-1.16.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.13.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.13.1.tgz"; - sha512 = "2AQVeahBK7Rt38p0Acl1fMsFQu3dsqoRODPoRaS0IM/bOBzVdAkDF9pCb5yKMREGpMZcyRFkt8Q+hGiUk0Nlfg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.16.0.tgz"; + sha512 = "OEusK3JKKpR4Yto5KwuqjQGgb9wAhmDqBWSQomWdtKQVFrzn5B6BMzOFikUzmeMTnUGGON7gurQBLXeZZLhRqg=="; }; }; "snyk-paket-parser-1.5.0" = { @@ -36835,13 +37329,13 @@ let sha512 = "KI6GHt+Oj4fYKiCp7duhseUj5YhyL/zJOrrJg0u6r59Ux9w8gmkUYT92FHW27ihwuT6IPzdGNEuy06Yv2C9WaQ=="; }; }; - "snyk-python-plugin-1.13.3" = { + "snyk-python-plugin-1.16.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.13.3"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.13.3.tgz"; - sha512 = "Ud7mHmpMG4uCChvYLx5jA8HwOV/FNpT65xTxSt+6wsOjIUTuLiqM86mbvgzgk3pir8vMP9yQEsCi1i0zYLBArw=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.16.0.tgz"; + sha512 = "IA53xOcy1s881tbIrIXNqIuCNozd4PAVWN8oF0xgRn2NQbq0e7EWt7kFPJbmZodpLCDpXaKKqV2MHbXruFIsrw=="; }; }; "snyk-resolve-1.0.1" = { @@ -36862,13 +37356,13 @@ let sha512 = "aFPtN8WLqIk4E1ulMyzvV5reY1Iksz+3oPnUVib1jKdyTHymmOIYF7z8QZ4UUr52UsgmrD9EA/dq7jpytwFoOQ=="; }; }; - "snyk-sbt-plugin-2.8.0" = { + "snyk-sbt-plugin-2.9.2" = { name = "snyk-sbt-plugin"; packageName = "snyk-sbt-plugin"; - version = "2.8.0"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.8.0.tgz"; - sha512 = "ZzyBdND5CsaO0xkv05geZXu8Dd6Llvr/5oTj811U7h7UmrvljrAiABW4RGjRJPrPVuuJaDej2p633sgGtK9UsA=="; + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.9.2.tgz"; + sha512 = "Mikl/ga3kJkvDs9KURmEa9YydmRguMW1CdJ4f7kA3iULSIsP7xqi8C4jYkJ/v3xfNrkfr8jACu2q9IDQRYJ+rg=="; }; }; "snyk-tree-1.0.0" = { @@ -36934,13 +37428,13 @@ let sha1 = "bd39329b8961371787e24f345b074ec9cf000e33"; }; }; - "socket.io-adapter-1.1.1" = { + "socket.io-adapter-1.1.2" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; - sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz"; + sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; "socket.io-client-1.0.6" = { @@ -37303,24 +37797,6 @@ let sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; }; }; - "source-map-support-0.4.6" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.6.tgz"; - sha1 = "32552aa64b458392a85eab3b0b5ee61527167aeb"; - }; - }; - "source-map-support-0.5.13" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.13"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"; - sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w=="; - }; - }; "source-map-support-0.5.16" = { name = "source-map-support"; packageName = "source-map-support"; @@ -37465,15 +37941,6 @@ let sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb"; }; }; - "speech-rule-engine-3.0.0-beta.6" = { - name = "speech-rule-engine"; - packageName = "speech-rule-engine"; - version = "3.0.0-beta.6"; - src = fetchurl { - url = "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-3.0.0-beta.6.tgz"; - sha512 = "B7gcT53jAsKpx7WvFYQcyUlFmgS3Wa9KlDy0FY8SOTa+Wz5EqmI0MpCD5/fYm8/2qiCPp8HwZg+H3cBgM+sNVw=="; - }; - }; "speedometer-0.1.4" = { name = "speedometer"; packageName = "speedometer"; @@ -37636,6 +38103,15 @@ let sha512 = "RvqoKxq+8pDHsJo7aXxsFR18i+dU2Wp5o12qAJOV5LNcDt+fgJsc2QKKg3sIRfXrN9ZjzY1T7SNe/DFVqAXjaw=="; }; }; + "sqlite3-4.1.1" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz"; + sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -37672,13 +38148,13 @@ let sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA=="; }; }; - "ssb-client-4.7.8" = { + "ssb-client-4.7.9" = { name = "ssb-client"; packageName = "ssb-client"; - version = "4.7.8"; + version = "4.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.8.tgz"; - sha512 = "0oQhsa8EZtXbq2tdb/Pvf9h22tW4q7BZ4gbuaxVqIyYqw79Hq6Sr3xFa6+Mj6DX0Gb00TbI/Ft/jts2NyDfbmQ=="; + url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.7.9.tgz"; + sha512 = "koVuazgGa+Pz7KHnPTsOFvaKSrE0T38wSO7n6P7ZQp+1BpaoBCI4z8Kq2SvMw521Sz9dK9Rwh2bTakEDRgx84A=="; }; }; "ssb-config-2.3.9" = { @@ -37879,13 +38355,13 @@ let sha512 = "iRXjeI0sbRbgMwaKg+poqhHSH7GvUVgJ+8ysi8q7Hjj4wHkczLGAOyVjnyhjF+ErPDFn9kXN+46joneKqSgEDg=="; }; }; - "ssb-ooo-1.3.1" = { + "ssb-ooo-1.3.2" = { name = "ssb-ooo"; packageName = "ssb-ooo"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.1.tgz"; - sha512 = "Ztx1qSHCIS4lcLwynSG8XKhzCZ1ejsUi5UAHBG+Hzkf91sqA38q5pnkLW/VVrtBz6yM5xv1AqYcr3KB8WWBXnQ=="; + url = "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.3.2.tgz"; + sha512 = "JBH0cDaqQ/WRZMfoyn/fNLDrbrs5w2xnSno/VUDWGhc+SX+3/h6zFK7VvCjdzEATlZ/D7VRkXMYrOedSIVIKwA=="; }; }; "ssb-plugins-1.0.0" = { @@ -37924,13 +38400,13 @@ let sha512 = "TfatNqLvoP+eW/pMIbCmNcaoDq4R2k8jCtWkwDKx4AtluN/LwtyP931d5Mh+2gmzA04W7kxkr6f5ENGgdadMYg=="; }; }; - "ssb-replicate-1.3.0" = { + "ssb-replicate-1.3.2" = { name = "ssb-replicate"; packageName = "ssb-replicate"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.0.tgz"; - sha512 = "FLizJ+eHtGrySb61v3asIKpZkje77a6Cl7ZotUjD3YjNUOC7y+HN0AWaupbiiFiQXDGrIZ0ti0Mr8bHkMOJurQ=="; + url = "https://registry.npmjs.org/ssb-replicate/-/ssb-replicate-1.3.2.tgz"; + sha512 = "r/34OHn5wDkVUu0UNdKdPjmd3cPDmgknA5nK+gXBZj9ugSDwmdDsfEUavGtA7hlO+He1pC4EXtBa14dqgTqJCg=="; }; }; "ssb-unix-socket-1.0.0" = { @@ -37942,13 +38418,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-validate-4.0.4" = { + "ssb-validate-4.0.5" = { name = "ssb-validate"; packageName = "ssb-validate"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.4.tgz"; - sha512 = "MojZCR1qgZHdO4pnh4Loiqxj7fxP3w+MrA/4smXoKD46ReEnOjt/8Vm2sq3qpqPmUBU2GbEoDlgw7OKy0mWJBw=="; + url = "https://registry.npmjs.org/ssb-validate/-/ssb-validate-4.0.5.tgz"; + sha512 = "uniDFHD9eOMAK5D5ykpxlwyqTn0HxXTbO1icTkAmRcDR/qbghbtQ0muCgJj5hGHRZH7jYjPFjTbW2l4kzH/oag=="; }; }; "ssb-ws-6.2.3" = { @@ -37969,13 +38445,13 @@ let sha512 = "ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA=="; }; }; - "sshpk-1.14.1" = { + "sshpk-1.14.2" = { name = "sshpk"; packageName = "sshpk"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz"; - sha1 = "130f5975eddad963f1d56f92b9ac6c51fa9f83eb"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz"; + sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"; }; }; "sshpk-1.16.1" = { @@ -38032,6 +38508,15 @@ let sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; }; }; + "ssri-7.1.0" = { + name = "ssri"; + packageName = "ssri"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz"; + sha512 = "77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g=="; + }; + }; "stable-0.1.8" = { name = "stable"; packageName = "stable"; @@ -38095,13 +38580,13 @@ let sha512 = "8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw=="; }; }; - "static-eval-2.0.2" = { + "static-eval-2.0.3" = { name = "static-eval"; packageName = "static-eval"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; - sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.3.tgz"; + sha512 = "zsxDGucfAh8T339sSKgpFbvg15Fms2IVaJGC+jqp0bVsxhcpM+iMeAI8weNo8dmf4OblgifTBUoyk1vGVtYw2w=="; }; }; "static-extend-0.1.2" = { @@ -38338,13 +38823,22 @@ let sha1 = "1618548694420021a1182ff0af1911c129761773"; }; }; - "stream-shift-1.0.0" = { + "stream-promise-3.2.0" = { + name = "stream-promise"; + packageName = "stream-promise"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-promise/-/stream-promise-3.2.0.tgz"; + sha512 = "P+7muTGs2C8yRcgJw/PPt61q7O517tDHiwYEzMWo1GSBCcZedUMT/clz7vUNsSxFphIlJ6QUL4GexQKlfJoVtA=="; + }; + }; + "stream-shift-1.0.1" = { name = "stream-shift"; packageName = "stream-shift"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; "stream-splicer-2.0.1" = { @@ -38491,13 +38985,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.10.3" = { + "string-kit-0.11.3" = { name = "string-kit"; packageName = "string-kit"; - version = "0.10.3"; + version = "0.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.10.3.tgz"; - sha512 = "Pn7887wnmb9N0uAYKzqKGj1FWN2GBryiZBkM8mGqQWHoZsTUKDY574RT7ajXbRz4kf0TRKJm1JY5b0bDW0B4cw=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.3.tgz"; + sha512 = "ZkCMF5wd4u6JK5CszLUePuEHCerk/xVkqO6Y7ocz4qo+Y36lYUxw8kG5PFLo8Q6V0DcPCad1Ro3SpOCxiJC+FA=="; }; }; "string-length-2.0.0" = { @@ -38581,49 +39075,40 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.padstart-3.0.0" = { + "string.prototype.padstart-3.1.0" = { name = "string.prototype.padstart"; packageName = "string.prototype.padstart"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz"; - sha1 = "5bcfad39f4649bb2d031292e19bcf0b510d4b242"; - }; - }; - "string.prototype.trim-1.1.2" = { - name = "string.prototype.trim"; - packageName = "string.prototype.trim"; - version = "1.1.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz"; - sha1 = "d04de2c89e137f4d7d206f086b5ed2fae6be8cea"; + url = "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz"; + sha512 = "envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw=="; }; }; - "string.prototype.trim-1.2.0" = { + "string.prototype.trim-1.2.1" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz"; - sha512 = "9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; + sha512 = "MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw=="; }; }; - "string.prototype.trimleft-2.1.0" = { + "string.prototype.trimleft-2.1.1" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; - sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; }; }; - "string.prototype.trimright-2.1.0" = { + "string.prototype.trimright-2.1.1" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; - sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; }; }; "string2compact-1.3.0" = { @@ -38896,6 +39381,15 @@ let sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; }; }; + "strip-indent-3.0.0" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + }; "strip-json-comments-0.1.3" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -39184,6 +39678,15 @@ let sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; + "supports-color-7.1.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; + sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; + }; + }; "supports-hyperlinks-1.0.1" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; @@ -39400,13 +39903,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.15.3" = { + "systeminformation-4.16.0" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.15.3"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.15.3.tgz"; - sha512 = "Fx2ARGHtLl2/xLeNoTR8/doXSxUXuAzIN+dyCK9O43j/UETLBt77yTEbTxmYsVD47PYjX1iQTdcY41CZckY+zg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.16.0.tgz"; + sha512 = "1FjxPJSw7ad0zug+1YIQATj6Cn+wM5OBASEpjohEeOD2EGPIf0Cnhthd1L2O1YX+wKgOMuPldGfxYdo8yNHEIg=="; }; }; "syswide-cas-5.3.0" = { @@ -39545,13 +40048,13 @@ let sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; }; }; - "tape-4.11.0" = { + "tape-4.12.1" = { name = "tape"; packageName = "tape"; - version = "4.11.0"; + version = "4.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.11.0.tgz"; - sha512 = "yixvDMX7q7JIs/omJSzSZrqulOV51EC9dK8dM0TzImTIkHWfe2/kFyL5v+d9C+SrCMaICk59ujsqFAVidDqDaA=="; + url = "https://registry.npmjs.org/tape/-/tape-4.12.1.tgz"; + sha512 = "xoK2ariLmdGxqyXhhxfIZlr0czNB8hNJeVQmHN4D7ZyBn30GUoa4q2oM4cX8jNhnj1mtILXn1ugbfxc0tTDKtA=="; }; }; "tar-0.1.17" = { @@ -39635,13 +40138,13 @@ let sha1 = "a354305702a964357033027aa949eaed5331b784"; }; }; - "taskkill-3.0.0" = { + "taskkill-3.1.0" = { name = "taskkill"; packageName = "taskkill"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-3.0.0.tgz"; - sha512 = "lKzlrlm9FVkxSwxl3h/9q/FQdjLke6AKPat5mfPN1+y9gH16F1/+pz3oQdQPJosBAEArW3vHuCMEoOf4d5l+NA=="; + url = "https://registry.npmjs.org/taskkill/-/taskkill-3.1.0.tgz"; + sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; }; }; "tasklist-3.1.1" = { @@ -39662,13 +40165,13 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; - "telegraf-3.33.3" = { + "telegraf-3.34.1" = { name = "telegraf"; packageName = "telegraf"; - version = "3.33.3"; + version = "3.34.1"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.33.3.tgz"; - sha512 = "ItSAeE9OjFH+X0rS8DeErccoUZRy2hBl+mDjFWDqyZWyRElxA5L178UpJV7tM6hCVN/leFY+9orfra2JtX4AyQ=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.34.1.tgz"; + sha512 = "XKempUafzdi3TrPIA/jo2e7sRoLjE7oexgYTzQ7BeWHPnEi+Wh5EvOroOElSD9V4SCt9bub3HM352VK7dJS8Zw=="; }; }; "telegram-typings-3.6.1" = { @@ -39779,22 +40282,22 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "term-size-2.1.0" = { + "term-size-2.1.1" = { name = "term-size"; packageName = "term-size"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-2.1.0.tgz"; - sha512 = "I42EWhJ+2aeNQawGx1VtpO0DFI9YcfuvAMNIdKyf/6sRbHJ4P+ZQ/zIT87tE+ln1ymAGcCJds4dolfSAS0AcNg=="; + url = "https://registry.npmjs.org/term-size/-/term-size-2.1.1.tgz"; + sha512 = "UqvQSch04R+69g4RDhrslmGvGL3ucDRX/U+snYW0Mab4uCAyKSndUksaoqlJ81QKSpRnIsuOYQCbC2ZWx2896A=="; }; }; - "terminal-kit-1.31.7" = { + "terminal-kit-1.32.2" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.31.7"; + version = "1.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.7.tgz"; - sha512 = "n5WkVXaPnJC7CfqC424lwPt2/ILWks7yFZi24fjiyaT+L23E1urRdjvALHtX1F3Iyjxso54vp86VHvdbXnf84A=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.32.2.tgz"; + sha512 = "OjN7FQ1n3rhJblI1LNUt9sP+t8kkJVQi96sJoFcnRECE59nKK5B1mfS6OCvOeDzH89mUABZYcoPE9rj4LTmhGQ=="; }; }; "terser-3.17.0" = { @@ -39806,22 +40309,22 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.4.0" = { + "terser-4.4.3" = { name = "terser"; packageName = "terser"; - version = "4.4.0"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz"; - sha512 = "oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA=="; + url = "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz"; + sha512 = "0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA=="; }; }; - "terser-webpack-plugin-1.4.1" = { + "terser-webpack-plugin-1.4.3" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA=="; }; }; "test-exclude-4.2.3" = { @@ -40004,6 +40507,15 @@ let sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48"; }; }; + "through2-2.0.0" = { + name = "through2"; + packageName = "through2"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz"; + sha1 = "f41a1c31df5e129e4314446f66eca05cd6a30480"; + }; + }; "through2-2.0.3" = { name = "through2"; packageName = "through2"; @@ -40166,13 +40678,13 @@ let sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; }; }; - "tiny-inflate-1.0.2" = { + "tiny-inflate-1.0.3" = { name = "tiny-inflate"; packageName = "tiny-inflate"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.2.tgz"; - sha1 = "93d9decffc8805bd57eae4310f0b745e9b6fb3a7"; + url = "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz"; + sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; }; }; "tinycolor-0.0.1" = { @@ -40211,6 +40723,15 @@ let sha512 = "zxhwsBpxD5fglnqHYZ9ZjunC8Hc67u/7QXzxHmhAIzzSr4a/Cq5PbzCeHsBZ7WL99uBUa6xgVLfjmGxnFU8XMg=="; }; }; + "tldjs-2.3.1" = { + name = "tldjs"; + packageName = "tldjs"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz"; + sha512 = "W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw=="; + }; + }; "tlds-1.203.1" = { name = "tlds"; packageName = "tlds"; @@ -40715,13 +41236,22 @@ let sha512 = "4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="; }; }; - "tree-kit-0.6.1" = { + "tree-kill-1.2.2" = { + name = "tree-kill"; + packageName = "tree-kill"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"; + sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; + }; + }; + "tree-kit-0.6.2" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.1.tgz"; - sha512 = "7mV4KbsLMuA6ths3J1wpVUj2PLmLdoNEGnP9fm3kxef4UXYC/A0rL5gKsqtkUaCMuRYUMORyioy8IpBWUBQ1Ig=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.6.2.tgz"; + sha512 = "95UzJA0EMbFfu5sGUUOoXixQMUGkwu82nGM4lmqLyQl+R4H3FK+lS0nT8TZJ5x7JhSHy+saVn7/AOqh6d+tmOg=="; }; }; "treeify-1.1.0" = { @@ -40769,6 +41299,15 @@ let sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; }; }; + "trim-newlines-3.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz"; + sha512 = "C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA=="; + }; + }; "trim-off-newlines-1.0.1" = { name = "trim-off-newlines"; packageName = "trim-off-newlines"; @@ -40877,13 +41416,13 @@ let sha512 = "XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw=="; }; }; - "ts-node-8.5.0" = { + "ts-node-8.5.4" = { name = "ts-node"; packageName = "ts-node"; - version = "8.5.0"; + version = "8.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.5.0.tgz"; - sha512 = "fbG32iZEupNV2E2Fd2m2yt1TdAwR3GTCrJQBHDevIiEBNy1A8kqnyl1fv7jmRmmbtcapFab2glZXHJvfD1ed0Q=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.5.4.tgz"; + sha512 = "izbVCRV68EasEPQ8MSIGBNK9dc/4sYJJKYA+IarMQct1RtEot6Xp0bXuClsbUSnKpg50ho+aOAx8en5c+y4OFw=="; }; }; "ts-process-promises-1.0.2" = { @@ -41066,13 +41605,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.13.3" = { + "twig-1.14.0" = { name = "twig"; packageName = "twig"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.13.3.tgz"; - sha512 = "Kjart2102Kf0IdsEmLonSJKcByU7o9uiJhBde3GhrNHrX4XenT5WSKu4Hpkx+rF6Kyppeyd48BKsCREIOPXd/g=="; + url = "https://registry.npmjs.org/twig/-/twig-1.14.0.tgz"; + sha512 = "ut1LslUKAeF56TYQglabJaATUqbNuGO3EcXDhUspAdNbxez5VwTk2n8H00V0VfNy9Scet+VGQP8oPxt4v6mykQ=="; }; }; "txt-to-ast-3.0.3" = { @@ -41129,13 +41668,13 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; - "type-fest-0.5.2" = { + "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; - sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; }; }; "type-fest-0.8.1" = { @@ -41165,13 +41704,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typechecker-4.8.0" = { + "typechecker-4.11.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.8.0"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.8.0.tgz"; - sha512 = "TjffTvOgY4JUHE2FU6fYB/C5+NkERPEoB/JmcZSiVP0s/dykDtFfErlH8xSgH2DnnLDgnE+HMjh5zpCseg0liQ=="; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.11.0.tgz"; + sha512 = "lz39Mc/d1UBcF/uQFL5P8L+oWdIn/stvkUgHf0tPRW4aEwGGErewNXo2Nb6We2WslWifn00rhcHbbRWRcTGhuw=="; }; }; "typed-function-1.1.0" = { @@ -41219,13 +41758,13 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.7.2" = { + "typescript-3.7.4" = { name = "typescript"; packageName = "typescript"; - version = "3.7.2"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz"; - sha512 = "ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz"; + sha512 = "A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -41318,22 +41857,22 @@ let sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw=="; }; }; - "uglify-js-3.6.0" = { + "uglify-js-3.6.9" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.6.0"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz"; - sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz"; + sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw=="; }; }; - "uglify-js-3.6.8" = { + "uglify-js-3.7.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.6.8"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz"; - sha512 = "XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz"; + sha512 = "uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -41687,13 +42226,13 @@ let sha512 = "e1dEtN4Z/TvLn/qHm+xeZpzqhJTtfZusFErk336kkZVpqrJYiV9ptxq+SbRPFMlN0OkjDYHmVJ929KYjsMTo3g=="; }; }; - "union-0.4.6" = { + "union-0.5.0" = { name = "union"; packageName = "union"; - version = "0.4.6"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/union/-/union-0.4.6.tgz"; - sha1 = "198fbdaeba254e788b0efcb630bc11f24a2959e0"; + url = "https://registry.npmjs.org/union/-/union-0.5.0.tgz"; + sha512 = "N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA=="; }; }; "union-value-1.0.1" = { @@ -41777,6 +42316,15 @@ let sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; }; }; + "unique-string-2.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; + }; + }; "unist-util-filter-0.2.1" = { name = "unist-util-filter"; packageName = "unist-util-filter"; @@ -42110,6 +42658,15 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; + "update-notifier-4.0.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.0.0.tgz"; + sha512 = "p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -42542,13 +43099,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.4" = { + "utp-native-2.1.5" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.4.tgz"; - sha512 = "FYjr3bHBnJpw8yD0CmFCh5USyDgr6VtuncEIun100GqCUdgqnkAx9irSY3tA4UrzRH56qmiocP2fs1QjQ7ZDZA=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.5.tgz"; + sha512 = "vQ193WXyOOo+LikYgXlhFLVU7w9zdLOuXr1mgmS/kRMtq/B7DgVbPPSWzKzfcUnBeS1vRApVzR8+o4xYItObcw=="; }; }; "uuid-2.0.3" = { @@ -42569,6 +43126,15 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; + "uuid-3.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; + sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + }; + }; "uuid-3.3.3" = { name = "uuid"; packageName = "uuid"; @@ -42821,13 +43387,13 @@ let sha512 = "fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="; }; }; - "verda-1.0.0-11" = { + "verda-1.0.0-12" = { name = "verda"; packageName = "verda"; - version = "1.0.0-11"; + version = "1.0.0-12"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.0.0-11.tgz"; - sha512 = "h97YglCV4HLUUSIi682tbcBlA5FH9sQPBkJQw8Nv6rErPDu7QAL66/bJxzuR5svkDlyZJZh8QKL2amC2idJPqw=="; + url = "https://registry.npmjs.org/verda/-/verda-1.0.0-12.tgz"; + sha512 = "pNfCbq1WlBTE0SsyajJFzkQtp+E/opy5/+8405XHE4VMQ+3Xr/h2s9OijnbHPwPDJvybV4+JCktJhc6Ru6yg7w=="; }; }; "verror-1.1.0" = { @@ -43208,13 +43774,13 @@ let sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; }; - "vscode-jsonrpc-5.0.0-next.4" = { + "vscode-jsonrpc-5.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.0.0-next.4"; + version = "5.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.4.tgz"; - sha512 = "Tos3tXP62ZTB9WowWwhvfVNdu1mEwQF/j7DqJuVL4QKhk311gH+mda0PZpG95LWyh5CCRpHMns4vNmMgZQrvXQ=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.5.tgz"; + sha512 = "k9akfglxWgr0dtLNscq2uBq48XJwnhf4EaDxn05KQowRwR0DkNML0zeYqFRLtXZe6x5vpL5ppyu4o6GqL+23YQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -43271,13 +43837,13 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.0-next.11" = { + "vscode-languageserver-protocol-3.15.0-next.14" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.0-next.11"; + version = "3.15.0-next.14"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.11.tgz"; - sha512 = "tpRnPtyS6q0EYH5RH12AtdMecgu3HVL2bBdBGzeQRN8Tf93I9LY4Fl5TXUNkIBjuxjMshkCM8ikhb+hlnWvB2w=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.14.tgz"; + sha512 = "xUwwno6Q6RFd2Z2EWV9D3dQlsKPnHyiZMNWq+EC7JJdp2WH1gRlD+KPX4UGRCnJK0WI5omqHV313IESPwRY5xA=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -43307,13 +43873,13 @@ let sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; }; }; - "vscode-languageserver-types-3.15.0-next.8" = { + "vscode-languageserver-types-3.15.0-next.9" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.15.0-next.8"; + version = "3.15.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.8.tgz"; - sha512 = "AEfWrSNyeamWMKPehh/kd3nBnKD9ZGCPhzfxMnW9YNqElSh28G2+Puk3knIQWyaWyV6Bzh28ok9BRJsPzXFCkQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.9.tgz"; + sha512 = "Rl/8qJ6932nrHCdPn+9y0x08uLVQaSLRG+U4JzhyKpWU4eJbVaDRoAcz1Llj7CErJGbPr6kdBvShPy5fRfR+Uw=="; }; }; "vscode-languageserver-types-3.6.0" = { @@ -43424,13 +43990,13 @@ let sha512 = "Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg=="; }; }; - "vue-jscodeshift-adapter-2.0.2" = { + "vue-jscodeshift-adapter-2.0.3" = { name = "vue-jscodeshift-adapter"; packageName = "vue-jscodeshift-adapter"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue-jscodeshift-adapter/-/vue-jscodeshift-adapter-2.0.2.tgz"; - sha512 = "EnRKDgQXGHnNbHpHdTEqBfDMxRPFSUc/hlDNLd9ucgdfpJ3S6o/V6og+CfNYgGPO2GKD6AQOsd+lltRuoM/SVA=="; + url = "https://registry.npmjs.org/vue-jscodeshift-adapter/-/vue-jscodeshift-adapter-2.0.3.tgz"; + sha512 = "RXv0lrDG2CAx3yAQCoD9beU8nAoT3rhh/fgb+xlYM0Qlm+cpkWSLTdfOt1x2j2wHI08uEsi0q7x6rjhn54EbNA=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -43451,13 +44017,13 @@ let sha512 = "VYNMsrIPZQZau5Gk8IVtgonN1quOznP9/pLIF5m2c4R30KCDDe3NwthrsM7lSUY2K4lezcb8j3Wu8cQhBuZEMQ=="; }; }; - "vue-template-compiler-2.6.10" = { + "vue-template-compiler-2.6.11" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz"; - sha512 = "jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz"; + sha512 = "KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA=="; }; }; "w3c-hr-time-1.0.1" = { @@ -43559,13 +44125,13 @@ let sha512 = "wtx18llPtWWW+x8hv+Gxvz+2VjO+vZuyihInsjySNpNGNVswH1Bb2KkbbCtE96yi52VUmbFMdidxM8kJAPaSWQ=="; }; }; - "web-tree-sitter-0.15.10" = { + "web-tree-sitter-0.15.11" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.15.10"; + version = "0.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.10.tgz"; - sha512 = "8utowZB5h5djbotf1umt4na9Vt6Q18ZICUeC9jW4qWWjUrtQ2xvxDuAJ+EibmqUJBAKATrDMXnY2xYaskGg8wg=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.11.tgz"; + sha512 = "7Sr26MV8bPPvKU+4VMpOoLYwaAFBsCsxRGtxYPSxClWIaR2KIciqg6zUeG14W9QrdlpBt7VHHzhd1CBb0e6i8w=="; }; }; "webassemblyjs-1.8.5" = { @@ -43595,13 +44161,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webpack-4.41.2" = { + "webpack-4.41.4" = { name = "webpack"; packageName = "webpack"; - version = "4.41.2"; + version = "4.41.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz"; - sha512 = "Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.4.tgz"; + sha512 = "Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q=="; }; }; "webpack-cli-3.3.10" = { @@ -43658,13 +44224,13 @@ let sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug=="; }; }; - "webtorrent-0.107.16" = { + "webtorrent-0.107.17" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.107.16"; + version = "0.107.17"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.16.tgz"; - sha512 = "5fdPZFiZPxwbigAHtMVQ7ZCXbZSQlxgB6JPD77itpc9DdKYPpliFwCLsNiQpj1jmpo91HlHUJk+Xp3ks1fLUQg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.107.17.tgz"; + sha512 = "Oe7d3+jpmPRDAc645PccIJPYa2w3n3BEiMU7J/Q76QSPF3SDUK8jO7keUCC2qk4ckcbdkb98bYK6/uK7M8vsRA=="; }; }; "whatwg-encoding-1.0.5" = { @@ -43712,15 +44278,6 @@ let sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ=="; }; }; - "whatwg-url-7.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; - }; - }; "whatwg-url-7.1.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -43775,13 +44332,31 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; - "which-2.0.1" = { + "which-2.0.2" = { name = "which"; packageName = "which"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.1.tgz"; - sha512 = "N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w=="; + url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + }; + "which-boxed-primitive-1.0.1" = { + name = "which-boxed-primitive"; + packageName = "which-boxed-primitive"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz"; + sha512 = "7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ=="; + }; + }; + "which-collection-1.0.0" = { + name = "which-collection"; + packageName = "which-collection"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.0.tgz"; + sha512 = "mG4RtFHE+17N2AxRNvBQ488oBjrhaOaI/G+soUaRJwdyDbu5zmqoAKPYBlY7Zd+QTwpfvInRLKo40feo2si1yA=="; }; }; "which-module-1.0.0" = { @@ -43820,15 +44395,6 @@ let sha1 = "20b721df05b35b706176ffa10b0909aba4603035"; }; }; - "wicked-good-xpath-1.3.0" = { - name = "wicked-good-xpath"; - packageName = "wicked-good-xpath"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz"; - sha1 = "81b0e95e8650e49c94b22298fff8686b5553cf6c"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -44288,22 +44854,13 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.1.2" = { + "ws-7.2.1" = { name = "ws"; packageName = "ws"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz"; - sha512 = "gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg=="; - }; - }; - "ws-7.2.0" = { - name = "ws"; - packageName = "ws"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz"; - sha512 = "+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg=="; + url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz"; + sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="; }; }; "x-default-browser-0.3.1" = { @@ -44360,6 +44917,15 @@ let sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; }; }; + "xdg-basedir-4.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + }; + }; "xenvar-0.5.1" = { name = "xenvar"; packageName = "xenvar"; @@ -44468,6 +45034,15 @@ let sha512 = "MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw=="; }; }; + "xml2js-0.4.23" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"; + sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; + }; + }; "xml2tss-0.0.5" = { name = "xml2tss"; packageName = "xml2tss"; @@ -44558,22 +45133,13 @@ let sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }; }; - "xmldom-0.1.27" = { + "xmldom-0.1.31" = { name = "xmldom"; packageName = "xmldom"; - version = "0.1.27"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"; - sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9"; - }; - }; - "xmldom-sre-0.1.31" = { - name = "xmldom-sre"; - packageName = "xmldom-sre"; version = "0.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz"; - sha512 = "f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw=="; + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz"; + sha512 = "yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ=="; }; }; "xmlhttprequest-1.8.0" = { @@ -44649,13 +45215,13 @@ let sha512 = "sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA=="; }; }; - "xsalsa20-1.0.2" = { + "xsalsa20-1.1.0" = { name = "xsalsa20"; packageName = "xsalsa20"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.0.2.tgz"; - sha512 = "g1DFmZ5JJ9Qzvt4dMw6m9IydqoCSP381ucU5zm46Owbk3bwmqAr8eEJirOPc7PrXRn45drzOpAyDp8jsnoyXyw=="; + url = "https://registry.npmjs.org/xsalsa20/-/xsalsa20-1.1.0.tgz"; + sha512 = "zd3ytX2cm+tcSndRU+krm0eL4TMMpZE7evs5hLRAoOy6gviqLfe3qOlkjF3i5SeAkQUCeJk0lJZrEU56kHRfWw=="; }; }; "xspfr-0.3.1" = { @@ -44865,13 +45431,22 @@ let sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow=="; }; }; - "yargs-14.2.1" = { + "yargs-14.2.2" = { name = "yargs"; packageName = "yargs"; - version = "14.2.1"; + version = "14.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-14.2.1.tgz"; - sha512 = "rZ00XIuGAoI58F0weHyCP3PAN17wJqdN/pF8eMp+imuP+jSdMCD5t4bSf5d5FKPvEDrK9zYlnhO7bFYKQ5UYow=="; + url = "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz"; + sha512 = "/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA=="; + }; + }; + "yargs-15.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "15.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.0.2.tgz"; + sha512 = "GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q=="; }; }; "yargs-3.10.0" = { @@ -44973,6 +45548,15 @@ let sha512 = "xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ=="; }; }; + "yargs-parser-16.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz"; + sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; + }; + }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -45045,6 +45629,15 @@ let sha512 = "gBnfbL9rYY05Gt0cjJhs/siqQXHYlZalTjK3nXn2QO20xbkIFPob+LlH44ML47GcR4VU9/2dYck1BWFM0Javxw=="; }; }; + "yarn-1.21.1" = { + name = "yarn"; + packageName = "yarn"; + version = "1.21.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yarn/-/yarn-1.21.1.tgz"; + sha512 = "dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -45099,13 +45692,13 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.6.0" = { + "yeoman-environment-2.7.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.6.0.tgz"; - sha512 = "Hl0LBs9/mKun8XyJ6gFiUNhZwjN/eezn+E9IFWz6KtXg/3wsnztF2lgtE8eIjfhWYtvY4yMq9iizi1Ei5JJ+7A=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.7.0.tgz"; + sha512 = "YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A=="; }; }; "yn-3.1.1" = { @@ -45144,13 +45737,13 @@ let sha512 = "Dhp/R0pqSHj3vPs5O1gVd9kZx5Iew2lqVcfJQOBHx3llM/dLea8vl9wSa9FK8wLdSBQJ6mmgKi9+Rk2DRH3i9Q=="; }; }; - "zen-observable-0.8.14" = { + "zen-observable-0.8.15" = { name = "zen-observable"; packageName = "zen-observable"; - version = "0.8.14"; + version = "0.8.15"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.14.tgz"; - sha512 = "kQz39uonEjEESwh+qCi83kcC3rZJGh4mrZW7xjkSQYXkq//JZHTtKo+6yuVloTgMtzsIWOJrjIrKvk/dqm0L5g=="; + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz"; + sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; }; }; "zen-observable-ts-0.8.20" = { @@ -45207,30 +45800,39 @@ let sha1 = "66c6de82cc36b09734b820703776490a6fbbe624"; }; }; + "zxcvbn-4.4.2" = { + name = "zxcvbn"; + packageName = "zxcvbn"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz"; + sha1 = "28ec17cf09743edcab056ddd8b1b06262cc73c30"; + }; + }; }; in { "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.3.18"; + version = "8.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.18.tgz"; - sha512 = "IWiGlAmVPkl/xWCrki3N45uqdYcjUvtWw9bRM53FF1EKLLbjue6DAVD1HktqgqjTyck0P7QkOXWRilT8rXKcEQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.21.tgz"; + sha512 = "ZZpA7mMfIobFT06rBNxm8vucAh8W2s0huJZ4iL0BPujnhIr71PL+gDwssySWDEz2q6i4CkH9QRH76DHhtL6VSQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.803.18" - sources."@angular-devkit/core-8.3.18" - sources."@angular-devkit/schematics-8.3.18" - sources."@schematics/angular-8.3.18" - sources."@schematics/update-0.803.18" + sources."@angular-devkit/architect-0.803.21" + sources."@angular-devkit/core-8.3.21" + sources."@angular-devkit/schematics-8.3.21" + sources."@schematics/angular-8.3.21" + sources."@schematics/update-0.803.21" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" sources."ajv-6.10.2" sources."ansi-colors-4.1.1" - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" @@ -45239,10 +45841,10 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."builtins-1.0.3" @@ -45281,7 +45883,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."err-code-1.1.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -45310,7 +45912,7 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."hosted-git-info-2.8.5" sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-2.1.0" // { @@ -45336,12 +45938,12 @@ in sources."ini-1.3.5" sources."inquirer-6.5.1" sources."ip-1.1.5" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-3.0.0" sources."is-promise-2.1.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -45357,9 +45959,9 @@ in sources."lodash-4.17.15" sources."lru-cache-5.1.1" sources."magic-string-0.25.3" - sources."make-fetch-happen-5.0.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."make-fetch-happen-5.0.2" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -45380,13 +45982,14 @@ in sources."semver-5.7.1" ]; }) - sources."npm-bundled-1.0.6" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."npm-packlist-1.4.6" + sources."npm-packlist-1.4.7" (sources."npm-pick-manifest-3.0.2" // { dependencies = [ sources."semver-5.7.1" @@ -45396,7 +45999,8 @@ in sources."oauth-sign-0.9.0" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.0" sources."open-6.4.0" @@ -45418,7 +46022,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."protoduck-5.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -45427,7 +46031,7 @@ in }) sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-2.1.0" + sources."read-package-json-2.1.1" sources."read-package-tree-5.3.1" (sources."readable-stream-2.3.6" // { dependencies = [ @@ -45436,7 +46040,7 @@ in }) sources."readdir-scoped-modules-1.1.0" sources."request-2.88.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.0" @@ -45452,7 +46056,6 @@ in ]; }) sources."signal-exit-3.0.2" - sources."slash-1.0.0" sources."smart-buffer-4.1.0" sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { @@ -45469,14 +46072,14 @@ in sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" (sources."string-width-4.2.0" // { dependencies = [ sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -45501,7 +46104,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -45655,7 +46258,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-4.2.1" sources."deep-freeze-node-1.1.3" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."define-properties-1.1.3" sources."diff3-0.0.3" sources."duplexer-0.1.1" @@ -45726,8 +46329,8 @@ in sources."through2-2.0.5" ]; }) - sources."handlebars-4.5.1" - sources."has-symbols-1.0.0" + sources."handlebars-4.5.3" + sources."has-symbols-1.0.1" sources."http-cache-semantics-4.0.3" sources."ignore-5.1.4" sources."inflight-1.0.6" @@ -45765,8 +46368,8 @@ in sources."map-stream-0.1.0" sources."marky-1.2.1" sources."matcher-2.0.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -45839,7 +46442,7 @@ in sources."split-0.3.3" sources."sprintf-js-1.0.3" sources."stream-combiner-0.0.4" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" sources."through2-3.0.1" @@ -45862,7 +46465,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.6.8" + sources."uglify-js-3.7.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -45900,210 +46503,302 @@ in bypassCache = true; reconstructLock = true; }; + "@bitwarden/cli" = nodeEnv.buildNodePackage { + name = "_at_bitwarden_slash_cli"; + packageName = "@bitwarden/cli"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.8.0.tgz"; + sha512 = "w0galFGHK7Ea9nVQs3+ct+qTiPqR9PXQEL2kxIEwjDIyKjGY104+twWpLiSOMih2NAS2kuf3egekdEKs8xR8wQ=="; + }; + dependencies = [ + sources."abab-2.0.3" + sources."acorn-6.4.0" + sources."acorn-globals-4.3.4" + sources."acorn-walk-6.2.0" + sources."agent-base-4.3.0" + sources."ajv-6.10.2" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."array-equal-1.0.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.0" + sources."bcrypt-pbkdf-1.0.2" + sources."big-integer-1.6.36" + sources."browser-process-hrtime-0.1.3" + sources."caseless-0.12.0" + sources."chalk-2.4.1" + sources."chardet-0.7.0" + sources."cli-cursor-2.1.0" + sources."cli-width-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.6" + sources."commander-2.18.0" + sources."core-util-is-1.0.2" + sources."cssom-0.3.8" + sources."cssstyle-1.4.0" + sources."dashdash-1.14.1" + sources."data-urls-1.1.0" + sources."debug-3.2.6" + sources."deep-is-0.1.3" + sources."delayed-stream-1.0.0" + sources."domexception-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."escodegen-1.12.0" + sources."esprima-3.1.3" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."figures-2.0.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.2" + sources."getpass-0.1.7" + sources."graceful-fs-4.2.3" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + sources."has-flag-3.0.0" + sources."html-encoding-sniffer-1.0.2" + sources."http-signature-1.2.0" + sources."https-proxy-agent-2.2.1" + sources."iconv-lite-0.4.24" + sources."inquirer-6.2.0" + sources."is-fullwidth-code-point-2.0.0" + sources."is-promise-2.1.0" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."jsdom-13.2.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."levn-0.3.0" + sources."lodash-4.17.15" + sources."lodash.sortby-4.7.0" + sources."lowdb-1.0.0" + sources."lunr-2.3.3" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."mimic-fn-1.2.0" + sources."ms-2.1.2" + sources."mute-stream-0.0.7" + sources."node-fetch-2.2.0" + sources."node-forge-0.7.6" + sources."nwsapi-2.2.0" + sources."oauth-sign-0.9.0" + sources."onetime-2.0.1" + sources."optionator-0.8.3" + sources."os-tmpdir-1.0.2" + sources."papaparse-4.6.0" + sources."parse5-5.1.0" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pn-1.1.0" + sources."prelude-ls-1.1.2" + sources."psl-1.6.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + (sources."request-2.88.0" // { + dependencies = [ + sources."punycode-1.4.1" + sources."tough-cookie-2.4.3" + ]; + }) + sources."request-promise-core-1.1.3" + sources."request-promise-native-1.0.8" + sources."restore-cursor-2.0.0" + sources."run-async-2.3.0" + sources."rxjs-6.5.3" + sources."safe-buffer-5.2.0" + sources."safer-buffer-2.1.2" + sources."saxes-3.1.11" + sources."signal-exit-3.0.2" + sources."source-map-0.6.1" + sources."sshpk-1.16.1" + sources."stealthy-require-1.1.1" + sources."steno-0.4.4" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."supports-color-5.5.0" + sources."symbol-tree-3.2.4" + sources."through-2.3.8" + (sources."tldjs-2.3.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."tmp-0.0.33" + sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" + sources."tslib-1.10.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."uri-js-4.2.2" + sources."uuid-3.3.3" + sources."verror-1.10.0" + sources."w3c-hr-time-1.0.1" + sources."w3c-xmlserializer-1.1.2" + sources."webidl-conversions-4.0.2" + sources."whatwg-encoding-1.0.5" + sources."whatwg-mimetype-2.3.0" + sources."whatwg-url-7.1.0" + sources."word-wrap-1.2.3" + sources."ws-6.2.1" + sources."xml-name-validator-3.0.0" + sources."xmlchars-2.2.0" + sources."zxcvbn-4.4.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A secure and free password manager for all of your devices."; + homepage = https://bitwarden.com/; + license = "GPL-3.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.0.5.tgz"; - sha512 = "G13V2wlye7IClgO/S8j/QOjp1fBv7MEawTXqGBX/FqSajY4DPmzZRK0eoc6+IZQLmHSYAwmVZ242HE8YL1McAw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.1.1.tgz"; + sha512 = "Qdxn3rL4E34y22geQdPOkQtGKbewa+hiyD0rEXMBOjqIqxWnYm68p/dTJjHeou3egGu5P9ol7BujJfPJBhfgTw=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.10.2" - sources."@apollographql/apollo-tools-0.4.0" + sources."@apollo/federation-0.11.2" + (sources."@apollo/protobufjs-1.0.3" // { + dependencies = [ + sources."@types/node-10.17.12" + ]; + }) + sources."@apollographql/apollo-tools-0.4.2" sources."@apollographql/graphql-language-service-interface-2.0.2" sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.7.2" // { + (sources."@babel/core-7.7.7" // { dependencies = [ - sources."@babel/generator-7.7.2" - sources."@babel/types-7.7.2" + sources."@babel/generator-7.7.7" sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.6.4" - (sources."@babel/helper-annotate-as-pure-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-call-delegate-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.7.0" - sources."@babel/helper-create-regexp-features-plugin-7.7.2" - (sources."@babel/helper-define-map-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-explode-assignable-expression-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-function-name-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-get-function-arity-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-hoist-variables-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-member-expression-to-functions-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-module-imports-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-module-transforms-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-optimise-call-expression-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) + sources."@babel/generator-7.7.4" + sources."@babel/helper-annotate-as-pure-7.7.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.4" + sources."@babel/helper-call-delegate-7.7.4" + sources."@babel/helper-create-class-features-plugin-7.7.4" + sources."@babel/helper-create-regexp-features-plugin-7.7.4" + sources."@babel/helper-define-map-7.7.4" + sources."@babel/helper-explode-assignable-expression-7.7.4" + sources."@babel/helper-function-name-7.7.4" + sources."@babel/helper-get-function-arity-7.7.4" + sources."@babel/helper-hoist-variables-7.7.4" + sources."@babel/helper-member-expression-to-functions-7.7.4" + sources."@babel/helper-module-imports-7.7.4" + sources."@babel/helper-module-transforms-7.7.5" + sources."@babel/helper-optimise-call-expression-7.7.4" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - (sources."@babel/helper-remap-async-to-generator-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-replace-supers-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-simple-access-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-split-export-declaration-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helper-wrap-function-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/helpers-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) + sources."@babel/helper-remap-async-to-generator-7.7.4" + sources."@babel/helper-replace-supers-7.7.4" + sources."@babel/helper-simple-access-7.7.4" + sources."@babel/helper-split-export-declaration-7.7.4" + sources."@babel/helper-wrap-function-7.7.4" + sources."@babel/helpers-7.7.4" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" - sources."@babel/plugin-proposal-async-generator-functions-7.7.0" - sources."@babel/plugin-proposal-class-properties-7.7.0" - sources."@babel/plugin-proposal-dynamic-import-7.7.0" - sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.6.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" - sources."@babel/plugin-syntax-async-generators-7.2.0" - sources."@babel/plugin-syntax-dynamic-import-7.2.0" - sources."@babel/plugin-syntax-flow-7.7.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-syntax-top-level-await-7.7.0" - sources."@babel/plugin-syntax-typescript-7.3.3" - sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.7.0" - sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.7.0" - sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.7.0" - sources."@babel/plugin-transform-duplicate-keys-7.5.0" - sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-flow-strip-types-7.6.3" - sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.7.0" - sources."@babel/plugin-transform-literals-7.2.0" - sources."@babel/plugin-transform-member-expression-literals-7.2.0" - sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.7.0" - sources."@babel/plugin-transform-modules-systemjs-7.7.0" - sources."@babel/plugin-transform-modules-umd-7.7.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" - sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.5.5" - sources."@babel/plugin-transform-parameters-7.4.4" - sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.7.0" - sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-shorthand-properties-7.2.0" - sources."@babel/plugin-transform-spread-7.6.2" - sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.4.4" - sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-typescript-7.7.2" - sources."@babel/plugin-transform-unicode-regex-7.7.0" - (sources."@babel/preset-env-7.7.1" // { - dependencies = [ - sources."@babel/types-7.7.2" + sources."@babel/parser-7.7.7" + sources."@babel/plugin-proposal-async-generator-functions-7.7.4" + sources."@babel/plugin-proposal-class-properties-7.7.4" + sources."@babel/plugin-proposal-dynamic-import-7.7.4" + sources."@babel/plugin-proposal-json-strings-7.7.4" + sources."@babel/plugin-proposal-object-rest-spread-7.7.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.7.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.7" + sources."@babel/plugin-syntax-async-generators-7.7.4" + sources."@babel/plugin-syntax-dynamic-import-7.7.4" + sources."@babel/plugin-syntax-flow-7.7.4" + sources."@babel/plugin-syntax-json-strings-7.7.4" + sources."@babel/plugin-syntax-object-rest-spread-7.7.4" + sources."@babel/plugin-syntax-optional-catch-binding-7.7.4" + sources."@babel/plugin-syntax-top-level-await-7.7.4" + sources."@babel/plugin-syntax-typescript-7.7.4" + sources."@babel/plugin-transform-arrow-functions-7.7.4" + sources."@babel/plugin-transform-async-to-generator-7.7.4" + sources."@babel/plugin-transform-block-scoped-functions-7.7.4" + sources."@babel/plugin-transform-block-scoping-7.7.4" + sources."@babel/plugin-transform-classes-7.7.4" + sources."@babel/plugin-transform-computed-properties-7.7.4" + sources."@babel/plugin-transform-destructuring-7.7.4" + sources."@babel/plugin-transform-dotall-regex-7.7.7" + sources."@babel/plugin-transform-duplicate-keys-7.7.4" + sources."@babel/plugin-transform-exponentiation-operator-7.7.4" + sources."@babel/plugin-transform-flow-strip-types-7.7.4" + sources."@babel/plugin-transform-for-of-7.7.4" + sources."@babel/plugin-transform-function-name-7.7.4" + sources."@babel/plugin-transform-literals-7.7.4" + sources."@babel/plugin-transform-member-expression-literals-7.7.4" + sources."@babel/plugin-transform-modules-amd-7.7.5" + sources."@babel/plugin-transform-modules-commonjs-7.7.5" + sources."@babel/plugin-transform-modules-systemjs-7.7.4" + sources."@babel/plugin-transform-modules-umd-7.7.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.4" + sources."@babel/plugin-transform-new-target-7.7.4" + sources."@babel/plugin-transform-object-super-7.7.4" + sources."@babel/plugin-transform-parameters-7.7.7" + sources."@babel/plugin-transform-property-literals-7.7.4" + sources."@babel/plugin-transform-regenerator-7.7.5" + sources."@babel/plugin-transform-reserved-words-7.7.4" + sources."@babel/plugin-transform-shorthand-properties-7.7.4" + sources."@babel/plugin-transform-spread-7.7.4" + sources."@babel/plugin-transform-sticky-regex-7.7.4" + sources."@babel/plugin-transform-template-literals-7.7.4" + sources."@babel/plugin-transform-typeof-symbol-7.7.4" + sources."@babel/plugin-transform-typescript-7.7.4" + sources."@babel/plugin-transform-unicode-regex-7.7.4" + (sources."@babel/preset-env-7.7.7" // { + dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.0.0" - sources."@babel/preset-typescript-7.7.2" - (sources."@babel/register-7.7.0" // { + sources."@babel/preset-flow-7.7.4" + sources."@babel/preset-typescript-7.7.7" + (sources."@babel/register-7.7.7" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.7.2" // { + (sources."@babel/runtime-7.7.7" // { dependencies = [ sources."regenerator-runtime-0.13.3" ]; }) - (sources."@babel/template-7.7.0" // { - dependencies = [ - sources."@babel/types-7.7.2" - ]; - }) - (sources."@babel/traverse-7.7.2" // { - dependencies = [ - sources."@babel/generator-7.7.2" - sources."@babel/types-7.7.2" - ]; - }) - sources."@babel/types-7.6.3" + sources."@babel/template-7.7.4" + sources."@babel/traverse-7.7.4" + sources."@babel/types-7.7.4" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" - sources."@hapi/address-2.1.2" + sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.0" sources."@hapi/joi-15.1.1" @@ -46121,31 +46816,33 @@ in dependencies = [ sources."clean-stack-1.3.0" sources."indent-string-3.2.0" + sources."strip-ansi-5.2.0" ]; }) sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.4" - (sources."@oclif/plugin-autocomplete-0.1.4" // { + (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."debug-3.2.6" sources."fs-extra-6.0.1" ]; }) - (sources."@oclif/plugin-help-2.2.1" // { + (sources."@oclif/plugin-help-2.2.2" // { dependencies = [ sources."indent-string-3.2.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."@oclif/plugin-not-found-1.2.3" (sources."@oclif/plugin-plugins-1.7.8" // { dependencies = [ - sources."cli-ux-5.3.3" - sources."indent-string-3.2.0" + sources."cli-ux-5.4.1" sources."npm-run-path-3.1.0" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."semver-5.7.1" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { @@ -46167,36 +46864,36 @@ in sources."@samverschueren/stream-to-observable-0.3.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.17.1" - sources."@types/connect-3.4.32" + sources."@types/color-name-1.1.1" + sources."@types/connect-3.4.33" sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/events-3.0.0" sources."@types/express-4.17.1" - sources."@types/express-serve-static-core-4.16.11" + sources."@types/express-serve-static-core-4.17.1" sources."@types/fs-capacitor-2.0.0" - sources."@types/fs-extra-5.1.0" sources."@types/glob-7.1.1" sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.1" - sources."@types/koa-2.0.52" + sources."@types/koa-2.11.0" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" - sources."@types/ws-6.0.3" + sources."@types/ws-6.0.4" sources."@types/zen-observable-0.8.0" - sources."@vue/cli-shared-utils-4.0.5" - (sources."@vue/cli-ui-4.0.5" // { + sources."@vue/cli-shared-utils-4.1.1" + (sources."@vue/cli-ui-4.1.1" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.0.5" - sources."@vue/cli-ui-addon-widgets-4.0.5" + sources."@vue/cli-ui-addon-webpack-4.1.1" + sources."@vue/cli-ui-addon-widgets-4.1.1" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.9" sources."abbrev-1.1.1" @@ -46214,22 +46911,26 @@ in sources."normalize-path-2.1.1" ]; }) - sources."apollo-2.21.0" - sources."apollo-cache-1.3.2" - sources."apollo-cache-control-0.8.5" - sources."apollo-cache-inmemory-1.6.3" - sources."apollo-client-2.6.4" - sources."apollo-codegen-core-0.35.7" - sources."apollo-codegen-flow-0.33.32" - sources."apollo-codegen-scala-0.34.32" - sources."apollo-codegen-swift-0.35.12" - sources."apollo-codegen-typescript-0.35.7" + (sources."apollo-2.21.2" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."apollo-cache-1.3.4" + sources."apollo-cache-control-0.8.9" + sources."apollo-cache-inmemory-1.6.5" + sources."apollo-client-2.6.8" + sources."apollo-codegen-core-0.35.9" + sources."apollo-codegen-flow-0.33.34" + sources."apollo-codegen-scala-0.34.34" + sources."apollo-codegen-swift-0.35.14" + sources."apollo-codegen-typescript-0.35.9" sources."apollo-datasource-0.6.3" - sources."apollo-engine-reporting-1.4.7" - sources."apollo-engine-reporting-protobuf-0.4.1" - sources."apollo-env-0.5.1" - sources."apollo-graphql-0.3.4" - sources."apollo-language-server-1.17.0" + sources."apollo-engine-reporting-1.4.12" + sources."apollo-engine-reporting-protobuf-0.4.4" + sources."apollo-env-0.6.0" + sources."apollo-graphql-0.3.6" + sources."apollo-language-server-1.17.2" sources."apollo-link-1.2.13" sources."apollo-link-context-1.0.19" sources."apollo-link-error-1.1.12" @@ -46239,16 +46940,16 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.19" sources."apollo-server-caching-0.5.0" - sources."apollo-server-core-2.9.7" + sources."apollo-server-core-2.9.14" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.3.4" - sources."apollo-server-express-2.9.7" - sources."apollo-server-plugin-base-0.6.5" - sources."apollo-server-types-0.2.5" - sources."apollo-tracing-0.8.5" + sources."apollo-server-express-2.9.14" + sources."apollo-server-plugin-base-0.6.9" + sources."apollo-server-types-0.2.9" + sources."apollo-tracing-0.8.9" sources."apollo-upload-client-11.0.0" - sources."apollo-utilities-1.3.2" - sources."arg-4.1.1" + sources."apollo-utilities-1.3.3" + sources."arg-4.1.2" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -46271,17 +46972,17 @@ in sources."atob-2.1.2" sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.0" (sources."babel-polyfill-6.26.0" // { dependencies = [ - sources."core-js-2.6.10" + sources."core-js-2.6.11" ]; }) (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."regenerator-runtime-0.11.1" ]; }) @@ -46295,6 +46996,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."bl-1.2.2" (sources."body-parser-1.19.0" // { dependencies = [ @@ -46305,7 +47007,7 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-4.1.0" // { + (sources."boxen-4.2.0" // { dependencies = [ (sources."ansi-align-3.0.0" // { dependencies = [ @@ -46313,20 +47015,30 @@ in ]; }) sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.0" sources."camelcase-5.3.1" + sources."chalk-3.0.0" sources."cli-boxes-2.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."term-size-2.1.0" - sources."type-fest-0.5.2" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + sources."strip-ansi-5.2.0" + sources."supports-color-7.1.0" + sources."term-size-2.1.1" + sources."type-fest-0.8.1" sources."widest-line-3.1.0" ]; }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.7.2" + sources."browserslist-4.8.2" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -46344,7 +47056,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001008" + sources."caniuse-lite-1.0.30001016" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -46375,6 +47087,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" + sources."cli-progress-3.4.0" sources."cli-spinners-2.2.0" (sources."cli-truncate-0.2.1" // { dependencies = [ @@ -46388,6 +47101,7 @@ in dependencies = [ sources."indent-string-3.2.0" sources."semver-5.7.1" + sources."strip-ansi-5.2.0" ]; }) sources."cli-width-2.2.0" @@ -46414,8 +47128,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.4.1" - sources."core-js-compat-3.4.1" + sources."core-js-3.6.1" + (sources."core-js-compat-3.6.1" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."cosmiconfig-5.2.1" @@ -46485,17 +47203,17 @@ in sources."easy-stack-1.0.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."ejs-2.7.1" - sources."electron-to-chromium-1.3.306" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.322" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."env-ci-3.2.2" - sources."envinfo-7.4.0" + sources."envinfo-7.5.0" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -46553,11 +47271,12 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-5.2.0" + sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" sources."fill-range-4.0.0" @@ -46576,7 +47295,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.111.3" + sources."flow-parser-0.114.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -46589,7 +47308,7 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."fswin-2.17.1227" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -46607,7 +47326,7 @@ in sources."graceful-fs-4.1.11" ]; }) - sources."glob-7.1.4" + sources."glob-7.1.5" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -46622,22 +47341,22 @@ in sources."slash-2.0.0" ]; }) - sources."globule-1.2.1" + sources."globule-1.3.0" sources."good-listener-1.2.2" sources."got-6.7.1" sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" sources."graphql-14.5.8" - (sources."graphql-anywhere-4.2.4" // { + (sources."graphql-anywhere-4.2.6" // { dependencies = [ sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.10.4" + sources."graphql-extensions-0.10.8" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.1" sources."graphql-tools-4.0.6" - sources."graphql-type-json-0.3.0" + sources."graphql-type-json-0.3.1" sources."graphql-upload-8.1.0" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -46650,7 +47369,7 @@ in }) sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -46667,7 +47386,7 @@ in sources."readable-stream-3.4.0" ]; }) - (sources."http-call-5.2.5" // { + (sources."http-call-5.3.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -46692,6 +47411,7 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."figures-2.0.0" + sources."strip-ansi-5.2.0" ]; }) sources."interpret-1.2.0" @@ -46702,10 +47422,10 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" @@ -46729,10 +47449,10 @@ in sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-upper-case-1.1.2" sources."is-windows-1.0.2" @@ -46842,8 +47562,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" @@ -46862,7 +47582,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nan-2.14.0" - sources."nanoid-2.1.6" + sources."nanoid-2.1.8" (sources."nanomatch-1.2.13" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -46889,7 +47609,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-releases-1.1.39" + sources."node-releases-1.1.44" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -46922,14 +47642,18 @@ in sources."object-path-0.11.4" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-6.4.0" sources."optimism-0.10.3" - sources."ora-3.4.0" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.2.1" @@ -46988,15 +47712,10 @@ in sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - (sources."protobufjs-6.8.8" // { - dependencies = [ - sources."@types/node-10.17.5" - ]; - }) sources."proxy-addr-2.0.5" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pstree.remy-1.1.7" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -47032,7 +47751,7 @@ in sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.0" // { + (sources."regjsparser-0.6.2" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -47047,7 +47766,7 @@ in }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -47172,11 +47891,15 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.padstart-3.0.0" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.padstart-3.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" - sources."strip-ansi-5.2.0" + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" @@ -47200,10 +47923,26 @@ in dependencies = [ sources."slice-ansi-2.1.0" sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."tar-stream-1.6.2" - sources."taskkill-3.0.0" + (sources."taskkill-3.1.0" // { + dependencies = [ + sources."cross-spawn-7.0.1" + sources."execa-3.4.0" + sources."get-stream-5.1.0" + sources."is-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.0" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) (sources."tasklist-3.1.1" // { dependencies = [ sources."pify-2.3.0" @@ -47249,14 +47988,14 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.5.0" + sources."ts-node-8.5.4" sources."tslib-1.10.0" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."type-is-1.6.18" - sources."typescript-3.7.2" + sources."typescript-3.7.4" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ @@ -47312,27 +48051,27 @@ in dependencies = [ sources."cross-spawn-7.0.1" sources."deepmerge-4.2.2" - sources."execa-3.3.0" + sources."execa-3.4.0" sources."fs-extra-8.1.0" sources."get-stream-5.1.0" sources."is-stream-2.0.0" sources."mimic-fn-2.1.0" - sources."npm-run-path-4.0.0" + sources."npm-run-path-4.0.1" sources."onetime-5.1.0" sources."p-finally-2.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."which-2.0.1" + sources."which-2.0.2" ]; }) - sources."vue-jscodeshift-adapter-2.0.2" + sources."vue-jscodeshift-adapter-2.0.3" (sources."vue-sfc-descriptor-to-string-1.0.0" // { dependencies = [ sources."indent-string-3.2.0" ]; }) - sources."vue-template-compiler-2.6.10" + sources."vue-template-compiler-2.6.11" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -47347,7 +48086,7 @@ in sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.22" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."yallist-2.1.2" @@ -47356,10 +48095,10 @@ in sources."commander-1.0.0" ]; }) - sources."yarn-1.19.1" + sources."yarn-1.21.1" sources."yauzl-2.10.0" sources."yn-3.1.1" - sources."zen-observable-0.8.14" + sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.20" ]; buildInputs = globalBuildInputs; @@ -47497,11 +48236,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.7.2" + sources."@babel/generator-7.7.7" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" - sources."@babel/template-7.7.0" - sources."@babel/types-7.7.2" + sources."@babel/parser-7.7.7" + sources."@babel/template-7.7.4" + sources."@babel/types-7.7.4" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -47575,32 +48314,32 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.14.2"; + version = "1.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.14.2.tgz"; - sha512 = "Mrx+RXcXYUgI/Di5Rx7NFMsvbkhqp7To6SA4LzWgwokyvGnDeGbosXsOE0cl0Uel0P5GuRuiAk/a+KwNJhM5NQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.14.5.tgz"; + sha512 = "zMCw1CCc2sR70pwLMCrSReTBWOHUClV28s7gD83eewkF7VM7e+fsPKtlKMRRzrxnVdzvRWXipZKWU3GjYZi95w=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.7.2" // { + (sources."@babel/core-7.7.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.7.2" // { + (sources."@babel/generator-7.7.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.7.0" - sources."@babel/helper-get-function-arity-7.7.0" - sources."@babel/helper-split-export-declaration-7.7.0" - sources."@babel/helpers-7.7.0" + sources."@babel/helper-function-name-7.7.4" + sources."@babel/helper-get-function-arity-7.7.4" + sources."@babel/helper-split-export-declaration-7.7.4" + sources."@babel/helpers-7.7.4" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" - sources."@babel/template-7.7.0" - sources."@babel/traverse-7.7.2" - sources."@babel/types-7.7.2" + sources."@babel/parser-7.7.7" + sources."@babel/template-7.7.4" + sources."@babel/traverse-7.7.4" + sources."@babel/types-7.7.4" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -47621,6 +48360,7 @@ in sources."escape-string-regexp-1.0.5" sources."esutils-2.0.3" sources."fs-extra-5.0.0" + sources."function-bind-1.1.1" (sources."global-modules-0.2.3" // { dependencies = [ sources."is-windows-0.2.0" @@ -47634,6 +48374,7 @@ in }) sources."globals-11.12.0" sources."graceful-fs-4.2.3" + sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" sources."homedir-polyfill-1.0.3" @@ -47652,7 +48393,7 @@ in sources."minimist-1.2.0" sources."moment-2.20.1" sources."ms-2.1.2" - sources."node.extend-2.0.0" + sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ sources."ansi-styles-1.0.0" @@ -47662,7 +48403,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -47676,7 +48417,7 @@ in sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" ]; buildInputs = globalBuildInputs; meta = { @@ -47691,14 +48432,14 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-2.0.1.tgz"; - sha512 = "Vo9yTuUtyFahkVMFaI6uMuX6N7k5DWa6a/8+7ov0/f8Lq9TVR0tUjzSzxQSxT1Y+RJIZgnP7BVb6Uhi+9cjxqA=="; + url = "https://registry.npmjs.org/asar/-/asar-2.0.3.tgz"; + sha512 = "QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw=="; }; dependencies = [ sources."balanced-match-1.0.0" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" sources."commander-2.20.3" @@ -47731,17 +48472,17 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.6.1.tgz"; - sha512 = "i40MhENbRrfGEjhfwacQ0iBMX0WyhYou3AjPXa6C6RMvsuFu5J0LFwY4BjKOF2IFGZPaS6VgcffmfRvmD1TgRA=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.7.0.tgz"; + sha512 = "7LoZPq2jYPov87LDnoYY5/3KdwTjjUQbQAim9zvRvjV2DI6sku5CKLGmoqaivOyx0Ah8mUWwnvHg/1R+H5N9qg=="; }; dependencies = [ - sources."abab-2.0.2" + sources."abab-2.0.3" sources."acorn-5.7.3" (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.3.0" + sources."acorn-6.4.0" ]; }) sources."acorn-walk-6.2.0" @@ -47752,7 +48493,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -47780,7 +48521,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -47806,8 +48547,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.15" sources."lodash.sortby-4.7.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -47818,7 +48559,7 @@ in sources."performance-now-2.1.0" sources."pn-1.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -47851,7 +48592,7 @@ in sources."vscode-languageserver-types-3.14.0" sources."vscode-uri-1.0.8" sources."w3c-hr-time-1.0.1" - sources."web-tree-sitter-0.15.10" + sources."web-tree-sitter-0.15.11" sources."webidl-conversions-4.0.2" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" @@ -47988,7 +48729,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -48081,7 +48822,7 @@ in sources."dash-ast-1.0.0" sources."defined-1.0.0" sources."deps-sort-2.0.1" - sources."des.js-1.0.0" + sources."des.js-1.0.1" (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" @@ -48090,7 +48831,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.5.1" + sources."elliptic-6.5.2" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.0.7" @@ -48123,7 +48864,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."module-deps-6.2.1" + sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -48150,7 +48891,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" @@ -48226,7 +48967,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.0" - sources."@types/node-10.17.5" + sources."@types/node-10.17.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.10.2" @@ -48241,7 +48982,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -48309,7 +49050,6 @@ in sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.2.11" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."diveSync-0.3.0" sources."dns-js-0.2.1" @@ -48320,14 +49060,12 @@ in ]; }) sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fifo-0.1.4" (sources."figures-1.7.0" // { dependencies = [ @@ -48346,7 +49084,6 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."getpass-0.1.7" @@ -48355,9 +49092,7 @@ in sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-ansi-1.0.3" - sources."has-symbols-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.5" sources."http-signature-1.2.0" @@ -48372,11 +49107,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" sources."is-finite-1.0.2" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-0.0.1" @@ -48414,8 +49145,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -48430,9 +49161,6 @@ in sources."numeral-1.5.6" sources."oauth-sign-0.9.0" sources."object-assign-1.0.0" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."open-0.0.5" (sources."optimist-0.6.1" // { @@ -48482,7 +49210,7 @@ in sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.8.8" - sources."psl-1.4.0" + sources."psl-1.6.0" (sources."pump-0.3.5" // { dependencies = [ sources."once-1.2.0" @@ -48526,7 +49254,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -48571,8 +49299,6 @@ in sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string2compact-1.3.0" sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" @@ -48610,7 +49336,6 @@ in sources."uri-js-4.2.2" sources."utfx-1.0.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."utp-0.0.7" sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" @@ -48626,13 +49351,13 @@ in sources."ultron-1.0.2" ]; }) - (sources."xml2js-0.4.22" // { + (sources."xml2js-0.4.23" // { dependencies = [ sources."xmlbuilder-11.0.1" ]; }) sources."xmlbuilder-9.0.7" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" sources."xspfr-0.3.1" sources."xtend-4.0.2" ]; @@ -48653,78 +49378,78 @@ in src = ../tools/misc/texlab/citeproc; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/core-7.7.2" - sources."@babel/generator-7.7.2" - sources."@babel/helper-annotate-as-pure-7.7.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" - sources."@babel/helper-call-delegate-7.7.0" - sources."@babel/helper-create-regexp-features-plugin-7.7.2" - sources."@babel/helper-define-map-7.7.0" - sources."@babel/helper-explode-assignable-expression-7.7.0" - sources."@babel/helper-function-name-7.7.0" - sources."@babel/helper-get-function-arity-7.7.0" - sources."@babel/helper-hoist-variables-7.7.0" - sources."@babel/helper-member-expression-to-functions-7.7.0" - sources."@babel/helper-module-imports-7.7.0" - sources."@babel/helper-module-transforms-7.7.0" - sources."@babel/helper-optimise-call-expression-7.7.0" + sources."@babel/core-7.7.7" + sources."@babel/generator-7.7.7" + sources."@babel/helper-annotate-as-pure-7.7.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.4" + sources."@babel/helper-call-delegate-7.7.4" + sources."@babel/helper-create-regexp-features-plugin-7.7.4" + sources."@babel/helper-define-map-7.7.4" + sources."@babel/helper-explode-assignable-expression-7.7.4" + sources."@babel/helper-function-name-7.7.4" + sources."@babel/helper-get-function-arity-7.7.4" + sources."@babel/helper-hoist-variables-7.7.4" + sources."@babel/helper-member-expression-to-functions-7.7.4" + sources."@babel/helper-module-imports-7.7.4" + sources."@babel/helper-module-transforms-7.7.5" + sources."@babel/helper-optimise-call-expression-7.7.4" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.7.0" - sources."@babel/helper-replace-supers-7.7.0" - sources."@babel/helper-simple-access-7.7.0" - sources."@babel/helper-split-export-declaration-7.7.0" - sources."@babel/helper-wrap-function-7.7.0" - sources."@babel/helpers-7.7.0" + sources."@babel/helper-remap-async-to-generator-7.7.4" + sources."@babel/helper-replace-supers-7.7.4" + sources."@babel/helper-simple-access-7.7.4" + sources."@babel/helper-split-export-declaration-7.7.4" + sources."@babel/helper-wrap-function-7.7.4" + sources."@babel/helpers-7.7.4" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" - sources."@babel/plugin-proposal-async-generator-functions-7.7.0" - sources."@babel/plugin-proposal-dynamic-import-7.7.0" - sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.6.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" - sources."@babel/plugin-syntax-async-generators-7.2.0" - sources."@babel/plugin-syntax-dynamic-import-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-syntax-top-level-await-7.7.0" - sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.7.0" - sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.7.0" - sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.7.0" - sources."@babel/plugin-transform-duplicate-keys-7.5.0" - sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.7.0" - sources."@babel/plugin-transform-literals-7.2.0" - sources."@babel/plugin-transform-member-expression-literals-7.2.0" - sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.7.0" - sources."@babel/plugin-transform-modules-systemjs-7.7.0" - sources."@babel/plugin-transform-modules-umd-7.7.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" - sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.5.5" - sources."@babel/plugin-transform-parameters-7.4.4" - sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.7.0" - sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-shorthand-properties-7.2.0" - sources."@babel/plugin-transform-spread-7.6.2" - sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.4.4" - sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.7.0" - sources."@babel/preset-env-7.7.1" - sources."@babel/template-7.7.0" - sources."@babel/traverse-7.7.2" - sources."@babel/types-7.7.2" + sources."@babel/parser-7.7.7" + sources."@babel/plugin-proposal-async-generator-functions-7.7.4" + sources."@babel/plugin-proposal-dynamic-import-7.7.4" + sources."@babel/plugin-proposal-json-strings-7.7.4" + sources."@babel/plugin-proposal-object-rest-spread-7.7.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.7.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.7" + sources."@babel/plugin-syntax-async-generators-7.7.4" + sources."@babel/plugin-syntax-dynamic-import-7.7.4" + sources."@babel/plugin-syntax-json-strings-7.7.4" + sources."@babel/plugin-syntax-object-rest-spread-7.7.4" + sources."@babel/plugin-syntax-optional-catch-binding-7.7.4" + sources."@babel/plugin-syntax-top-level-await-7.7.4" + sources."@babel/plugin-transform-arrow-functions-7.7.4" + sources."@babel/plugin-transform-async-to-generator-7.7.4" + sources."@babel/plugin-transform-block-scoped-functions-7.7.4" + sources."@babel/plugin-transform-block-scoping-7.7.4" + sources."@babel/plugin-transform-classes-7.7.4" + sources."@babel/plugin-transform-computed-properties-7.7.4" + sources."@babel/plugin-transform-destructuring-7.7.4" + sources."@babel/plugin-transform-dotall-regex-7.7.7" + sources."@babel/plugin-transform-duplicate-keys-7.7.4" + sources."@babel/plugin-transform-exponentiation-operator-7.7.4" + sources."@babel/plugin-transform-for-of-7.7.4" + sources."@babel/plugin-transform-function-name-7.7.4" + sources."@babel/plugin-transform-literals-7.7.4" + sources."@babel/plugin-transform-member-expression-literals-7.7.4" + sources."@babel/plugin-transform-modules-amd-7.7.5" + sources."@babel/plugin-transform-modules-commonjs-7.7.5" + sources."@babel/plugin-transform-modules-systemjs-7.7.4" + sources."@babel/plugin-transform-modules-umd-7.7.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.4" + sources."@babel/plugin-transform-new-target-7.7.4" + sources."@babel/plugin-transform-object-super-7.7.4" + sources."@babel/plugin-transform-parameters-7.7.7" + sources."@babel/plugin-transform-property-literals-7.7.4" + sources."@babel/plugin-transform-regenerator-7.7.5" + sources."@babel/plugin-transform-reserved-words-7.7.4" + sources."@babel/plugin-transform-shorthand-properties-7.7.4" + sources."@babel/plugin-transform-spread-7.7.4" + sources."@babel/plugin-transform-sticky-regex-7.7.4" + sources."@babel/plugin-transform-template-literals-7.7.4" + sources."@babel/plugin-transform-typeof-symbol-7.7.4" + sources."@babel/plugin-transform-unicode-regex-7.7.4" + sources."@babel/preset-env-7.7.7" + sources."@babel/template-7.7.4" + sources."@babel/traverse-7.7.4" + sources."@babel/types-7.7.4" sources."@citation-js/core-0.4.9" sources."@citation-js/date-0.4.4" sources."@citation-js/name-0.4.2" @@ -48733,7 +49458,7 @@ in sources."@types/anymatch-1.3.1" sources."@types/concat-stream-1.6.0" sources."@types/form-data-0.0.33" - sources."@types/node-11.15.2" + sources."@types/node-11.15.3" sources."@types/qs-6.9.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.4" @@ -48742,7 +49467,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.39.8" // { + (sources."@types/webpack-4.41.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -48772,7 +49497,7 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" @@ -48784,7 +49509,7 @@ in ]; }) sources."aproba-1.2.0" - sources."arg-4.1.1" + sources."arg-4.1.2" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -48819,7 +49544,8 @@ in sources."base64-js-1.3.1" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" - sources."bluebird-3.7.1" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -48834,7 +49560,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.7.2" + sources."browserslist-4.8.2" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" @@ -48843,14 +49569,14 @@ in sources."cacache-12.0.3" sources."cache-base-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001008" + sources."caniuse-lite-1.0.30001016" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" sources."chownr-1.1.3" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" - sources."citeproc-2.2.27" + sources."citeproc-2.2.30" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -48883,10 +49609,10 @@ in sources."convert-source-map-1.7.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" - (sources."core-js-compat-3.4.1" // { + sources."core-js-2.6.11" + (sources."core-js-compat-3.6.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.0.0" ]; }) sources."core-util-is-1.0.2" @@ -48902,14 +49628,14 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."des.js-1.0.0" + sources."des.js-1.0.1" sources."detect-file-1.0.0" sources."diff-4.0.1" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.306" - sources."elliptic-6.5.1" + sources."electron-to-chromium-1.3.322" + sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" sources."encoding-0.1.12" @@ -48958,8 +49684,9 @@ in ]; }) sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.1" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -48975,7 +49702,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-port-3.2.0" @@ -48996,7 +49723,7 @@ in sources."globals-11.12.0" sources."graceful-fs-4.2.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -49014,7 +49741,7 @@ in }) (sources."http-response-object-3.0.2" // { dependencies = [ - sources."@types/node-10.17.5" + sources."@types/node-10.17.12" ]; }) sources."https-browserify-1.0.0" @@ -49082,8 +49809,8 @@ in sources."memory-fs-0.5.0" sources."micromatch-3.1.10" sources."miller-rabin-4.0.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -49112,7 +49839,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.39" // { + (sources."node-releases-1.1.44" // { dependencies = [ sources."semver-6.3.0" ]; @@ -49192,7 +49919,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.0" // { + (sources."regjsparser-0.6.2" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -49202,7 +49929,7 @@ in sources."repeat-string-1.6.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-cwd-2.0.0" (sources."resolve-dir-1.0.1" // { dependencies = [ @@ -49220,7 +49947,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."semver-5.7.1" - sources."serialize-javascript-1.9.1" + sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -49294,7 +50021,7 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string-width-3.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" @@ -49303,12 +50030,12 @@ in sources."sync-request-5.0.0" sources."sync-rpc-1.3.4" sources."tapable-1.1.3" - (sources."terser-4.4.0" // { + (sources."terser-4.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.1" // { + (sources."terser-webpack-plugin-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -49330,7 +50057,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."ts-loader-5.4.5" - sources."ts-node-8.5.0" + sources."ts-node-8.5.4" sources."tslib-1.10.0" sources."tslint-5.20.1" sources."tslint-config-prettier-1.18.0" @@ -49372,7 +50099,7 @@ in sources."v8-compile-cache-2.0.3" sources."vm-browserify-1.1.2" sources."watchpack-1.6.0" - (sources."webpack-4.41.2" // { + (sources."webpack-4.41.4" // { dependencies = [ sources."memory-fs-0.4.1" ]; @@ -49504,10 +50231,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.1.0.tgz"; - sha512 = "HwWCWql35j7EIp29mO4yRAxPH+Z2t2gwsLk3RLr6wktYjRacy0S83sG4RBDNfbfyLqJeZxFgMoKaCC/bTNxoWA=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.0.tgz"; + sha512 = "6rlW+nPl22mxAvQB67DkatkSfUNr5qEAmKyn0TJtSEy49kJ3W7v4oiHH9Y0Au6F7ACjAB2nOCZpP885MYwfuoQ=="; }; dependencies = [ sources."async-2.6.3" @@ -49518,17 +50245,17 @@ in sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."commander-2.19.0" + sources."commander-4.0.1" sources."core-util-is-1.0.2" sources."debug-3.2.6" sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.5" - sources."eventemitter3-3.1.2" + sources."eventemitter3-4.0.0" sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" sources."follow-redirects-1.9.0" - sources."http-proxy-1.17.0" + sources."http-proxy-1.18.0" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" @@ -49585,7 +50312,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.10.2" @@ -49609,7 +50336,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -49706,7 +50433,7 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" - sources."deep-equal-1.0.1" + sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -49731,7 +50458,7 @@ in sources."end-of-stream-1.4.4" sources."endent-1.3.0" sources."env-paths-1.0.0" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -49773,7 +50500,7 @@ in sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.7" sources."fast-json-parse-1.0.3" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -49818,7 +50545,7 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -49834,7 +50561,7 @@ in sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" - sources."import-fresh-3.1.0" + sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" @@ -49851,11 +50578,12 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.0" sources."is-accessor-descriptor-1.0.0" + sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -49873,10 +50601,10 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" @@ -49911,8 +50639,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -49928,6 +50656,7 @@ in sources."nice-try-1.0.5" sources."nopt-4.0.1" sources."normalize-package-data-2.5.0" + sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-6.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -49944,9 +50673,11 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."objectorarray-1.0.3" sources."on-finished-2.3.0" @@ -49987,7 +50718,7 @@ in sources."promzard-0.3.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.5.1" @@ -50005,12 +50736,9 @@ in sources."pify-4.0.1" ]; }) - (sources."read-package-json-2.1.0" // { - dependencies = [ - sources."slash-1.0.0" - ]; - }) + sources."read-package-json-2.1.1" sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."repeat-element-1.1.3" @@ -50022,7 +50750,7 @@ in sources."tough-cookie-2.4.3" ]; }) - sources."resolve-1.11.1" + sources."resolve-1.14.1" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -50112,9 +50840,9 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trim-1.1.2" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trim-1.2.1" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" (sources."strip-ansi-5.2.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -50124,7 +50852,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."tape-4.11.0" + sources."tape-4.12.1" (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -50192,7 +50920,7 @@ in sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xmlbuilder-9.0.7" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" sources."yallist-2.1.2" ]; buildInputs = globalBuildInputs; @@ -50208,10 +50936,10 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-2.0.0.tgz"; - sha512 = "LzrtY3lBWvFZcw4lXgkEbbDUd7y78juC3C5l7gj3UyezMEZF0Be9fjCVLN1HoZAzdMDeC3KHehWpHBJvgVAPkw=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.0.0.tgz"; + sha512 = "fxNNpGrnuVMbaDBpHdgwReMy48BelhAoS6OUUX6Zv5nMwSPZOMxL/kB5VxM9xQoB1vvw38zG9drLRS8gvavxeg=="; }; dependencies = [ sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -50219,7 +50947,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -50227,7 +50955,7 @@ in sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" - sources."arrify-1.0.1" + sources."arrify-2.0.1" sources."assign-symbols-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.0" @@ -50267,8 +50995,8 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" - sources."cp-file-6.2.0" - sources."cpy-7.3.0" + sources."cp-file-7.0.0" + sources."cpy-8.0.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -50360,6 +51088,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."json-parse-better-errors-1.0.2" + sources."junk-3.1.0" sources."kind-of-6.0.2" (sources."load-json-file-4.0.0" // { dependencies = [ @@ -50368,7 +51097,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-2.1.0" + sources."make-dir-3.0.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -50376,7 +51105,11 @@ in sources."merge2-1.3.0" sources."micromatch-3.1.10" sources."minimatch-3.0.4" - sources."minimist-options-3.0.2" + (sources."minimist-options-3.0.2" // { + dependencies = [ + sources."arrify-1.0.1" + ]; + }) (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -50385,7 +51118,11 @@ in sources."ms-2.0.0" sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -50402,8 +51139,13 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."p-all-2.1.0" + sources."p-event-4.1.0" + sources."p-finally-1.0.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-2.1.0" + sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."parse-json-4.0.0" sources."pascalcase-0.1.1" @@ -50425,12 +51167,11 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" - sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" - sources."semver-5.7.1" + sources."semver-6.3.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -50547,7 +51288,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -50576,7 +51317,7 @@ in sources."d-1.0.1" sources."debug-3.2.6" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.52" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -50587,7 +51328,7 @@ in sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -50622,8 +51363,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" sources."ms-2.1.2" @@ -50689,10 +51430,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.2.0.tgz"; - sha512 = "BWbSreHNhZbSStkvLrEepjVuNp7ooKOiO7amoezEZPAac2H0MxBhzUIazto9OT7fZkcaRNubDuHKxGcxqlIwRA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.3.0.tgz"; + sha512 = "yheXb68YkLCHD+INCHB4f8/3hyet4psVpSyieiPHemIbGbbYl085n22vECIRcjoF043qyP70Cg4WWBiSIx1mWw=="; }; dependencies = [ sources."ansi-escapes-3.2.0" @@ -50719,7 +51460,7 @@ in }) sources."debug-2.6.9" sources."duplexer2-0.0.2" - sources."envinfo-7.3.1" + sources."envinfo-7.5.0" sources."escape-string-regexp-1.0.5" sources."external-editor-3.1.0" sources."figures-2.0.0" @@ -50825,7 +51566,7 @@ in sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."cross-spawn-5.1.0" sources."escape-string-regexp-1.0.5" sources."fs-extra-4.0.3" @@ -50917,7 +51658,7 @@ in sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -51027,7 +51768,6 @@ in sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" sources."deep-extend-0.6.0" - sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."diffy-2.1.0" @@ -51059,8 +51799,6 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" (sources."expand-brackets-2.1.4" // { @@ -51099,8 +51837,12 @@ in sources."eyes-0.1.8" sources."fast-bitfield-1.2.2" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."fd-lock-1.0.2" + sources."fast-json-stable-stringify-2.1.0" + (sources."fd-lock-1.0.2" // { + dependencies = [ + sources."napi-macros-1.8.2" + ]; + }) sources."fd-read-stream-1.1.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { @@ -51109,14 +51851,12 @@ in ]; }) sources."flat-tree-1.6.0" - sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -51127,9 +51867,7 @@ in sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -51163,14 +51901,12 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inspect-custom-symbol-1.1.0" + sources."inspect-custom-symbol-1.1.1" sources."ip-1.1.5" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -51187,11 +51923,9 @@ in sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.4" - sources."is-symbol-1.0.2" + sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -51232,8 +51966,8 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-2.0.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" @@ -51262,7 +51996,7 @@ in sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" - sources."napi-macros-1.8.2" + sources."napi-macros-2.0.0" sources."ncp-1.0.1" sources."neat-input-1.10.0" sources."neat-log-3.1.0" @@ -51287,15 +52021,13 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-headers-2.0.2" + sources."parse-headers-2.0.3" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -51317,7 +52049,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -51443,11 +52175,8 @@ in sources."ms-2.0.0" ]; }) - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string-width-2.1.1" - sources."string.prototype.trim-1.2.0" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -51517,8 +52246,9 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.4" // { + (sources."utp-native-2.1.5" // { dependencies = [ + sources."node-gyp-build-4.2.0" sources."readable-stream-3.4.0" sources."unordered-set-2.0.1" ]; @@ -51539,7 +52269,7 @@ in sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" sources."xhr-2.5.0" - sources."xsalsa20-1.0.2" + sources."xsalsa20-1.1.0" sources."xtend-4.0.2" sources."yallist-2.1.2" ]; @@ -51645,8 +52375,8 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-0.0.10" sources."ms-0.7.0" sources."nan-2.14.0" @@ -51763,10 +52493,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.15.7"; + version = "6.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.15.7.tgz"; - sha512 = "Z6AsKLwPxSz7auY4+p9mFOR+Ep0+iAIJ9OxADLeadprQO33A4XuerCpkePOzewQeVFbnspdB0+jCRsj9shPpCw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.16.2.tgz"; + sha512 = "TCZHo+lRPCyhM16WIxn8hiavYj0784kFHhsZTCyCUD8BghjEKMqE/trKaUK6VTkB+1uOpgqdWQPrR5jHkHeUxw=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -51775,12 +52505,12 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.569.0" + sources."aws-sdk-2.596.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."buffer-4.9.2" + sources."buffer-4.9.1" sources."buffer-queue-1.0.0" sources."bytes-3.1.0" sources."caseless-0.12.0" @@ -51788,27 +52518,21 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."decimal.js-10.2.0" - sources."define-properties-1.1.3" sources."delay-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."eventemitter3-4.0.0" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."function-bind-1.1.1" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" - sources."has-symbols-1.0.0" sources."http-signature-1.2.0" sources."ieee754-1.1.13" sources."inherits-2.0.4" @@ -51818,10 +52542,6 @@ in sources."jsbn-1.1.0" ]; }) - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -51834,13 +52554,10 @@ in sources."jsprim-1.4.1" sources."lodash-4.17.15" sources."lossless-json-1.0.3" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-0.0.10" sources."oauth-sign-0.9.0" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" @@ -51848,7 +52565,7 @@ in sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-1.3.2" sources."qs-6.5.2" @@ -51869,14 +52586,12 @@ in }) sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.2.1" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."socks5-https-client-1.2.1" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -51897,14 +52612,13 @@ in }) sources."url-0.10.3" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" - sources."uuid-3.3.3" + sources."uuid-3.3.2" sources."verror-1.10.0" sources."when-3.7.8" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."xml2js-0.4.22" - sources."xmlbuilder-11.0.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" ]; buildInputs = globalBuildInputs; meta = { @@ -51991,7 +52705,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."cross-spawn-5.1.0" sources."currently-unhandled-0.4.1" sources."debug-2.6.9" @@ -52103,7 +52817,7 @@ in sources."private-0.1.8" sources."prop-types-15.7.2" sources."pseudomap-1.0.2" - sources."react-is-16.11.0" + sources."react-is-16.12.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -52119,7 +52833,7 @@ in sources."regenerator-runtime-0.11.1" sources."repeating-2.0.1" sources."require-from-string-1.2.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-3.0.0" sources."restore-cursor-2.0.0" sources."safe-buffer-5.2.0" @@ -52196,10 +52910,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "6.6.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz"; - sha512 = "PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g=="; + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" @@ -52207,7 +52921,7 @@ in sources."acorn-7.1.0" sources."acorn-jsx-5.1.0" sources."ajv-6.10.2" - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -52243,7 +52957,7 @@ in sources."esutils-2.0.3" sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."figures-3.1.0" sources."file-entry-cache-5.0.1" @@ -52253,15 +52967,15 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.0" - sources."globals-11.12.0" + sources."globals-12.3.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" - sources."import-fresh-3.1.0" + sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.0.0" + sources."inquirer-7.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -52332,7 +53046,7 @@ in sources."tmp-0.0.33" sources."tslib-1.10.0" sources."type-check-0.3.2" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.0" sources."which-1.3.1" @@ -52364,7 +53078,7 @@ in sources."acorn-7.1.0" sources."acorn-jsx-5.1.0" sources."ajv-6.10.2" - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -52390,7 +53104,7 @@ in sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" - sources."eslint-6.6.0" + sources."eslint-6.8.0" sources."eslint-scope-5.0.0" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" @@ -52402,7 +53116,7 @@ in sources."esutils-2.0.3" sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."figures-3.1.0" sources."file-entry-cache-5.0.1" @@ -52412,15 +53126,15 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.0" - sources."globals-11.12.0" + sources."globals-12.3.0" sources."has-flag-3.0.0" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" - sources."import-fresh-3.1.0" + sources."import-fresh-3.2.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.0.0" + sources."inquirer-7.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" @@ -52453,7 +53167,7 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" @@ -52494,7 +53208,7 @@ in sources."tmp-0.0.33" sources."tslib-1.10.0" sources."type-check-0.3.2" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.0" sources."which-1.3.1" @@ -52530,7 +53244,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-from-1.1.1" sources."camelcase-2.1.1" @@ -52559,7 +53273,7 @@ in sources."extract-zip-1.6.7" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fd-slicer-1.0.1" sources."find-up-1.1.2" sources."forever-agent-0.6.1" @@ -52605,8 +53319,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -52646,7 +53360,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."promise-phantom-3.1.6" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" @@ -52656,7 +53370,7 @@ in sources."repeating-2.0.1" sources."request-2.88.0" sources."request-progress-2.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -52834,7 +53548,7 @@ in sources."read-pkg-up-3.0.0" sources."readable-stream-2.3.6" sources."redent-2.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."restore-cursor-2.0.0" sources."run-async-2.3.0" sources."rxjs-6.5.3" @@ -52916,6 +53630,7 @@ in ]; }) sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" (sources."broadway-0.3.6" // { @@ -52965,7 +53680,7 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.0" - sources."deep-equal-1.1.0" + sources."deep-equal-2.0.1" sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ @@ -52974,6 +53689,9 @@ in }) sources."defined-0.0.0" sources."director-1.2.7" + sources."es-abstract-1.17.0" + sources."es-get-iterator-1.0.2" + sources."es-to-primitive-1.2.1" (sources."event-stream-0.5.3" // { dependencies = [ sources."optimist-0.2.8" @@ -52989,6 +53707,7 @@ in }) sources."extglob-0.3.2" sources."eyes-0.1.8" + sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" (sources."flatiron-0.4.3" // { @@ -53005,7 +53724,7 @@ in }) sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -53013,6 +53732,7 @@ in sources."glob-parent-2.0.0" sources."graceful-fs-4.2.3" sources."has-1.0.3" + sources."has-symbols-1.0.1" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -53038,14 +53758,17 @@ in ]; }) sources."is-arguments-1.0.4" + sources."is-bigint-1.0.0" sources."is-binary-path-1.0.1" + sources."is-boolean-object-1.0.1" sources."is-buffer-1.1.6" + sources."is-callable-1.1.5" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -53056,7 +53779,9 @@ in sources."is-extendable-0.1.1" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" + sources."is-map-2.0.1" sources."is-number-2.1.0" + sources."is-number-object-1.0.4" (sources."is-plain-object-2.0.4" // { dependencies = [ sources."isobject-3.0.1" @@ -53064,10 +53789,19 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" + sources."is-set-2.0.1" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.1" sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-2.1.0" + sources."isarray-2.0.5" + (sources."isobject-2.1.0" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) sources."isstream-0.1.2" sources."jsonify-0.0.0" sources."kind-of-3.2.2" @@ -53120,13 +53854,15 @@ in }) ]; }) - sources."object-is-1.0.1" + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) + sources."object.assign-4.1.0" sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -53161,7 +53897,11 @@ in ]; }) sources."read-1.0.7" - sources."readable-stream-2.3.6" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) (sources."readdirp-2.2.1" // { dependencies = [ sources."arr-diff-4.0.0" @@ -53215,7 +53955,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -53232,6 +53972,7 @@ in ]; }) sources."shush-1.0.0" + sources."side-channel-1.0.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -53279,6 +54020,8 @@ in sources."kind-of-5.1.0" ]; }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" sources."strip-json-comments-0.1.3" (sources."tape-2.3.3" // { @@ -53303,6 +54046,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isarray-1.0.0" sources."isobject-3.0.1" ]; }) @@ -53316,6 +54060,8 @@ in sources."ncp-1.0.1" ]; }) + sources."which-boxed-primitive-1.0.1" + sources."which-collection-1.0.0" sources."winston-0.8.3" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" @@ -53346,7 +54092,7 @@ in sources."microee-0.0.6" sources."minilog-3.1.0" sources."ms-2.1.2" - sources."simple-git-1.126.0" + sources."simple-git-1.129.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; buildInputs = globalBuildInputs; @@ -53384,8 +54130,9 @@ in sources."git-packidx-parser-1.0.0" sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" + sources."handlebars-4.5.3" sources."hashlru-2.3.0" - sources."highlight.js-9.16.2" + sources."highlight.js-9.17.1" sources."increment-buffer-1.0.1" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -53405,9 +54152,9 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" - sources."minimist-1.2.0" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."minimist-0.0.10" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -53420,18 +54167,20 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.4.2" + sources."muxrpc-6.4.8" sources."nan-2.14.0" sources."nearley-2.19.0" + sources."neo-async-2.6.1" sources."node-gyp-build-4.2.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" + sources."optimist-0.6.1" sources."options-0.0.6" sources."os-homedir-1.0.2" sources."packet-stream-2.0.4" sources."packet-stream-codec-1.1.2" sources."pako-1.0.10" - sources."private-box-0.3.0" + sources."private-box-0.3.1" sources."progress-1.1.8" sources."pull-block-filter-1.0.0" sources."pull-box-stream-1.0.13" @@ -53479,7 +54228,11 @@ in sources."pull-ws-3.3.2" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) sources."relative-url-1.0.2" sources."remove-markdown-0.1.0" sources."ret-0.1.15" @@ -53499,10 +54252,11 @@ in }) sources."sodium-chloride-1.1.2" sources."sodium-native-2.4.6" + sources."source-map-0.6.1" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" - (sources."ssb-client-4.7.8" // { + (sources."ssb-client-4.7.9" // { dependencies = [ sources."ssb-config-3.4.3" ]; @@ -53535,7 +54289,9 @@ in sources."through-2.2.7" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" + sources."uglify-js-3.7.2" sources."ultron-1.0.2" + sources."wordwrap-0.0.3" sources."ws-1.1.5" sources."xtend-4.0.2" ]; @@ -53570,14 +54326,28 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.0.0.tgz"; - sha512 = "eRb/bUvC5E5TXSD0/A6DJffPP+g7gcpn572XhC/sQnWW0B3fopeegldE++pM2bfKuUGGsObRThsbuU5NqR8P9Q=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.0.1.tgz"; + sha512 = "gNHhP0cOL38zx4zn05SYJTLdnQB0mGu09zI3mIYN+wuFybSw1I7GpUvr9zYeMOwFHiMacpeJ8llBvNywLZnM7Q=="; }; dependencies = [ + sources."@babel/code-frame-7.5.5" + (sources."@babel/highlight-7.5.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" + sources."@types/minimist-1.2.0" + sources."@types/normalize-package-data-2.4.0" sources."ajv-6.10.2" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -53586,28 +54356,19 @@ in sources."string-width-3.1.0" ]; }) - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" - sources."array-find-index-1.0.2" + sources."ansi-styles-4.2.0" sources."arrify-1.0.1" - (sources."boxen-3.2.0" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."type-fest-0.3.1" - ]; - }) + sources."boxen-4.2.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."chalk-2.4.2" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.1.1" + sources."chalk-3.0.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" @@ -53616,20 +54377,12 @@ in sources."cli-width-2.2.0" sources."clone-1.0.4" sources."clone-response-1.0.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."conf-6.2.0" - (sources."configstore-4.0.0" // { - dependencies = [ - sources."dot-prop-4.2.0" - sources."is-obj-1.0.1" - sources."make-dir-1.3.0" - sources."write-file-atomic-2.4.3" - ]; - }) + sources."configstore-5.0.0" sources."cross-spawn-7.0.1" - sources."crypto-random-string-1.0.0" - sources."currently-unhandled-0.4.1" + sources."crypto-random-string-2.0.0" sources."debounce-fn-3.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -53640,7 +54393,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -53648,21 +54401,23 @@ in sources."env-paths-2.2.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."execa-3.3.0" + sources."esutils-2.0.3" + sources."execa-3.4.0" sources."external-editor-3.1.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figures-3.1.0" sources."find-up-3.0.0" sources."get-stream-5.1.0" - sources."global-dirs-0.1.1" + sources."global-dirs-2.0.1" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" ]; }) sources."graceful-fs-4.2.3" - sources."has-flag-3.0.0" + sources."hard-rejection-2.1.0" + sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.5" sources."http-cache-semantics-4.0.3" @@ -53670,50 +54425,74 @@ in sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" + sources."indent-string-4.0.0" sources."ini-1.3.5" - sources."inquirer-7.0.0" + (sources."inquirer-7.0.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) (sources."inquirer-autocomplete-prompt-1.0.1" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."figures-2.0.0" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" ]; }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.1.0" + sources."is-installed-globally-0.3.1" sources."is-interactive-1.0.0" - sources."is-npm-3.0.0" + sources."is-npm-4.0.0" sources."is-obj-2.0.0" - sources."is-path-inside-1.0.1" + sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" + sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json-schema-typed-7.0.2" + sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."load-json-file-4.0.0" + sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."log-symbols-3.0.0" - sources."loud-rejection-1.6.0" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" sources."make-dir-3.0.0" - sources."map-obj-2.0.0" - sources."meow-5.0.0" + sources."map-obj-4.1.0" + sources."meow-6.0.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" + sources."min-indent-1.0.0" sources."minimist-1.2.0" - sources."minimist-options-3.0.2" + sources."minimist-options-4.0.2" sources."mute-stream-0.0.8" sources."node-fetch-2.6.0" (sources."normalize-package-data-2.5.0" // { @@ -53722,10 +54501,14 @@ in ]; }) sources."normalize-url-4.5.0" - sources."npm-run-path-4.0.0" + sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.0" - sources."ora-4.0.2" + (sources."ora-4.0.3" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-finally-2.0.1" @@ -53733,34 +54516,33 @@ in sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - sources."parse-json-4.0.0" + sources."parse-json-5.0.0" sources."path-exists-3.0.0" - sources."path-is-inside-1.0.2" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."path-parse-1.0.6" - sources."path-type-3.0.0" - sources."pify-3.0.0" sources."pkg-up-3.1.0" sources."prepend-http-2.0.0" - sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."quick-lru-1.1.0" + sources."quick-lru-4.0.1" sources."rc-1.2.8" - sources."read-pkg-3.0.0" - (sources."read-pkg-up-3.0.0" // { + (sources."read-pkg-5.2.0" // { dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" + sources."type-fest-0.6.0" ]; }) - sources."redent-2.0.0" + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) + sources."redent-3.0.0" sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.3.0" @@ -53768,11 +54550,7 @@ in sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-diff-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" @@ -53790,53 +54568,30 @@ in sources."ansi-regex-4.1.0" ]; }) - sources."strip-bom-3.0.0" - sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."get-stream-3.0.0" - sources."is-stream-1.1.0" - sources."npm-run-path-2.0.2" - sources."p-finally-1.0.0" - sources."path-key-2.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) + sources."supports-color-7.1.0" + sources."term-size-2.1.1" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" sources."tslib-1.10.0" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" - sources."unique-string-1.0.0" - sources."update-notifier-3.0.1" + sources."unique-string-2.0.0" + sources."update-notifier-4.0.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" - sources."which-2.0.1" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."which-2.0.2" + sources."widest-line-3.1.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.1" - sources."xdg-basedir-3.0.0" - sources."yallist-2.1.2" - sources."yargs-parser-10.1.0" + sources."xdg-basedir-4.0.0" + sources."yargs-parser-16.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -53871,6 +54626,7 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."agent-base-4.3.0" sources."ajv-6.10.2" @@ -53883,7 +54639,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" (sources."apollo-codegen-0.20.2" // { @@ -53907,11 +54663,11 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-runtime-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."qs-6.7.0" @@ -53983,16 +54739,25 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" sources."create-error-class-3.0.2" (sources."creato-1.1.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."inquirer-7.0.0" + sources."ansi-styles-4.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."inquirer-7.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."ora-4.0.2" + (sources."ora-4.0.3" // { + dependencies = [ + sources."chalk-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) (sources."string-width-4.2.0" // { dependencies = [ sources."strip-ansi-6.0.0" @@ -54003,6 +54768,7 @@ in sources."ansi-regex-4.1.0" ]; }) + sources."supports-color-7.1.0" sources."update-notifier-3.0.1" ]; }) @@ -54029,7 +54795,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -54086,7 +54852,7 @@ in }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figures-3.1.0" sources."finalhandler-1.1.2" sources."find-0.2.9" @@ -54282,8 +55048,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -54395,7 +55161,7 @@ in sources."proxy-addr-2.0.5" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -54419,7 +55185,7 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" @@ -54507,7 +55273,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."unique-string-1.0.0" sources."universalify-0.1.2" @@ -54768,7 +55534,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -54885,11 +55651,8 @@ in sources."cli-table-0.3.1" sources."colors-1.0.3" sources."core-util-is-1.0.2" - sources."define-properties-1.1.3" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-3.0.0" (sources."event-stream-0.9.8" // { @@ -54897,17 +55660,10 @@ in sources."optimist-0.2.8" ]; }) - sources."function-bind-1.1.1" sources."gl-matrix-2.8.1" - sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-symbols-1.0.0" sources."here-0.0.2" sources."inherits-2.0.4" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" sources."isarray-0.0.1" sources."lodash-4.17.15" sources."lodash.assign-4.2.0" @@ -54919,9 +55675,6 @@ in sources."memorystream-0.3.1" sources."node-emoji-1.10.0" sources."nopt-2.1.2" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" sources."png-js-0.1.1" @@ -54929,17 +55682,14 @@ in sources."redeyed-1.0.1" sources."sax-1.2.4" sources."sparkline-0.1.2" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.15.3" + sources."systeminformation-4.16.0" sources."term-canvas-0.0.5" - sources."util.promisify-1.0.0" sources."wordwrap-0.0.3" sources."x256-0.0.2" - sources."xml2js-0.4.22" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" ]; buildInputs = globalBuildInputs; @@ -55004,6 +55754,7 @@ in ]; }) sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -55069,7 +55820,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.52" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -55092,7 +55843,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -55110,6 +55861,7 @@ in ]; }) sources."fancy-log-1.3.3" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -55125,7 +55877,7 @@ in sources."fragment-cache-0.2.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" @@ -55143,7 +55895,7 @@ in sources."graceful-fs-4.2.3" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -55275,7 +56027,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -55346,7 +56098,7 @@ in ]; }) sources."stream-exhaust-1.0.2" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -55473,7 +56225,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.52" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -55487,7 +56239,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -55653,7 +56405,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -55773,7 +56525,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.6.8" + sources."uglify-js-3.7.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -55801,7 +56553,7 @@ in sources."async-2.6.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -55833,7 +56585,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" @@ -55864,8 +56616,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -55874,7 +56626,7 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."performance-now-2.1.0" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-1.1.14" @@ -55911,14 +56663,15 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.11.1.tgz"; - sha512 = "6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w=="; + url = "https://registry.npmjs.org/http-server/-/http-server-0.12.0.tgz"; + sha512 = "imGLDSTT1BZ0QG1rBFnaZ6weK5jeisUnCxZQI1cpYTdz0luPUM5e3s+WU5zRWEkiI6DQxL2p54oeKrDlzO6bRw=="; }; dependencies = [ sources."async-2.6.3" - sources."colors-1.0.3" + sources."basic-auth-1.1.0" + sources."colors-1.4.0" sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" @@ -55935,23 +56688,24 @@ in ]; }) sources."ms-2.1.2" - sources."opener-1.4.3" + sources."opener-1.5.1" (sources."optimist-0.6.1" // { dependencies = [ sources."minimist-0.0.10" ]; }) sources."portfinder-1.0.25" - sources."qs-2.3.3" + sources."qs-6.9.1" sources."requires-port-1.0.0" - sources."union-0.4.6" + sources."secure-compare-3.0.1" + sources."union-0.5.0" sources."url-join-2.0.5" sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; meta = { description = "A simple zero-configuration command-line http server"; - homepage = "https://github.com/indexzero/http-server#readme"; + homepage = "https://github.com/http-party/http-server#readme"; license = "MIT"; }; production = true; @@ -56107,36 +56861,43 @@ in ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; - version = "5.4.5"; + version = "5.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/ionic/-/ionic-5.4.5.tgz"; - sha512 = "hc45gTZeqNGQl8Pr3R9F2Ud8qrMybOK9YiG1vGwZVm4ZwnhQw3urB4UHIQVjuruHWQBXS+KM9gFAopJlan9E4Q=="; + url = "https://registry.npmjs.org/ionic/-/ionic-5.4.13.tgz"; + sha512 = "PtE2juZMaa/ycwwlcEt62UonpPPB0bMJaqRvYOIrVVWL1/yAcHtdDvTVvyumz3RS8cIi2f5NX4GIIvwgYIvVsA=="; }; dependencies = [ - sources."@ionic/cli-framework-3.0.0" - sources."@ionic/cli-framework-prompts-1.0.1" - sources."@ionic/discover-2.0.6" - sources."@ionic/utils-array-1.2.1" - sources."@ionic/utils-fs-2.0.8" - sources."@ionic/utils-network-1.0.5" - sources."@ionic/utils-object-1.0.5" - sources."@ionic/utils-process-1.0.5" - sources."@ionic/utils-stream-2.0.4" - sources."@ionic/utils-subprocess-1.0.9" - sources."@ionic/utils-terminal-1.0.5" + sources."@ionic/cli-framework-3.0.5" + sources."@ionic/cli-framework-prompts-1.0.4" + sources."@ionic/discover-2.0.7" + sources."@ionic/utils-array-1.2.2" + sources."@ionic/utils-fs-2.0.9" + sources."@ionic/utils-network-1.0.6" + sources."@ionic/utils-object-1.0.6" + sources."@ionic/utils-process-1.0.8" + sources."@ionic/utils-stream-2.0.5" + sources."@ionic/utils-subprocess-1.0.12" + sources."@ionic/utils-terminal-1.1.2" sources."@types/color-name-1.1.1" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" - sources."astral-regex-1.0.0" - sources."async-limiter-1.0.1" + sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" - sources."chalk-2.4.2" + (sources."chalk-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."chardet-0.7.0" sources."chownr-1.1.3" sources."cli-cursor-2.1.0" @@ -56230,13 +56991,15 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.0.0" // { + (sources."inquirer-7.0.1" // { dependencies = [ - sources."ansi-escapes-4.2.1" + sources."ansi-escapes-4.3.0" + sources."chalk-2.4.2" sources."cli-cursor-3.1.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.0" sources."restore-cursor-3.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."ip-1.1.5" @@ -56270,6 +57033,7 @@ in (sources."log-update-3.3.0" // { dependencies = [ sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" sources."wrap-ansi-5.1.0" ]; }) @@ -56277,8 +57041,8 @@ in sources."macos-release-2.3.0" sources."methods-1.1.2" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -56308,7 +57072,7 @@ in sources."pac-proxy-agent-3.0.1" sources."pac-resolver-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."proxy-agent-3.1.1" @@ -56330,7 +57094,14 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" - sources."slice-ansi-2.1.0" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."smart-buffer-4.1.0" sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { @@ -56353,13 +57124,12 @@ in dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" ]; }) sources."string_decoder-1.3.0" - (sources."strip-ansi-5.2.0" // { + (sources."strip-ansi-6.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" ]; }) sources."strip-eof-1.0.0" @@ -56379,14 +57149,14 @@ in sources."tree-kill-1.2.1" sources."tslib-1.10.0" sources."type-check-0.3.2" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."untildify-4.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.3.3" - sources."which-2.0.1" + sources."which-2.0.2" sources."windows-release-3.2.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { @@ -56394,12 +57164,11 @@ in sources."ansi-styles-4.2.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.1" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -56416,10 +57185,10 @@ in ios-deploy = nodeEnv.buildNodePackage { name = "ios-deploy"; packageName = "ios-deploy"; - version = "1.9.4"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.9.4.tgz"; - sha512 = "pgyc19zgtwGrfx3GL8yV0c0dAPucTpJ0VZkuS3DcqxIZYC48+UW+tBTxI43u1ZDk17mop0ABLs1SkAy5SUQ6pQ=="; + url = "https://registry.npmjs.org/ios-deploy/-/ios-deploy-1.10.0.tgz"; + sha512 = "sklB6PkJkWrHDublkZJeY4z9i7hl0nS2aRVse+/idGnb4eZddMQRfPVB4YzkEoyJ4FyW1I3sdLP6/cg/Imu/sw=="; }; buildInputs = globalBuildInputs; meta = { @@ -56451,13 +57220,13 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bezier-js-2.4.4" sources."bindings-1.5.0" sources."block-stream-0.0.9" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."bufferstreams-1.1.3" sources."camelcase-4.1.0" @@ -56533,7 +57302,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" sources."find-up-2.1.0" @@ -56590,8 +57359,8 @@ in sources."megaminx-0.9.0" sources."mem-1.1.0" sources."microbuffer-1.0.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -56674,7 +57443,7 @@ in sources."promise-polyfill-6.1.0" sources."proper-lockfile-3.2.0" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -56684,7 +57453,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."resumer-0.0.0" @@ -56758,7 +57527,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.0.0-11" // { + (sources."verda-1.0.0-12" // { dependencies = [ sources."ansi-regex-4.1.0" sources."fs-extra-6.0.1" @@ -56814,10 +57583,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.3.1"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.3.1.tgz"; - sha512 = "//GIzuTPZOAyvwf8U+/xjbzkNu+QMXoW0k3p1bPlbq43kGZD0WDJO9uhTDQ0mX6I+Sct4Is7TdvmSAqX2mrR/g=="; + url = "https://registry.npmjs.org/jake/-/jake-10.4.3.tgz"; + sha512 = "rraIRf0uRWQUE0rtjfTQaGA1Ow1l9O/2b2cNleTqQVihyM/3W2+V5S5ZbXUIkHpiBnZaeNtsCZkq2070BdlrPQ=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -56945,12 +57714,12 @@ in }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" - sources."abab-2.0.2" + sources."abab-2.0.3" sources."abbrev-1.1.1" sources."acorn-5.7.3" (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.3.0" + sources."acorn-6.4.0" ]; }) sources."acorn-walk-6.2.0" @@ -56986,7 +57755,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base-64-0.1.0" sources."bcrypt-pbkdf-1.0.2" @@ -57034,7 +57803,6 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."deepmerge-2.2.1" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -57063,8 +57831,6 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."entities-1.1.2" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.12.0" @@ -57075,7 +57841,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" sources."fd-slicer-1.1.0" @@ -57092,7 +57858,6 @@ in sources."fs-extra-5.0.0" sources."fs-minipass-2.0.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -57106,10 +57871,8 @@ in sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" sources."highlight.js-9.12.0" @@ -57161,13 +57924,9 @@ in sources."is-absolute-0.2.6" sources."is-arrayish-0.3.2" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-regex-1.0.4" sources."is-relative-0.2.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-windows-0.2.0" @@ -57211,8 +57970,8 @@ in sources."md5-2.2.1" sources."mdurl-1.0.1" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -57237,7 +57996,7 @@ in sources."needle-2.4.0" sources."nextgen-events-1.3.0" sources."no-case-2.3.2" - (sources."node-abi-2.12.0" // { + (sources."node-abi-2.13.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -57253,22 +58012,20 @@ in }) sources."noop-logger-0.1.1" sources."nopt-4.0.1" - sources."npm-bundled-1.0.6" - sources."npm-packlist-1.4.6" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.7" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ sources."inspect-parameters-declaration-0.0.10" sources."magicli-0.0.5" ]; }) - sources."object.getownpropertydescriptors-2.0.3" sources."omggif-1.0.10" sources."once-1.4.0" sources."optionator-0.8.3" @@ -57282,7 +58039,7 @@ in sources."parse5-4.0.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.0" + sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."pify-3.0.0" @@ -57294,7 +58051,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."proper-lockfile-2.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.1.2" @@ -57330,7 +58087,7 @@ in sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."seventh-0.7.30" - (sources."sharp-0.23.2" // { + (sources."sharp-0.23.4" // { dependencies = [ sources."tar-5.0.5" ]; @@ -57351,12 +58108,12 @@ in sources."source-map-url-0.4.0" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-4.1.0" + sources."sqlite3-4.1.1" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.10.3" + sources."string-kit-0.11.3" sources."string-padding-1.0.2" (sources."string-to-stream-1.1.1" // { dependencies = [ @@ -57370,8 +58127,6 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.3.0" (sources."stringify-parameters-0.0.4" // { dependencies = [ @@ -57405,7 +58160,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.31.7" + sources."terminal-kit-1.32.2" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -57416,7 +58171,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tree-kit-0.6.1" + sources."tree-kit-0.6.2" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -57437,7 +58192,6 @@ in sources."urix-0.1.0" sources."url-parse-1.4.7" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."uuid-3.3.3" sources."valid-url-1.0.9" sources."verror-1.10.0" @@ -57446,7 +58200,7 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-6.5.0" - sources."which-2.0.1" + sources."which-2.0.2" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" @@ -57460,7 +58214,7 @@ in sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" - sources."xml2js-0.4.22" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."yallist-4.0.0" sources."yargs-parser-7.0.0" @@ -57555,9 +58309,9 @@ in sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.7.3" + sources."@babel/parser-7.7.7" sources."argparse-1.0.10" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."catharsis-0.8.11" sources."entities-1.1.2" sources."escape-string-regexp-2.0.0" @@ -57593,10 +58347,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.10.3"; + version = "2.11.0-rc1"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.10.3.tgz"; - sha512 = "d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0-rc1.tgz"; + sha512 = "jWEHO8ad7pVMW5ek4yv300dPY8t9iyStVXE3hbelDmv99giOy8HkgSTsYvLTfC2F0FpQ1LoCS2p6StWe6AgRGQ=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -57707,15 +58461,15 @@ in sources."extend-3.0.2" sources."form-data-2.5.1" sources."formidable-1.2.1" - sources."graphlib-2.1.7" + sources."graphlib-2.1.8" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.13.1" sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" @@ -57762,7 +58516,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -57805,7 +58559,7 @@ in sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -57830,7 +58584,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" sources."forever-agent-0.6.1" @@ -57899,13 +58653,13 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-1.0.1" sources."minimist-1.2.0" sources."morgan-1.9.1" sources."ms-2.0.0" - sources."nanoid-2.1.6" + sources."nanoid-2.1.8" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" @@ -57932,7 +58686,7 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -58014,7 +58768,7 @@ in sources."xdg-basedir-3.0.0" sources."y18n-4.0.0" sources."yallist-2.1.2" - sources."yargs-14.2.1" + sources."yargs-14.2.2" sources."yargs-parser-15.0.0" ]; buildInputs = globalBuildInputs; @@ -58075,7 +58829,7 @@ in sources."better-assert-1.0.2" sources."binary-extensions-2.0.0" sources."blob-0.0.5" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -58084,7 +58838,7 @@ in sources."buffer-fill-1.0.0" sources."bytes-3.1.0" sources."callsite-1.0.0" - sources."chokidar-3.3.0" + sources."chokidar-3.3.1" sources."colors-1.4.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" @@ -58156,8 +58910,8 @@ in sources."lru-cache-4.1.5" sources."media-typer-0.3.0" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."ms-2.0.0" @@ -58178,7 +58932,7 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.2.0" + sources."readdirp-3.3.0" sources."requires-port-1.0.0" sources."rfdc-1.1.4" sources."rimraf-2.7.1" @@ -58190,7 +58944,7 @@ in sources."debug-3.1.0" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.1.1" // { dependencies = [ sources."debug-3.1.0" @@ -58273,7 +59027,7 @@ in sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.3" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -58309,7 +59063,7 @@ in sources."replace-ext-1.0.0" sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."through2-2.0.5" sources."through2-filter-3.0.0" @@ -58355,7 +59109,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -58404,7 +59158,7 @@ in sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."find-up-3.0.0" sources."forever-agent-0.6.1" @@ -58452,8 +59206,8 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -58496,7 +59250,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -58595,10 +59349,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.18.4"; + version = "3.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.18.4.tgz"; - sha512 = "DiU53cvMxaU07Bj2HwBwUQ2O3c/ORNq/QwKj1vGJH4vSkZSTUxPryp2baSNlt8PmnLNXOVpw0vOTRkEF+6n/cA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.19.0.tgz"; + sha512 = "YtMmwEqzWHQCh7Ynk7BvjrZri3EkSeVqTAcwZIqWlv9V/dCfvFPyRqp+2NIjPB5nj1FWXLRH6F05VT/qvzuuOA=="; }; dependencies = [ (sources."@evocateur/libnpmaccess-3.1.2" // { @@ -58618,30 +59372,30 @@ in sources."semver-5.7.1" ]; }) - sources."@lerna/add-3.18.4" - sources."@lerna/bootstrap-3.18.4" - sources."@lerna/changed-3.18.4" + sources."@lerna/add-3.19.0" + sources."@lerna/bootstrap-3.18.5" + sources."@lerna/changed-3.18.5" sources."@lerna/check-working-tree-3.16.5" sources."@lerna/child-process-3.16.5" - sources."@lerna/clean-3.18.4" - sources."@lerna/cli-3.18.0" + sources."@lerna/clean-3.18.5" + sources."@lerna/cli-3.18.5" sources."@lerna/collect-uncommitted-3.16.5" sources."@lerna/collect-updates-3.18.0" - sources."@lerna/command-3.18.0" - (sources."@lerna/conventional-commits-3.16.4" // { + sources."@lerna/command-3.18.5" + (sources."@lerna/conventional-commits-3.18.5" // { dependencies = [ sources."pify-4.0.1" ]; }) - (sources."@lerna/create-3.18.0" // { + (sources."@lerna/create-3.18.5" // { dependencies = [ sources."pify-4.0.1" ]; }) sources."@lerna/create-symlink-3.16.2" sources."@lerna/describe-ref-3.16.5" - sources."@lerna/diff-3.18.0" - sources."@lerna/exec-3.18.4" + sources."@lerna/diff-3.18.5" + sources."@lerna/exec-3.18.5" sources."@lerna/filter-options-3.18.4" sources."@lerna/filter-packages-3.18.0" sources."@lerna/get-npm-exec-opts-3.13.0" @@ -58650,46 +59404,46 @@ in sources."@lerna/gitlab-client-3.15.0" sources."@lerna/global-options-3.13.0" sources."@lerna/has-npm-version-3.16.5" - sources."@lerna/import-3.18.0" - sources."@lerna/init-3.18.0" - sources."@lerna/link-3.18.0" - sources."@lerna/list-3.18.4" - sources."@lerna/listable-3.18.4" + sources."@lerna/import-3.18.5" + sources."@lerna/init-3.18.5" + sources."@lerna/link-3.18.5" + sources."@lerna/list-3.18.5" + sources."@lerna/listable-3.18.5" sources."@lerna/log-packed-3.16.0" (sources."@lerna/npm-conf-3.16.0" // { dependencies = [ sources."pify-4.0.1" ]; }) - sources."@lerna/npm-dist-tag-3.18.1" + sources."@lerna/npm-dist-tag-3.18.5" sources."@lerna/npm-install-3.16.5" - (sources."@lerna/npm-publish-3.16.2" // { + (sources."@lerna/npm-publish-3.18.5" // { dependencies = [ sources."pify-4.0.1" ]; }) sources."@lerna/npm-run-script-3.16.5" - sources."@lerna/otplease-3.16.0" + sources."@lerna/otplease-3.18.5" sources."@lerna/output-3.13.0" sources."@lerna/pack-directory-3.16.4" sources."@lerna/package-3.16.0" - sources."@lerna/package-graph-3.18.0" + sources."@lerna/package-graph-3.18.5" sources."@lerna/prerelease-id-from-version-3.16.0" sources."@lerna/project-3.18.0" - sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.18.4" + sources."@lerna/prompt-3.18.5" + sources."@lerna/publish-3.18.5" sources."@lerna/pulse-till-done-3.13.0" - sources."@lerna/query-graph-3.18.0" + sources."@lerna/query-graph-3.18.5" sources."@lerna/resolve-symlink-3.16.0" sources."@lerna/rimraf-dir-3.16.5" - sources."@lerna/run-3.18.4" + sources."@lerna/run-3.18.5" sources."@lerna/run-lifecycle-3.16.2" - sources."@lerna/run-topologically-3.18.0" + sources."@lerna/run-topologically-3.18.5" sources."@lerna/symlink-binary-3.17.0" sources."@lerna/symlink-dependencies-3.17.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.18.4" + sources."@lerna/version-3.18.5" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -58707,12 +59461,12 @@ in ]; }) sources."@octokit/request-error-1.2.0" - sources."@octokit/rest-16.35.0" - sources."@octokit/types-2.0.1" + sources."@octokit/rest-16.36.0" + sources."@octokit/types-2.0.2" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -58744,7 +59498,7 @@ in sources."atob-2.1.2" sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -58753,7 +59507,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."before-after-hook-2.1.0" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -58809,6 +59563,7 @@ in ]; }) sources."clone-1.0.4" + sources."clone-deep-4.0.1" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" @@ -58833,13 +59588,13 @@ in ]; }) sources."conventional-changelog-preset-loader-2.3.0" - (sources."conventional-changelog-writer-4.0.10" // { + (sources."conventional-changelog-writer-4.0.11" // { dependencies = [ sources."through2-3.0.1" ]; }) sources."conventional-commits-filter-2.0.2" - (sources."conventional-commits-parser-3.0.7" // { + (sources."conventional-commits-parser-3.0.8" // { dependencies = [ sources."through2-3.0.1" ]; @@ -58847,6 +59602,8 @@ in (sources."conventional-recommended-bump-5.0.1" // { dependencies = [ sources."concat-stream-2.0.0" + sources."meow-4.0.1" + sources."minimist-1.2.0" sources."readable-stream-3.4.0" ]; }) @@ -58894,10 +59651,10 @@ in sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" - sources."env-paths-1.0.0" + sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -58949,7 +59706,7 @@ in }) ]; }) - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.1" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { @@ -59004,13 +59761,23 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."git-raw-commits-2.0.0" + (sources."git-raw-commits-2.0.0" // { + dependencies = [ + sources."meow-4.0.1" + sources."minimist-1.2.0" + ]; + }) (sources."git-remote-origin-url-2.0.0" // { dependencies = [ sources."pify-2.3.0" ]; }) - sources."git-semver-tags-2.0.3" + (sources."git-semver-tags-2.0.3" // { + dependencies = [ + sources."meow-4.0.1" + sources."minimist-1.2.0" + ]; + }) sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" @@ -59023,7 +59790,7 @@ in ]; }) sources."graceful-fs-4.2.3" - (sources."handlebars-4.5.1" // { + (sources."handlebars-4.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59032,7 +59799,7 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -59077,10 +59844,10 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" @@ -59097,10 +59864,10 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -59139,19 +59906,20 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."make-dir-1.3.0" - sources."make-fetch-happen-5.0.1" + sources."make-fetch-happen-5.0.2" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" - (sources."meow-4.0.1" // { + (sources."meow-5.0.0" // { dependencies = [ - sources."minimist-1.2.0" + sources."camelcase-4.1.0" + sources."yargs-parser-10.1.0" ]; }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -59177,26 +59945,27 @@ in sources."nice-try-1.0.5" sources."node-fetch-2.6.0" sources."node-fetch-npm-2.0.2" - (sources."node-gyp-5.0.5" // { + (sources."node-gyp-5.0.7" // { dependencies = [ - sources."semver-5.3.0" + sources."semver-5.7.1" ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."normalize-url-3.3.0" - sources."npm-bundled-1.0.6" + sources."npm-bundled-1.1.1" sources."npm-lifecycle-3.1.4" + sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."npm-packlist-1.4.6" + sources."npm-packlist-1.4.7" (sources."npm-pick-manifest-3.0.2" // { dependencies = [ sources."semver-5.7.1" @@ -59223,7 +59992,8 @@ in sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" @@ -59268,7 +60038,7 @@ in sources."proto-list-1.2.4" sources."protocols-1.4.7" sources."protoduck-5.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -59281,11 +60051,7 @@ in sources."quick-lru-1.1.0" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" - (sources."read-package-json-2.1.0" // { - dependencies = [ - sources."slash-1.0.0" - ]; - }) + sources."read-package-json-2.1.1" sources."read-package-tree-5.3.1" (sources."read-pkg-3.0.0" // { dependencies = [ @@ -59315,7 +60081,7 @@ in sources."request-2.88.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -59340,6 +60106,7 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" @@ -59414,15 +60181,15 @@ in ]; }) sources."stream-each-1.2.3" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -59467,7 +60234,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.6.8" // { + (sources."uglify-js-3.7.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59530,7 +60297,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yallist-3.1.1" - (sources."yargs-14.2.1" // { + (sources."yargs-14.2.2" // { dependencies = [ sources."ansi-regex-4.1.0" sources."string-width-3.1.0" @@ -59564,7 +60331,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."clone-2.1.2" @@ -59577,7 +60344,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" @@ -59594,15 +60361,15 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."promise-7.3.1" sources."prr-1.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -59688,6 +60455,7 @@ in sources."batch-0.6.1" sources."bcryptjs-2.4.3" sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -59759,6 +60527,7 @@ in ]; }) sources."faye-websocket-0.11.3" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -59770,7 +60539,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from-0.1.7" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."get-value-2.0.6" (sources."glob-parent-3.1.0" // { dependencies = [ @@ -59812,8 +60581,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mixin-deep-1.3.2" sources."morgan-1.9.1" sources."ms-2.0.0" @@ -60006,7 +60775,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -60019,6 +60788,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."blob-0.0.5" sources."body-parser-1.19.0" sources."braces-1.8.5" @@ -60106,7 +60876,8 @@ in 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."fast-json-stable-stringify-2.1.0" + sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" sources."finalhandler-1.1.2" @@ -60117,7 +60888,7 @@ in sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.2.1" @@ -60211,8 +60982,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-1.2.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -60269,7 +61040,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.7.0" (sources."randomatic-3.1.1" // { @@ -60390,7 +61161,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ sources."component-emitter-1.2.1" @@ -60477,7 +61248,7 @@ in sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -60498,84 +61269,84 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/core-7.7.2" - sources."@babel/generator-7.7.2" - sources."@babel/helper-annotate-as-pure-7.7.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" - sources."@babel/helper-call-delegate-7.7.0" - sources."@babel/helper-create-class-features-plugin-7.7.0" - sources."@babel/helper-create-regexp-features-plugin-7.7.2" - sources."@babel/helper-define-map-7.7.0" - sources."@babel/helper-explode-assignable-expression-7.7.0" - sources."@babel/helper-function-name-7.7.0" - sources."@babel/helper-get-function-arity-7.7.0" - sources."@babel/helper-hoist-variables-7.7.0" - sources."@babel/helper-member-expression-to-functions-7.7.0" - sources."@babel/helper-module-imports-7.7.0" - sources."@babel/helper-module-transforms-7.7.0" - sources."@babel/helper-optimise-call-expression-7.7.0" + sources."@babel/core-7.7.7" + sources."@babel/generator-7.7.7" + sources."@babel/helper-annotate-as-pure-7.7.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.4" + sources."@babel/helper-call-delegate-7.7.4" + sources."@babel/helper-create-class-features-plugin-7.7.4" + sources."@babel/helper-create-regexp-features-plugin-7.7.4" + sources."@babel/helper-define-map-7.7.4" + sources."@babel/helper-explode-assignable-expression-7.7.4" + sources."@babel/helper-function-name-7.7.4" + sources."@babel/helper-get-function-arity-7.7.4" + sources."@babel/helper-hoist-variables-7.7.4" + sources."@babel/helper-member-expression-to-functions-7.7.4" + sources."@babel/helper-module-imports-7.7.4" + sources."@babel/helper-module-transforms-7.7.5" + sources."@babel/helper-optimise-call-expression-7.7.4" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.7.0" - sources."@babel/helper-replace-supers-7.7.0" - sources."@babel/helper-simple-access-7.7.0" - sources."@babel/helper-split-export-declaration-7.7.0" - sources."@babel/helper-wrap-function-7.7.0" - sources."@babel/helpers-7.7.0" + sources."@babel/helper-remap-async-to-generator-7.7.4" + sources."@babel/helper-replace-supers-7.7.4" + sources."@babel/helper-simple-access-7.7.4" + sources."@babel/helper-split-export-declaration-7.7.4" + sources."@babel/helper-wrap-function-7.7.4" + sources."@babel/helpers-7.7.4" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" + sources."@babel/parser-7.7.7" sources."@babel/plugin-external-helpers-7.0.0" - sources."@babel/plugin-proposal-async-generator-functions-7.7.0" - sources."@babel/plugin-proposal-class-properties-7.7.0" - sources."@babel/plugin-proposal-dynamic-import-7.7.0" - sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.6.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" - sources."@babel/plugin-syntax-async-generators-7.2.0" - sources."@babel/plugin-syntax-dynamic-import-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-syntax-top-level-await-7.7.0" - sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.7.0" - sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.7.0" - sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.7.0" - sources."@babel/plugin-transform-duplicate-keys-7.5.0" - sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.7.0" - sources."@babel/plugin-transform-literals-7.2.0" - sources."@babel/plugin-transform-member-expression-literals-7.2.0" - sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.7.0" - sources."@babel/plugin-transform-modules-systemjs-7.7.0" - sources."@babel/plugin-transform-modules-umd-7.7.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" - sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.5.5" - sources."@babel/plugin-transform-parameters-7.4.4" - sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.7.0" - sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-runtime-7.6.2" - sources."@babel/plugin-transform-shorthand-properties-7.2.0" - sources."@babel/plugin-transform-spread-7.6.2" - sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.4.4" - sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.7.0" - sources."@babel/preset-env-7.7.1" + sources."@babel/plugin-proposal-async-generator-functions-7.7.4" + sources."@babel/plugin-proposal-class-properties-7.7.4" + sources."@babel/plugin-proposal-dynamic-import-7.7.4" + sources."@babel/plugin-proposal-json-strings-7.7.4" + sources."@babel/plugin-proposal-object-rest-spread-7.7.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.7.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.7" + sources."@babel/plugin-syntax-async-generators-7.7.4" + sources."@babel/plugin-syntax-dynamic-import-7.7.4" + sources."@babel/plugin-syntax-json-strings-7.7.4" + sources."@babel/plugin-syntax-object-rest-spread-7.7.4" + sources."@babel/plugin-syntax-optional-catch-binding-7.7.4" + sources."@babel/plugin-syntax-top-level-await-7.7.4" + sources."@babel/plugin-transform-arrow-functions-7.7.4" + sources."@babel/plugin-transform-async-to-generator-7.7.4" + sources."@babel/plugin-transform-block-scoped-functions-7.7.4" + sources."@babel/plugin-transform-block-scoping-7.7.4" + sources."@babel/plugin-transform-classes-7.7.4" + sources."@babel/plugin-transform-computed-properties-7.7.4" + sources."@babel/plugin-transform-destructuring-7.7.4" + sources."@babel/plugin-transform-dotall-regex-7.7.7" + sources."@babel/plugin-transform-duplicate-keys-7.7.4" + sources."@babel/plugin-transform-exponentiation-operator-7.7.4" + sources."@babel/plugin-transform-for-of-7.7.4" + sources."@babel/plugin-transform-function-name-7.7.4" + sources."@babel/plugin-transform-literals-7.7.4" + sources."@babel/plugin-transform-member-expression-literals-7.7.4" + sources."@babel/plugin-transform-modules-amd-7.7.5" + sources."@babel/plugin-transform-modules-commonjs-7.7.5" + sources."@babel/plugin-transform-modules-systemjs-7.7.4" + sources."@babel/plugin-transform-modules-umd-7.7.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.4" + sources."@babel/plugin-transform-new-target-7.7.4" + sources."@babel/plugin-transform-object-super-7.7.4" + sources."@babel/plugin-transform-parameters-7.7.7" + sources."@babel/plugin-transform-property-literals-7.7.4" + sources."@babel/plugin-transform-regenerator-7.7.5" + sources."@babel/plugin-transform-reserved-words-7.7.4" + sources."@babel/plugin-transform-runtime-7.7.6" + sources."@babel/plugin-transform-shorthand-properties-7.7.4" + sources."@babel/plugin-transform-spread-7.7.4" + sources."@babel/plugin-transform-sticky-regex-7.7.4" + sources."@babel/plugin-transform-template-literals-7.7.4" + sources."@babel/plugin-transform-typeof-symbol-7.7.4" + sources."@babel/plugin-transform-unicode-regex-7.7.4" + sources."@babel/preset-env-7.7.7" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.7.2" - sources."@babel/template-7.7.0" - sources."@babel/traverse-7.7.2" - sources."@babel/types-7.7.2" + sources."@babel/runtime-7.7.7" + sources."@babel/template-7.7.4" + sources."@babel/traverse-7.7.4" + sources."@babel/types-7.7.4" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -60586,7 +61357,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -60608,7 +61379,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."ace.improved-0.2.1" - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" @@ -60767,8 +61538,9 @@ in sources."base64-js-1.3.1" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."bl-1.2.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -60779,7 +61551,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.7.2" + sources."browserslist-4.8.2" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -60802,7 +61574,7 @@ in }) sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001008" + sources."caniuse-lite-1.0.30001016" sources."caw-2.0.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -60878,10 +61650,10 @@ in sources."convert-source-map-1.7.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" - (sources."core-js-compat-3.4.1" // { + sources."core-js-2.6.11" + (sources."core-js-compat-3.6.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.0.0" ]; }) sources."core-util-is-1.0.2" @@ -60932,14 +61704,14 @@ in sources."clone-1.0.4" ]; }) - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."define-properties-1.1.3" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" ]; }) - sources."des.js-1.0.0" + sources."des.js-1.0.1" sources."detect-file-1.0.0" sources."detect-indent-4.0.0" sources."diffie-hellman-5.0.3" @@ -60959,8 +61731,8 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.306" - sources."elliptic-6.5.1" + sources."electron-to-chromium-1.3.322" + sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.4" @@ -61053,10 +61825,11 @@ in sources."ms-2.0.0" ]; }) - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fd-slicer-1.1.0" sources."figgy-pudding-3.5.1" sources."file-type-8.1.0" + sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" @@ -61115,7 +61888,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-proxy-2.1.0" @@ -61159,7 +61932,7 @@ in sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-to-string-tag-x-1.4.1" (sources."has-value-1.0.0" // { dependencies = [ @@ -61333,7 +62106,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.39" // { + (sources."node-releases-1.1.44" // { dependencies = [ sources."semver-6.3.0" ]; @@ -61520,7 +62293,7 @@ in sources."regex-not-1.0.2" sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.0" // { + (sources."regjsparser-0.6.2" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -61532,7 +62305,7 @@ in sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-cwd-2.0.0" (sources."resolve-dependencies-2.2.3" // { dependencies = [ @@ -61578,7 +62351,7 @@ in sources."schema-utils-1.0.0" sources."seek-bzip-1.0.5" sources."semver-5.7.1" - sources."serialize-javascript-1.9.1" + sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -61656,7 +62429,7 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."strict-uri-encode-1.1.0" (sources."string-width-3.1.0" // { dependencies = [ @@ -61673,13 +62446,13 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-4.4.0" // { + (sources."terser-4.4.3" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.1" // { + (sources."terser-webpack-plugin-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61748,7 +62521,7 @@ in sources."vm-browserify-1.1.2" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" - (sources."webpack-4.41.2" // { + (sources."webpack-4.41.4" // { dependencies = [ sources."arr-diff-4.0.0" sources."array-unique-0.3.2" @@ -61888,7 +62661,7 @@ in sources."async-3.1.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -61904,7 +62677,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" @@ -61922,17 +62695,17 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."link-check-4.4.6" + sources."link-check-4.4.7" sources."lodash-4.17.15" sources."markdown-link-extractor-1.2.2" sources."marked-0.7.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."ms-2.1.2" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" sources."progress-2.0.3" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -61964,23 +62737,14 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.0.0"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.0.tgz"; - sha512 = "z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.7.tgz"; + sha512 = "OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ=="; }; - dependencies = [ - sources."commander-4.0.1" - sources."esm-3.2.25" - sources."mathjax-full-git://github.com/mathjax/MathJax-src.git" - sources."mj-context-menu-0.2.0" - sources."speech-rule-engine-3.0.0-beta.6" - sources."wicked-good-xpath-1.3.0" - sources."xmldom-sre-0.1.31" - ]; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; + description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers."; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; @@ -62089,7 +62853,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.6.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -62199,7 +62963,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.52" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -62224,7 +62988,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -62374,7 +63138,7 @@ in sources."har-validator-4.2.1" sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -62478,8 +63242,8 @@ in sources."memoizee-0.4.14" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-2.0.10" sources."minimist-1.2.0" (sources."mixin-deep-1.3.2" // { @@ -62572,7 +63336,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -62646,7 +63410,7 @@ in ]; }) sources."stream-consume-0.1.1" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -62683,8 +63447,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" - sources."typescript-3.7.2" - (sources."uglify-js-3.6.8" // { + sources."typescript-3.7.4" + (sources."uglify-js-3.7.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -62785,7 +63549,7 @@ in sources."define-properties-1.1.3" sources."diff-3.5.0" sources."emoji-regex-7.0.3" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -62798,16 +63562,16 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."he-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-buffer-2.0.4" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."isexe-2.0.0" sources."js-yaml-3.13.1" sources."locate-path-3.0.0" @@ -62821,7 +63585,7 @@ in sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."p-limit-2.2.1" sources."p-locate-3.0.0" @@ -62834,8 +63598,8 @@ in sources."set-blocking-2.0.0" sources."sprintf-js-1.0.3" sources."string-width-2.1.1" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-6.0.0" @@ -62893,7 +63657,7 @@ in sources."extend-3.0.2" sources."form-data-2.5.1" sources."formidable-1.2.1" - sources."graphlib-2.1.7" + sources."graphlib-2.1.8" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.13.1" @@ -62905,8 +63669,8 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" @@ -62934,29 +63698,59 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "4.5.0"; + version = "4.6.0-alpha.0"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-4.5.0.tgz"; - sha512 = "+Q5EEIYIZG14NYAAQmvHHdYZ8hg0TbcsFo9vDf2rHhwidqdJv7jrDk0vQz+kUrNvhNQO/pqkBrZ08yEWZbD/0A=="; + url = "https://registry.npmjs.org/neovim/-/neovim-4.6.0-alpha.0.tgz"; + sha512 = "hlnWPmp2dx0byH2TlUmkEkaMhEg2bedZx1NOtL4SY6XcGdW76nYZrPJUkgVi/4f+kRRHbB3BuSF1qV70WFDP+w=="; }; dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."cycle-1.0.3" + sources."async-2.6.3" + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.3" + sources."colornames-1.1.1" + sources."colors-1.4.0" + sources."colorspace-1.1.2" + sources."core-util-is-1.0.2" + sources."diagnostics-1.1.1" + sources."enabled-1.0.2" + sources."env-variable-0.0.5" sources."event-lite-0.1.2" - sources."eyes-0.1.8" + sources."fast-safe-stringify-2.0.7" + sources."fecha-2.3.3" sources."ieee754-1.1.13" + sources."inherits-2.0.4" sources."int64-buffer-0.1.10" + sources."is-arrayish-0.3.2" + sources."is-stream-1.1.0" sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isstream-0.1.2" + sources."kuler-1.0.1" sources."lodash-4.17.15" + sources."lodash.defaults-4.2.0" + sources."lodash.omit-4.5.0" + sources."logform-2.1.2" + sources."ms-2.1.2" sources."msgpack-lite-0.1.26" - sources."semver-5.7.1" + sources."one-time-0.0.4" + sources."process-nextick-args-2.0.1" + sources."readable-stream-3.4.0" + sources."safe-buffer-5.2.0" + sources."semver-7.1.1" + sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" - sources."traverse-0.6.6" - sources."which-1.3.1" - sources."winston-2.4.4" + sources."string_decoder-1.3.0" + sources."text-hex-1.0.0" + sources."triple-beam-1.3.0" + sources."util-deprecate-1.0.2" + sources."winston-3.2.1" + (sources."winston-transport-4.3.0" // { + dependencies = [ + sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -62993,10 +63787,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "6.0.1"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.0.1.tgz"; - sha512 = "udHG4hGe3Ji97AYJbJhaRwuSOuQO7KHnE4ZPH3Sox3tjRZ+bkBsDvfZ7eYA1qwD8eLWr//193x806ss3HFTPRw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.7.tgz"; + sha512 = "K8aByl8OJD51V0VbUURTKsmdswkQQusIvlvmTyhHlIT1hBvaSxzdxpSle857XuXa7uc02UEZx9OR5aDxSWS5Qw=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -63008,7 +63802,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -63027,7 +63821,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-minipass-1.2.7" @@ -63052,8 +63846,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.9.0" @@ -63071,7 +63865,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."readable-stream-2.3.6" @@ -63154,7 +63948,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -63268,8 +64062,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."mkdirp-0.5.1" // { @@ -63329,7 +64123,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -63416,7 +64210,7 @@ in sources."lodash-3.10.1" ]; }) - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" sources."xtend-4.0.2" sources."y18n-3.2.1" sources."yargs-3.32.0" @@ -63474,8 +64268,9 @@ in sources."ms-2.1.2" sources."needle-2.4.0" sources."nopt-4.0.1" - sources."npm-bundled-1.0.6" - sources."npm-packlist-1.4.6" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.7" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" @@ -63521,18 +64316,17 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.0.2.tgz"; - sha512 = "QSyPpAGGVFgVlKyumWFd8j2hd420+sh8DSxlvAtatDVaIG3+MaAD3eDLg49HIwRyAhiROVS1XNWkqyq/H1/cBA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.0.3.tgz"; + sha512 = "UoTPT7jTApgoVm9lah7Ri10S5w1boQeLIKWFxUq1yfLJ7AYhKmVT46z5HRQt4vAUBLze7cl+aFjEt67LDujXmg=="; }; dependencies = [ - sources."@babel/runtime-7.7.2" - sources."@node-red/editor-api-1.0.2" - sources."@node-red/editor-client-1.0.2" - (sources."@node-red/nodes-1.0.2" // { + sources."@babel/runtime-7.7.7" + sources."@node-red/editor-api-1.0.3" + sources."@node-red/editor-client-1.0.3" + (sources."@node-red/nodes-1.0.3" // { dependencies = [ - sources."cookie-0.4.0" sources."http-errors-1.7.3" sources."iconv-lite-0.5.0" sources."inherits-2.0.4" @@ -63544,9 +64338,9 @@ in }) ]; }) - sources."@node-red/registry-1.0.2" - sources."@node-red/runtime-1.0.2" - sources."@node-red/util-1.0.2" + sources."@node-red/registry-1.0.3" + sources."@node-red/runtime-1.0.3" + sources."@node-red/util-1.0.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."agent-base-4.3.0" @@ -63557,6 +64351,7 @@ in (sources."are-we-there-yet-1.1.5" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63568,16 +64363,28 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" - sources."basic-auth-2.0.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-3.0.6" sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" (sources."bl-1.2.2" // { dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) ]; }) sources."body-parser-1.19.0" @@ -63595,6 +64402,7 @@ in (sources."callback-stream-1.1.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63610,24 +64418,34 @@ in (sources."concat-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."content-type-1.0.4" - sources."cookie-0.3.1" - sources."cookie-parser-1.4.4" + sources."cookie-0.4.0" + (sources."cookie-parser-1.4.4" // { + dependencies = [ + sources."cookie-0.3.1" + ]; + }) sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.7.1" + sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" sources."dashdash-1.14.1" sources."debug-2.6.9" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.4.1" @@ -63648,6 +64466,7 @@ in (sources."duplexify-3.7.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63656,7 +64475,9 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" - sources."es5-ext-0.10.52" + sources."es-abstract-1.17.0" + sources."es-to-primitive-1.2.1" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-4.2.8" @@ -63673,15 +64494,15 @@ in sources."event-emitter-0.3.5" (sources."express-4.17.1" // { dependencies = [ - sources."cookie-0.4.0" + sources."safe-buffer-5.1.2" ]; }) - (sources."express-session-1.16.2" // { + (sources."express-session-1.17.0" // { dependencies = [ sources."depd-2.0.0" ]; }) - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -63689,7 +64510,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -63699,6 +64520,7 @@ in sources."fs-minipass-1.2.7" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -63706,19 +64528,22 @@ in (sources."glob-stream-6.1.0" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" + sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."help-me-1.1.0" sources."htmlparser2-3.10.1" sources."http-errors-1.7.2" sources."http-signature-1.2.0" - (sources."https-proxy-agent-2.2.2" // { + (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -63732,11 +64557,15 @@ in sources."ini-1.3.5" sources."ipaddr.js-1.9.0" sources."is-absolute-1.0.0" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-regex-1.0.5" sources."is-relative-1.0.0" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" @@ -63749,7 +64578,7 @@ in 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.6.5" + sources."jsonata-1.7.0" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -63775,8 +64604,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-1.2.0" (sources."minipass-2.9.0" // { @@ -63795,6 +64624,7 @@ in (sources."mqtt-2.18.8" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63816,23 +64646,29 @@ in sources."semver-5.7.1" ]; }) - sources."node-red-node-rbe-0.2.5" + sources."node-red-node-rbe-0.2.6" sources."node-red-node-tail-0.0.3" sources."nopt-4.0.1" - sources."npm-bundled-1.0.6" - sources."npm-packlist-1.4.6" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.7" sources."npmlog-4.1.2" sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" + sources."object-inspect-1.7.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63852,7 +64688,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -63876,7 +64712,7 @@ in }) sources."retry-0.6.1" sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-6.3.0" @@ -63895,14 +64731,12 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."statuses-1.5.0" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" sources."string-width-1.0.2" - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.0" - ]; - }) + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."tail-2.0.3" @@ -63914,6 +64748,7 @@ in (sources."through2-2.0.5" // { dependencies = [ sources."readable-stream-2.3.6" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -63930,7 +64765,7 @@ in sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.6.0" + sources."uglify-js-3.6.9" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."ultron-1.1.1" @@ -63940,23 +64775,36 @@ in sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.3.3" sources."vary-1.1.2" sources."verror-1.10.0" (sources."websocket-stream-5.5.0" // { dependencies = [ - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" - sources."ws-3.3.3" + (sources."readable-stream-2.3.6" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."ws-3.3.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) ]; }) sources."when-3.7.8" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."ws-6.2.1" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."yallist-2.1.2" ]; @@ -63988,7 +64836,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -64011,7 +64859,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -64051,8 +64899,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.9.0" @@ -64096,7 +64944,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -64105,7 +64953,7 @@ in ]; }) sources."request-2.88.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -64163,340 +65011,115 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "1.19.4"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz"; - sha512 = "VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.2.tgz"; + sha512 = "GWhYPMfde2+M0FsHnggIHXTqPDHXia32HRhh6H0d75Mt9FKUoCBvumNHr7LdrpPBTKxsWmIEOjoN+P4IU6Hcaw=="; }; dependencies = [ sources."abbrev-1.1.1" sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - (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.3.2" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" - sources."atob-2.1.2" + sources."anymatch-3.1.1" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-1.13.1" + sources."binary-extensions-2.0.0" sources."boxen-1.3.0" 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."cache-base-1.0.1" + sources."braces-3.0.2" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.8" + sources."chokidar-3.3.1" sources."ci-info-1.6.0" - (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."cli-boxes-1.0.0" - sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" - (sources."debug-3.2.6" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decode-uri-component-0.2.0" + sources."debug-3.2.6" sources."deep-extend-0.6.0" - sources."define-property-2.0.2" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - 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-shallow-3.0.2" - (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."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fsevents-1.2.9" + sources."fill-range-7.0.1" + sources."fsevents-2.1.2" sources."get-stream-3.0.0" - sources."get-value-2.0.6" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-parent-5.1.0" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-accessor-descriptor-1.0.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" + sources."is-binary-path-2.1.0" sources."is-ci-1.2.1" - 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-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.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."kind-of-6.0.2" sources."latest-version-3.1.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."micromatch-3.1.10" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."mixin-deep-1.3.2" - sources."ms-2.0.0" - sources."nan-2.14.0" - sources."nanomatch-1.2.13" + sources."ms-2.1.2" sources."nopt-1.0.10" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" - (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."p-finally-1.0.0" sources."package-json-4.0.1" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" + sources."picomatch-2.1.1" sources."pify-3.0.0" - sources."posix-character-classes-0.1.1" sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.7" sources."rc-1.2.8" - sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" - sources."regex-not-1.0.2" + sources."readdirp-3.3.0" 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."ret-0.1.15" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" + sources."safe-buffer-5.2.0" sources."semver-5.7.1" sources."semver-diff-2.1.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) 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."debug-2.6.9" - 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."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."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."string-width-2.1.1" - sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" sources."term-size-1.2.0" sources."timed-out-4.0.1" - (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."to-regex-range-5.0.1" sources."touch-3.1.0" (sources."undefsafe-2.0.2" // { dependencies = [ sources."debug-2.6.9" - ]; - }) - (sources."union-value-1.0.1" // { - dependencies = [ - sources."is-extendable-0.1.1" + sources."ms-2.0.0" ]; }) sources."unique-string-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."unzip-response-2.0.1" - sources."upath-1.2.0" sources."update-notifier-2.5.0" - sources."urix-0.1.0" sources."url-parse-lax-1.0.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" sources."which-1.3.1" sources."widest-line-2.0.1" sources."write-file-atomic-2.4.3" @@ -64516,10 +65139,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.13.0"; + version = "6.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.13.0.tgz"; - sha512 = "zjSJ8zjk0cDBZXqTWbQ6+qOdm1m2k489YDFP60RQRUhOxT5LOBhl+cDtFlEXEIblcNjofmsZ/qQ/wzmn5frimQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.13.4.tgz"; + sha512 = "vTcUL4SCg3AzwInWTbqg1OIaOXlzKSS8Mb8kc5avwrJpcvevDA5J9BhYSuei+fNs3pwOp4lzA5x2FVDXACvoXA=="; }; buildInputs = globalBuildInputs; meta = { @@ -64534,29 +65157,38 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.2.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.2.1.tgz"; - sha512 = "gYXHGc9mAncGrEMjs2uRJgOdWRP5CR9iZ+HyUNf4eqjtdDV6jLvi2e19G5BEpdvc8fU73J+B5m8ALYB49du/EA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.1.tgz"; + sha512 = "rDrKAqhQuTYq2EkndroPMZGA9N6tpTotOVOIJoxRa3ZKnb/mOcq2TZv4A4LLSM8+9kZlP+sBwE+XAGh8wWZw/w=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."JSONStream-1.3.5" + sources."@types/color-name-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" + sources."aggregate-error-3.0.1" sources."ansi-align-3.0.0" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.0" sources."aproba-1.2.0" sources."argparse-1.0.10" sources."balanced-match-1.0.0" - sources."bluebird-3.7.1" - sources."boxen-3.2.0" + sources."bluebird-3.7.2" + (sources."boxen-3.2.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."brace-expansion-1.1.11" - sources."buffer-from-1.1.1" sources."builtins-1.0.3" - sources."cacache-12.0.3" + sources."cacache-13.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -64565,30 +65197,30 @@ in ]; }) sources."camelcase-5.3.1" - sources."chalk-2.4.2" + sources."chalk-3.0.0" sources."chownr-1.1.3" sources."ci-info-2.0.0" sources."cint-8.2.1" + sources."clean-stack-2.2.0" sources."cli-boxes-2.2.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."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colors-1.0.3" - sources."commander-3.0.2" + sources."commander-4.0.1" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" sources."configstore-4.0.0" sources."copy-concurrently-1.0.5" sources."core-util-is-1.0.2" (sources."cross-spawn-5.1.0" // { dependencies = [ sources."lru-cache-4.1.5" + sources."which-1.3.1" sources."yallist-2.1.2" ]; }) sources."crypto-random-string-1.0.0" - sources."cyclist-1.0.1" (sources."debug-3.1.0" // { dependencies = [ sources."ms-2.0.0" @@ -64596,10 +65228,9 @@ in }) sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."dot-prop-4.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.7.1" sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" @@ -64608,39 +65239,37 @@ in sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - (sources."execa-0.7.0" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) + sources."execa-0.7.0" sources."fast-diff-1.2.0" sources."figgy-pudding-3.5.1" sources."find-up-4.1.0" - sources."flush-write-stream-1.1.1" - sources."from2-2.3.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."genfun-5.0.0" sources."get-stdin-7.0.0" - sources."get-stream-4.1.0" + sources."get-stream-3.0.0" sources."glob-7.1.6" sources."global-dirs-0.1.1" - sources."got-9.6.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.2.3" sources."has-ansi-2.0.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-2.8.5" + sources."hosted-git-info-3.0.2" sources."http-cache-semantics-3.8.1" sources."http-proxy-agent-2.1.0" - sources."https-proxy-agent-2.2.4" + sources."https-proxy-agent-3.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."iferr-0.1.5" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -64659,7 +65288,7 @@ in sources."jju-1.4.0" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.0.1" sources."json-parse-helpfulerror-1.0.3" (sources."json5-2.1.1" // { dependencies = [ @@ -64683,13 +65312,26 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."make-dir-1.3.0" - sources."make-fetch-happen-5.0.1" + sources."make-fetch-happen-6.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mississippi-3.0.0" + (sources."minipass-3.1.1" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.2.1" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.2" + sources."minipass-sized-1.0.3" + (sources."minizlib-2.1.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" sources."ms-2.1.2" @@ -64701,29 +65343,26 @@ in sources."supports-color-2.0.0" ]; }) - sources."node-fetch-npm-2.0.2" - (sources."normalize-package-data-2.5.0" // { + sources."normalize-url-4.5.0" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + (sources."npm-package-arg-7.0.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.0" - sources."npm-bundled-1.0.6" - (sources."npm-package-arg-6.1.1" // { + sources."npm-packlist-1.4.7" + (sources."npm-pick-manifest-4.0.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."npm-packlist-1.4.6" - (sources."npm-pick-manifest-3.0.2" // { + (sources."npm-registry-fetch-5.0.1" // { dependencies = [ - sources."semver-5.7.1" + sources."safe-buffer-5.2.0" ]; }) - sources."npm-registry-fetch-4.0.2" sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -64732,14 +65371,10 @@ in sources."p-finally-1.0.0" sources."p-limit-2.2.1" sources."p-locate-4.1.0" + sources."p-map-3.0.0" sources."p-try-2.2.0" sources."package-json-6.5.0" - (sources."pacote-9.5.9" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."parallel-transform-1.2.0" + sources."pacote-10.2.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -64752,44 +65387,30 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."prompts-2.3.0" - sources."protoduck-5.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) (sources."rc-1.2.8" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."rc-config-loader-2.0.5" // { + (sources."rc-config-loader-3.0.0" // { dependencies = [ sources."debug-4.1.1" - sources."path-exists-3.0.0" - ]; - }) - (sources."readable-stream-2.3.6" // { - dependencies = [ - sources."safe-buffer-5.1.2" ]; }) + sources."read-package-json-fast-1.1.1" + sources."readable-stream-2.3.6" sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" - (sources."requireg-0.2.2" // { - dependencies = [ - sources."resolve-1.7.1" - ]; - }) - sources."resolve-1.12.0" + sources."requireg-0.2.2" + sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" sources."rimraf-2.7.1" sources."run-queue-1.0.3" - sources."safe-buffer-5.2.0" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-6.3.0" (sources."semver-diff-2.1.0" // { @@ -64810,45 +65431,44 @@ in ]; }) sources."spawn-please-0.3.0" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" - sources."ssri-6.0.1" - sources."stream-each-1.2.3" - sources."stream-shift-1.0.0" + sources."ssri-7.1.0" (sources."string-width-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" sources."strip-ansi-5.2.0" ]; }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - sources."tar-4.4.13" + sources."supports-color-7.1.0" + (sources."tar-5.0.5" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."term-size-1.2.0" - sources."through-2.3.8" - sources."through2-2.0.5" sources."to-readable-stream-1.0.0" sources."type-fest-0.3.1" - sources."typedarray-0.0.6" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."update-notifier-3.0.1" + (sources."update-notifier-3.0.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" - sources."which-1.3.1" + sources."which-2.0.2" (sources."widest-line-2.0.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -64859,8 +65479,6 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xtend-4.0.2" - sources."y18n-4.0.0" sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64893,7 +65511,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -64919,7 +65537,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."findit-1.2.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -64958,8 +65576,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.3.5" @@ -64988,7 +65606,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -65102,93 +65720,93 @@ in }; dependencies = [ sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.7.2" // { + (sources."@babel/core-7.7.7" // { dependencies = [ sources."json5-2.1.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.7.2" // { + (sources."@babel/generator-7.7.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.7.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" - sources."@babel/helper-builder-react-jsx-7.7.0" - sources."@babel/helper-call-delegate-7.7.0" - sources."@babel/helper-create-regexp-features-plugin-7.7.2" - sources."@babel/helper-define-map-7.7.0" - sources."@babel/helper-explode-assignable-expression-7.7.0" - sources."@babel/helper-function-name-7.7.0" - sources."@babel/helper-get-function-arity-7.7.0" - sources."@babel/helper-hoist-variables-7.7.0" - sources."@babel/helper-member-expression-to-functions-7.7.0" - sources."@babel/helper-module-imports-7.7.0" - sources."@babel/helper-module-transforms-7.7.0" - sources."@babel/helper-optimise-call-expression-7.7.0" + sources."@babel/helper-annotate-as-pure-7.7.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.4" + sources."@babel/helper-builder-react-jsx-7.7.4" + sources."@babel/helper-call-delegate-7.7.4" + sources."@babel/helper-create-regexp-features-plugin-7.7.4" + sources."@babel/helper-define-map-7.7.4" + sources."@babel/helper-explode-assignable-expression-7.7.4" + sources."@babel/helper-function-name-7.7.4" + sources."@babel/helper-get-function-arity-7.7.4" + sources."@babel/helper-hoist-variables-7.7.4" + sources."@babel/helper-member-expression-to-functions-7.7.4" + sources."@babel/helper-module-imports-7.7.4" + sources."@babel/helper-module-transforms-7.7.5" + sources."@babel/helper-optimise-call-expression-7.7.4" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.7.0" - sources."@babel/helper-replace-supers-7.7.0" - sources."@babel/helper-simple-access-7.7.0" - sources."@babel/helper-split-export-declaration-7.7.0" - sources."@babel/helper-wrap-function-7.7.0" - sources."@babel/helpers-7.7.0" + sources."@babel/helper-remap-async-to-generator-7.7.4" + sources."@babel/helper-replace-supers-7.7.4" + sources."@babel/helper-simple-access-7.7.4" + sources."@babel/helper-split-export-declaration-7.7.4" + sources."@babel/helper-wrap-function-7.7.4" + sources."@babel/helpers-7.7.4" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.7.3" - sources."@babel/plugin-proposal-async-generator-functions-7.7.0" - sources."@babel/plugin-proposal-dynamic-import-7.7.0" - sources."@babel/plugin-proposal-json-strings-7.2.0" - sources."@babel/plugin-proposal-object-rest-spread-7.6.2" - sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" - sources."@babel/plugin-syntax-async-generators-7.2.0" - sources."@babel/plugin-syntax-dynamic-import-7.2.0" - sources."@babel/plugin-syntax-flow-7.7.0" - sources."@babel/plugin-syntax-json-strings-7.2.0" - sources."@babel/plugin-syntax-jsx-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-syntax-top-level-await-7.7.0" - sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.7.0" - sources."@babel/plugin-transform-block-scoped-functions-7.2.0" - sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.7.0" - sources."@babel/plugin-transform-computed-properties-7.2.0" - sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.7.0" - sources."@babel/plugin-transform-duplicate-keys-7.5.0" - sources."@babel/plugin-transform-exponentiation-operator-7.2.0" - sources."@babel/plugin-transform-flow-strip-types-7.6.3" - sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.7.0" - sources."@babel/plugin-transform-literals-7.2.0" - sources."@babel/plugin-transform-member-expression-literals-7.2.0" - sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.7.0" - sources."@babel/plugin-transform-modules-systemjs-7.7.0" - sources."@babel/plugin-transform-modules-umd-7.7.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" - sources."@babel/plugin-transform-new-target-7.4.4" - sources."@babel/plugin-transform-object-super-7.5.5" - sources."@babel/plugin-transform-parameters-7.4.4" - sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-react-jsx-7.7.0" - sources."@babel/plugin-transform-regenerator-7.7.0" - sources."@babel/plugin-transform-reserved-words-7.2.0" - sources."@babel/plugin-transform-shorthand-properties-7.2.0" - sources."@babel/plugin-transform-spread-7.6.2" - sources."@babel/plugin-transform-sticky-regex-7.2.0" - sources."@babel/plugin-transform-template-literals-7.4.4" - sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.7.0" - sources."@babel/preset-env-7.7.1" - sources."@babel/runtime-7.7.2" - sources."@babel/template-7.7.0" - sources."@babel/traverse-7.7.2" - sources."@babel/types-7.7.2" + sources."@babel/parser-7.7.7" + sources."@babel/plugin-proposal-async-generator-functions-7.7.4" + sources."@babel/plugin-proposal-dynamic-import-7.7.4" + sources."@babel/plugin-proposal-json-strings-7.7.4" + sources."@babel/plugin-proposal-object-rest-spread-7.7.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.7.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.7" + sources."@babel/plugin-syntax-async-generators-7.7.4" + sources."@babel/plugin-syntax-dynamic-import-7.7.4" + sources."@babel/plugin-syntax-flow-7.7.4" + sources."@babel/plugin-syntax-json-strings-7.7.4" + sources."@babel/plugin-syntax-jsx-7.7.4" + sources."@babel/plugin-syntax-object-rest-spread-7.7.4" + sources."@babel/plugin-syntax-optional-catch-binding-7.7.4" + sources."@babel/plugin-syntax-top-level-await-7.7.4" + sources."@babel/plugin-transform-arrow-functions-7.7.4" + sources."@babel/plugin-transform-async-to-generator-7.7.4" + sources."@babel/plugin-transform-block-scoped-functions-7.7.4" + sources."@babel/plugin-transform-block-scoping-7.7.4" + sources."@babel/plugin-transform-classes-7.7.4" + sources."@babel/plugin-transform-computed-properties-7.7.4" + sources."@babel/plugin-transform-destructuring-7.7.4" + sources."@babel/plugin-transform-dotall-regex-7.7.7" + sources."@babel/plugin-transform-duplicate-keys-7.7.4" + sources."@babel/plugin-transform-exponentiation-operator-7.7.4" + sources."@babel/plugin-transform-flow-strip-types-7.7.4" + sources."@babel/plugin-transform-for-of-7.7.4" + sources."@babel/plugin-transform-function-name-7.7.4" + sources."@babel/plugin-transform-literals-7.7.4" + sources."@babel/plugin-transform-member-expression-literals-7.7.4" + sources."@babel/plugin-transform-modules-amd-7.7.5" + sources."@babel/plugin-transform-modules-commonjs-7.7.5" + sources."@babel/plugin-transform-modules-systemjs-7.7.4" + sources."@babel/plugin-transform-modules-umd-7.7.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.4" + sources."@babel/plugin-transform-new-target-7.7.4" + sources."@babel/plugin-transform-object-super-7.7.4" + sources."@babel/plugin-transform-parameters-7.7.7" + sources."@babel/plugin-transform-property-literals-7.7.4" + sources."@babel/plugin-transform-react-jsx-7.7.7" + sources."@babel/plugin-transform-regenerator-7.7.5" + sources."@babel/plugin-transform-reserved-words-7.7.4" + sources."@babel/plugin-transform-shorthand-properties-7.7.4" + sources."@babel/plugin-transform-spread-7.7.4" + sources."@babel/plugin-transform-sticky-regex-7.7.4" + sources."@babel/plugin-transform-template-literals-7.7.4" + sources."@babel/plugin-transform-typeof-symbol-7.7.4" + sources."@babel/plugin-transform-unicode-regex-7.7.4" + sources."@babel/preset-env-7.7.7" + sources."@babel/runtime-7.7.7" + sources."@babel/template-7.7.4" + sources."@babel/traverse-7.7.4" + sources."@babel/types-7.7.4" sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -65198,11 +65816,11 @@ in sources."@parcel/watcher-1.12.1" sources."@parcel/workers-1.11.0" sources."@types/q-1.5.2" - sources."abab-2.0.2" + sources."abab-2.0.3" sources."acorn-5.7.3" (sources."acorn-globals-4.3.4" // { dependencies = [ - sources."acorn-6.3.0" + sources."acorn-6.4.0" ]; }) sources."acorn-walk-6.2.0" @@ -65237,7 +65855,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-plugin-dynamic-import-node-2.3.0" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -65259,7 +65877,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" - sources."bindings-1.2.1" + sources."bindings-1.5.0" sources."bn.js-4.11.8" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" @@ -65277,7 +65895,7 @@ in sources."pako-1.0.10" ]; }) - sources."browserslist-4.7.2" + sources."browserslist-4.8.2" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -65294,7 +65912,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001008" + sources."caniuse-lite-1.0.30001016" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -65325,10 +65943,10 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" - (sources."core-js-compat-3.4.1" // { + sources."core-js-2.6.11" + (sources."core-js-compat-3.6.1" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.0.0" ]; }) sources."core-util-is-1.0.2" @@ -65381,7 +65999,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.15" + sources."deasync-0.1.19" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -65410,7 +66028,7 @@ in }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."des.js-1.0.0" + sources."des.js-1.0.1" sources."destroy-1.0.4" sources."diffie-hellman-5.0.3" (sources."dom-serializer-0.2.2" // { @@ -65430,14 +66048,14 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.306" - sources."elliptic-6.5.1" + sources."electron-to-chromium-1.3.322" + sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.4.0" + sources."envinfo-7.5.0" sources."error-ex-1.3.2" - (sources."es-abstract-1.16.0" // { + (sources."es-abstract-1.17.0" // { dependencies = [ sources."object-inspect-1.7.0" ]; @@ -65469,9 +66087,10 @@ in sources."falafel-2.1.0" sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastparse-1.1.2" + sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-4.0.0" sources."find-up-3.0.0" @@ -65482,7 +66101,7 @@ in sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-port-3.2.0" @@ -65507,7 +66126,7 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -65526,7 +66145,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.0" - sources."terser-4.4.0" + sources."terser-4.4.3" ]; }) (sources."htmlparser2-3.10.1" // { @@ -65554,14 +66173,14 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-color-stop-1.1.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.2" @@ -65576,10 +66195,10 @@ in sources."is-number-3.0.0" sources."is-obj-1.0.1" sources."is-plain-object-2.0.4" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-resolvable-1.1.0" sources."is-svg-3.0.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" @@ -65598,7 +66217,7 @@ in sources."jsbn-0.1.1" (sources."jsdom-14.1.0" // { dependencies = [ - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."escodegen-1.12.0" sources."ws-6.2.1" ]; @@ -65641,8 +66260,8 @@ in }) sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -65676,7 +66295,7 @@ in sources."punycode-1.4.1" ]; }) - (sources."node-releases-1.1.39" // { + (sources."node-releases-1.1.44" // { dependencies = [ sources."semver-6.3.0" ]; @@ -65693,9 +66312,9 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" - sources."object.values-1.1.0" + sources."object.values-1.1.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -65723,7 +66342,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.21" // { + (sources."postcss-7.0.25" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -65796,10 +66415,10 @@ in sources."private-0.1.8" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" - (sources."purgecss-1.4.1" // { + (sources."purgecss-1.4.2" // { dependencies = [ sources."cssesc-3.0.0" sources."postcss-selector-parser-6.0.2" @@ -65831,7 +66450,7 @@ in }) sources."regexpu-core-4.6.0" sources."regjsgen-0.5.1" - (sources."regjsparser-0.6.0" // { + (sources."regjsparser-0.6.2" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -65849,7 +66468,7 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -65874,7 +66493,7 @@ in sources."ms-2.1.1" ]; }) - sources."serialize-to-js-3.0.0" + sources."serialize-to-js-3.0.2" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."set-value-2.0.1" @@ -65916,7 +66535,11 @@ in sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stable-0.1.8" - sources."static-eval-2.0.2" + (sources."static-eval-2.0.3" // { + dependencies = [ + sources."escodegen-1.12.0" + ]; + }) sources."static-extend-0.1.2" sources."static-module-2.2.5" sources."statuses-1.5.0" @@ -65929,8 +66552,8 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -65945,7 +66568,7 @@ in sources."through2-2.0.5" sources."timers-browserify-2.0.11" sources."timsort-0.3.0" - sources."tiny-inflate-1.0.2" + sources."tiny-inflate-1.0.3" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-object-path-0.3.0" @@ -66036,7 +66659,7 @@ in sources."xmlchars-2.2.0" sources."xtend-4.0.2" sources."y18n-4.0.0" - sources."yargs-14.2.1" + sources."yargs-14.2.2" sources."yargs-parser-15.0.0" ]; buildInputs = globalBuildInputs; @@ -66124,7 +66747,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.1.0" + sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."dns-equal-1.0.0" @@ -66132,6 +66755,8 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-abstract-1.17.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" sources."fifo-0.1.4" @@ -66153,6 +66778,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" sources."hat-0.0.3" sources."hosted-git-info-2.8.5" sources."http-headers-3.0.2" @@ -66180,11 +66806,13 @@ in sources."ipaddr.js-1.9.1" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" - sources."is-date-object-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" sources."is-finite-1.0.2" sources."is-fullwidth-code-point-1.0.0" sources."is-promise-2.1.0" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."isarray-1.0.0" sources."k-bucket-0.6.0" @@ -66218,8 +66846,10 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-is-1.0.1" + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" sources."object-keys-1.1.1" + sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -66276,9 +66906,9 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.6" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -66310,6 +66940,8 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string2compact-1.3.0" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -66349,7 +66981,7 @@ in ]; }) sources."xmlbuilder-4.0.0" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -66389,7 +67021,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -66484,7 +67116,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fd-slicer-1.1.0" sources."fifo-0.1.4" sources."finalhandler-1.1.2" @@ -66562,8 +67194,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -66603,7 +67235,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -66656,7 +67288,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -66717,7 +67349,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -66736,10 +67368,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.2.2"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.2.2.tgz"; - sha512 = "cgIti3UV6PlZnuLd1Il78vxjbAo+UfeTvdDxdneZphjGwmJqFbmWxw5jQK/JiiNTLn2Tnj3Oy3+/hRxhVHFQug=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.6.0.tgz"; + sha512 = "KTRmtPFUrRfSp3pC7nvg6+MD7KmLZFsnUVNmRgO/zOO/AUsTDIZsbwOqdxZULld7RUfZZmHbSHCGvudIX8Ix8w=="; }; buildInputs = globalBuildInputs; meta = { @@ -66769,6 +67401,43 @@ in bypassCache = true; reconstructLock = true; }; + pscid = nodeEnv.buildNodePackage { + name = "pscid"; + packageName = "pscid"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pscid/-/pscid-2.8.5.tgz"; + sha512 = "I+Obl5HqXpXeGEn7BMhzZN57h48laWh0HX3D84UsABiKqYuhuc+kn8S65idvjcWKiHz1MomXz+ovE+wzV4QMxw=="; + }; + dependencies = [ + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."gaze-1.1.3" + sources."glob-7.1.6" + sources."globule-1.3.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."isexe-2.0.0" + sources."keypress-0.2.1" + sources."lodash-4.17.15" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A lightweight editor experience for PureScript development"; + homepage = "https://github.com/kritzcreek/pscid#readme"; + license = "LGPL-3.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; @@ -66845,7 +67514,7 @@ in sources."dash-ast-1.0.0" sources."defined-1.0.0" sources."deps-sort-2.0.1" - sources."des.js-1.0.0" + sources."des.js-1.0.1" (sources."detective-5.2.0" // { dependencies = [ sources."minimist-1.2.0" @@ -66854,7 +67523,7 @@ in sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - sources."elliptic-6.5.1" + sources."elliptic-6.5.2" sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" @@ -66864,7 +67533,7 @@ in sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" - sources."globule-1.2.1" + sources."globule-1.3.0" sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."hash-base-3.0.4" @@ -66898,7 +67567,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - (sources."module-deps-6.2.1" // { + (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" ]; @@ -66942,7 +67611,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" @@ -66982,7 +67651,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."timers-browserify-1.4.2" - sources."tree-kill-1.2.1" + sources."tree-kill-1.2.2" sources."tty-browserify-0.0.1" sources."typedarray-0.0.6" sources."umd-3.0.3" @@ -67014,6 +67683,24 @@ in bypassCache = true; reconstructLock = true; }; + purescript-psa = nodeEnv.buildNodePackage { + name = "purescript-psa"; + packageName = "purescript-psa"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.7.3.tgz"; + sha512 = "qcnhruybTHVunhJqAuurOEWnz1BOOc/7mpcnyH5yxm5caYCejxq8GOE4ZNWbiPMeTlcG79qUPIOz7gx5OVmk2Q=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Error/Warning reporting frontend for psc"; + homepage = "https://github.com/natefaubion/purescript-psa#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; react-native-cli = nodeEnv.buildNodePackage { name = "react-native-cli"; packageName = "react-native-cli"; @@ -67032,8 +67719,11 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-1.1.0" + sources."deep-equal-2.0.1" sources."define-properties-1.1.3" + sources."es-abstract-1.17.0" + sources."es-get-iterator-1.0.2" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."eyes-0.1.8" sources."fs.realpath-1.0.0" @@ -67041,12 +67731,24 @@ in sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-symbols-1.0.1" sources."i-0.3.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arguments-1.0.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" + sources."is-bigint-1.0.0" + sources."is-boolean-object-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" + sources."is-map-2.0.1" + sources."is-number-object-1.0.4" + sources."is-regex-1.0.5" + sources."is-set-2.0.1" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.1" + sources."isarray-2.0.5" sources."isstream-0.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -67057,21 +67759,28 @@ in }) sources."mute-stream-0.0.8" sources."ncp-0.4.2" - sources."object-is-1.0.1" + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" sources."object-keys-1.1.1" + sources."object.assign-4.1.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" sources."prompt-0.2.14" sources."read-1.0.7" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" + sources."side-channel-1.0.2" sources."stack-trace-0.0.10" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" + sources."which-boxed-primitive-1.0.1" + sources."which-collection-1.0.0" (sources."winston-0.8.3" // { dependencies = [ sources."pkginfo-0.3.1" @@ -67176,7 +67885,7 @@ in sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" @@ -67219,7 +67928,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."formidable-1.0.11" @@ -67241,8 +67950,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -67260,7 +67969,7 @@ in }) sources."pause-0.0.1" sources."performance-now-2.1.0" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-0.6.5" sources."range-parser-0.0.4" @@ -67300,10 +68009,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "6.3.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz"; + sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -67356,7 +68065,7 @@ in sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" (sources."fast-url-parser-1.1.3" // { dependencies = [ sources."punycode-1.4.1" @@ -67370,8 +68079,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-1.2.0" sources."ms-2.0.0" @@ -67424,12 +68133,13 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.57.0"; + version = "1.60.4"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.57.0.tgz"; - sha512 = "pb+6Jo3/oRdo4BNYTz8wbnqhetC0epFfezzEbUsOCHGPUoHgxnZmo22rceBXL9P7Npd4JA8qwtTu7GYmrTZSSA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.60.4.tgz"; + sha512 = "9KXWxm956hSpWJSA7ILqRhMNCHyR6q/o4ug6euXGO4zSbev3JlFxHG9EAr6/m7KVJQpw5yODmNOXlbEK4mkeRg=="; }; dependencies = [ + sources."2-thenable-1.0.0" sources."@serverless/cli-1.4.0" (sources."@serverless/component-metrics-1.0.8" // { dependencies = [ @@ -67442,7 +68152,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.2.3" // { + (sources."@serverless/enterprise-plugin-3.2.6" // { dependencies = [ sources."fs-extra-7.0.1" sources."node-fetch-2.6.0" @@ -67459,10 +68169,10 @@ in sources."@serverless/template-1.1.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/lodash-4.14.146" + sources."@types/lodash-4.14.149" sources."agent-base-4.3.0" - sources."ansi-align-2.0.0" - sources."ansi-escapes-4.2.1" + sources."ansi-align-3.0.0" + sources."ansi-escapes-4.3.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" @@ -67487,10 +68197,10 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.569.0" // { + (sources."aws-sdk-2.596.0" // { dependencies = [ - sources."buffer-4.9.2" - sources."uuid-3.3.3" + sources."buffer-4.9.1" + sources."uuid-3.3.2" ]; }) sources."balanced-match-1.0.0" @@ -67502,8 +68212,12 @@ in sources."base64-js-1.3.1" sources."binary-extensions-2.0.0" sources."bl-1.2.2" - sources."bluebird-3.7.1" - sources."boxen-1.3.0" + sources."bluebird-3.7.2" + (sources."boxen-3.2.0" // { + dependencies = [ + sources."type-fest-0.3.1" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.4.3" @@ -67520,13 +68234,13 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."cachedir-2.2.0" - sources."camelcase-4.1.0" + sources."cachedir-2.3.0" + sources."camelcase-5.3.1" sources."capture-stack-trace-1.0.1" sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-3.3.0" + sources."chokidar-3.3.1" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -67546,7 +68260,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-boxes-1.0.0" + sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.0" sources."clone-response-1.0.2" @@ -67579,6 +68293,7 @@ in sources."type-1.2.0" ]; }) + sources."dayjs-1.8.18" sources."debug-4.1.1" sources."decode-uri-component-0.2.0" sources."decompress-4.2.0" @@ -67597,9 +68312,8 @@ in ]; }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."deferred-0.7.11" - sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dot-prop-4.2.0" @@ -67613,11 +68327,10 @@ in ]; }) sources."duplexer3-0.1.4" + sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.52" + sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -67631,6 +68344,7 @@ in sources."escape-string-regexp-1.0.5" sources."esniff-1.1.0" sources."esprima-4.0.1" + sources."essentials-1.1.1" sources."event-emitter-0.3.5" sources."events-1.1.1" (sources."execa-0.7.0" // { @@ -67638,7 +68352,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."ext-1.2.0" + sources."ext-1.4.0" sources."extend-3.0.2" sources."extend-shallow-3.0.2" sources."external-editor-3.1.0" @@ -67669,7 +68383,6 @@ in ]; }) sources."fsevents-2.1.2" - sources."function-bind-1.1.1" sources."get-proxy-2.1.0" sources."get-stdin-5.0.1" sources."get-stream-4.1.0" @@ -67681,11 +68394,9 @@ in sources."got-9.6.0" sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" - sources."graphlib-2.1.7" - sources."has-1.0.3" + sources."graphlib-2.1.8" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.0" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -67717,16 +68428,20 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" sources."figures-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) ]; }) sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" - sources."is-callable-1.1.4" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" sources."is-extendable-1.0.1" @@ -67743,10 +68458,8 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.1.1" sources."isarray-1.0.0" @@ -67796,8 +68509,8 @@ in sources."memoizee-0.4.14" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -67811,7 +68524,7 @@ in sources."moment-2.24.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nanoid-2.1.6" + sources."nanoid-2.1.8" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."ncjsm-4.0.1" @@ -67842,10 +68555,7 @@ in ]; }) sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -67897,7 +68607,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."readdirp-3.2.0" + sources."readdirp-3.3.0" sources."regenerator-runtime-0.13.3" sources."regex-not-1.0.2" sources."registry-auth-token-4.0.0" @@ -67914,7 +68624,7 @@ in sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.2.1" (sources."seek-bzip-1.0.5" // { dependencies = [ sources."commander-2.8.1" @@ -67934,7 +68644,7 @@ in sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.2" - sources."simple-git-1.126.0" + sources."simple-git-1.129.0" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -67984,14 +68694,8 @@ in sources."kind-of-5.1.0" ]; }) - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."stream-promise-3.2.0" + sources."string-width-3.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -68034,7 +68738,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."type-2.0.0" - sources."type-fest-0.5.2" + sources."type-fest-0.8.1" sources."unbzip2-stream-1.3.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -68055,7 +68759,17 @@ in }) sources."untildify-3.0.3" sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" + (sources."update-notifier-2.5.0" // { + dependencies = [ + sources."ansi-align-2.0.0" + sources."ansi-regex-3.0.0" + sources."boxen-1.3.0" + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) (sources."uri-js-3.0.2" // { dependencies = [ sources."punycode-2.1.1" @@ -68067,18 +68781,23 @@ in sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."uuid-2.0.3" sources."walkdir-0.0.11" sources."whatwg-fetch-3.0.0" sources."which-1.3.1" - sources."widest-line-2.0.1" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.22" - sources."xmlbuilder-11.0.1" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.43" @@ -68116,7 +68835,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -68175,7 +68894,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -68221,8 +68940,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.7.0" @@ -68242,7 +68961,7 @@ in sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -68727,13 +69446,13 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.244.0"; + version = "1.266.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.244.0.tgz"; - sha512 = "w94dZS2w23XKunecST979nBaYAMFp/YjIPjS0aDK1vL4tEVu1l0qDBlwJGsd5Ijv5cyuO0m2/U0JMPUA1FqKlQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.266.0.tgz"; + sha512 = "JWrbaeC1/omAfE1/kYXKGb5Xzc7hOiKAt7wla+PlTDMs+nAMPvqNd8Bx2GVcCUl2KfoimzCmf2MsoChvvHXV3g=="; }; dependencies = [ - sources."@snyk/cli-interface-2.2.0" + sources."@snyk/cli-interface-2.3.0" sources."@snyk/cocoapods-lockfile-parser-3.0.0" sources."@snyk/composer-lockfile-parser-1.2.0" sources."@snyk/dep-graph-1.13.1" @@ -68749,7 +69468,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.1" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -68807,7 +69526,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."core-js-3.4.1" + sources."core-js-3.6.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -68821,7 +69540,6 @@ in sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."define-properties-1.1.3" (sources."degenerator-1.0.4" // { dependencies = [ sources."esprima-3.1.3" @@ -68831,7 +69549,7 @@ in sources."diff-4.0.1" sources."dockerfile-ast-0.0.16" sources."dot-prop-4.2.0" - (sources."dotnet-deps-parser-4.5.2" // { + (sources."dotnet-deps-parser-4.9.0" // { dependencies = [ sources."xml2js-0.4.19" ]; @@ -68840,8 +69558,6 @@ in sources."email-validator-2.0.4" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -68868,7 +69584,6 @@ in sources."readable-stream-1.1.14" ]; }) - sources."function-bind-1.1.1" sources."get-stream-4.1.0" (sources."get-uri-2.0.4" // { dependencies = [ @@ -68886,10 +69601,8 @@ in ]; }) sources."graceful-fs-4.2.3" - sources."graphlib-2.1.7" - sources."has-1.0.3" + sources."graphlib-2.1.8" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."hosted-git-info-2.8.5" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -68910,9 +69623,7 @@ in sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" sources."is-ci-1.2.1" - sources."is-date-object-1.0.1" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" @@ -68922,11 +69633,9 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" @@ -68969,9 +69678,6 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-1.3.1" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" @@ -68980,6 +69686,7 @@ in sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" + sources."p-map-2.1.0" (sources."pac-proxy-agent-3.0.1" // { dependencies = [ sources."debug-4.1.1" @@ -69058,27 +69765,32 @@ in sources."debug-4.1.1" ]; }) - (sources."snyk-gradle-plugin-3.2.0" // { + (sources."snyk-gradle-plugin-3.2.2" // { dependencies = [ + sources."@snyk/cli-interface-2.2.0" sources."debug-4.1.1" ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.4.0" // { + (sources."snyk-mvn-plugin-2.7.0" // { dependencies = [ + sources."@snyk/cli-interface-2.2.0" + sources."debug-4.1.1" + sources."tmp-0.1.0" sources."tslib-1.9.3" ]; }) - sources."snyk-nodejs-lockfile-parser-1.16.1" - sources."snyk-nuget-plugin-1.13.1" + sources."snyk-nodejs-lockfile-parser-1.17.0" + sources."snyk-nuget-plugin-1.16.0" sources."snyk-paket-parser-1.5.0" (sources."snyk-php-plugin-1.7.0" // { dependencies = [ + sources."@snyk/cli-interface-2.2.0" sources."tslib-1.9.3" ]; }) sources."snyk-policy-1.13.5" - sources."snyk-python-plugin-1.13.3" + sources."snyk-python-plugin-1.16.0" sources."snyk-resolve-1.0.1" (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ @@ -69088,8 +69800,9 @@ in sources."yallist-2.1.2" ]; }) - (sources."snyk-sbt-plugin-2.8.0" // { + (sources."snyk-sbt-plugin-2.9.2" // { dependencies = [ + sources."debug-4.1.1" sources."tmp-0.1.0" ]; }) @@ -69115,8 +69828,6 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" (sources."strip-ansi-5.2.0" // { dependencies = [ @@ -69151,7 +69862,7 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.0" sources."toml-3.0.0" - sources."tree-kill-1.2.1" + sources."tree-kill-1.2.2" sources."tslib-1.10.0" sources."type-check-0.3.2" sources."unique-string-1.0.0" @@ -69160,7 +69871,6 @@ in sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."uuid-3.3.3" sources."vscode-languageserver-types-3.14.0" sources."which-1.3.1" @@ -69176,7 +69886,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - (sources."xml2js-0.4.22" // { + (sources."xml2js-0.4.23" // { dependencies = [ sources."xmlbuilder-11.0.1" ]; @@ -69239,14 +69949,14 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-component-0.0.3" sources."parseqs-0.0.5" sources."parseuri-0.0.5" - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ sources."ms-2.0.0" @@ -69259,7 +69969,7 @@ in }) sources."socket.io-parser-3.4.0" sources."to-array-0.1.4" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -69315,26 +70025,20 @@ in }) sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."define-properties-1.1.3" sources."dot-prop-4.2.0" sources."draftlog-1.0.12" sources."duplexer3-0.1.4" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."find-up-2.1.0" - sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" sources."hosted-git-info-2.8.5" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-3.0.1" @@ -69343,9 +70047,7 @@ in sources."indent-string-3.2.0" sources."ini-1.3.5" sources."is-arrayish-0.2.1" - sources."is-callable-1.1.4" sources."is-ci-1.2.1" - sources."is-date-object-1.0.1" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -69353,10 +70055,8 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-redirect-1.0.0" - sources."is-regex-1.0.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."isexe-2.0.0" sources."json-parse-better-errors-1.0.2" sources."latest-version-3.1.0" @@ -69376,9 +70076,6 @@ in sources."ms-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."onetime-2.0.1" (sources."ora-3.4.0" // { dependencies = [ @@ -69407,7 +70104,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.0" @@ -69423,8 +70120,6 @@ in sources."spdx-license-ids-3.0.5" sources."speedtest-net-1.6.0" sources."string-width-2.1.1" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."strip-ansi-4.0.0" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" @@ -69438,7 +70133,6 @@ in sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."url-parse-lax-1.0.0" - sources."util.promisify-1.0.0" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -69446,7 +70140,7 @@ in sources."wrap-ansi-3.0.1" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.22" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."yallist-2.1.2" sources."yargs-parser-10.1.0" @@ -69464,10 +70158,10 @@ in ssb-server = nodeEnv.buildNodePackage { name = "ssb-server"; packageName = "ssb-server"; - version = "15.1.2"; + version = "15.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.1.2.tgz"; - sha512 = "lCzCYwQUXQq19kCM59nlF6UY634WCpMqL01gOBp5SuQgawr8DSuuk+RBUZswSTEjwDsL16ltGR8/rtaYvyiZ8A=="; + url = "https://registry.npmjs.org/ssb-server/-/ssb-server-15.2.0.tgz"; + sha512 = "iOzvg1HSRuT7k56AdKbeVnqeyc8iTZNMqIcbOv+zc4GBZODc37vtxtv688EnyNVCWuLnBsQBH3HlAYrcolQE7g=="; }; dependencies = [ sources."abstract-leveldown-6.0.3" @@ -69503,6 +70197,7 @@ in sources."bash-color-0.0.4" sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" + sources."bindings-1.5.0" (sources."bl-0.8.2" // { dependencies = [ sources."isarray-0.0.1" @@ -69580,7 +70275,7 @@ in sources."cross-spawn-6.0.5" sources."debug-4.1.1" sources."decode-uri-component-0.2.0" - sources."deep-equal-1.1.0" + sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" (sources."deferred-leveldown-5.3.0" // { dependencies = [ @@ -69608,7 +70303,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" @@ -69623,6 +70318,7 @@ in }) sources."extend.js-0.0.2" sources."extglob-0.3.2" + sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" (sources."flumecodec-0.0.0" // { @@ -69633,7 +70329,7 @@ in sources."flumedb-1.1.0" sources."flumelog-offset-3.4.3" sources."flumeview-hashtable-1.1.1" - sources."flumeview-level-3.0.13" + sources."flumeview-level-3.0.14" (sources."flumeview-query-6.3.0" // { dependencies = [ sources."map-filter-reduce-3.2.2" @@ -69654,7 +70350,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-6.0.4" @@ -69666,7 +70362,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -69705,14 +70401,14 @@ in sources."is-arguments-1.0.4" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-canonical-base64-1.1.1" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.2" ]; }) - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-decimal-1.0.3" (sources."is-descriptor-1.0.2" // { dependencies = [ @@ -69735,8 +70431,8 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.11" sources."is-windows-1.0.2" @@ -69755,8 +70451,8 @@ in sources."readable-stream-3.4.0" ]; }) - sources."level-js-4.0.1" - sources."level-packager-5.1.0" + sources."level-js-4.0.2" + sources."level-packager-5.1.1" sources."level-post-1.0.7" (sources."level-sublevel-6.6.5" // { dependencies = [ @@ -69820,13 +70516,13 @@ in sources."monotonic-timestamp-0.0.9" sources."moo-0.4.3" sources."ms-2.1.2" - sources."multiblob-1.13.4" + sources."multiblob-1.13.6" sources."multiblob-http-1.0.0" sources."multicb-1.2.2" sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.4.2" + sources."muxrpc-6.4.8" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -69866,14 +70562,15 @@ in }) ]; }) - sources."object-inspect-1.6.0" - sources."object-is-1.0.1" + sources."object-inspect-1.7.0" + sources."object-is-1.0.2" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) + sources."object.assign-4.1.0" sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -69906,7 +70603,7 @@ in sources."plur-2.1.2" sources."posix-character-classes-0.1.1" sources."preserve-0.2.0" - sources."private-box-0.3.0" + sources."private-box-0.3.1" sources."process-nextick-args-2.0.1" sources."promisize-1.1.2" sources."prr-1.0.1" @@ -70031,7 +70728,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -70043,7 +70740,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.11.1" + sources."resolve-1.14.1" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" @@ -70059,7 +70756,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."secret-handshake-1.1.20" - sources."secret-stack-6.3.0" + sources."secret-stack-6.3.1" sources."semver-5.7.1" sources."separator-escape-0.0.0" (sources."set-value-2.0.1" // { @@ -70116,7 +70813,7 @@ in sources."split-string-3.1.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" - sources."ssb-client-4.7.8" + sources."ssb-client-4.7.9" sources."ssb-config-3.4.3" sources."ssb-db-19.2.0" sources."ssb-ebt-5.6.7" @@ -70131,7 +70828,7 @@ in sources."ssb-msgs-5.2.0" sources."ssb-no-auth-1.0.0" sources."ssb-onion-1.0.0" - (sources."ssb-ooo-1.3.1" // { + (sources."ssb-ooo-1.3.2" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -70145,9 +70842,9 @@ in ]; }) sources."ssb-ref-2.13.9" - sources."ssb-replicate-1.3.0" + sources."ssb-replicate-1.3.2" sources."ssb-unix-socket-1.0.0" - sources."ssb-validate-4.0.4" + sources."ssb-validate-4.0.5" sources."ssb-ws-6.2.3" sources."stack-0.1.0" (sources."static-extend-0.1.2" // { @@ -70174,17 +70871,16 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.1.2" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trim-1.2.1" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.11.0" // { + (sources."tape-4.12.1" // { dependencies = [ - sources."deep-equal-1.0.1" sources."glob-7.1.6" ]; }) @@ -70289,7 +70985,7 @@ in sources."@sailshq/lodash-3.10.4" (sources."@slack/client-3.16.0" // { dependencies = [ - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."request-2.76.0" sources."url-join-0.0.1" sources."ws-1.1.5" @@ -70312,7 +71008,7 @@ in }) (sources."adbkit-apkreader-3.1.2" // { dependencies = [ - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."debug-0.7.4" ]; }) @@ -70345,9 +71041,13 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - sources."aws-sdk-2.569.0" + (sources."aws-sdk-2.596.0" // { + dependencies = [ + sources."uuid-3.3.2" + ]; + }) sources."aws-sign2-0.6.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -70376,7 +71076,7 @@ in }) sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."buffer-4.9.2" + sources."buffer-4.9.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" @@ -70431,7 +71131,7 @@ in sources."cookie-signature-1.0.6" sources."cookiejar-2.1.2" sources."cookies-0.7.1" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."cross-spawn-4.0.2" @@ -70447,7 +71147,6 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-extend-0.4.2" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."deref-0.6.4" @@ -70470,7 +71169,7 @@ in dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" - sources."ws-7.2.0" + sources."ws-7.2.1" ]; }) (sources."engine.io-client-3.4.0" // { @@ -70482,8 +71181,6 @@ in }) sources."engine.io-parser-2.2.0" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-2.0.0" @@ -70514,7 +71211,7 @@ in sources."eyes-0.1.8" sources."faker-3.1.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" @@ -70548,7 +71245,7 @@ in ]; }) sources."graceful-fs-4.2.3" - sources."graphlib-2.1.7" + sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" sources."has-1.0.3" @@ -70559,7 +71256,6 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" (sources."hipchatter-0.3.2" // { @@ -70591,8 +71287,6 @@ in sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -70603,9 +71297,8 @@ in sources."is-my-json-valid-2.20.0" sources."is-promise-2.1.0" sources."is-property-1.0.2" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -70701,8 +71394,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" @@ -70731,9 +71424,6 @@ in sources."object-assign-4.1.1" sources."object-component-0.0.3" sources."object-hash-0.3.0" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70786,7 +71476,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" sources."pug-code-gen-2.0.2" @@ -70840,9 +71530,9 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."ret-0.2.2" - sources."rethinkdb-2.3.3" + sources."rethinkdb-2.4.2" sources."retry-0.9.0" sources."right-align-0.1.3" sources."rimraf-2.4.5" @@ -70855,7 +71545,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" + sources."sax-1.2.1" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ @@ -70882,7 +71572,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -70935,8 +71625,6 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -71023,7 +71711,6 @@ in sources."url-join-1.1.0" sources."utf-8-validate-1.2.2" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" @@ -71073,9 +71760,9 @@ in sources."node-forge-0.2.24" ]; }) - sources."xml2js-0.4.22" - sources."xmlbuilder-11.0.1" - sources."xmldom-0.1.27" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.1.31" sources."xmlhttprequest-ssl-1.5.5" sources."xpath-0.0.5" sources."xpath.js-1.1.0" @@ -71154,18 +71841,18 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.0.0" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."has-symbols-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."js-yaml-3.13.1" sources."mdn-data-2.0.4" sources."minimist-0.0.8" @@ -71173,15 +71860,16 @@ in sources."nth-check-1.0.2" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" - sources."object.values-1.1.0" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.values-1.1.1" sources."q-1.5.1" sources."sax-1.2.4" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stable-0.1.8" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."supports-color-5.5.0" sources."unquote-1.1.1" sources."util.promisify-1.0.0" @@ -71234,6 +71922,7 @@ in ]; }) sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" (sources."body-parser-1.12.4" // { dependencies = [ sources."debug-2.2.0" @@ -71309,7 +71998,7 @@ in sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -71374,6 +72063,7 @@ in ]; }) sources."figures-1.7.0" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -71388,7 +72078,7 @@ in sources."fresh-0.5.2" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -71400,13 +72090,13 @@ in sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" - (sources."graphlib-2.1.7" // { + (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.15" ]; }) sources."growl-1.9.2" - (sources."handlebars-4.5.1" // { + (sources."handlebars-4.5.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -71521,8 +72211,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -71766,7 +72456,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.6.8" // { + (sources."uglify-js-3.7.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -71837,7 +72527,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-12.12.7" + sources."@types/node-12.12.22" sources."ajv-6.10.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -71847,7 +72537,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" (sources."bcrypt-pbkdf-1.0.2" // { dependencies = [ sources."tweetnacl-0.14.5" @@ -71871,7 +72561,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."find-up-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -71892,8 +72582,10 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.4.4" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."minimist-1.2.0" + sources."module-alias-2.2.2" sources."moment-2.24.0" sources."ms-2.1.2" sources."node-fetch-2.6.0" @@ -71904,7 +72596,7 @@ in sources."path-exists-3.0.0" sources."performance-now-2.1.0" sources."prism-media-0.0.3" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."ramda-0.25.0" @@ -71925,7 +72617,7 @@ in }) sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."telegraf-3.33.3" + sources."telegraf-3.34.1" sources."telegram-typings-3.6.1" (sources."tough-cookie-2.4.3" // { dependencies = [ @@ -71962,7 +72654,7 @@ in sha512 = "pVJhZp1vvv2ewgPv6YwNsyCU+ComJdHBtTajDo/EdfGHY2CLCQ53ucgCzvWfFx+KXls0H6sRwnDMY8Qo+aQviw=="; }; dependencies = [ - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."acorn-loose-6.1.0" sources."acorn-walk-6.2.0" sources."balanced-match-1.0.0" @@ -72034,7 +72726,7 @@ in sources."argparse-1.0.10" sources."bail-1.0.4" sources."balanced-match-1.0.0" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" @@ -72051,12 +72743,12 @@ in sources."core-util-is-1.0.2" sources."crypt-0.0.2" sources."debug-4.1.1" - sources."deep-equal-1.1.0" + sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" sources."diff-4.0.1" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -72075,7 +72767,7 @@ in sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."hosted-git-info-2.8.5" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -72084,15 +72776,15 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" sources."is-decimal-1.0.3" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.3" sources."is-plain-obj-1.1.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.3" sources."is-word-character-1.0.3" @@ -72121,8 +72813,9 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-inspect-1.7.0" - sources."object-is-1.0.1" + sources."object-is-1.0.2" sources."object-keys-1.1.1" + sources."object.assign-4.1.0" sources."once-1.4.0" sources."optionator-0.8.3" sources."p-limit-1.3.0" @@ -72154,13 +72847,13 @@ in ]; }) sources."readable-stream-2.3.6" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."remark-frontmatter-1.3.2" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -72172,9 +72865,9 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.2" sources."string-width-1.0.2" - sources."string.prototype.padstart-3.0.0" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.padstart-3.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -72258,9 +72951,22 @@ in }; dependencies = [ sources."define-properties-1.1.3" + sources."es-abstract-1.17.0" + sources."es-to-primitive-1.2.1" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."match-index-1.0.3" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."regexp.prototype.flags-1.2.0" + sources."object.assign-4.1.0" + sources."regexp.prototype.flags-1.3.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -72318,6 +73024,7 @@ in (sources."concat-stream-1.6.2" // { dependencies = [ sources."isarray-1.0.0" + sources."process-nextick-args-2.0.1" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -72329,7 +73036,7 @@ in sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."cuss-1.17.0" - sources."debug-0.8.1" + sources."debug-4.1.1" sources."decamelize-1.2.0" sources."deep-extend-0.6.0" sources."dot-prop-4.2.0" @@ -72350,8 +73057,8 @@ in sources."fs.realpath-1.0.0" sources."get-stdin-4.0.1" sources."get-stream-3.0.0" - sources."git-diff-tree-1.0.0" - sources."git-spawned-stream-0.1.1" + sources."git-diff-tree-1.1.0" + sources."git-spawned-stream-1.0.1" sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -72413,7 +73120,7 @@ in sources."meow-3.7.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."ms-2.0.0" + sources."ms-2.1.2" sources."nlcst-is-literal-1.2.0" sources."nlcst-normalize-2.1.3" sources."nlcst-search-1.5.1" @@ -72444,7 +73151,7 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-7.0.0" sources."prepend-http-1.0.4" - sources."process-nextick-args-2.0.1" + sources."process-nextick-args-1.0.7" sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" @@ -72463,7 +73170,7 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-5.0.0" sources."retext-english-3.0.4" sources."retext-equality-3.2.0" @@ -72511,11 +73218,10 @@ in sources."term-size-1.2.0" sources."textlint-rule-helper-2.1.1" sources."through-2.3.8" - (sources."through2-2.0.5" // { + (sources."through2-2.0.0" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.6" - sources."string_decoder-1.1.1" + sources."readable-stream-2.0.6" ]; }) sources."timed-out-4.0.1" @@ -72531,6 +73237,7 @@ in (sources."unified-engine-4.0.1" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."unified-message-control-1.0.4" @@ -72719,31 +73426,29 @@ in sources."@textlint/types-1.2.3" sources."boundary-1.0.1" sources."buffer-from-1.1.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" + sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."inherits-2.0.4" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" - sources."isarray-1.0.0" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."object-assign-4.1.1" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."object.values-1.1.0" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.6" - sources."safe-buffer-5.1.2" - sources."sentence-splitter-3.1.0" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" - sources."string_decoder-1.1.1" + sources."object.assign-4.1.0" + sources."object.values-1.1.1" + sources."readable-stream-3.4.0" + sources."safe-buffer-5.2.0" + sources."sentence-splitter-3.2.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" + sources."string_decoder-1.3.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."typedarray-0.0.6" @@ -72776,19 +73481,20 @@ in sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" sources."end-with-1.0.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.0" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."has-symbols-1.0.1" + sources."is-callable-1.1.5" + sources."is-date-object-1.0.2" + sources."is-regex-1.0.5" + sources."is-symbol-1.0.3" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."object.assign-4.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -72803,10 +73509,10 @@ in textlint-rule-stop-words = nodeEnv.buildNodePackage { name = "textlint-rule-stop-words"; packageName = "textlint-rule-stop-words"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-1.0.17.tgz"; - sha512 = "7m1k3xMwsOw7WyGNINJQ5EX2+mnqAeg6VBfXY7BVUr/y6NOYhPbEj3A3MBJ9Jt9dfC1twL0aI6mKPo+5xLUsVA=="; + url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-1.0.18.tgz"; + sha512 = "/Cg20pLZgEl8vi6gUu44DGRG+iOtXa4rcvfiOURrwP5lbaQHpuo/0bQSKJnnFzih/hRHw/qnEXqd7PsfpnuEYw=="; }; dependencies = [ sources."@textlint/ast-node-types-4.2.5" @@ -72869,22 +73575,24 @@ in sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ=="; }; dependencies = [ - sources."array-includes-3.0.3" + sources."array-includes-3.1.1" sources."define-properties-1.1.3" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.0" - sources."is-callable-1.1.4" + sources."has-symbols-1.0.1" + sources."is-callable-1.1.5" sources."is-capitalized-1.0.0" - sources."is-date-object-1.0.1" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" + sources."is-date-object-1.0.2" + sources."is-regex-1.0.5" + sources."is-string-1.0.5" + sources."is-symbol-1.0.3" sources."object-inspect-1.7.0" sources."object-keys-1.1.1" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."object.assign-4.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -72912,7 +73620,7 @@ in sources."define-properties-1.1.3" sources."e-prime-0.10.2" sources."function-bind-1.1.1" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" sources."object-keys-1.1.1" sources."object.assign-4.1.0" @@ -72972,7 +73680,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.0" @@ -73019,7 +73727,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.4.1" + sources."core-js-3.6.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -73027,7 +73735,7 @@ in sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -73074,7 +73782,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.4.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-text-encoding-1.0.0" sources."file-type-12.3.1" sources."filename-reserved-regex-2.0.0" @@ -73195,8 +73903,9 @@ in }) sources."nopt-4.0.1" sources."normalize-url-4.5.0" - sources."npm-bundled-1.0.6" - sources."npm-packlist-1.4.6" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.7" sources."npmlog-4.1.2" sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" @@ -73223,7 +73932,7 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -73262,7 +73971,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -73327,7 +74036,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.2.0" + sources."ws-7.2.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.19.1" @@ -73346,10 +74055,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.110.0"; + version = "0.111.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.110.0.tgz"; - sha512 = "wlurH8XBO9Sd5VIw8nBa+taLR20kqaI4e9FiuMh6tqK8eOS2q2R+ZoUyufbyDTVTHhs8GiTbv0r2CMLkwerFJg=="; + url = "https://registry.npmjs.org/three/-/three-0.111.0.tgz"; + sha512 = "AcTqyGJ3H75AIusOuADy0LsP958QKQwm/YhABHFMzd6RFXPNVay1rlSbbG6WYv7KM72G2THMMwqbjQd4dVHMkQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -73395,7 +74104,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -73414,7 +74123,7 @@ in sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" (sources."fields-0.1.24" // { dependencies = [ sources."colors-0.6.2" @@ -73443,8 +74152,8 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.15" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.10" sources."moment-2.24.0" @@ -73459,7 +74168,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."pkginfo-0.3.1" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."request-2.88.0" @@ -73492,7 +74201,7 @@ in }) sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" ]; buildInputs = globalBuildInputs; meta = { @@ -73507,10 +74216,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.5.0.tgz"; - sha512 = "t1b1B2H0y9jOUqDm2rr9gQsnI0mm0ws47h+pz8sBWw+Ylw+J664bM/usKPevh38J17zlKo3FisAZvSjcOVfIZQ=="; + url = "https://registry.npmjs.org/triton/-/triton-7.5.1.tgz"; + sha512 = "UR/eNGvp3YY/TgrKOV+7QRHFAQVBX5sbnrFIKTMRdX9juzt7t+rlUgNQYMycMB1afBRQXs+r02rfvSKiPJ7xZA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -73638,7 +74347,7 @@ in sources."verror-1.1.0" ]; }) - (sources."sshpk-1.14.1" // { + (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -73646,6 +74355,7 @@ in (sources."sshpk-agent-1.7.0" // { dependencies = [ sources."assert-plus-1.0.0" + sources."sshpk-1.14.2" ]; }) (sources."string_decoder-1.1.1" // { @@ -73771,10 +74481,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.7.2"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz"; - sha512 = "ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz"; + sha512 = "A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw=="; }; buildInputs = globalBuildInputs; meta = { @@ -73806,10 +74516,10 @@ in sources."tempy-0.2.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."vscode-jsonrpc-5.0.0-next.4" + sources."vscode-jsonrpc-5.0.0-next.5" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.0-next.11" - sources."vscode-languageserver-types-3.15.0-next.8" + sources."vscode-languageserver-protocol-3.15.0-next.14" + sources."vscode-languageserver-types-3.15.0-next.9" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" ]; @@ -73825,10 +74535,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.6.8"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz"; - sha512 = "XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz"; + sha512 = "uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA=="; }; dependencies = [ sources."commander-2.20.3" @@ -73847,13 +74557,13 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.0.tgz"; - sha512 = "/z1T7PRc2c3AlXK1IQCzpZ1ft07MLxi/WmZlBBdqZiVV9pf3tOa7uWILs9bHaHUAlWMxix1F0ZATCNqb38e1dA=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.1.tgz"; + sha512 = "ePcMZXXUjAt3Gevn/iBzXjlitmrgOQsNTn2w0d1/+jGhDcr8MxDFRCI5tuYWKsBBXX4/ccSsiBI0aaHd2SzQbQ=="; }; dependencies = [ - sources."@primer/octicons-9.2.0" + sources."@primer/octicons-9.3.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -73870,7 +74580,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -73936,13 +74646,9 @@ in sources."diff-4.0.1" sources."diff2html-2.8.0" sources."dnd-page-scroll-0.0.4" - (sources."eachr-3.2.0" // { - dependencies = [ - sources."editions-1.3.4" - ]; - }) + sources."eachr-3.3.0" sources."ecc-jsbn-0.1.2" - (sources."editions-2.2.0" // { + (sources."editions-2.3.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -73962,7 +74668,7 @@ in ]; }) sources."engine.io-parser-2.1.3" - sources."errlop-1.1.2" + sources."errlop-2.0.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" @@ -73985,15 +74691,11 @@ in ]; }) sources."extend-3.0.2" - (sources."extract-opts-3.3.1" // { - dependencies = [ - sources."editions-1.3.4" - ]; - }) + sources."extract-opts-3.4.0" sources."extsprintf-1.3.0" sources."eyes-0.1.8" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -74074,8 +74776,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -74126,7 +74828,7 @@ in sources."parseqs-0.0.5" sources."parseuri-0.0.5" sources."parseurl-1.3.3" - sources."passport-0.4.0" + sources."passport-0.4.1" sources."passport-local-1.0.0" sources."passport-strategy-1.0.0" sources."path-exists-3.0.0" @@ -74139,7 +74841,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.5" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -74160,7 +74862,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" @@ -74189,7 +74891,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.1" + sources."socket.io-adapter-1.1.2" (sources."socket.io-client-2.2.0" // { dependencies = [ sources."debug-3.1.0" @@ -74235,7 +74937,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typechecker-4.8.0" + sources."typechecker-4.11.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" @@ -74378,12 +75080,12 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.2" - sources."bluebird-3.7.1" + sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."buffer-5.4.3" sources."buffer-alloc-1.2.0" @@ -74443,7 +75145,7 @@ in sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-type-5.2.0" @@ -74463,7 +75165,7 @@ in sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" - sources."handlebars-4.5.1" + sources."handlebars-4.5.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -74521,8 +75223,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" @@ -74552,7 +75254,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-metadata-1.0.0" @@ -74616,7 +75318,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.6.8" + sources."uglify-js-3.7.2" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -74672,12 +75374,12 @@ in sources."@starptech/rehype-minify-whitespace-0.9.0" sources."@starptech/rehype-webparser-0.9.0" sources."@starptech/webparser-0.9.0" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" sources."ajv-6.10.2" sources."ajv-keywords-2.1.1" @@ -74733,6 +75435,7 @@ in ]; }) sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" sources."bootstrap-vue-helper-json-1.1.1" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" @@ -74815,7 +75518,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" @@ -74920,11 +75623,12 @@ in }) sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fault-1.0.3" sources."figures-2.0.0" sources."file-entry-cache-5.0.1" + sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" (sources."fill-range-4.0.0" // { dependencies = [ @@ -74940,7 +75644,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -74992,7 +75696,7 @@ in sources."html-whitespace-sensitive-tag-names-1.0.1" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" - (sources."import-fresh-3.1.0" // { + (sources."import-fresh-3.2.1" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -75301,7 +76005,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -75474,7 +76178,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."typescript-3.7.2" + sources."typescript-3.7.4" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -75547,10 +76251,10 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-jsonrpc-5.0.0-next.4" + sources."vscode-jsonrpc-5.0.0-next.5" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.0-next.11" - sources."vscode-languageserver-types-3.15.0-next.8" + sources."vscode-languageserver-protocol-3.15.0-next.14" + sources."vscode-languageserver-types-3.15.0-next.9" sources."vscode-nls-4.1.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -75603,32 +76307,36 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "3.2.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-3.2.1.tgz"; - sha512 = "WzZbCDIjIUshZRVaiYFbaMp/1/xPjW7qeTQ0F7Xx1MYkamZ4RN5dnhxWFz+Hzg6GzhFdny+zucNDKOwYfAV3LA=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.0.0.tgz"; + sha512 = "778HKIoWpIrZzOq7rPA7Fu7YQ/fnZ6w9XCKUqGJRjo2NgOtgtkLmkd7lCw3gU7KJYe7hurI5XYossJMgjmyNaQ=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" - sources."@babel/polyfill-7.6.0" - sources."@babel/runtime-7.6.2" - sources."@babel/runtime-corejs2-7.7.2" + sources."@babel/polyfill-7.7.0" + sources."@babel/runtime-7.7.7" + sources."@babel/runtime-corejs2-7.7.7" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.7" + sources."@types/node-13.1.0" sources."JSONSelect-0.2.1" - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."acorn-jsx-5.1.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.14.0" // { + (sources."addons-linter-1.19.0" // { dependencies = [ + sources."ansi-regex-4.1.0" sources."decamelize-1.2.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" sources."yargs-14.0.0" ]; }) @@ -75636,7 +76344,13 @@ in sources."ajv-6.10.2" sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -75674,11 +76388,10 @@ in sources."astral-regex-1.0.0" sources."async-0.2.10" sources."async-each-1.0.3" - sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -75687,16 +76400,6 @@ in sources."supports-color-2.0.0" ]; }) - (sources."babel-polyfill-6.16.0" // { - dependencies = [ - sources."regenerator-runtime-0.9.6" - ]; - }) - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -75706,6 +76409,7 @@ in sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" + sources."bindings-1.5.0" (sources."bl-1.2.2" // { dependencies = [ (sources."readable-stream-2.3.6" // { @@ -75722,7 +76426,21 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - sources."boxen-3.2.0" + (sources."boxen-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.0" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -75754,11 +76472,11 @@ in sources."cheerio-1.0.0-rc.3" (sources."chokidar-2.1.8" // { dependencies = [ - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."normalize-path-3.0.0" ]; }) - sources."chrome-launcher-0.11.2" + sources."chrome-launcher-0.12.0" sources."ci-info-2.0.0" sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { @@ -75784,6 +76502,7 @@ in (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) @@ -75815,9 +76534,9 @@ in sources."string_decoder-1.1.1" ]; }) - sources."configstore-4.0.0" + sources."configstore-5.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.10" + sources."core-js-2.6.11" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -75832,7 +76551,7 @@ in sources."semver-5.7.1" ]; }) - sources."crypto-random-string-1.0.0" + sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" @@ -75842,21 +76561,19 @@ in sources."decamelize-3.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.1.0" + sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."deepcopy-0.6.3" - sources."deepmerge-4.0.0" + sources."deepcopy-2.0.0" + sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.0" + sources."defer-to-connect-1.1.1" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.40.0" // { + (sources."dispensary-0.48.1" // { dependencies = [ sources."async-3.1.0" - sources."decamelize-1.2.0" - sources."yargs-14.0.0" ]; }) sources."doctrine-3.0.0" @@ -75864,19 +76581,18 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."dot-prop-4.2.0" + sources."dot-prop-5.2.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-7.0.3" - sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.16.0" + sources."es-abstract-1.17.0" sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.52" + sources."es5-ext-0.10.53" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -75948,7 +76664,7 @@ in sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - (sources."espree-6.1.1" // { + (sources."espree-6.1.2" // { dependencies = [ sources."acorn-7.1.0" ]; @@ -75981,7 +76697,7 @@ in sources."kind-of-5.1.0" ]; }) - (sources."ext-1.2.0" // { + (sources."ext-1.4.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -76003,13 +76719,14 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-json-patch-2.2.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-1.5.0" + sources."fast-redact-2.0.0" sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."figures-2.0.0" sources."file-entry-cache-5.0.1" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76017,7 +76734,7 @@ in ]; }) sources."find-up-3.0.0" - (sources."firefox-profile-1.2.0" // { + (sources."firefox-profile-1.3.0" // { dependencies = [ sources."async-2.5.0" ]; @@ -76034,7 +76751,7 @@ in sources."fs-constants-1.0.0" sources."fs-extra-4.0.3" sources."fs.realpath-1.0.0" - sources."fsevents-2.0.7" + sources."fsevents-2.1.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" (sources."fx-runner-1.0.11" // { @@ -76050,20 +76767,19 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."gettext-parser-1.1.0" - (sources."git-rev-sync-1.12.0" // { + (sources."git-rev-sync-2.0.0" // { dependencies = [ - sources."graceful-fs-4.1.11" + sources."graceful-fs-4.1.15" sources."shelljs-0.7.7" ]; }) - sources."glob-7.1.4" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" ]; }) - sources."global-dirs-0.1.1" + sources."global-dirs-2.0.1" sources."globals-11.12.0" sources."got-9.6.0" sources."graceful-fs-4.2.3" @@ -76073,9 +76789,8 @@ in sources."har-validator-5.1.3" sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-color-0.1.7" sources."has-flag-3.0.0" - sources."has-symbols-1.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -76089,7 +76804,7 @@ in sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" - (sources."import-fresh-3.1.0" // { + (sources."import-fresh-3.2.1" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -76101,17 +76816,8 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" ]; }) sources."interpret-1.2.0" @@ -76122,35 +76828,35 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.1.4" + sources."is-callable-1.1.5" sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.1" + sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" + sources."is-installed-globally-0.3.1" sources."is-mergeable-object-1.1.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" - sources."is-npm-3.0.0" + sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."is-obj-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-property-1.0.2" - sources."is-regex-1.0.4" + sources."is-regex-1.0.5" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.2" + sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -76177,9 +76883,10 @@ in sources."jsonfile-4.0.0" sources."jsonify-0.0.0" sources."jsonpointer-4.0.1" - (sources."jsonwebtoken-8.2.1" // { + (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."ms-2.1.2" + sources."semver-5.7.1" ]; }) sources."jsprim-1.4.1" @@ -76211,21 +76918,20 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + sources."make-dir-3.0.0" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-0.0.94" + sources."mdn-browser-compat-data-1.0.1" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" ]; }) sources."micromatch-3.1.10" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -76257,13 +76963,6 @@ in sources."nice-try-1.0.5" sources."node-forge-0.7.6" sources."node-notifier-6.0.0" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - sources."strip-ansi-0.1.1" - ]; - }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."npm-run-path-2.0.2" @@ -76285,18 +76984,14 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.1" + sources."object-is-1.0.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.getownpropertydescriptors-2.0.3" + sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - (sources."open-6.4.0" // { - dependencies = [ - sources."is-wsl-1.1.0" - ]; - }) + sources."open-7.0.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-4.0.0" @@ -76327,13 +77022,11 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."pino-5.13.3" + sources."pino-5.14.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" - sources."po2json-0.4.5" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.18" // { + (sources."postcss-7.0.24" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -76343,8 +77036,7 @@ in sources."probe-image-size-5.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -76371,7 +77063,7 @@ in sources."rechoir-0.6.2" sources."regenerator-runtime-0.13.3" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.2.0" + sources."regexp.prototype.flags-1.3.0" sources."regexpp-2.0.1" sources."registry-auth-token-4.0.0" sources."registry-url-5.1.0" @@ -76383,7 +77075,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -76399,11 +77091,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-6.3.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."semver-diff-3.1.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -76417,22 +77105,9 @@ in sources."shell-quote-1.6.1" sources."shelljs-0.7.8" sources."shellwords-0.1.1" - (sources."sign-addon-0.3.1" // { + (sources."sign-addon-2.0.4" // { dependencies = [ - sources."ajv-5.5.2" - sources."es6-error-4.0.0" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."fast-deep-equal-1.1.0" - sources."har-validator-5.0.3" - sources."json-schema-traverse-0.3.1" - sources."mz-2.5.0" - sources."oauth-sign-0.8.2" - sources."punycode-1.4.1" - sources."request-2.87.0" - sources."source-map-0.5.7" - sources."source-map-support-0.4.6" - sources."tough-cookie-2.3.4" + sources."core-js-3.6.0" ]; }) sources."signal-exit-3.0.2" @@ -76470,7 +77145,7 @@ in sources."sonic-boom-0.7.6" sources."source-map-0.6.1" sources."source-map-resolve-0.5.2" - sources."source-map-support-0.5.13" + sources."source-map-support-0.5.16" sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."split-0.3.3" @@ -76502,14 +77177,14 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-3.1.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" + sources."string.prototype.trimleft-2.1.1" + sources."string.prototype.trimright-2.1.1" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -76518,7 +77193,13 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" - sources."table-5.4.6" + (sources."table-5.4.6" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) (sources."tar-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.6" @@ -76526,13 +77207,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."get-stream-3.0.0" - ]; - }) + sources."term-size-2.1.1" sources."text-table-0.2.0" sources."thenify-3.3.0" sources."thenify-all-1.6.0" @@ -76560,15 +77235,16 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."type-check-0.3.2" - sources."type-fest-0.3.1" + sources."type-detect-4.0.8" + sources."type-fest-0.8.1" sources."typedarray-0.0.6" - sources."underscore-1.6.0" + sources."typedarray-to-buffer-3.1.5" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" ]; }) - sources."unique-string-1.0.0" + sources."unique-string-2.0.0" sources."universalify-0.1.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -76581,28 +77257,38 @@ in ]; }) sources."upath-1.2.0" - sources."update-notifier-3.0.1" + (sources."update-notifier-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.0" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."uri-js-4.2.2" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."uuid-3.3.3" sources."verror-1.10.0" sources."watchpack-1.6.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - sources."whatwg-url-7.0.0" + sources."whatwg-url-7.1.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-2.0.1" // { + (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) sources."winreg-0.0.12" @@ -76610,21 +77296,40 @@ in (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) sources."wrappy-1.0.2" sources."write-1.0.3" - sources."write-file-atomic-2.4.3" - sources."ws-7.1.2" - sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.22" + sources."write-file-atomic-3.0.1" + sources."ws-7.2.1" + sources."xdg-basedir-4.0.0" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xregexp-4.2.4" sources."xtend-4.0.2" sources."y18n-4.0.0" - sources."yallist-2.1.2" - sources."yargs-13.3.0" + (sources."yargs-15.0.2" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."decamelize-1.2.0" + sources."emoji-regex-8.0.0" + sources."find-up-4.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-6.2.0" + sources."yargs-parser-16.1.0" + ]; + }) (sources."yargs-parser-13.1.1" // { dependencies = [ sources."decamelize-1.2.0" @@ -76657,10 +77362,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.41.2"; + version = "4.41.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz"; - sha512 = "Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.41.4.tgz"; + sha512 = "Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q=="; }; dependencies = [ sources."@webassemblyjs/ast-1.8.5" @@ -76683,7 +77388,7 @@ in sources."@webassemblyjs/wast-printer-1.8.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-6.3.0" + sources."acorn-6.4.0" sources."ajv-6.10.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" @@ -76716,7 +77421,8 @@ in sources."base64-js-1.3.1" sources."big.js-5.2.2" sources."binary-extensions-1.13.1" - sources."bluebird-3.7.1" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" sources."bn.js-4.11.8" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { @@ -76777,11 +77483,11 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" - sources."des.js-1.0.0" + sources."des.js-1.0.1" sources."diffie-hellman-5.0.3" sources."domain-browser-1.2.0" sources."duplexify-3.7.1" - sources."elliptic-6.5.1" + sources."elliptic-6.5.2" sources."emojis-list-2.1.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.1.1" // { @@ -76825,8 +77531,9 @@ in ]; }) sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.1" + sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -76840,7 +77547,7 @@ in sources."from2-2.3.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.9" + sources."fsevents-1.2.11" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -76989,7 +77696,7 @@ in sources."safe-regex-1.1.0" sources."schema-utils-1.0.0" sources."semver-5.7.1" - sources."serialize-javascript-1.9.1" + sources."serialize-javascript-2.1.2" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -77056,15 +77763,15 @@ in sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" - sources."stream-shift-1.0.0" + sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.4.0" // { + (sources."terser-4.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.1" // { + (sources."terser-webpack-plugin-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -77482,10 +78189,9 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.0" - sources."@types/node-10.17.5" + sources."@types/node-10.17.12" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" - sources."async-limiter-1.0.1" sources."balanced-match-1.0.0" sources."bencode-2.0.1" sources."binary-search-1.3.6" @@ -77514,7 +78220,7 @@ in }) sources."blob-to-buffer-1.2.8" sources."block-stream2-2.0.0" - sources."bn.js-5.0.0" + sources."bn.js-5.1.1" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" sources."buffer-alloc-1.2.0" @@ -77555,7 +78261,6 @@ in sources."create-torrent-4.4.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."define-properties-1.1.3" (sources."dlnacasts-0.1.0" // { dependencies = [ sources."mime-1.6.0" @@ -77567,8 +78272,6 @@ in sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."end-of-stream-1.4.4" - sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -77579,12 +78282,9 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-7.0.0" sources."glob-7.1.6" - sources."has-1.0.3" - sources."has-symbols-1.0.0" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" sources."http-parser-js-0.4.13" @@ -77595,11 +78295,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-1.9.1" sources."is-ascii-1.0.0" - sources."is-callable-1.1.4" - sources."is-date-object-1.0.1" sources."is-file-1.0.0" - sources."is-regex-1.0.4" - sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-wsl-2.1.1" sources."isarray-1.0.0" @@ -77647,9 +78343,6 @@ in sources."node-gyp-build-3.7.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."object-inspect-1.7.0" - sources."object-keys-1.1.1" - sources."object.getownpropertydescriptors-2.0.3" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.0.0" @@ -77700,14 +78393,14 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.6.1" // { + (sources."simple-peer-9.6.2" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" - (sources."simple-websocket-8.1.0" // { + (sources."simple-websocket-8.1.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -77718,8 +78411,6 @@ in sources."stream-to-blob-2.0.0" sources."stream-to-blob-url-3.0.0" sources."stream-with-known-length-to-buffer-1.0.3" - sources."string.prototype.trimleft-2.1.0" - sources."string.prototype.trimright-2.1.0" sources."string2compact-1.3.0" sources."string_decoder-1.3.0" sources."thirty-two-1.0.2" @@ -77750,10 +78441,9 @@ in sources."ut_pex-2.0.0" sources."utf-8-validate-5.0.2" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."videostream-3.2.1" sources."vlc-command-1.2.0" - (sources."webtorrent-0.107.16" // { + (sources."webtorrent-0.107.17" // { dependencies = [ sources."debug-4.1.1" sources."decompress-response-4.2.1" @@ -77764,10 +78454,10 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.2.0" - sources."xml2js-0.4.22" + sources."ws-7.2.1" + sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xmldom-0.1.27" + sources."xmldom-0.1.31" ]; buildInputs = globalBuildInputs; meta = { @@ -77827,10 +78517,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.19.1"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.19.1.tgz"; - sha512 = "gBnfbL9rYY05Gt0cjJhs/siqQXHYlZalTjK3nXn2QO20xbkIFPob+LlH44ML47GcR4VU9/2dYck1BWFM0Javxw=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.21.1.tgz"; + sha512 = "dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -77845,16 +78535,17 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-3.1.0.tgz"; - sha512 = "boSESRRyvfyns3DfzxF2F0LVV97wSEFbKUi1oC7RwnZTA66KZ7Bo3JjOLe7mM6IjjeI0vEZcr4BbFjrSHh8d0Q=="; + url = "https://registry.npmjs.org/yo/-/yo-3.1.1.tgz"; + sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ + sources."@babel/runtime-7.7.7" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" - sources."aggregate-error-1.0.0" + sources."aggregate-error-3.0.1" sources."ajv-6.10.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" @@ -77878,7 +78569,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -77892,7 +78583,7 @@ in ]; }) sources."bin-version-check-3.0.0" - sources."boolean-2.0.3" + sources."boolean-3.0.0" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -77908,6 +78599,7 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ + sources."get-stream-3.0.0" sources."lowercase-keys-1.0.0" ]; }) @@ -77936,7 +78628,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-stack-1.3.0" + sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" @@ -77957,7 +78649,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-3.4.1" + sources."core-js-3.6.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -77993,11 +78685,7 @@ in sources."es6-error-4.1.1" sources."es6-promise-4.2.8" sources."escape-string-regexp-1.0.5" - (sources."execa-0.6.3" // { - dependencies = [ - sources."cross-spawn-5.1.0" - ]; - }) + sources."execa-1.0.0" sources."execall-1.0.0" sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { @@ -78034,14 +78722,14 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" sources."fast-glob-2.2.7" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."figures-2.0.0" (sources."fill-range-4.0.0" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."filter-obj-1.1.0" + sources."filter-obj-2.0.1" sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" @@ -78052,11 +78740,10 @@ in sources."fragment-cache-0.2.1" sources."from2-2.3.0" sources."fs.realpath-1.0.0" - sources."fullname-3.3.0" - sources."function-bind-1.1.1" + sources."fullname-4.0.1" sources."gauge-1.2.7" sources."get-stdin-4.0.1" - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -78066,16 +78753,21 @@ in ]; }) sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.1.6" // { + (sources."global-agent-2.1.7" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."global-dirs-0.1.1" sources."global-tunnel-ng-2.7.1" - sources."globalthis-1.0.0" + sources."globalthis-1.0.1" sources."globby-8.0.2" - sources."got-8.3.2" + (sources."got-8.3.2" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."p-cancelable-0.4.1" + ]; + }) sources."graceful-fs-4.2.3" sources."grouped-queue-0.3.3" sources."har-schema-2.0.0" @@ -78103,13 +78795,17 @@ in sources."ignore-3.3.10" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" + sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" sources."inquirer-6.5.2" sources."insight-0.10.3" - sources."into-stream-3.1.0" + (sources."into-stream-3.1.0" // { + dependencies = [ + sources."p-is-promise-1.1.0" + ]; + }) sources."ip-regex-2.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -78163,6 +78859,7 @@ in sources."kind-of-6.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" @@ -78187,15 +78884,16 @@ in sources."lru-cache-4.1.5" sources."macos-release-2.3.0" sources."make-dir-1.3.0" + sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-obj-1.0.1" sources."map-visit-1.0.0" - (sources."matcher-2.0.0" // { + (sources."matcher-2.1.0" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; }) - sources."mem-1.1.0" + sources."mem-5.1.1" sources."mem-fs-1.1.3" (sources."meow-3.7.0" // { dependencies = [ @@ -78206,9 +78904,9 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" - sources."mimic-fn-1.2.0" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.0" @@ -78231,6 +78929,7 @@ in sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ + sources."get-stream-3.0.0" sources."got-7.1.0" sources."p-cancelable-0.3.0" sources."p-timeout-1.2.1" @@ -78260,19 +78959,24 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" + (sources."onetime-2.0.1" // { + dependencies = [ + sources."mimic-fn-1.2.0" + ]; + }) sources."open-6.4.0" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."p-any-1.1.0" - sources."p-cancelable-0.4.1" + sources."p-any-2.1.0" + sources."p-cancelable-2.0.0" + sources."p-defer-1.0.0" sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" + sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" - sources."p-some-2.0.1" + sources."p-some-4.1.0" sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."package-json-5.0.0" @@ -78280,14 +78984,7 @@ in sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" - (sources."passwd-user-2.1.0" // { - dependencies = [ - sources."execa-0.4.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" - sources."pify-2.3.0" - ]; - }) + sources."passwd-user-3.0.0" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" @@ -78309,7 +79006,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -78340,6 +79037,7 @@ in sources."indent-string-2.1.0" ]; }) + sources."regenerator-runtime-0.13.3" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" @@ -78353,12 +79051,12 @@ in sources."tough-cookie-2.4.3" ]; }) - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."roarr-2.14.4" + sources."roarr-2.14.6" sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" @@ -78372,7 +79070,11 @@ in sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" sources."semver-truncate-1.1.2" - sources."serialize-error-5.0.0" + (sources."serialize-error-5.0.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -78501,6 +79203,7 @@ in dependencies = [ sources."cross-spawn-5.1.0" sources."execa-0.7.0" + sources."get-stream-3.0.0" ]; }) sources."text-table-0.2.0" @@ -78522,8 +79225,8 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.13.3" - sources."type-fest-0.8.1" + sources."twig-1.14.0" + sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" sources."unique-string-1.0.0" @@ -78559,12 +79262,7 @@ in sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.1" - (sources."windows-release-3.2.0" // { - dependencies = [ - sources."execa-1.0.0" - sources."get-stream-4.1.0" - ]; - }) + sources."windows-release-3.2.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -78585,7 +79283,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.6.0" // { + (sources."yeoman-environment-2.7.0" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 79ff0993092..f4cba080a61 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -157,13 +157,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.8.0" = { + "aws4-1.9.0" = { name = "aws4"; packageName = "aws4"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; }; }; "balanced-match-1.0.0" = { @@ -526,13 +526,13 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-json-stable-stringify-2.0.0" = { + "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "fill-range-4.0.0" = { @@ -1219,22 +1219,22 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "mime-db-1.40.0" = { + "mime-db-1.42.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.40.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; - sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; }; }; - "mime-types-2.1.24" = { + "mime-types-2.1.25" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.24"; + version = "2.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; - sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; }; }; "minimatch-3.0.4" = { @@ -1624,13 +1624,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.4.0" = { + "psl-1.6.0" = { name = "psl"; packageName = "psl"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; - sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz"; + sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA=="; }; }; "punycode-1.4.1" = { @@ -1714,13 +1714,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.12.0" = { + "resolve-1.14.1" = { name = "resolve"; packageName = "resolve"; - version = "1.12.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; - sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz"; + sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg=="; }; }; "resolve-dir-1.0.1" = { @@ -2497,7 +2497,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2608,7 +2608,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -2631,7 +2631,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -2671,8 +2671,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.9.0" @@ -2716,7 +2716,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -2725,7 +2725,7 @@ in ]; }) sources."request-2.88.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index 5858875a41a..71b35957832 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -85,13 +85,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.8.0" = { + "aws4-1.9.0" = { name = "aws4"; packageName = "aws4"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz"; + sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="; }; }; "balanced-match-1.0.0" = { @@ -292,13 +292,13 @@ let sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; }; }; - "fast-json-stable-stringify-2.0.0" = { + "fast-json-stable-stringify-2.1.0" = { name = "fast-json-stable-stringify"; packageName = "fast-json-stable-stringify"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; "findit-2.0.0" = { @@ -571,22 +571,22 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; - "mime-db-1.40.0" = { + "mime-db-1.42.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.40.0"; + version = "1.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; - sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; }; }; - "mime-types-2.1.24" = { + "mime-types-2.1.25" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.24"; + version = "2.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; - sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; }; }; "minimatch-3.0.4" = { @@ -841,13 +841,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "psl-1.4.0" = { + "psl-1.6.0" = { name = "psl"; packageName = "psl"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz"; - sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz"; + sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA=="; }; }; "punycode-1.4.1" = { @@ -895,13 +895,13 @@ let sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; }; }; - "resolve-1.12.0" = { + "resolve-1.14.1" = { name = "resolve"; packageName = "resolve"; - version = "1.12.0"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz"; - sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz"; + sha512 = "fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg=="; }; }; "retry-0.10.1" = { @@ -1276,7 +1276,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" + sources."aws4-1.9.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -1299,7 +1299,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" + sources."fast-json-stable-stringify-2.1.0" sources."findit-2.0.0" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -1339,8 +1339,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.42.0" + sources."mime-types-2.1.25" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."minipass-2.9.0" @@ -1384,7 +1384,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.4.0" + sources."psl-1.6.0" sources."punycode-2.1.1" sources."qs-6.5.2" (sources."readable-stream-2.3.6" // { @@ -1393,7 +1393,7 @@ in ]; }) sources."request-2.88.0" - sources."resolve-1.12.0" + sources."resolve-1.14.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix new file mode 100644 index 00000000000..f005421a6fc --- /dev/null +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: + +buildDunePackage { + pname = "alcotest-lwt"; + + inherit (alcotest) version src; + + propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + + doCheck = true; + + meta = alcotest.meta // { + description = "Lwt-based helpers for Alcotest"; + }; + +} diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index 2584c5ad8b3..ed216d8236a 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' mkdir $out/bin diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 8f1917d6873..b97c78a399b 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "biniou"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { - owner = "mjambon"; + owner = "ocaml-community"; repo = pname; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + rev = version; + sha256 = "0x2kiy809n1j0yf32l7hj102y628jp5jdrkbi3z7ld8jq04h1790"; }; propagatedBuildInputs = [ easy-format ]; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index b5a4f179b17..7b8103efac8 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -45,7 +45,7 @@ EOF createFindlibDestdir = true; - buildFlags = "all"; + buildFlags = [ "all" ]; doCheck = true; checkTarget = "tests"; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index d0bc2f5a375..7de8968e061 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -8,14 +8,14 @@ let url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; patches = []; - installTargets = "install-findlib"; + installTargets = [ "install-findlib" ]; } else { version = "1.05"; download_id = "1037"; url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; patches = [./makefile_1_05.patch]; - installTargets = "install"; + installTargets = [ "install" ]; }; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { --subst-var-by ZLIB_INCLUDE "${zlib.dev}/include" ''; - buildFlags = "all allopt"; + buildFlags = [ "all" "allopt" ]; inherit (param) installTargets; diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix index 99f101010f3..24547a03a08 100644 --- a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix +++ b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix @@ -19,7 +19,7 @@ buildOcaml rec { ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ]; propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ]; - buildFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/mirage/ocaml-cohttp; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 39234e86ef1..22538b87f6a 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchFromGitHub, buildDunePackage -, ppx_sexp_conv -, astring, ipaddr, uri +, ppx_sexp_conv, sexplib +, astring, ipaddr, macaddr, uri, }: buildDunePackage rec { pname = "conduit"; - version = "1.0.0"; + version = "1.4.0"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-conduit"; - rev = "v${version}"; - sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; - }; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-conduit"; + rev = "v${version}"; + sha256 = "1qzamqcmf9ywz04bkwrv17mz9j6zq2w9h1xmnjvp11pnwrs2xq8l"; + }; - buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr uri ]; + buildInputs = [ ppx_sexp_conv ]; + propagatedBuildInputs = [ astring ipaddr macaddr sexplib uri ]; - meta = { - description = "Network connection library for TCP and SSL"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; + meta = { + description = "Network connection library for TCP and SSL"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; + inherit (src.meta) homepage; + }; } diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix new file mode 100644 index 00000000000..716e40e16e9 --- /dev/null +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, autoconf }: + +buildDunePackage rec { + pname = "cpu"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = pname; + rev = "v${version}"; + sha256 = "1vir6gh1bhvxgj2fcn69c38yhw3jgk7dyikmw789m5ld2csnyjiv"; + }; + + preConfigure = '' + autoconf + autoheader + ''; + + buildInputs = [ autoconf ]; + + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Core pinning library"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 50857e159dd..1c7a0ccb0fa 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ocamlbuild ncurses ]; propagatedBuildInputs = [ param.zarith zlib ]; - buildFlags = "setup.data build"; + buildFlags = [ "setup.data" "build" ]; preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index bfddc8d1c66..05a18612804 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "csv"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; - sha256 = "1llwjdi14vvfy4966crapibq0djii71x47b0yxhjcl5jw4xnsaha"; + sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; }; meta = { diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index dc6b1751283..9bcf4fc411f 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 26876cad8c8..824da303068 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ menhir ]; - makeFlags = "-C src"; + makeFlags = [ "-C" "src" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 87d9ac7a324..16a9f96798c 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "dtoa"; - version = "0.3.1"; + version = "0.3.2"; minimumOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn"; + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix new file mode 100644 index 00000000000..d84c21565db --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, dune_2, dune-private-libs }: + +buildDunePackage rec { + pname = "dune-configurator"; + + inherit (dune_2) src version; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dune-private-libs ]; + + meta = with lib; { + description = "Helper library for gathering system configuration"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix new file mode 100644 index 00000000000..1c3503f11a1 --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -0,0 +1,15 @@ +{ lib, buildDunePackage, dune_2 }: + +buildDunePackage rec { + pname = "dune-private-libs"; + + inherit (dune_2) src version; + + dontAddPrefix = true; + + meta = with lib; { + description = "Private libraries of Dune"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 1abf387bdd3..62e63592566 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { make ''; - makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib"; + makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; meta = { homepage = http://dypgen.free.fr; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 4f586f2f99e..ce17cc60ebf 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml fontconfig ]; - makeFlags = "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/ OCAML_HAVE_OCAMLOPT=yes"; + makeFlags = [ + "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/" + "OCAML_HAVE_OCAMLOPT=yes" + ]; meta = { description = "Fontconfig bindings for OCaml"; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index 39ec4c011f8..979c364e496 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }) ]; - makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)"; + makeFlags = [ "PREFIX=$(out)" "OCAML_SITE=$(OCAMLFIND_DESTDIR)" ]; postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META"; } diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index a174bd6a8b1..cc99b726e6e 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,28 +1,27 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg -, bos, cmdliner, ocamlgraph +{ stdenv, fetchurl, buildDunePackage, alcotest, cmdliner +, rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "functoria is not available for OCaml ${ocaml.version}" else +buildDunePackage rec { + pname = "functoria"; + version = "3.0.3"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-functoria-${version}"; - version = "2.0.2"; - src = fetchurl { - url = "https://github.com/mirage/functoria/releases/download/${version}/functoria-${version}.tbz"; - sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747"; - }; + minimumOCamlVersion = "4.04"; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; - propagatedBuildInputs = [ bos cmdliner ocamlgraph ]; + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "08wv2890gz7ci1fa2b3z4cvqf98nqb09f89y08kcmnsirlbbzlfh"; + }; - inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; + checkInputs = [ alcotest ]; - meta = { - description = "A DSL to organize functor applications"; - homepage = https://github.com/mirage/functoria; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - }; + doCheck = true; + + meta = with stdenv.lib; { + description = "A DSL to organize functor applications"; + homepage = https://github.com/mirage/functoria; + license = licenses.isc; + maintainers = [ maintainers.vbgl ]; + }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index c8b29759b97..18b5fb39776 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib ]; - installTargets = "ocamlfind-install"; + installTargets = [ "ocamlfind-install" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix new file mode 100644 index 00000000000..b1141f814a8 --- /dev/null +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage, fmt, logs }: + +buildDunePackage rec { + pname = "index"; + version = "1.0.1"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; + sha256 = "1006wr3g21s4j2vsd73gphhkrh1fy4swh6gqvlsa9c6q7vz9wbvz"; + }; + + propagatedBuildInputs = [ fmt logs ]; + + meta = { + homepage = "https://github.com/mirage/index"; + description = "A platform-agnostic multi-level index"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 3d5959fe64e..be76e413c36 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, buildDunePackage, sexplib, ppx_sexp_conv }: +{ lib, buildDunePackage +, macaddr, ounit +}: buildDunePackage rec { pname = "ipaddr"; - version = "2.8.0"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/archive/${version}.tar.gz"; - sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; - }; + inherit (macaddr) version src; + + buildInputs = [ ounit ]; + + propagatedBuildInputs = [ macaddr ]; - propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; + doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/mirage/ocaml-ipaddr; description = "A library for manipulation of IP (and MAC) address representations "; license = licenses.isc; - maintainers = [ maintainers.ericbmerritt ]; + maintainers = with maintainers; [ alexfmpe ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/irmin-watcher/default.nix b/pkgs/development/ocaml-modules/irmin-watcher/default.nix new file mode 100644 index 00000000000..55dc9ca866b --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin-watcher/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, buildDunePackage +, astring, fmt, logs, ocaml_lwt +}: + +buildDunePackage rec { + pname = "irmin-watcher"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/mirage/irmin-watcher/releases/download/${version}/irmin-watcher-${version}.tbz"; + sha256 = "00d4ph4jbsw6adp3zqdrwi099hfcf7p1xzi0685qr7bgcmandjfv"; + }; + + propagatedBuildInputs = [ astring fmt logs ocaml_lwt ]; + + meta = { + homepage = "https://github.com/mirage/irmin-watcher"; + description = "Portable Irmin watch backends using FSevents or Inotify"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/pkgs/development/ocaml-modules/irmin/1.4.nix new file mode 100644 index 00000000000..878160f4b0a --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/1.4.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, astring, cstruct, fmt, hex, jsonm, logs, ocaml_lwt, ocamlgraph, uri +}: + +buildDunePackage rec { + pname = "irmin"; + version = "1.4.0"; + + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "019di4cz0z65knl232rnwj26npnc1mqh8j71xbf0mav6x350g1w5"; + }; + + propagatedBuildInputs = [ astring cstruct fmt hex jsonm logs ocaml_lwt ocamlgraph uri ]; + + doCheck = true; + + meta = with lib; { + homepage = https://github.com/mirage/irmin; + description = "Irmin, a distributed database that follows the same design principles as Git"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/irmin/default.nix b/pkgs/development/ocaml-modules/irmin/default.nix new file mode 100644 index 00000000000..2db57671177 --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl, buildDunePackage +, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +, alcotest, hex +}: + +buildDunePackage rec { + + pname = "irmin"; + version = "2.0.0"; + + minimumOCamlVersion = "4.06"; + + src = fetchurl { + url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; + sha256 = "09qffvgi5yrm3ghiywlbdhjly8xb5x5njnan213q8j033fzmf2dr"; + }; + + propagatedBuildInputs = [ astring base64 digestif fmt jsonm logs ocaml_lwt ocamlgraph uri ]; + + checkInputs = lib.optionals doCheck [ alcotest hex ]; + + doCheck = true; + + meta = { + homepage = "https://irmin.org/"; + description = "A distributed database built on the same principles as Git"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/irmin/fs.nix b/pkgs/development/ocaml-modules/irmin/fs.nix new file mode 100644 index 00000000000..b1987aa7cbc --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/fs.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, irmin, irmin-test }: + +buildDunePackage rec { + + pname = "irmin-fs"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ irmin ]; + + checkInputs = lib.optional doCheck irmin-test; + + doCheck = true; + + meta = irmin.meta // { + description = "Generic file-system backend for Irmin"; + }; + +} + + diff --git a/pkgs/development/ocaml-modules/irmin/git.nix b/pkgs/development/ocaml-modules/irmin/git.nix new file mode 100644 index 00000000000..bb28042a1f6 --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/git.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, git, irmin, irmin-mem, irmin-test, git-unix }: + +buildDunePackage rec { + + pname = "irmin-git"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ git irmin ]; + + checkInputs = lib.optionals doCheck [ git-unix irmin-mem irmin-test ]; + + doCheck = true; + + meta = irmin.meta // { + description = "Git backend for Irmin"; + }; + +} + diff --git a/pkgs/development/ocaml-modules/irmin/graphql.nix b/pkgs/development/ocaml-modules/irmin/graphql.nix new file mode 100644 index 00000000000..abcdc3d58dd --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }: + +buildDunePackage rec { + + pname = "irmin-graphql"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; + + doCheck = true; + + meta = irmin.meta // { + description = "GraphQL server for Irmin"; + }; + +} + + + diff --git a/pkgs/development/ocaml-modules/irmin/http.nix b/pkgs/development/ocaml-modules/irmin/http.nix new file mode 100644 index 00000000000..c8db6d563c9 --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/http.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine +, checkseum, git-unix, irmin-git, irmin-mem, irmin-test +}: + +buildDunePackage rec { + + pname = "irmin-http"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ cohttp-lwt irmin webmachine ]; + + checkInputs = lib.optionals doCheck [ checkseum git-unix irmin-git irmin-mem irmin-test ]; + + doCheck = true; + + meta = irmin.meta // { + description = "HTTP client and server for Irmin"; + }; + +} + + diff --git a/pkgs/development/ocaml-modules/irmin/mem.nix b/pkgs/development/ocaml-modules/irmin/mem.nix new file mode 100644 index 00000000000..b7040b9db0d --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/mem.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, irmin, irmin-test }: + +buildDunePackage rec { + + pname = "irmin-mem"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ irmin ]; + + checkInputs = lib.optional doCheck irmin-test; + + doCheck = true; + + meta = irmin.meta // { + description = "Generic in-memory Irmin stores"; + }; + +} diff --git a/pkgs/development/ocaml-modules/irmin/pack.nix b/pkgs/development/ocaml-modules/irmin/pack.nix new file mode 100644 index 00000000000..4eacc719cec --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/pack.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, alcotest-lwt, index, irmin, irmin-test }: + +buildDunePackage rec { + + pname = "irmin-pack"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ index irmin ]; + + checkInputs = lib.optionals doCheck [ alcotest-lwt irmin-test ]; + + doCheck = true; + + meta = irmin.meta // { + description = "Irmin backend which stores values in a pack file"; + }; + +} diff --git a/pkgs/development/ocaml-modules/irmin/test.nix b/pkgs/development/ocaml-modules/irmin/test.nix new file mode 100644 index 00000000000..57e33e2db8a --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/test.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, alcotest, cmdliner, irmin, metrics-unix, mtime }: + +buildDunePackage { + + pname = "irmin-test"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ alcotest cmdliner irmin metrics-unix mtime ]; + + meta = irmin.meta // { + description = "Irmin test suite"; + }; + +} diff --git a/pkgs/development/ocaml-modules/irmin/unix.nix b/pkgs/development/ocaml-modules/irmin/unix.nix new file mode 100644 index 00000000000..5793678bfcf --- /dev/null +++ b/pkgs/development/ocaml-modules/irmin/unix.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage +, checkseum, cmdliner, git-unix, yaml +, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http, irmin-mem, irmin-pack, irmin-watcher +, irmin-test +}: + +buildDunePackage rec { + + pname = "irmin-unix"; + + inherit (irmin) version src; + + propagatedBuildInputs = [ checkseum cmdliner git-unix yaml + irmin irmin-fs irmin-git irmin-graphql irmin-http irmin-mem irmin-pack irmin-watcher + ]; + + checkInputs = lib.optional doCheck irmin-test; + + doCheck = true; + + meta = irmin.meta // { + description = "Unix backends for Irmin"; + }; + +} + diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index ae85847b58b..847322b1a10 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildFlags = "lib libopt glut glutopt"; + buildFlags = [ "lib" "libopt" "glut" "glutopt" ]; postInstall = '' cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index d0349de4db3..e2ebb76397c 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = "world"; + buildFlags = [ "world" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 217af54040f..46b76abd268 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; - buildFlags = "world"; + buildFlags = [ "world" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index fff4cff7802..b74501fdd68 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib" ]; - buildFlags = "ocaml_all"; + buildFlags = [ "ocaml_all" ]; - installFlags = "-C bindings/ocaml"; + installFlags = [ "-C" "bindings/ocaml" ]; postInstall = '' mkdir -p $OCAMLFIND_DESTDIR/ diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index 4ad6fc2c471..3cf4541aa01 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,9 +1,21 @@ -{ buildDunePackage, lwt, ppx_tools_versioned }: +{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }: buildDunePackage { pname = "lwt_ppx"; + version = "1.2.4"; + + src = fetchzip { + # `lwt_ppx` has a different release cycle than Lwt, but it's included in + # one of its release bundles. + # Because there could exist an Lwt release _without_ a `lwt_ppx` release, + # this `src` field doesn't inherit from the Lwt derivation. + # + # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, + # as new Lwt releases may contain broken `lwt_ppx` code. + url = "https://github.com/ocsigen/lwt/archive/4.4.0.tar.gz"; + sha256 = "1l97zdcql7y13fhaq0m9n9xvxf712jg0w70r72fvv6j49xm4nlhi"; + }; - inherit (lwt) src version; propagatedBuildInputs = [ lwt ppx_tools_versioned ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix new file mode 100644 index 00000000000..7061fdf5d5b --- /dev/null +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, ppx_sexp_conv +}: + +buildDunePackage rec { + pname = "macaddr"; + version = "3.1.0"; + + minimumOCamlVersion = "4.04"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-ipaddr/archive/v${version}.tar.gz"; + sha256 = "1hi3v5dzg6h4qb268ch3h6v61gsc8bv21ajhb35z37v5nsdmyzbh"; + }; + + propagatedBuildInputs = [ ppx_sexp_conv ]; + + doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency + + meta = with lib; { + homepage = https://github.com/mirage/ocaml-ipaddr; + description = "A library for manipulation of MAC address representations"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index cd9d9f2d150..da68c811df1 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ ''; - makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo"; + makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; meta = { homepage = http://cairographics.org/cairo-ocaml; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 1c09edf3a7e..50c63ef718a 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ocaml findlib ]; - installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 8c8d4519249..a1e524a8642 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocurl-0.8.2"; + name = "ocurl-0.9.0"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9"; + sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index efdd2a28412..12cd5436308 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "owl-base"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "owlbarn"; repo = "owl"; rev = version; - sha256 = "1v4jfn3w18zq188f9gskx9ffja3xx59j2mgrw6azp8lsbqixg5xk"; + sha256 = "1a2lbhywrb3bmm4k48wwbp6iszpd3aj1f23v10i78cbqm5slk6dj"; }; propagatedBuildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index eedfdba34ed..0cc1c1db42a 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -10,5 +10,5 @@ buildDunePackage rec { checkInputs = [ alcotest ]; propagatedBuildInputs = [ eigen stdio stdlib-shims openblasCompat owl-base ]; - # tests not enabled for now due to owlbarn/owl/issues/460 + doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 } diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix new file mode 100644 index 00000000000..0a4fc9ecea4 --- /dev/null +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildDunePackage, fetchFromGitHub, ocamlnet, cpu }: + +buildDunePackage rec { + pname = "parany"; + version = "8.0.0"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = pname; + rev = "v${version}"; + sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm"; + }; + + propagatedBuildInputs = [ ocamlnet cpu ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Generalized map/reduce for multicore computing"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.lgpl2; + }; +} diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 899806c4dae..d618f90e541 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; dontBuild = true; - installFlags = "-C src"; + installFlags = [ "-C" "src" ]; meta = with stdenv.lib; { homepage = http://gallium.inria.fr/~fpottier/pprint/; diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 5d45ee90c2e..b09ff9c7f22 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_gen_rec"; - version = "1.0.0"; + version = "1.1.0"; minimumOCamlVersion = "4.01"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "0qy0wa3rd5yh1612jijadi1yddfslpsmmmf69phi2dhr3vmkhza7"; + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0fwi4bknq8h9zgpsarjvnzdm9bm8qlyyw0lz30pihg02aiiljqbh"; }; buildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix index 3b61a651263..75d1e57765e 100644 --- a/pkgs/development/ocaml-modules/ppxfind/default.nix +++ b/pkgs/development/ocaml-modules/ppxfind/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: +{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: buildDunePackage (rec { pname = "ppxfind"; @@ -12,6 +12,9 @@ buildDunePackage (rec { buildInputs = [ ocaml-migrate-parsetree ]; + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; + meta = { homepage = "https://github.com/diml/ppxfind"; description = "ocamlfind ppx tool"; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 57f1a832f56..485620514e4 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - installFlags = "LIBDIR=$(OCAMLFIND_DESTDIR)"; + installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index b797af0a702..0223d4f59ff 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -2,10 +2,10 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.03" - then { - version = "0.6.1"; - url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6.1/rope-0.6.1.tbz"; - sha256 = "1zqh28jz1zjb0l354wi1046qpkwmk582ssz0gsqh6d44wpspdxk2"; + then rec { + version = "0.6.2"; + url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; + sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i"; buildInputs = [ dune ]; extra = { buildPhase = "dune build -p rope"; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index d40ce19a8fd..579d3da81e3 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-rresult-${version}"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild topkg ]; + propagatedBuildInputs = [ result ]; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 0b8f83a1ea3..a36d84ffa3a 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,26 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune }: +{ stdenv, fetchFromGitHub, buildDunePackage }: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "stdint"; - name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "0.5.1"; + version = "0.6.0"; + src = fetchFromGitHub { owner = "andrenth"; repo = "ocaml-stdint"; rev = version; - sha256 = "0z2z77m3clna9m9k0f8fd1400cdlglvy1kr893qs3907b3v0c057"; + sha256 = "19ccxs0vij81vyc9nqc9kbr154ralb9dgc2y2nr71a5xkx6xfn0y"; }; - buildInputs = [ ocaml findlib dune ]; - - buildPhase = "dune build -p ${pname}"; - inherit (dune) installPhase; - meta = { description = "Various signed and unsigned integers for OCaml"; + homepage = "https://github.com/andrenth/ocaml-stdint"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.gebner ]; - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 207a7b183e6..940f6cf5107 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { dontBuild = true; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index ed868c30a44..d32fcf07b6c 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ camlp4 ]; - buildFlags = "all all.opt"; + buildFlags = [ "all" "all.opt" ]; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 4c820d13808..420cb30bb94 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "wtf8"; - version = "1.0.1"; + version = "1.0.2"; minimumOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq"; + url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "09ygcxxd5warkdzz17rgpidrd0pg14cy2svvnvy1hna080lzg7vp"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix new file mode 100644 index 00000000000..31790755357 --- /dev/null +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, ppx_sexp_conv +, bos, ctypes, fmt, logs, rresult, sexplib +}: + +buildDunePackage rec { + pname = "yaml"; + version = "2.0.1"; + + src = fetchurl { + url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz"; + sha256 = "1r8jj572h416g2zliwmxj2j9hkv73nxnpfb9gmbj9gixg24lskx0"; + }; + + propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ]; + + meta = { + description = "Parse and generate YAML 1.1 files"; + homepage = "https://github.com/avsm/ocaml-yaml"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 24942da0072..dca97a53cbf 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -15,7 +15,7 @@ let extra = { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = "mkdir $out/bin"; }; diff --git a/pkgs/development/perl-modules/timedate-2020.patch b/pkgs/development/perl-modules/timedate-2020.patch new file mode 100644 index 00000000000..ea4d8307f03 --- /dev/null +++ b/pkgs/development/perl-modules/timedate-2020.patch @@ -0,0 +1,12 @@ +Index: TimeDate-2.30/t/getdate.t +=================================================================== +--- TimeDate-2.30.orig/t/getdate.t ++++ TimeDate-2.30/t/getdate.t +@@ -156,7 +156,7 @@ Jul 22 10:00:00 UTC 2002 ;102733200 + !; + + require Time::Local; +-my $offset = Time::Local::timegm(0,0,0,1,0,70); ++my $offset = Time::Local::timegm(0,0,0,1,0,1970); + + @data = split(/\n/, $data); diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 2cdab404c5f..cd1435d6599 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index f94ee8d7637..8ce33e67efe 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure avahi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 846fb7e3730..7524823a5dc 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 54f99bf8afc..1a006c9eb8f 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "A simple utility for literate programming and documenting source code written in the Pure programming language"; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index ebd13743442..e41110386d7 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure fcgi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 74ec8e49343..e1c1b4d2d4b 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure faust libtool ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index efea0b4182c..4d019b5b699 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libffi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 22bbb4d3be4..54ac78fd6c4 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]); nativeBuildInputs = [ pkgconfig ]; buildInputs = [ hsEnv pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; meta = { description = "Pure interface generator"; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index b67a972b00b..34c13f99f92 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ + "libdir=${placeholder ''out''}/lib" + "prefix=${placeholder ''out''}/" + ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 34d12f1471f..838e81b20ba 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure glpkWithExtras ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index d1657cdd445..c45f51509b7 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gnuplot ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 08aa674eb6b..847fe7538e9 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure gsl ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index a6a93f9ec95..1e7957ae382 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure pure-ffi gtk2 ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 2dd0865f6ea..94ceef78908 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure liblo ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 7f3638fe5c9..c0f50812946 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ]; - makeFlags = "CFLAGS=-I${lilv}/include/lilv-0 libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 98556acbf28..b4a63eb7020 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure lv2 ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index 950c536e760..e55d4994455 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure portmidi ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 63196fadf46..59617beb461 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 8fbb1dac320..e117d04a4cc 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure octave ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 4ae1e58a7bc..69808d1aaf0 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libiodbc ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index d5b0a7dbde5..17a16229b57 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pure ]; propagatedBuildInputs = [ pandoc gawk getopt ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; preInstall = '' mkdir -p $out/bin mkdir -p $out/share/man/man1 diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 20d61e5c362..547610fdf01 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index a6bb2ed6167..d145788c552 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure readline ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 235478a1776..aa8245bb12d 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index 91ff3a446c2..aa3b2544af0 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure sqlite ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 8c39b9791e0..b248a0084ff 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index dd7a945182b..d29719891d2 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 03e322d74c0..d939a3b3ad4 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure tcl tk xlibsWrapper ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index 8e268611035..73753a5d34f 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure libxml2 libxslt ]; - makeFlags = "libdir=$(out)/lib prefix=$(out)/"; + makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ]; setupHook = ../generic-setup-hook.sh; meta = { diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 97b35257820..ef86aedc527 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -11,14 +11,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytest freezegun glibcLocales ]; + checkInputs = [ pytest freezegun ]; doCheck = !stdenv.isDarwin; - preCheck = '' - export LC_ALL="en_US.UTF-8" - ''; - meta = with lib; { homepage = http://babel.edgewall.org; description = "A collection of tools for internationalizing Python applications"; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 3e3d90f09d2..22093f0258a 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -1,24 +1,29 @@ -{ buildPythonPackage, fetchPypi, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: buildPythonPackage rec { pname = "JPype1"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1630439d5b0fb49e2878b43a1a1f074f9d4f46520f525569e14f1f0f9399f871"; + sha256 = "c16d01cde9c2c955d76d45675e64b06c3255784d49cea4147024e99a01fbbb18"; }; - patches = [ ./set-compiler-language.patch ]; + checkInputs = [ + pytest + ]; - checkInputs = [ pytest ]; - - # ImportError: Failed to import test module: test.testlucene + # required openjdk (easy) but then there were some class path issues + # when running the tests doCheck = false; - meta = { - homepage = "https://github.com/originell/jpype/"; - license = "License :: OSI Approved :: Apache Software License"; - description = "A Python to Java bridge."; + meta = with lib; { + homepage = https://github.com/originell/jpype/; + license = licenses.asl20; + description = "A Python to Java bridge"; }; } diff --git a/pkgs/development/python-modules/JPype1/set-compiler-language.patch b/pkgs/development/python-modules/JPype1/set-compiler-language.patch deleted file mode 100644 index 1d5921a6ffa..00000000000 --- a/pkgs/development/python-modules/JPype1/set-compiler-language.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2017-01-12 19:08:44.000000000 -0500 -+++ b/setup.py 2018-02-15 12:28:16.000000000 -0500 -@@ -123,7 +123,7 @@ - - # extra compile args - copt = {'msvc': ['/EHsc'], -- 'unix' : ['-ggdb'], -+ 'unix' : ['-ggdb', '-x', 'c++'], - 'mingw32' : [], - } - # extra link args diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index a423945b0ce..dd1cc819ad6 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -1,16 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, JPype1 }: +{ lib +, buildPythonPackage +, fetchPypi +, JPype1 +}: buildPythonPackage rec { pname = "JayDeBeApi"; version = "1.1.1"; + src = fetchPypi { inherit pname version; sha256 = "0a189xs9zw81jvwwglvf2qyqnk6ra0biljssx9n4ffayqn9glbds"; }; - propagatedBuildInputs = [ JPype1 ]; - meta = { - homepage = "https://github.com/baztian/jaydebeapi"; - license = lib.licenses.lgpl2; - description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API."; + + propagatedBuildInputs = [ + JPype1 + ]; + + meta = with lib; { + homepage = https://github.com/baztian/jaydebeapi; + license = licenses.lgpl2; + description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API"; }; } diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index cb0986e1d7f..38636c9e31d 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.4.2"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "15v2sqm5g12bqa0c7wikfh9ck2nl97ayizy1hpqhmws5gqalq748"; + sha256 = "98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index b57d33a87ec..867c771350c 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Rtree"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "140j1vsbcj6sivq1b6pgkwm0czivx2x3d66mqq0d9ymg46njrzn9"; + sha256 = "55c046a98e8d84235792de1f18635f680d7b4085264fbced6b073f28fcbe353a"; }; propagatedBuildInputs = [ libspatialindex ]; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 554eaf97791..67600a6e5fd 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -35,7 +35,11 @@ let ''; # Theano spews warnings and disabled flags if the compiler isn't named g++ - cxx_compiler = wrapped "g++" "\\$HOME/.theano" + cxx_compiler_name = + if stdenv.cc.isGNU then "g++" else + if stdenv.cc.isClang then "clang++" else + throw "Unknown C++ compiler"; + cxx_compiler = wrapped cxx_compiler_name "\\$HOME/.theano" ( stdenv.lib.optional cudaSupport libgpuarray_ ++ stdenv.lib.optional cudnnSupport cudnn ); diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 5b0b9d19570..e7a2f120c1b 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "d9129186431e150d7fe455f1cb1ecbb92bb5dba9da9bc3ef7b012d98c4db2526"; + sha256 = "75e737d6ce7723d9ff9b7aa1ba3233c34be62ef18d5859e706b8fdc828989830"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 3cd6277a3fa..8db47220543 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, +{ lib +, buildPythonPackage +, fetchFromGitHub +, pamqp +, pytest +, asynctest +, pyrabbit2 +, isPy27 }: buildPythonPackage rec { pname = "aioamqp"; - version = "0.13.0"; + version = "0.14.0"; + disabled = isPy27; - meta = { - homepage = https://github.com/polyconseil/aioamqp; - description = "AMQP implementation using asyncio"; - license = lib.licenses.bsd3; + src = fetchFromGitHub { + owner = "Polyconseil"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; }; - src = fetchPypi { - inherit pname version; - sha256 = "ced0d2bb0054809b37b0636da34fc7cda23d66943fb5f9f0610555988cf347b2"; - }; + propagatedBuildInputs = [ + pamqp + ]; + + checkInputs = [ + pytest + asynctest + pyrabbit2 + ]; - disabled = pythonOlder "3.3"; + # tests assume rabbitmq server running + doCheck = false; + + meta = with lib; { + homepage = https://github.com/polyconseil/aioamqp; + description = "AMQP implementation using asyncio"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; } diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix new file mode 100644 index 00000000000..38fdf14164e --- /dev/null +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestrunner +, pytest +, pytest-asyncio +, contextvars +, sqlalchemy +, isPy27 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocontextvars"; + version = "0.2.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "fantix"; + repo = pname; + rev = "v${version}"; + sha256 = "0a2gmrm9csiknc8n3si67sgzffkydplh9d7ga1k87ygk2aj22mmk"; + }; + + buildInputs = [ + pytestrunner + ]; + + checkInputs = [ + pytest + pytest-asyncio + ]; + + propagatedBuildInputs = [ + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Asyncio support for PEP-567 contextvars backport"; + homepage = https://github.com/fantix/aiocontextvars; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 5be6f9d86fd..dee85117406 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "2.4.2"; + version = "2.6.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e43e0fd628506f95752e90ab1579e5495183cc3c46915d0b0a062975cb5d181b"; + sha256 = "139d1d348fcfe2f34926a210a32dff069935d17167c4e1cb66e8b039cbb4d6c1"; }; propagatedBuildInputs = [ attrs protobuf zeroconf ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index f898c9313e1..d6487c8157b 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, attrs }: buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.2.2"; + version = "0.3.3"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"; + sha256 = "21974ce5d782c426ddbf7bdfc5e602a38783b1ee839a4a0ed0990240e2e123b5"; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ aiohttp attrs ]; # Checks needs internet access doCheck = false; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 6ac46b744a5..40dec3e1c1e 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -51,6 +51,7 @@ buildPythonPackage rec { and not connector \ and not client_disconnect \ and not handle_keepalive_on_closed_connection \ + and not proxy_https_bad_response \ and not partially_applied_handler \ and not middleware" \ --ignore=test_connector.py diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 258d5f10c95..ede51da9ef1 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "1.9.2"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "a7e545ae17658c10f2c5321e40b85426a8c284e5b33b5dfbe9171f9bdf37aa3e"; + sha256 = "d95e51f15c442d769004774e7b4220155e32dc6c8ae834b035a2f0d8ff783ff0"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix new file mode 100644 index 00000000000..891e9f216ce --- /dev/null +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pymysql +, pytest +, isPy27 +}: + +buildPythonPackage rec { + pname = "aiomysql"; + version = "0.0.20"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = "v${version}"; + sha256 = "1mxih81zc2k64briirpp5wz4f72l8v05avfyfibaq9fr6lcbih9b"; + }; + + propagatedBuildInputs = [ + pymysql + ]; + + checkInputs = [ + pytest + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "PyMySQL>=0.9,<=0.9.2" "PyMySQL" + ''; + + checkPhase = '' + pytest + ''; + + # tests require mysql database + doCheck = false; + + meta = with lib; { + description = "MySQL driver for asyncio"; + homepage = https://github.com/aio-libs/aiomysql; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix new file mode 100644 index 00000000000..1032485e980 --- /dev/null +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, aiounittest +, isPy27 +, pytest +}: + +buildPythonPackage rec { + pname = "aiosqlite"; + version = "0.11.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jreese"; + repo = pname; + rev = "v${version}"; + sha256 = "0pmkp4iy738yv2sl08kvhd0ma6wjqbmfnwid72gvg4zqsr1hnn0z"; + }; + + buildInputs = [ + setuptools + ]; + + checkInputs = [ + aiounittest + ]; + + meta = with lib; { + description = "Asyncio bridge to the standard sqlite3 module"; + homepage = https://github.com/jreese/aiosqlite; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix new file mode 100644 index 00000000000..743600a0d3b --- /dev/null +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, coverage +, isPy27 +}: + +buildPythonPackage rec { + pname = "aiounittest"; + version = "1.3.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "kwarunek"; + repo = pname; + rev = version; + sha256 = "0mlic2q49cb0vv62mixy4i4x8c91qb6jlji7khiamcxcg676nasl"; + }; + + checkInputs = [ + nose + coverage + ]; + + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Test asyncio code more easily"; + homepage = https://github.com/kwarunek/aiounittest; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index da958cd8d97..72e7ae6417a 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.2.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "9f907d7e8b286a1cfb22db9084f9ce4fde7ad7956bb496dc7c952e10ac90e36a"; + sha256 = "3b0cb1948833e062f4048992fbc97ecfaaaac24aaa0d83a1202a99fb58af8c6d"; }; buildInputs = [ pytest pytestcov mock coverage ]; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 344a724756e..9cb362a7bd1 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , entrypoints , glibcLocales , ipython @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "3.2.0"; + version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "098macm0sw54xqijdy1c8cppcgw79wn52qdc71qqb51nibc17gls"; + sha256 = "92dcd7b84c715f8e02bbdf37e36193a4af8138b5b064c05f237e6ed41573880a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index e3d32e6a069..5041ee54e4f 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -1,18 +1,21 @@ { stdenv , buildPythonPackage , fetchPypi +, h5py , nose }: buildPythonPackage rec { - version = "1.16.2"; + version = "1.16.3"; pname = "annoy"; src = fetchPypi { inherit pname version; - sha256 = "41348e813fe7125eda3e2229a075eba3d065173ba6c5f20c545bb9c2932633fa"; + sha256 = "fe2779664bd8846f2d67191a7e6010b8df890ac4586336748fd0697f31654379"; }; + nativeBuildInputs = [ h5py ]; + checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 50addec97c2..62c9b33d5e3 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -11,13 +11,15 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "4.1.1a0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00mw56a3lmdb5xvrzhahrzqv3wvxfz0mxl4n0qbkxzggf2pg0i8d"; + sha256 = "eb925d8682d70563ccb80e2aca7b3edf84fb0b768cea3edc6846aac7abdc414a"; }; + format = "pyproject"; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]; checkInputs = [ nose ]; @@ -31,10 +33,11 @@ buildPythonPackage rec { # give a hint to setuptools_scm on package version preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" + export HOME=$(mktemp -d) ''; checkPhase = '' - PATH=$out/bin:$PATH HOME=$(mktemp -d) nosetests test + PATH=$out/bin:$PATH nosetests test ''; meta = with lib; { @@ -42,5 +45,6 @@ buildPythonPackage rec { description = "Best practices checker for Ansible"; license = licenses.mit; maintainers = [ maintainers.sengaya ]; + broken = true; # requires new flit to build }; } diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 638b2c2baa3..712944568f2 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -1,26 +1,25 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , substituteAll , fetchpatch , nose , six +, withGraphviz ? true , graphviz , fontconfig }: buildPythonPackage rec { pname = "anytree"; - version = "2.7.2"; + version = "2.7.3"; - src = fetchFromGitHub { - owner = "c0fec0de"; - repo = pname; - rev = version; - sha256 = "0ag5ir9h5p7rbm2pmpxlkflwigrm7z4afh24jvbhqj7pyrbjmk9w"; + src = fetchPypi { + inherit pname version; + sha256 = "05736hamjv4f38jw6z9y4wckc7mz18ivbizm1s3pb0n6fp1sy4zk"; }; - patches = [ + patches = lib.optionals withGraphviz [ (substituteAll { src = ./graphviz.patch; inherit graphviz; @@ -35,11 +34,14 @@ buildPythonPackage rec { six ]; - # Fontconfig error: Cannot load default config file - preCheck = '' + # tests print “Fontconfig error: Cannot load default config file” + preCheck = lib.optionalString withGraphviz '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf ''; + # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree + doCheck = withGraphviz; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 217a921a634..1ed984fc718 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0rr32z9hbf8w4w1fs5gj2v0ixcq2vq7a3wssrlxagi5ii7ygap7y"; + sha256 = "24b8490c22310b0779a058ccb24ec2fef33d571bb5aba1f525ab5963b0eabcdd"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/area/default.nix b/pkgs/development/python-modules/area/default.nix new file mode 100644 index 00000000000..37d7369dbee --- /dev/null +++ b/pkgs/development/python-modules/area/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "area"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "18k5hwmlxhajlq306zxndsglb11vv8vd4vpmwx8dpvfxd1kbksya"; + }; + + # tests not working on the package from pypi + doCheck = false; + + meta = with lib; { + description = "Calculate the area inside of any GeoJSON geometry. This is a port of Mapbox’s geojson-area for Python."; + homepage = "https://github.com/scisco/area"; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index 9e64d2f65ff..472911340ad 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aresponses"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "d1d6ef52b9a97142d106688cf9b112602ef3dc66f6368de8f91f47241d8cfc9c"; + sha256 = "20a63536d86af6f31f9b0720c561bdc595b6bfe071940e347ab58b11caff9e1b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 1c0efb4da3b..6f978778f7d 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "ec88b5ccefe2d47d8f14916a006431d0afb756751ee5c46f28654a7d8a69be53"; + sha256 = "a37f522cf3b6a34abddfedb61c4546f60023b3799b22d1cd971eacdc0861530a"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 187e795416c..130a2c18917 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -12,11 +12,12 @@ buildPythonPackage rec { pname = "argon2_cffi"; - version = "19.1.0"; + version = "19.2.0"; src = fetchPypi { - inherit pname version; - sha256 = "81548a27b919861040cb928a350733f4f9455dd67c7d1ba92eb5960a1d7f8b26"; + pname = "argon2-cffi"; + inherit version; + sha256 = "ffaa623eea77b497ffbdd1a51e941b33d3bf552c60f14dbee274c4070677bda3"; }; propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index dc251ac2ab2..3a466170c77 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ase"; - version = "3.18.1"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "e21948dbf79011cc796d772885a8aafb255a6f365d112fe6a3bd26198c6cac7f"; + sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index c84672e8abc..3aa5a432c4b 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.18.1"; + version = "3.19.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0zxcdj61j9mxlgk2y4ax6rpml9gvmal8aa3pdmwwq4chyzdlh6g2"; + sha256 = "a8378ab57e91cfe1ba09b3639d8409bb7fc1a40b59479c7822d206e673ad93f9"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index ead16f986ca..dc6df10803f 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384"; + sha256 = "0bf4xxaig0b9dv6njynaqk2j7vlpagh3y49s9qj95y0jvjw5q8as"; }; # No tests included diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 21eeead88ca..e8ea8c37cd9 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,22 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }: buildPythonPackage rec { pname = "astor"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0qkq5bf13fqcwablg0nk7rx83izxdizysd42n26j5wbingcfx9ip"; + sha256 = "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka"; }; - # fix packaging for setuptools>=41.4 - patches = [ - ( fetchpatch { - url = "https://github.com/berkerpeksag/astor/pull/163/commits/bd697678674aafcf3f7b1c06af67df181ed584e2.patch"; - sha256 = "1m4szdyzalngd5klanmpjx5smgpc7rl5klky0lc0yhwbx210mla6"; - }) - ]; - # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 checkInputs = [ pytest ]; checkPhase = '' @@ -28,7 +20,7 @@ buildPythonPackage rec { and not test_codegen_from_root' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Library for reading, writing and rewriting python AST"; homepage = https://github.com/berkerpeksag/astor; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index fac97d2d368..93b2784902f 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "astropy-helpers"; - version = "3.2.2"; + version = "4.0.1"; disabled = !isPy3k; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cf32cb008b19597a1fe1a4d97f59734f30cd513aa3369a321e7b5b86cdb623fb"; + sha256 = "f1096414d108778218d6bea06d4d9c7b2ff7c83856a451331ac194e74de9f413"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index fce2ecd392a..c23c15e1d4d 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.2.3"; + version = "4.0"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "47f00816c2978fdd10f448c8f0337d6dca7b8cbeaab4bf272b5fd37cb4b890d3"; + sha256 = "404200e0baa84de09ac563ad9ccab3817e9b9669d0025cee74a8752f4bc2771b"; }; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 8dbb4da7060..56570295dee 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "astunparse"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67"; + sha256 = "5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872"; }; propagatedBuildInputs = [ six wheel ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index da222f7e615..3d225079441 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "1.18.0"; + version = "2.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1d9x7xpsqqd5scdk7f1c76lycgrxylaaf5qn4p46i8clfvm5a435"; + sha256 = "19d0b4c65115d09b42ed21c748884157babfb3055a6e130ea349dfdcbcef3380"; }; patches = [ diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index e21e04af6f5..d1ccef1ece4 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "bidict>=0.17,<0.18" "bidict" \ - --replace "more-itertools>=4.0,<5.0" "more-itertools" + --replace "more-itertools>=4.0,<8.0" "more-itertools" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index bcda2b4b617..c3d95f8915c 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "19.10.1"; + version = "19.11.1"; src = fetchPypi { inherit pname version; - sha256 = "734385b00547448b3f30a752cbfd2900d15924d77dc4a1699b8bce1ea8899f39"; + sha256 = "201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 5757b7fb15c..1d2ebdf2655 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.16"; + version = "0.12.19"; src = fetchPypi { inherit pname version; - sha256 = "df5380b96dc9c1b129e68057578e4a2d42d9b73a0ae97ff263a9072baf8f7a5e"; + sha256 = "1s729a8205jzg7pfw8xgmi850x03p9nw8c6a602f5bnmhha96h45"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix index 6b515b56713..a35a97c5e02 100644 --- a/pkgs/development/python-modules/awkward1/default.nix +++ b/pkgs/development/python-modules/awkward1/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward1"; - version = "0.1.28"; + version = "0.1.38"; src = fetchPypi { inherit pname version; - sha256 = "2269aca04c827549435e24f9976d27e904d02b74a30caa9a2a463225a8ba1609"; + sha256 = "1c87defa8c1661ffe36f8a785fa9a60ae3b70484984a935e710cd8cb1f763fd7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 0c16480e9c4..1f03ef8cb3b 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3 -, requests, click, configparser, fido2, isPy27 }: +, requests, requests-kerberos, click, configparser, fido2, isPy27 }: buildPythonPackage rec { pname = "aws-adfs"; - version = "1.20.0"; + version = "1.21.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1j18ffq5z8bcajavnlpbfhxrcadld5iv5gsfxg543yvdsp6hn2dg"; + sha256 = "ba96e71404474350b2c3ae4d5cb2dd25e9267b6d0680933c5711a51ea364e3bc"; }; # Relax version constraint @@ -24,7 +24,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ lxml boto3 requests click configparser fido2 ]; + propagatedBuildInputs = [ lxml boto3 requests requests-kerberos click configparser fido2 ]; meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 298ce22daa6..732d5fba528 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.16.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "0xvfbhiqdqy4qs4z8v2p7z3l01w5af948bmf400s5jsq2hnxl6nv"; + sha256 = "a62f31ac81a9f36a89ba61b147c5df5819e73af3562859711191354d86836326"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 8c421532288..c0ca6908586 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.4.2"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "ce4adb60fe67ebe91f2fc57d5067b4e44df6e233652987be4fb2e549688cf9fe"; + sha256 = "263a38f3920d9dc625e3acb92e6f6d300f4250b70f538bd009ce6e485676ab74"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix index 0b46506960c..b842a66cd27 100644 --- a/pkgs/development/python-modules/azure-common/default.nix +++ b/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.23"; + version = "1.1.24"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "53b1195b8f20943ccc0e71a17849258f7781bc6db1c72edc7d6c055f79bd54e3"; + sha256 = "184ad6a05a3089dfdc1ce07c1cbfa489bbc45b5f6f56e848cac0851e6443da21"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix new file mode 100644 index 00000000000..ee134762149 --- /dev/null +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, aiodns +, aiohttp +, msrest +, pytest +, pytestCheckHook +, requests +, six +, trio +, typing-extensions +}: + +buildPythonPackage rec { + version = "1.1.1"; + pname = "azure-core"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "00jm43gw89n446zdm18qziwd85lsx1gandxpmw62dc1bdnsfakxl"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + aiodns + aiohttp + msrest + pytest + pytestCheckHook + trio + typing-extensions + ]; + + pytestFlagsArray = [ "tests/" ]; + disabledTests = [ "response" "request" "timeout" ]; + + meta = with lib; { + description = "Microsoft Azure Core Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix new file mode 100644 index 00000000000..e4b894eca64 --- /dev/null +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -0,0 +1,53 @@ +{ buildPythonPackage +, fetchPypi +, isPy38 +, lib + +# pythonPackages +, azure-common +, azure-core +, azure-nspkg +, cryptography +, mock +, msal +, msal-extensions +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-identity"; + version = "1.1.0"; + disabled = isPy38; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + azure-nspkg + cryptography + mock + msal + msal-extensions + msrest + msrestazure + ]; + + # Requires checkout from mono-repo and a mock account: + # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/identity/tests.yml + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Identity Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix new file mode 100644 index 00000000000..34629e6eb48 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -0,0 +1,47 @@ +{ lib, buildPythonPackage, isPy27, fetchPypi +, aiohttp +, azure-common +, azure-core +, azure-nspkg +, cryptography +, msrest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "azure-keyvault-keys"; + version = "4.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1l1fwm8plzr5zbv02nlvs0i8ssmd88cxm5lb19i54b3scci77hiq"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + cryptography + ]; + + # requires relative paths to utilities in the mono-repo + doCheck = false; + checkInputs = [ aiohttp pytestCheckHook ]; + + pythonImportsCheck = [ + "azure" + "azure.core" + "azure.common" + "azure.keyvault" + "azure.keyvault.keys" + ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Keys Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix new file mode 100644 index 00000000000..fd3f3c0284f --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-nspkg/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, azure-nspkg +}: + +buildPythonPackage rec { + pname = "azure-keyvault-nspkg"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0hdnd6124hx7s16z1pssmq5m5mqqqz8s38ixl9aayv4wmf5bhs5c"; + }; + + propagatedBuildInputs = [ + azure-nspkg + ]; + + # Just a namespace package, no tests exist: + # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/keyvault/tests.yml + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Key Vault Namespace Package [Internal]"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix new file mode 100644 index 00000000000..e2b40c29d85 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-keyvault-secrets"; + version = "4.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "066p4x2ixasz6qbxss2ilchl73w1kh2nc32lgh8qygl3d90059lp"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + # requires checkout from mono-repo + doCheck = false; + + meta = with lib; { + description = "Microsoft Azure Key Vault Secrets Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 91f31ec0a01..b6f7f1d70d4 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,44 +1,36 @@ -{ lib -, buildPythonPackage -, python -, isPy3k -, fetchPypi -, azure-common -, azure-nspkg -, msrest -, msrestazure -, cryptography +{ lib, buildPythonPackage, isPy27, fetchPypi +, azure-keyvault-keys +, azure-keyvault-secrets }: buildPythonPackage rec { pname = "azure-keyvault"; - version = "1.1.0"; + version = "4.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49"; + sha256 = "e85f5bd6cb4f10b3248b99bbf02e3acc6371d366846897027d4153f18025a2d7"; }; propagatedBuildInputs = [ - azure-common - azure-nspkg - msrest - msrestazure - cryptography + azure-keyvault-keys + azure-keyvault-secrets ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - ''; - - # has no tests + # this is just a meta package, which contains keys and secrets doCheck = false; + pythonImportsCheck = [ + "azure.keyvault.keys" + "azure.keyvault.secrets" + ]; + meta = with lib; { description = "This is the Microsoft Azure Key Vault Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ mwilsoninsight ]; + maintainers = with maintainers; [ jonringer ]; }; } diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index bbee8b39993..da6d1639a13 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0cdbe0914aec544884ef681e31950efa548d9bec6d6dc354e00c3dbdab9e76e3"; + sha256 = "a53e9e09e2711ce9109329538fe9a8a1a5d0809efb231d7df481e55d09c4f02a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index b69e4b649de..de4a1338611 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -24,9 +24,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 2d98f57f1ba..5d1e3e6e3a9 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8fa3d3ac8a88ad6fd25f87966c27049864780d88b7b946d06da310d945a8772a"; + sha256 = "21fabdd393ba2ff1162a490cfa0d2b72a715da8462b1645bd986241137fc771f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index aef56be79c0..45542c8e9d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.9.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0y28z30g7y2pj7rfxyxmqpr19z24d01g9qhafvjxry748im1961h"; + sha256 = "3f6c1369903856864c7e4a05c2c261563153597172b182382d6332f3acd04016"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 7fc7c568301..93c294e4be9 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pc5pf7jpkpdrad5hafh2hki01dpx5773whp6kpxp71gh265mm5n"; + sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217"; }; propagatedBuildInputs = [ @@ -27,9 +27,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 546ec5ab840..756af164a71 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 89ae5912b39..0f1527f688b 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still needed for when the version is overrided + # to previous versions. E.g azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index c8b6ebfba63..789784babfb 100644 --- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.10.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "01gnrhwi3nswjdxk9fjjwbyyx83agpdksrksk0c4d7bm9p2871g6"; + sha256 = "cc844a152079e0d18fb5f47663a24cb204982925425c1fb51bac53894885000b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 82955674c4b..6cda959448c 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yq9s7a2ch8j84af3hzj350jnjq5s3ysiqvmypvcb7vl6rkkd2lm"; + sha256 = "55e129da3c3750cd5a26b91035990590a3f97aef4971de62d84de00f4fd6f1e4"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index e3529bda8d2..26918fbd7db 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still need when overriding to prevoius versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index d86b7f40d4b..90b45d0e3f0 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5d0c6b3a0f882dde8ae3d42467f03ea6c4e3f62613936087d54c67e6f504939b"; + sha256 = "b144e66cb8b947b871354edbcee15b78e107fb8f3a337d46d04cd8b73300741b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 87e70c2fdcc..328e81c8fe7 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index 5046bf8740f..b60a82a7b1a 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -24,9 +24,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # still needed when overriding to previous versions + # E.g. azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 4f2481097e1..8f9128a62a0 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { - version = "6.0.0"; + version = "7.0.0"; pname = "azure-mgmt-resource"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; + sha256 = "eaea8b5d05495d1b74220052275d46b6bed93b59245bcaa747279a52e41c3bdf"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 9c849829a12..03084e11cf3 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; + # this is still needed for overriding to previous versions + # E.g azure-cli postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py + rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py ''; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5a5a708a5dd..0929ca3ff5c 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.15.0"; + version = "0.16.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9"; + sha256 = "ddbdc29c1dca437275b0cb5a6fe2d86fa6886ccefb2270287357f07afe80a4ac"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index c2b172e6c49..552b1c88792 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "6.0.0"; + version = "7.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0pgmxr8shz6rmgbacfy1xb99y9ja38ck1lap0n58m6jjy1mgxk2w"; + sha256 = "7f5e6b18dee267c99f08f6a716a93173bbae433c8665f5c59153fb1a963bc105"; }; postInstall = if isPy3k then "" else '' diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index 7656e7c6376..02460b27952 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.1"; + version = "0.50.2"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0i8ls5h2ny12h9gnqwyq13ysvxgdq7b1kxirj4n58dfy94a182gv"; + sha256 = "836649d510aa2b7467bc87d8dab18f2db917b63aa2fe8f3e5d0bb44011e465f5"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/azure-servicefabric/default.nix b/pkgs/development/python-modules/azure-servicefabric/default.nix index 79d303a4652..19420b0526d 100644 --- a/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "6.5.0.0"; + version = "7.0.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "02q32rc3vmg3kpi92s2y2ic47s3mi9qjcvzvrpjdlzji8lhd9w45"; + sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix index 997682ca865..4ed52d333d6 100644 --- a/pkgs/development/python-modules/babelgladeextractor/default.nix +++ b/pkgs/development/python-modules/babelgladeextractor/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, isPy3k , buildPythonPackage , fetchPypi , Babel @@ -7,22 +8,21 @@ buildPythonPackage rec { pname = "babelgladeextractor"; - version = "0.6.1"; + version = "0.6.3"; src = fetchPypi { pname = "BabelGladeExtractor"; inherit version; extension = "tar.bz2"; - sha256 = "1jhs12pliz54dbnigib1h8ywfzsj1g32c1vhspvg46f5983nvf93"; + sha256 = "12i2i97wai5vv5h522rj6pfcdsfyrkgmjqc699m5v4af0yy3rqsq"; }; propagatedBuildInputs = [ Babel ]; - # Tests missing - # https://github.com/gnome-keysign/babel-glade/issues/5 - doCheck = false; + # SyntaxError: Non-ASCII character '\xc3' in file /build/BabelGladeExtractor-0.6.3/babelglade/tests/test_translate.py on line 20, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details + doCheck = isPy3k; meta = with lib; { homepage = "https://github.com/gnome-keysign/babel-glade"; diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 2a8b5e7960d..8cb84c02b37 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -4,23 +4,27 @@ , setuptools_scm , isPy3k , pytest +, pytest-black +, pytest-flake8 +, pytestcov }: buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.5"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a"; + sha256 = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"; }; - buildInputs = [ setuptools_scm ]; - - checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools_scm ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' - pytest + rm backports/functools_lru_cache.py + pytest -k 'not format' ''; # Test fail on Python 2 @@ -31,4 +35,4 @@ buildPythonPackage rec { homepage = https://github.com/jaraco/backports.functools_lru_cache; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix new file mode 100644 index 00000000000..64ef8ec53fa --- /dev/null +++ b/pkgs/development/python-modules/bandit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, fetchPypi +, lib +, isPy3k + +# pythonPackages +, GitPython +, pbr +, pyyaml +, six +, stevedore +}: + +buildPythonPackage rec { + pname = "bandit"; + version = "1.6.2"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0rb034c99pyhb4a60z7f2kz40cjydhm8m9v2blaal1rmhlam7rs1"; + }; + + propagatedBuildInputs = [ + GitPython + pbr + pyyaml + six + stevedore + ]; + + # Framework is Tox, tox performs 'pip install' inside the virtual-env + # and this requires Network Connectivity + doCheck = false; + + meta = { + description = "Security oriented static analyser for python code"; + homepage = "https://bandit.readthedocs.io/en/latest/"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix new file mode 100644 index 00000000000..c575dc516ff --- /dev/null +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -0,0 +1,38 @@ +{ enum-compat +, lib +, buildPythonPackage +, fetchFromGitHub +, nose +, python +}: + +buildPythonPackage rec { + pname = "bashlex"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "idank"; + repo = pname; + rev = version; + sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k"; + }; + + checkInputs = [ nose ]; + propagatedBuildInputs = [ enum-compat ]; + + # workaround https://github.com/idank/bashlex/issues/51 + preBuild = '' + ${python.interpreter} -c 'import bashlex' + ''; + + checkPhase = '' + ${python.interpreter} -m nose --with-doctest + ''; + + meta = with lib; { + description = "Python parser for bash"; + license = licenses.gpl3; + homepage = https://github.com/idank/bashlex; + maintainers = with maintainers; [ multun ]; + }; +} diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 430e7c3da8a..210fbbe2176 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.18"; + version = "0.5.19"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "86c453d827b8d6c3574ec306f6fadfc5028614e1cd46676841336e6787a7496a"; + sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f"; }; checkInputs = [ pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index c8e8c100616..1720738b169 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "beautifulsoup4"; - version = "4.8.1"; + version = "4.8.2"; src = fetchPypi { inherit pname version; - sha256 = "6135db2ba678168c07950f9a16c4031822c6f4aec75a65e0a97bc5ca09789931"; + sha256 = "05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index ec66124e3c7..6b7bad58bc4 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.2.4"; + version = "1.3.12"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "1mvp1mi1k6yqgyj7rxij8mlwclqlyfzq08s67v0qaycw44l68ifg"; + sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; }; propagatedBuildInputs = [ ]; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index a35c2d07394..727687c5e70 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "biopython"; - version = "1.75"; + version = "1.76"; src = fetchPypi { inherit pname version; - sha256 = "01lrm353si63anhhynf6hqbd3f753c2k8dkk953j3g6257py8q2h"; + sha256 = "0wlch9xpa0fpgjzyxi6jsfca6iakaq9a05927xg8vqnmvaccnwrq"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 3c84366c9d1..f119aedc4b8 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.2.0"; pname = "bitarray"; src = fetchPypi { inherit pname version; - sha256 = "0nv1283qcfilhnb4q6znlijply6lfxwpvp10cr0v33l0qwa86mwz"; + sha256 = "4f8706b651243c9faa981f075bcbdef2fab83e9b9bc9211ed2cb5849f9a68342"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index ddbb2f0d27e..08caabef3bd 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bjoern"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1ajmmfzr6fm8h8s7m69f2ffx0wk6snjvdx527hhj00bzn7zybnmn"; + sha256 = "01f3b601cf0ab0a9c7cb9c8f944ab7c738baaa6043ca82db20e9bd7a9be5767b"; }; buildInputs = [ libev ]; diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 86b253a72c9..1033f9def76 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -24,10 +24,9 @@ buildPythonPackage rec { substituteInPlace setup.py --replace ",<3dev" "" ''; - # Disable a test - # https://github.com/mozilla/bleach/issues/467 + # Disable network tests checkPhase = '' - pytest -k "not test_only_text_is_cleaned" + pytest -k "not protocols" ''; meta = { diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index c92f299f919..18f59b05288 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , fetchPypi , futures -, isPy3k +, isPy27 , isPyPy , jinja2 , lib @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "1.3.4"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0m27j29jpi977y95k272xc24qkl5bkniy046cil116hrbgnppng2"; + sha256 = "1rywd6c6hi0c6yg18j5zxssjd07a5hafcd21xr3q2yvp3aj3h3f6"; }; patches = [ @@ -39,7 +39,12 @@ buildPythonPackage rec { disabled = isPyPy; - checkInputs = [ mock pytest pillow selenium ]; + checkInputs = [ + mock + pytest + pillow + selenium + ]; propagatedBuildInputs = [ pillow @@ -51,7 +56,9 @@ buildPythonPackage rec { numpy packaging ] - ++ lib.optionals ( !isPy3k ) [ futures ]; + ++ lib.optionals ( isPy27 ) [ + futures + ]; checkPhase = '' ${python.interpreter} -m unittest discover -s bokeh/tests diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index df10288905d..d89cf3c615d 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "19.7.3"; + version = "19.11.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw"; + sha256 = "3927ae782b7329dede2bf85ff5ff328c88f0514ecb592267e28912340f395d3e"; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index f36a84b85ca..c0de6eecae9 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bottle"; - version = "0.12.17"; + version = "0.12.18"; src = fetchPypi { inherit pname version; - sha256 = "e9eaa412a60cc3d42ceb42f58d15864d9ed1b92e9d630b8130c871c5bb16107c"; + sha256 = "0819b74b145a7def225c0e83b16a4d5711fde751cd92bae467a69efce720f69e"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index 21492dc152c..f45eea2c5df 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -1,26 +1,34 @@ -{ buildPythonPackage -, fetchPypi +{ lib, buildPythonPackage, fetchPypi , nose -, pytest , numpy +, pytest , python }: buildPythonPackage rec { pname = "Bottleneck"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36"; + sha256 = "0a2a94zahl3kqld2n9dm58fvazz9s52sa16nd8yn5jv20hvqc5a5"; }; - checkInputs = [ pytest nose ]; propagatedBuildInputs = [ numpy ]; - checkPhase = '' - py.test -p no:warnings $out/${python.sitePackages} - ''; + postPatch = '' substituteInPlace setup.py --replace "__builtins__.__NUMPY_SETUP__ = False" "" ''; + + checkInputs = [ pytest nose ]; + checkPhase = '' + py.test -p no:warnings $out/${python.sitePackages} + ''; + + meta = with lib; { + description = "Fast NumPy array functions written in C"; + homepage = "https://github.com/pydata/bottleneck"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; + }; } diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index c81233045c0..447a5230c7f 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -5,6 +5,7 @@ , jinja2 , selenium , six +, setuptools }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six ]; + propagatedBuildInputs = [ jinja2 six setuptools ]; # Seems to require a browser doCheck = false; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 08e37e2773c..d2b19ae8650 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,12 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }: +{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.13.1"; + version = "4.14.0"; pname = "breathe"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c6752345252f48092bf72a450fd9e84367bd5b4af99d86c92047f82c6c2287ab"; + sha256 = "178848e4088faf8c2c60f000379fcabfb3411b260e0fbddc08fb57e0e5caea08"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index af03e1ad665..99d7641c07e 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, pyaes, pycrc }: +, cryptography, pyaes, pycrc }: buildPythonPackage rec { pname = "broadlink"; @@ -15,7 +15,7 @@ buildPythonPackage rec { --replace pyaes==1.6.0 pyaes ''; - propagatedBuildInputs = [ pyaes pycrc ]; + propagatedBuildInputs = [ cryptography pyaes pycrc ]; # no tests available doCheck = false; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 807dafab436..13eea3e21fd 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}: buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.7.6"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1f24hsclg1wz2i8aiam91l06qqy0plxhwl615l4qkg35mbw4ry7h"; + sha256 = "42e73e0276083ff162080860cd039138760921a56a0f316775cecee37d444c3f"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 74df8a6b628..190598942c7 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,31 +1,31 @@ -{ stdenv, buildPythonPackage, fetchPypi -, mock, unittest2, nose +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, setuptools , twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six -, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future }: +, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: buildPythonPackage rec { pname = "bugwarrior"; version = "1.7.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks"; }; - buildInputs = [ mock unittest2 nose /* jira megaplan */ ]; propagatedBuildInputs = [ + setuptools twiggy requests offtrac bugzilla taskw dateutil pytz keyring six - jinja2 pycurl dogpile_cache lockfile click pyxdg future + jinja2 pycurl dogpile_cache lockfile click pyxdg future jira ]; - # for the moment jira>=0.22 and megaplan>=1.4 are missing for running the test suite. + # for the moment oauth2client <4.0.0 and megaplan>=1.4 are missing for running the test suite. doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ralphbean/bugwarrior; + homepage = https://github.com/ralphbean/bugwarrior; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pierron ]; + maintainers = with maintainers; [ pierron yurrriq ]; }; } diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 7385a329551..e627667f3ec 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -44,10 +44,9 @@ let autobahn pyjwt pyyaml - + ] # tls - twisted.extras.tls - ]; + ++ twisted.extras.tls; checkInputs = [ treq diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix new file mode 100644 index 00000000000..57a3609bad0 --- /dev/null +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, numpy, cython, zlib, six +, python-lzo, nose }: + +buildPythonPackage rec { + pname = "bx-python"; + version = "0.8.6"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "bxlab"; + repo = "bx-python"; + rev = "v${version}"; + sha256 = "1i40vmn8n83vqcpqj843riv9vp16s753jc4wc90p0cmrnhmzcv13"; + }; + + nativeBuildInputs = [ cython ]; + buildInputs = [ zlib ]; + propagatedBuildInputs = [ numpy six python-lzo ]; + checkInputs = [ nose ]; + + postInstall = '' + cp -r scripts/* $out/bin + + # This is a small hack; the test suit uses the scripts which need to + # be patched. Linking the patched scripts in $out back to the + # working directory allows the tests to run + rm -rf scripts + ln -s $out/bin scripts + ''; + + meta = with lib; { + homepage = "https://github.com/bxlab/bx-python"; + description = + "Tools for manipulating biological data, particularly multiple sequence alignments"; + license = licenses.mit; + maintainers = [ maintainers.jbedo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 7fedf8c5461..693646c80a4 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.12.5"; + version = "0.12.6"; pname = "CacheControl"; src = fetchPypi { inherit pname version; - sha256 = "cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"; + sha256 = "be9aa45477a134aee56c8fac518627e1154df063e85f67d4f83ce0ccc23688e8"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 51bf0e753a9..30f0d9132bb 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "cachetools"; - version = "3.1.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a"; + sha256 = "9a52dd97a85f257f4e4127f15818e71a0c7899f121b34591fcc1173ea79a0198"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index d5c3428fcc1..e66bef51d03 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cachy"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp"; + sha256 = "186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 653296a927e..895775eb87f 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.6.1"; + version = "0.6.2"; propagatedBuildInputs = [ tzlocal requests vobject lxml nose ]; src = fetchPypi { inherit pname version; - sha256 = "eddb7f4e6a3eb5f02eaa2227817a53ac4372d4c4d51876536f4c6f00282f569e"; + sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d"; }; meta = with lib; { @@ -17,5 +17,6 @@ buildPythonPackage rec { homepage = "https://pythonhosted.org/caldav/"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; + broken = true; # missing xandikos package }; } diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index f9ad5933843..ad6958e644b 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "catalogue"; - version = "0.0.7"; + version = "0.0.8"; src = fetchPypi { inherit pname version; - sha256 = "0m7xp85fg57wi1l1vdsq2k0b8dv5bnfccds33lb04z9vrds4l3jv"; + sha256 = "c407a51c22f51b0f938104b6396c489145bae234386e68eb1d56326c3b3e128e"; }; propagatedBuildInputs = [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 19eaeaf8d82..4522379fa64 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4c4532aa683f170f40bd76f928b70bc06ff171a959e06e71bf35f2f9d6031ef9"; + sha256 = "d3363bb5df72d74420986a435449f3c3979285941dff57d5d97ecba352a0e3e2"; }; postPatch = '' @@ -19,9 +19,11 @@ buildPythonPackage rec { # ignore test that's incompatible with pytest5 # test_eventlet touches network + # test_mongodb requires pymongo checkPhase = '' - pytest -k 'not restore_current_app_fallback' \ - --ignore=t/unit/concurrency/test_eventlet.py + pytest -k 'not restore_current_app_fallback and not msgpack' \ + --ignore=t/unit/concurrency/test_eventlet.py \ + --ignore=t/unit/backends/test_mongodb.py ''; checkInputs = [ case pytest boto3 moto ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 40e74328572..7ffc50ea520 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.9.11"; + version = "2019.11.28"; src = fetchPypi { inherit pname version; - sha256 = "0l0yw94ypd117bl7f0fx8sqw9wsnrpcsn92vr7nkxy54zq665wz4"; + sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; }; meta = { diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix new file mode 100644 index 00000000000..ce96bce5bc7 --- /dev/null +++ b/pkgs/development/python-modules/certipy/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyopenssl +}: + +buildPythonPackage rec { + pname = "certipy"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n980gqpzh0fm58h3i4mi2i10wgj606lscm1r5sk60vbf6vh8mv9"; + }; + + propagatedBuildInputs = [ pyopenssl ]; + + doCheck = false; #no tests were included + + meta = with stdenv.lib; { + homepage = https://github.com/LLNL/certipy; + description = "wrapper for pyOpenSSL"; + license = licenses.bsd3; + maintainers = with maintainers; [ isgy ]; + }; + +} diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 15d15c23a8d..b05aeebf9d4 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -29,7 +29,8 @@ if isPyPy then null else buildPythonPackage rec { ''; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang + "-Wno-unused-command-line-argument -Wno-unreachable-code"; doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate checkPhase = '' diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index eeccaedf5f6..7b1ef63767d 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,10 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , pyyaml , six , requests , aws-sam-translator +, importlib-metadata +, importlib-resources , jsonpatch , jsonschema , pathlib2 @@ -13,11 +16,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.24.8"; + version = "0.26.2"; src = fetchPypi { inherit pname version; - sha256 = "5aa1540ee9a7efc23ebe54a22f1a505766a4bb44f64a0f4fe79574a156a9b43e"; + sha256 = "5449313b5f176024bd5fd6ebe69ce986a2d9b8a9d6a147b2d442c8d9fa99a6c5"; }; propagatedBuildInputs = [ @@ -29,7 +32,7 @@ buildPythonPackage rec { jsonschema pathlib2 setuptools - ]; + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; # No tests included in archive doCheck = false; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index 9cdbd0dac11..b7c83b3b3ff 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "channels"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6b8ebd93fe0041a23e31c9f4130d92fadb9c0040c0eb377a004540631325a31d"; + sha256 = "08e756406d7165cb32f6fc3090c0643f41ca9f7e0f7fada0b31194662f20f414"; }; # Files are missing in the distribution diff --git a/pkgs/development/python-modules/cld2-cffi/default.nix b/pkgs/development/python-modules/cld2-cffi/default.nix index a38d4c0866e..7775fee5ba0 100644 --- a/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/pkgs/development/python-modules/cld2-cffi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror - NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing"; + NIX_CFLAGS_COMPILE = "-w" + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; checkPhase = "nosetests -v"; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 7882c98e524..46ac5be03ce 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "2.16.0"; + version = "2.17.0"; src = fetchPypi { inherit pname version; - sha256 = "622e777b8ac2eb479708fe53893c37b2fd5469ce2c6c5b794a658246f05c6b81"; + sha256 = "f5a1c6b32047aa0d272398d311fd711d41dd5e1cd5195ebe36ebb47f464416fa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index ca95ebbf1f3..961f6b5bc1d 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "clifford"; - version = "1.0.4"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7fc5aa76b4f73c697c0ebd2f86c5233e7ca0a5109b80147f4e711bc3de4b3f2c"; + sha256 = "b27fdec70574ac928c91fe333a70ece153d75cd0499cce09acea5980ae349bee"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 37a41c7fba4..94f3fa08b13 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.3.2"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pvzq3glf4sjgrm0wyxln3s6vicdc9q8r5sgaiqmxdmd9pylw0xm"; + sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index ce1ad60a532..72b6a2fa30a 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -8,8 +8,9 @@ , od , docutils , repeated_test -, unittest2 , pygments +, unittest2 +, pytest }: buildPythonPackage rec { @@ -21,14 +22,15 @@ buildPythonPackage rec { sha256 = "f54dedcf6fea90a3e75c30cb65e0ab1e832760121f393b8d68edd711dbaf7187"; }; - checkInputs = [ + checkInputs = [ dateutil pygments repeated_test unittest2 + pytest ]; - - propagatedBuildInputs = [ + + propagatedBuildInputs = [ attrs docutils od @@ -36,6 +38,10 @@ buildPythonPackage rec { six ]; + checkPhase = '' + pytest + ''; + meta = with stdenv.lib; { description = "Command-line argument parsing for Python"; homepage = "https://github.com/epsy/clize"; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 4120dda5460..75a77d4c63c 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "ClusterShell"; - version = "1.8.1"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "e913efb4fe017eed9731d5ad8be397509e7f1966e6cb6441ee2bce074b16b310"; + sha256 = "0ebc1925c1aed94f99d74cbc0230215127ade80a25240133204094faa74bc41b"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix new file mode 100644 index 00000000000..1743e23942f --- /dev/null +++ b/pkgs/development/python-modules/cma/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, python +}: + +buildPythonPackage rec { + pname = "cma"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "CMA-ES"; + repo = "pycma"; + rev = "r${version}"; + sha256 = "0c26969pcqj047axksfffd9pj77n16k4r9h6pyid9q3ah5zk0xg3"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkPhase = '' + ${python.executable} -m cma.test + ''; + + meta = with lib; { + description = "CMA-ES, Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization in Python"; + homepage = https://github.com/CMA-ES/pycma; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 13361b645bf..2dba7e43391 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "0.9.21"; + version = "0.9.22"; src = fetchPypi { inherit pname version; - sha256 = "0pxxxhcxf4wzxvlh6jvw30pzgk1nsciq1qfxilpa8idv06jzx048"; + sha256 = "ba244b07c0b465ff54a6838dc61919599141dc92de1bf00bb0a70875189155e6"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index e85c95b85bd..d6f84ca8748 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorama"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"; + sha256 = "e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"; }; # No tests in archive diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index 4ae6dd8e479..e4288745d96 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc ln -s $HOME/.config/matplotlib $HOME/.matplotlib - pytest colorcet + # requires other backends to be available + pytest colorcet -k 'not matplotlib_default_colormap_plot' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 2ccdb03bc22..b62d80600c7 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "colored"; - version = "1.4.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "0qf9470fsasimsmsri13jw1d2zpn3g24fv6vss64jq3ifwfkcs14"; + sha256 = "056fac09d9e39b34296e7618897ed1b8c274f98423770c2980d829fd670955ed"; }; # No proper test suite diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix new file mode 100644 index 00000000000..f2741c615b8 --- /dev/null +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +, bashlex +, click +, shutilwhich +, gcc +, coreutils +}: + +buildPythonPackage rec { + pname = "compiledb"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "nickdiego"; + repo = pname; + rev = "v${version}"; + sha256 = "0qricdgqzry7j3rmgwyd43av3c2kxpzkh6f9zcqbzrjkn78qbpd4"; + }; + + # fix the tests + patchPhase = '' + substituteInPlace tests/data/multiple_commands_oneline.txt \ + --replace /bin/echo ${coreutils}/bin/echo + ''; + + checkInputs = [ pytest gcc coreutils ]; + propagatedBuildInputs = [ click bashlex shutilwhich ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Tool for generating Clang's JSON Compilation Database files"; + license = licenses.gpl3; + homepage = https://github.com/nickdiego/compiledb; + maintainers = with maintainers; [ multun ]; + }; +} diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index e6959a3304b..82a3aac6e1d 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "baaf0fd2c1c108d007f402dab5481ac5f12d77d034825bf5a27f8224757bd0ac"; + sha256 = "558738aff623d6667aa5b85df6093ad3828867de8a82b66a6d458fb42567beb3"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 8d992f71f33..f32a6bfd1ac 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "1nn8z7ggjj04v97jm33dxh2cv2azy4xi1hwkj9qwbbc68vasc3cp"; + sha256 = "4025ccddbc79443a4e2342de0d770f669558eb737fca2e7851558cd45f78ef78"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index bc1356a7274..4f2af55f208 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.3.0"; + version = "2.4.0"; # we're fetching from GitHub because tests weren't distributed on PyPi src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = version; - sha256 = "1xdm3misxwgrl87ms0vvn0h4rjwzlmmi7kcra2ahs40iaraf33ln"; + sha256 = "1b9q027wrks0afl7l3a1wxymz3aick26b9fq2m07pc5wb9np0vvg"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index abccd1e136d..4010eb5ec5a 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "cookiecutter"; - version = "1.6.0"; + version = "1.7.0"; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e"; + sha256 = "1bh4vf45q9nanmgwnw7m0gxirndih9yyz5s0y2xbnlbcqbhrg6a7"; }; checkInputs = [ pytest pytestcov pytest-mock freezegun ]; diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix new file mode 100644 index 00000000000..8c08021a823 --- /dev/null +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, pytest +}: + +buildPythonPackage rec { + pname = "coordinates"; + version = "0.4.0"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "clbarnes"; + repo = "coordinates"; + rev = "v${version}"; + sha256 = "1zha594rshjg3qjq9mrai2hfldya282ihasp2i3km7b2j4gjdw2b"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + runHook preCheck + pytest tests/ + runHook postCheck + ''; + + meta = with lib; { + description = "Convenience class for doing maths with explicit coordinates"; + homepage = https://github.com/clbarnes/coordinates; + license = licenses.mit; + maintainers = [ maintainers.mildlyincompetent ]; + }; +} diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 4ac38986245..598c3bd1c08 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "3.6.1"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "d3d608b9ff405e7ba5e9629ef0c09b7605997e1aea0dafb2aaa66761ff7cab08"; + sha256 = "d083832e9db65da4784436deabd7d37959de88c3b8ba51d539fa1e1f8313439d"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index aaa6192f2d5..dbf6616c22d 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "coveralls"; name = "${pname}-python-${version}"; - version = "1.8.2"; + version = "1.9.2"; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "fb51cddef4bc458de347274116df15d641a735d3f0a580a9472174e2e62f408c"; + sha256 = "8e3315e8620bb6b3c6f3179a75f498e7179c93b3ddc440352404f941b1f70524"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix new file mode 100644 index 00000000000..6fd31d007f6 --- /dev/null +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + version = "2.0"; + pname = "crc32c"; + + src = fetchFromGitHub { + owner = "ICRAR"; + repo = pname; + rev = "v${version}"; + sha256 = "15x1sj23n50qdjmi8mjq5wgf5jfn1yv78vjc59wplvl0s50w2dnk"; + }; + + meta = { + description = "Python software implementation and hardware API of CRC32C checksum algorithm"; + homepage = "https://github.com/ICRAR/crc32c"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 969a4e8af89..a538721c9b9 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "0.3.30"; + version = "0.3.31"; src = fetchPypi { inherit pname version; - sha256 = "538adeb3a7f7816c3cdec6db974c441620d764c25ff4ed0146ee7296b8a50590"; + sha256 = "15riw8sl8jzzkvvjlz3i3p7jcx423zipxhff5ddvki6zgnrb9149"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index f949120db0c..5426a609449 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "6.4.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "126waa1jiynq00glr1hq86sgwwmakq009crfsn8qqgrj4c4clw6a"; + sha256 = "7230b25052b2b9074cc338b44338b4bd43575a48ad7b9c2ce7f36d7e0d117012"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 7064e81a5d2..6ba8f338638 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.2.3"; + version = "7.3.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "1b1zarb6g1b2nl3bj9m5ph1sxqc44bscwq30300q78hm666sbf6z"; + sha256 = "2e0da54e948b55e5c75fab14b391d58aa8b9be1eddfd9ec9a8a0e500bc8bfc7e"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index b3d4a40bf66..1ca86f3d9d0 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -4,15 +4,16 @@ , cython , python }: + buildPythonPackage rec { pname = "cymem"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "explosion"; repo = "cymem"; rev = "v${version}"; - sha256 = "109i67vwgql9za8mfvgbrd6rgraz4djkvpzb4gqvzl13214s6ava"; + sha256 = "0cqz6whq4zginxjnh4cfqlsh535p4qz295ymvjchp71fv8mz11f6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index d55595d456f..beef26ec5be 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,7 +1,7 @@ { lib , bokeh , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fsspec , pytest , pythonOlder @@ -15,25 +15,44 @@ buildPythonPackage rec { pname = "dask"; - version = "2.6.0"; + version = "2.9.1"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "81c7891f0d2e7ac03d1f7fabf1f639360a1db52c03a7155ba9b08e9ee6280f2b"; + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "1xayr4gkp4slvmh2ksdr0d196giz3yhknqjjg1vw2j0la9gwfwxs"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytest + ]; + propagatedBuildInputs = [ - bokeh cloudpickle dill fsspec numpy pandas partd toolz ]; + bokeh + cloudpickle + dill + fsspec + numpy + pandas + partd + toolz + ]; - checkPhase = '' - py.test dask + postPatch = '' + # versioneer hack to set version of github package + echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py + + substituteInPlace setup.py \ + --replace "version=versioneer.get_version()," "version='${version}'," \ + --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - # URLError - doCheck = false; + checkPhase = '' + pytest + ''; meta = { description = "Minimal task scheduling abstraction"; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix new file mode 100644 index 00000000000..e4129ed9bbf --- /dev/null +++ b/pkgs/development/python-modules/databases/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sqlalchemy +, aiocontextvars +, isPy27 +, pytest +, asyncpg +, aiomysql +, aiosqlite +}: + +buildPythonPackage rec { + pname = "databases"; + version = "0.2.6"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "0cdb4vln4zdmqbbcj7711b81b2l64jg1miihqcg8gpi35v404h2q"; + }; + + propagatedBuildInputs = [ + sqlalchemy + aiocontextvars + ]; + + checkInputs = [ + pytest + asyncpg + aiomysql + aiosqlite + ]; + + # big chunk to tests depend on existing posgresql and mysql databases + # some tests are better than no tests + checkPhase = '' + pytest --ignore=tests/test_integration.py --ignore=tests/test_databases.py + ''; + + meta = with lib; { + description = "Async database support for Python"; + homepage = https://github.com/encode/databases; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 53a33037d16..6dc19a17462 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchPypi , decorator, requests, simplejson, pillow -, nose, mock, pytest }: +, nose, mock, pytest, freezegun }: buildPythonPackage rec { pname = "datadog"; - version = "0.30.0"; + version = "0.33.0"; src = fetchPypi { inherit pname version; - sha256 = "07c053e39c6509023d69bc2f3b8e3d5d101b4e75baf2da2b9fc707391c3e773d"; + sha256 = "bce73f33a4496b004402baa502251150e3b48a48f610ff89d4cd110b366ee0ab"; }; postPatch = '' @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator requests simplejson pillow ]; - checkInputs = [ nose mock pytest ]; + checkInputs = [ nose mock pytest freezegun ]; checkPhase = '' pytest tests/unit ''; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 2039283771e..789e488e461 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "59ac9e3830167d07b350992402a9f547f26eca45cd69a0fb04061a4047e7ff2a"; + sha256 = "3a423d61014ae8d2668848edab6c12a6244be6f249570bd7811dd5698d5ff633"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index f81b7d1c8bf..a2f7b603b84 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh"; }; - propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") [ enum34 ]; + propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; doCheck = !isPy3k; # tests are not yet ported. diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index 46a229a99ae..dac72fb72b7 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d13e6af8f36238e89d00f4ebccf2bda4f6d1878be560a6600689e42077e164e3"; + sha256 = "9f79cf234064cf9b43492b72da35c473de3f03163d37bd13cec5bd8d200dda6b"; }; checkInputs = [ nose six pyyaml mock ]; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 6f82adc94ca..a2a986828b5 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "1ragmpihjr9p6n27hw7gy83qyc68csqpn18m9kvwsby1vi7mgdy8"; + sha256 = "4eac169b4b08008cacf4e5e26e82302a7ccd43c07846d1a1228f3e271a128de2"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 0d49f627821..ed16f7f95e5 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "2.4.1"; + version = "2.5.0"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12h91rvbrf9qmdmj5nfqhcd3bpwq1pvk990bag4hyxcf86qlzds4"; + sha256 = "2ba4e8dcd5439a245287fac056db02a9261432b1a44a5cffbe593032de86f1c7"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 6aec01ed738..a420fc037bb 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -1,22 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, tox +, fetchFromGitHub +, pytest +, pytestcov +, pytest_xdist +, pytest-django +, mock }: buildPythonPackage rec { pname = "diskcache"; version = "4.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "bcee5a59f9c264e2809e58d01be6569a3bbb1e36a1e0fb83f7ef9b2075f95ce0"; + src = fetchFromGitHub { + owner = "grantjenks"; + repo = "python-diskcache"; + rev = "v${version}"; + sha256 = "0xy2vpk4hixb4gg871d9sx9wxdz8pi0pmnfdwg4bf8jqfjg022w8"; }; checkInputs = [ - tox + pytest + pytestcov + pytest_xdist + pytest-django + mock ]; + checkPhase = '' + pytest + ''; + meta = with lib; { description = "Disk and file backed persistent cache"; homepage = "http://www.grantjenks.com/docs/diskcache/"; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 4179499eaf3..951593bac97 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.6.0"; + version = "2.9.1"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "30b0ca195ace1e39bdd278bf1ad257f7674b3e2b8e7a2a37ce7e2ade4aecccf3"; + sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd"; }; checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 4e2377ffb0f..3e95e7ff16b 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.0.0"; + version = "2.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1samrxf8lic6a4c0lgw31b38s97l8hnaknd7ilyy2plahmm0h03i"; + sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; }; propagatedBuildInputs = [ ldap django_2_2 ]; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 0ca6c400df2..c31036c1814 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -12,12 +12,12 @@ }: buildPythonPackage rec { - version = "2.1"; + version = "2.2"; pname = "django-configurations"; src = fetchPypi { inherit pname version; - sha256 = "71d9acdff33aa034f0157b0b3d23629fe0cd499bf4d0b6d699b9ca0701d952e8"; + sha256 = "9e3bcea1355ac50a4c9f854f751d214cb17e5f8adf18405a4488d0a1e8945915"; }; checkInputs = [ django-discover-runner mock dj-database-url dj-email-url dj-search-url django-cache-url six ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 358f2ab1be4..005dc65a499 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5762ec9c2d59f38c76828dc1d4308baca4bc0d3e1d6f217683e7a24a1c4611a3"; + sha256 = "84933651fbbde8f2bc084bef2f077b79db1ec1389432f21dd661eaae6b3d6a95"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 5702bb226b4..01ae357677b 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0wppv1q3jkkg2d66qsygc4dfpvhfcj5i2as2xpqnzf3l3w7dgja1"; + sha256 = "b05cf04b2c36916d15b78e24610002206529f1441e2632253a26b2db6bfd3b27"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index acf49d74167..a4dcb57fe43 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.10"; + version = "0.1.11"; src = fetchPypi { inherit pname version; - sha256 = "ec305ca79b6e16fb6d699d3159258f9f680ead8ea5ef9b419e7faf13f31355df"; + sha256 = "043fa1aaddceb9b170c64c0745dc3a059165dcbc74946a434340778f63efa3c2"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index cb8c5f52630..da1dfe21df2 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-pglocks"; - version = "1.0.3"; + version = "1.0.4"; meta = { description = "PostgreSQL locking context managers and functions for Django."; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "daa3323de355b9057d8f37143e2ae8d283925fd25128ab66bb8c700d000111d9"; + sha256 = "3c47c66fbfbd268ef46269673a0516a039539b0972b8ed2ec9cfee44c4b65523"; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/pkgs/development/python-modules/django-postgresql-netfields/default.nix new file mode 100644 index 00000000000..35be6f76147 --- /dev/null +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, django +, netaddr +, six +, fetchFromGitHub +# required for tests +#, djangorestframework +#, psycopg2 +#, unittest2 +}: + +buildPythonPackage rec { + version = "1.2.2"; + pname = "django-postgresql-netfields"; + + src = fetchFromGitHub { + owner = "jimfunk"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1rrh38f3zl3jk5ijs6g75dxxvxygf4lczbgc7ahrgzf58g4a48lm"; + }; + + # tests need a postgres database + doCheck = false; + + # keeping the dependencies below as comment for reference + # checkPhase = '' + # python manage.py test + # ''; + + # buildInputs = [ + # djangorestframework + # psycopg2 + # unittest2 + # ]; + + propagatedBuildInputs = [ + django + netaddr + six + ]; + + meta = with stdenv.lib; { + description = "Django PostgreSQL netfields implementation"; + homepage = https://github.com/jimfunk/django-postgresql-netfields; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/python-modules/django-ranged-response/default.nix b/pkgs/development/python-modules/django-ranged-response/default.nix new file mode 100644 index 00000000000..29b2baf89cd --- /dev/null +++ b/pkgs/development/python-modules/django-ranged-response/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, fetchPypi, buildPythonPackage, django }: + +buildPythonPackage rec { + pname = "django-ranged-response"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "11gr3jpmb5rvg3scv026kjwwkmnxwivgq5ypxadnnc9p58szy7zp"; + }; + + # tests not included in PyPi package, github source is not up to date with 0.2.0 + doCheck = false; + + propagatedBuildInputs = [ django ]; + + meta = with stdenv.lib; { + description = "A modified FileResponse that returns `Content-Range` headers with the HTTP response, so browsers (read Safari 9+) that request the file, can stream the response properly"; + homepage = "https://github.com/wearespindle/django-ranged-fileresponse"; + license = licenses.mit; + maintainers = with maintainers; [ mrmebelman ]; + }; +} diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix new file mode 100644 index 00000000000..67977caf9ec --- /dev/null +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, six +, testfixtures +, django +, django-ranged-response +, pillow +, withTTS ? true +, flite +}: + +buildPythonPackage rec { + pname = "django-simple-captcha"; + version = "0.5.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:1g92sdgcb81r3il34pg0z210cz6wm14k00b558nshai8br1g09gw"; + extension = "zip"; + }; + + checkInputs = [ testfixtures ]; + checkPhase = '' + cd testproject + ${python.interpreter} manage.py test captcha + ''; + + propagatedBuildInputs = [ django django-ranged-response six pillow ] + ++ lib.optional withTTS flite; + + meta = with lib; { + description = "An extremely simple, yet highly customizable Django application to add captcha images to any Django form"; + homepage = "https://github.com/mbi/django-simple-captcha"; + license = licenses.mit; + maintainers = with maintainers; [ mrmebelman schmittlauch ]; + }; +} diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index d4f46e0355f..90993db4c5b 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "1.10"; + version = "1.11"; src = fetchPypi { inherit pname version; - sha256 = "0y0r6ssxyg9x1rylpyxg2ha2hl18080k5xp308k4ankpjm50hvc8"; + sha256 = "8322ee9d7bf5ffa5360990320d2cc2efc7017feff35422636d49f625721edf82"; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index cb82fdc204c..cbfeb4288cf 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Django"; - version = "1.11.24"; + version = "1.11.27"; src = fetchurl { url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1qw97zcsnbnn9dqad1kps48vfaifdkvqb8c3vld6nnvp7x2jfp11"; + sha256 = "1f39c5af0lkls6mqw1fd2r9rf4mbshchqjy900ab3lcshs1i6490"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_1.nix b/pkgs/development/python-modules/django/2_1.nix index d1ebc686bbd..19e8b0c1a75 100644 --- a/pkgs/development/python-modules/django/2_1.nix +++ b/pkgs/development/python-modules/django/2_1.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.1.14"; + version = "2.1.15"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d9159141fc354c4c28cc2b2586d55ba6d5e1531f5470218bb56a75be03d67398"; + sha256 = "a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c"; }; patches = stdenv.lib.optionals withGdal [ diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 22204bf5ff0..bc8ae39433d 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.8"; + version = "2.2.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "183wmqgkspb9vk1dc42h5s2h31gjpw68vv6ywbvpljvakiplzbd4"; + sha256 = "199mwqs6apdxjm4afqjbvqs98j2927rv2wbgy5vzvqwjhzviyak6"; }; patches = stdenv.lib.optional withGdal diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 96c63738eb7..12d8c220aff 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchPypi , django +, six }: buildPythonPackage rec { pname = "django-contrib-comments"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "61b051d7bc3ff593e86b41a1ed5e969423cf55cc92768598af3315e2528e0890"; + sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { homepage = https://github.com/django/django-contrib-comments; diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 85761be9ba5..c19ca255319 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,11 +2,11 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.10.0"; + version = "4.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg"; + sha256 = "a5b1e3ffd3198735e6c529d9bdf38ca3fcb3155515249b98dc4d966b8ddf9d2b"; }; doCheck = false; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 69c2f531728..5a4faf5f24e 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.4"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "ed46722389fb2441860d471c7538967dee545bcee891d3d907b04f4baa98f5fa"; + sha256 = "1add55bb05311f4acd26683dd71af60729d4f33dfe42c608da8e15e679a32009"; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 6ca498ce5e9..2851894b6b6 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.1.0"; + version = "1.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "044fzcpmns90kaxdi49qczlam4xsi8rl73rpfwvxx1gkcqzidgq1"; + sha256 = "4186a6ce1e1e9af5e2db8dd3479c5d31fa11a87d216a2ce5089ba3afde24a2c5"; }; propagatedBuildInputs = [ isort django ]; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 5c45b18be64..d4b3464b6ae 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.3"; + version = "4.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c21db06a8d4943bf2a28d9d7a119058698fb76116df2679ecbf15a46a501de42"; + sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index addff19853d..60e5760b524 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, django }: +{ stdenv, buildPythonPackage, fetchPypi, django, isPy27 }: + buildPythonPackage rec { - version = "3.10.3"; + version = "3.11.0"; pname = "djangorestframework"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "140hwz52rlqqc10gbw5bhyyi4zbpqj3z7wgnh2jrhs2wfzwwp0fw"; + sha256 = "e782087823c47a26826ee5b6fa0c542968219263fb3976ec3c31edab23a4001f"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 60c5dc24b11..c65fdfec953 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "0.9.5"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "6bf47aa71bc466f5d6a201042317fb415fbc45f3cae4f5dbe1e337e235549ff2"; + sha256 = "19rz48pzz1i5cc896khaqx2hkhcj5hwsklnyynrdgdr5818qjyff"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index 65f45ca86f6..e6ec04bb79e 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.10"; + version = "0.9.12"; src = fetchPypi { inherit pname version; - sha256 = "666bf55274a630a2925411c4ea9ca724529299bbe70f91979ad99c72c5e5099e"; + sha256 = "c206f09948f3ad17884adffdb552b700072c6022fa59744a0f0606114c475e19"; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/pkgs/development/python-modules/dodgy/default.nix b/pkgs/development/python-modules/dodgy/default.nix new file mode 100644 index 00000000000..ecd3cc6ce75 --- /dev/null +++ b/pkgs/development/python-modules/dodgy/default.nix @@ -0,0 +1,40 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, lib + +# pythonPackages +, mock +, nose +}: + +buildPythonPackage rec { + pname = "dodgy"; + version = "0.2.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "landscapeio"; + repo = pname; + rev = version; + sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x"; + }; + + checkInputs = [ + mock + nose + ]; + + checkPhase = '' + nosetests tests/test_checks.py + ''; + + meta = with lib; { + description = "Looks at Python code to search for things which look \"dodgy\" such as passwords or diffs"; + homepage = "https://github.com/landscapeio/dodgy"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ae6507c4442..785f37144be 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.19.13"; + version = "0.19.14"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "aa628449c5f594a9a282f4d9e5993fef65481ef5e3b9b6c52ff31200f8f5dc95"; + sha256 = "d1320232c859ab086fff79eee8fa6ddbcbcbe01ff0c64c9bed48eca470b00b46"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index dae1df69562..894363237f5 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "easy-thumbnails"; - version = "2.6"; + version = "2.7"; meta = { description = "Easy thumbnails for Django"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "23fbe3415c93b2369ece8ebdfb5faa05540943bef8b941b3118ce769ba95e275"; + sha256 = "e4e7a0dd4001f56bfd4058428f2c91eafe27d33ef3b8b33ac4e013b159b9ff91"; }; propagatedBuildInputs = [ django pillow ]; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 7f8a803740d..32acb1213a8 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.7"; + version = "0.2.8"; src = fetchPypi { inherit pname version; - sha256 = "f757cd16cdab5b87117b4ee6cf197f99bfa109253364c7bd717ad0bcd39218a0"; + sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; }; # No tests diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 32659b520ba..2602fba7713 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonAtLeast , fetchFromGitHub -, net_snmp +, net-snmp , openssl , pytest , pytestcov @@ -35,12 +35,12 @@ buildPythonPackage rec { ]; buildInputs = [ - net_snmp + net-snmp openssl ]; buildPhase = '' - python setup.py build bdist_wheel --basedir=${net_snmp}/bin + python setup.py build bdist_wheel --basedir=${lib.getBin net-snmp}/bin ''; # Unable to get tests to pass, even running by hand. The pytest tests have diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index 825cc0df56c..aa69b7e2fcd 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -2,17 +2,19 @@ , buildPythonPackage , fetchPypi , pkgs +, six }: buildPythonPackage rec { pname = "ecdsa"; - version = "0.13.3"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d"; + sha256 = "64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e"; }; + propagatedBuildInputs = [ six ]; # Only needed for tests checkInputs = [ pkgs.openssl ]; diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index 6b8329550da..fec5518f0e8 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -7,12 +7,12 @@ , testtools }: buildPythonPackage rec { - version = "0.12.0"; + version = "1.1.0"; pname = "effect"; src = fetchPypi { inherit pname version; - sha256 = "0s8zsncq4l0ar2b4dijf8yzrk13x2swr1w2nb30s1p5jd6r24czl"; + sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e9c65018f67..ccef465eca1 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.0.5"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "693935914d59a517dfffdaab547ff906712a386d9e25027517464960221cbd4c"; + sha256 = "0140787216646e1eb7eb001f8146aff7071d7ca438854249787b6cc221ddd266"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 637cca7f608..093a30d29da 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; pname = "elementpath"; src = fetchFromGitHub { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0060cd49m0q25k7anzyiz76360hag2f9j5hvqhbmscivf1ssckzq"; + sha256 = "05wplh836ffwhncf5rpdnz4g1b3mqw7jiy83352nw4x3aak4ifbr"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 9069bef68e0..2b7815c6978 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0dj4kk325b01s7q1zkwpm9rrzl7n1jf7fr92wcajjhc5kx14hwb0"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; checkInputs = [ pytest glibcLocales ]; # JPLTest uses assets not distributed in package checkPhase = '' diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index 73813d34c5a..a8ac610855d 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Eve"; - version = "0.9.2"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "0191ed42ef85d747758bba29df5ff1e296b8152fefddb2f75c3d778c2e6fb9d3"; + sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 8ac7b597a4c..47602afa07d 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -13,13 +13,13 @@ }: buildPythonPackage rec { - version = "0.8.11"; + version = "0.8.12"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0e4c9b9b42257deb9c38c112dbe44e1203dea686d454dc76adb72ded25ac878c"; + sha256 = "e54eec0a03fb8e7e9e8b509546c6d92efbc871ea7597611fe2c16f03e1c94b6d"; }; # https://github.com/nicfit/eyeD3/pull/284 diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index f9155187ca3..0d8c77f557f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -17,11 +17,11 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "2.0.4"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "6327c665c0d8721280b3036d9c9e851c60092bc1f30c8394cc433f8723e2bda5"; + sha256 = "92c84a10bec81217d9cb554ee12b3838c8986ce0b5d45f72f769da22e4bb5432"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c90b64dca81..75edf5dc424 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,22 +1,28 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , uvicorn , starlette , pydantic -, python , isPy3k -, which +, pytest +, pytestcov +, pyjwt +, passlib +, aiosqlite }: buildPythonPackage rec { pname = "fastapi"; - version = "0.42.0"; + version = "0.45.0"; + format = "flit"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "48cb522c1c993e238bfe272fbb18049cbd4bf5b9d6c0d4a4fa113cc790e8196c"; + src = fetchFromGitHub { + owner = "tiangolo"; + repo = "fastapi"; + rev = version; + sha256 = "1qwh382ny6qa3zi64micdq4j7dc64zv4rfd8g91j0digd4rhs6i1"; }; propagatedBuildInputs = [ @@ -25,10 +31,24 @@ buildPythonPackage rec { pydantic ]; - patches = [ ./setup.py.patch ]; + checkInputs = [ + pytest + pytestcov + pyjwt + passlib + aiosqlite + ]; + + # starlette pinning kept in place due to 0.12.9 being a hard + # dependency luckily fastapi is currently the only dependent on + # starlette. Please remove pinning when possible + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "pydantic >=0.32.2,<=0.32.2" "pydantic" + ''; checkPhase = '' - ${python.interpreter} -c "from fastapi import FastAPI; app = FastAPI()" + pytest --ignore=tests/test_default_response_class.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fastapi/setup.py.patch b/pkgs/development/python-modules/fastapi/setup.py.patch deleted file mode 100644 index 43661343d74..00000000000 --- a/pkgs/development/python-modules/fastapi/setup.py.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index ccc3d2b..77ce446 100644 ---- a/setup.py -+++ b/setup.py -@@ -10,7 +10,7 @@ package_data = \ - {'': ['*']} - - install_requires = \ --['starlette >=0.11.1,<=0.12.0', 'pydantic >=0.30,<=0.30.0'] -+['starlette >=0.11.1', 'pydantic >=0.30'] - - extras_require = \ - {'all': ['requests', diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index f780c76fd6d..d3f796ab950 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "2.2.0"; + version = "3.0.0"; pname = "fints"; disabled = isPy27; @@ -15,14 +15,9 @@ buildPythonPackage rec { owner = "raphaelm"; repo = "python-fints"; rev = "v${version}"; - sha256 = "1gx173dzdprf3jsc7dss0xax8s6l2hr02qg9m5c4rksb3dl5fl8w"; + sha256 = "00fqgnmv7z6d792ga4cyzn9lrfjf79jplkssm2jbyb0akfggfj7h"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'sepaxml==2.0.*' 'sepaxml~=2.0' - ''; - propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 4f9f80fdd82..abc0853b4c7 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Fiona"; - version = "1.8.11"; + version = "1.8.13"; src = fetchPypi { inherit pname version; - sha256 = "1e7ca9e051f5bffa1c43c70d573da9ca223fc076b84fa73380614fc02b9eb7f6"; + sha256 = "5ec34898c8b983a723fb4e949dd3e0ed7e691c303e51f6bfd61e52ac9ac813ae"; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index b0f9682ed85..8bb6a472c9f 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-API"; - version = "1.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "0r23pdlaz6ibz9vml3m7v6v3firvykbrsi1zzxkdhls0zi9jq560"; + sha256 = "6986642e5b25b7def710ca9489ed2b88c94006bfc06eca01c78da7cf447e66e5"; }; propagatedBuildInputs = [ flask markdown ]; diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index bd528af6bfa..64c3e3384dc 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,17 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess }: +{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.7.2"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "17jnnmnpdflv120yhsfbnpick06iias6f2hcxmf1mi1nr35kdqjj"; + sha256 = "3d0bd13c448c1640334131ed4163a12aff7df2155e73860f07fc9e5e75de7126"; }; propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest pytestcov pytest-xprocess ]; + checkInputs = [ pytest pytestcov pytest-xprocess pytestcache ]; # backend_cache relies on pytest-cache, which is a stale package from 2013 checkPhase = '' diff --git a/pkgs/development/python-modules/flask-swagger-ui/default.nix b/pkgs/development/python-modules/flask-swagger-ui/default.nix new file mode 100644 index 00000000000..a281864117b --- /dev/null +++ b/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, flask }: + +buildPythonPackage rec { + pname = "flask-swagger-ui"; + version = "3.20.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "3282c770764c8053360f33b2fc120e1d169ecca2138537d0e6e1135b1f9d4ff2"; + }; + + doCheck = false; # there are no tests + + propagatedBuildInputs = [ + flask + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sveint/flask-swagger-ui"; + license = licenses.mit; + description = "Swagger UI blueprint for Flask"; + maintainers = with maintainers; [ vanschelven ]; + }; +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index eb59eaa0f1c..f85afa77021 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , numpy , pytest , pytestrunner @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.0.2"; + version = "4.2.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bb9bf6b5b4ded33e0d9f823e5ae2e1fa643af4d614915660abe3853a9a6931cd"; + sha256 = "66bb3dfe7efe5972b0145339c063ffaf9539e973f7ff8791df84366eafc65804"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 8680ff2d2aa..a9ab0db1ed9 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.13.1"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "0sqxp4fshnpcv69c2j04v8c22pjak28iwscxv998h2s3054knxz2"; + sha256 = "8498c7e9eaecb5b19be74b18d55c2086440be08de29f2bb507f9b505757467ff"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index 0ba46c1832b..ae4e32291c3 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.3"; + version = "0.8.4"; src = fetchPypi { inherit pname version; - sha256 = "07ll1rh1bkq1dpb7gxd86jsjhxni73kp9iljiy0d2b86ji8h108p"; + sha256 = "8b6d810f5389692c45d236dec89cecc4ff32ad053e4c878c91363acfa4508639"; }; propagatedBuildInputs = [ tkinter supercollider ]; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 7bc4ed82fea..e23351d3da6 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -14,15 +15,29 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.0dev"; + version = "0.5.1dev"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "091zqgsqd5cqma1hvimkq5xpr9f1jw80v9m2fr6k9hvssqjzgnab"; + sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; }; + patches = [ + # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162) + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch"; + name = "less-precision-in-tests.patch"; + sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz"; + }) + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch"; + name = "dont-hardcode-precision.patch"; + sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9"; + }) + ]; + buildInputs = [ gmp pari diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index a94f847fc90..7e0ed8b9712 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder +, pytest }: buildPythonPackage rec { pname = "fsspec"; - version = "0.5.2"; - + version = "0.6.2"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "6531a5fa9ea6bf27a5180d225558a8a7aa5d7c3cbf7e8b146dd37ac699017937"; + src = fetchFromGitHub { + owner = "intake"; + repo = "filesystem_spec"; + rev = version; + sha256 = "1y3d6xw14rcldz9779ir6mjaff4rk82ch6ahn4y9mya0qglpc31i"; }; - # no tests - doCheck = false; + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; meta = with lib; { - description = "A specification that python filesystems should adhere to."; - homepage = "https://github.com/intake/filesystem_spec"; + description = "A specification that python filesystems should adhere to"; + homepage = https://github.com/intake/filesystem_spec; license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f4f3821afa3..bab5b26635d 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "32ee8063b1d3b5cd95c117c5a4aa812940e3d3c0daa3d535cd6633c1025a59bc"; + sha256 = "c7c6c276f182a63a807b52a95f197df12794ff014f48dd287cb51ca2dcbe1b34"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 6ea44bc09a2..5a6313be583 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "geopandas"; repo = "geopandas"; rev = "v${version}"; - sha256 = "0bdgphw43m2nrgcp83j1pnxknnzahm2zmdr55hyz3jjkva7m6dpk"; + sha256 = "1wy2n204vf5bbswgma205lr1is7nnxr385m4x3v7pra05bq8ag3q"; }; checkInputs = [ pytest Rtree ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 140f93f33f8..341d08d95ed 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "52119435ba73ddd5e697dae7bec8b93a048bc738720b81691ebd4b4d81d2d762"; + sha256 = "8f4b69063a256994d38243cc0eba4e1453017b5b8b04a173216d02d47ffc3989"; }; nativeBuildInputs = [ setuptools pytestrunner ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index ec58825878a..a7bac0fd762 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = https://github.com/alpernebbi/git-annex-adapter; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ma27 ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 2a89fb262ff..739ef7d95e4 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "19.2.0"; + version = "19.10.0"; src = fetchPypi { inherit pname version; - sha256 = "c277f34e5e498834a63c2114a25a6c67b5cf0b92f96bb65cba063d861c3d1da6"; + sha256 = "c8a50cb9fcf0c84807836c6a73cf61285557834b9050d7bde7732b936aceb7dd"; }; propagatedBuildInputs = [ boltons attrs face ]; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index 6a9a3160c9b..d7bf6d082f8 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; homepage = https://pypi.org/project/google-i18n-address/; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 94fe6d5e0a1..0a3f145f131 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.1.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "5c6cb11d56dfe2cfb95f3083ed4c1347dafbf15a88fc9a7aab3ed5ee4c75cc40"; + sha256 = "15d543ab31c981bcb9bfb10f588159848ef570fafb6b9d1347f1429a9b1f531a"; }; postPatch = '' diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 3a6b49e4e9f..6bfc10f0a09 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.14.3"; + version = "1.15.0"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "df8adc4b97f5ab4328a0e745bee77877cf4a7d4601cb1cd5959d2bbf8fba57aa"; + sha256 = "2d661c8d650a1df5805d0e360121cb55c55d8bd29f858fa62cbe943e59ce89f7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index e73f1e86613..934af49462b 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.4.1"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e6c02a6709d13490c73450f3b1ac3436bd26795fa04d9711d7cad973a71eb118"; + sha256 = "35eeb50c101968b4b5eecc840002a6f83af6789b6a947f27f0b2787e30cc1835"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 52248605c75..3fc0fc8598d 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.7.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "fa92a77fcc79032dba756b82196a29f63a7b374379bacdb78be128e09b8abc03"; + sha256 = "6541245cdee3e3ba5d98bb3ecd0b343fd5d3de1e880cfc5daf59f4a69a045171"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index f81663b407d..e361b4436ee 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.21.0"; + version = "1.23.1"; src = fetchPypi { inherit pname version; - sha256 = "b38d5669235583ee4334d468b3719ea4a381da4b2abbedbf13cb926d893a11ab"; + sha256 = "99c341592d711d8f131fe80d842f7e1b04b2ca1faefa1ffedf4dec1b382cebf6"; }; checkInputs = [ pytest mock ipython ]; diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 3dae6bfdadc..a71d2e493dd 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5bfa5db942ddb491a62198e690754dbed80228e5cb2c389d809be33464f6cb31"; + sha256 = "eea9d4aca54499b555a893fa441deac1bd7ae9cbc8e03bdd681fd33fad72e170"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index 0b0914b1480..139ce85a319 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.0.3"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "10750207c1a9ad6f6e082d91dbff3920443bdaf1c344a782730489a9efa802f1"; + sha256 = "49036087c1170c3fad026e45189f17092b8c584a9accb2d73d1854f494e223ae"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index a08a1c4fd10..becc2678dc1 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.5.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "24c28e9383e714b1447e5b4a2282beda2c94714e78cbb6cfc5f8ccbfcfdb3ffa"; + sha256 = "302bc448e77f1de958ba7413fb85819eda911043f219d8fc030a356848bc6f31"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 6c7388b4cf1..30990938435 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.12.1"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "acf2b1f8388b0baf3286bd2a67e3adad70a28d0fa768fd2196a96710637c4b72"; + sha256 = "844f5e63597c2a15561eec68397ee5f425e9be7728d2d7072f50f983fab31b9a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index 697e2b2d7c9..e6211d844fa 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "201fa86bbc76cf7ccbfac293bb7ed2dfba9bb9e5244b2785f619d083a8b2b51d"; + sha256 = "7fec7b523ab5e1f87721ca61181114818579bb4d17de768a3993811c9d2aacfe"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index 5bc612ad188..a556fb95568 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "0.33.0"; + version = "0.34.0"; src = fetchPypi { inherit pname version; - sha256 = "cba63744faeea3b0167a752268955df127736e453820f01cc24e97bf4ae83c24"; + sha256 = "75370af645dd815c234561e7b356fa5d99b0ee6448c0e5d013455c72af961d0b"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 8860578b207..99723450866 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "afb08eb558f3e4d836e6f77443f81555d6921ffc888c7c3085acd1205fba6e8c"; + sha256 = "bdead87e40eba93043c6704578e946cf2794366312f936da0a2b3754234dde29"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix index 0fad7cbdbfa..80e88d53f1f 100644 --- a/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.11.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "58b0c324296986d2f308d1b9917341d5c1e8e72253349e3ba5163b99bf7fc840"; + sha256 = "eafa09cc344339a23702ee74eac5713974fefafdfd56afb589bd25548c79c80d"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix index b14c48cbf08..c00ea653900 100644 --- a/pkgs/development/python-modules/google_cloud_speech/default.nix +++ b/pkgs/development/python-modules/google_cloud_speech/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "1.2.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "f8a1f67b01b5b8bd22fa3ba95a4b99ae4a55b6299665d5ae1afa3db7f6706c32"; + sha256 = "21b597b18ee2b9b9a5e2e05a7a1d47173f8f3adeada36b5bdf6cb816114430bf"; }; propagatedBuildInputs = [ google_api_core ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 1d68197364b..ff750602465 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.20.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "2e7e2435978bda1c209b70a9a00b8cbc53c3b00d6f09eb2c991ebba857babf24"; + sha256 = "c66e876ae9547884fa42566a2ebfec51d280f488d7a058af9611ba90c78bed78"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index 9a139399ccd..95bcb0d4d57 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "93f57f5ee273b4efcb3d7cc9d1c0b9a63dc9fd61d1fb47b861182364cfd51f94"; + sha256 = "221388d1dd4bf21ba46ead499bbb3dfba9151b852c4fdca70935ba36e5c3631a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index a6010969409..57e106fcfbe 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.11.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "ef5c53772500bb30b546889ba8823a8d21217153544800f31a9bfd6f514643cb"; + sha256 = "66d0a63d27e83656b1b4e0205d32725e4c58db174118badba164bb7d05a66981"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 10c8792b9c8..39dfc123650 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "0.39.0"; + version = "0.41.0"; src = fetchPypi { inherit pname version; - sha256 = "f33aea6721d453901ded268dee61a01ab77d4cd215a76edc3cc61b6028299d3e"; + sha256 = "fd7adcfd8f1bddc19797b25ba3287a4f0cf42e208f330fffb7f1cd125e4d6cd3"; }; checkInputs = [ mock ]; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index a7fc28623fc..8486eba68c1 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cdeb8fbb3551a665db921023603af2f0d6ac59ad8b48259cb510b8799505775f"; + sha256 = "2a8fd188afe1cbfd5998bf20602f76b0336aa892de88fe842a806b9a3ed78d2a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index f5a9341e2cc..c6afce2f9ba 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = https://github.com/NoMore201/googleplay-api; license = licenses.gpl3; description = "Google Play Unofficial Python API"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 2edb41571d9..074d41aab94 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = https://github.com/matlink/gplaycli; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gprof2dot/default.nix b/pkgs/development/python-modules/gprof2dot/default.nix index 48abf5058df..28609919098 100644 --- a/pkgs/development/python-modules/gprof2dot/default.nix +++ b/pkgs/development/python-modules/gprof2dot/default.nix @@ -1,20 +1,20 @@ { lib, fetchFromGitHub, buildPythonApplication, python, graphviz }: buildPythonApplication { - name = "gprof2dot-2017-09-19"; + name = "gprof2dot-2019-11-30"; src = fetchFromGitHub { owner = "jrfonseca"; repo = "gprof2dot"; - rev = "2017.09.19"; - sha256 = "1b5wvjv5ykbhz7aix7l3y7mg1hxi0vgak4a49gr92sdlz8blj51v"; + rev = "2019.11.30"; + sha256 = "1nw4cfwimd0djarw4wc756q095xir78js8flmycg6g7sl3l6p27s"; }; checkInputs = [ graphviz ]; checkPhase = "${python.interpreter} tests/test.py"; meta = with lib; { - homepage = https://github.com/jrfonseca/gprof2dot; + homepage = "https://github.com/jrfonseca/gprof2dot"; description = "Python script to convert the output from many profilers into a dot graph"; license = licenses.lgpl3Plus; maintainers = [ maintainers.pmiddend ]; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 4b0e665de09..e069c8f8c7b 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook -, pkgconfig, boost, expat, scipy, cgal, gmp, mpfr +, pkg-config, boost, expat, scipy, cgal, gmp, mpfr , gobject-introspection, pygobject3, gtk3, matplotlib, ncurses , buildPythonPackage , fetchpatch @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.27"; + version = "2.29"; meta = with stdenv.lib; { description = "Python module for manipulation and statistical analysis of graphs"; @@ -21,25 +21,9 @@ buildPythonPackage rec { src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "04s31qwlfcl7bwsggnic8gqcqmx2wsrmfw77nf7vzgnz42bwch27"; + sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c"; }; - patches = [ - # fix build with cgal 4.13 (https://git.skewed.de/count0/graph-tool/issues/509) - (fetchpatch { - name = "cgal-4.13.patch"; - url = "https://git.skewed.de/count0/graph-tool/commit/aa39e4a6b42d43fac30c841d176c75aff92cc01a.patch"; - sha256 = "1578inb4jqwq2fhhwscn5z95nzmaxvmvk30nzs5wirr26iznap4m"; - }) - ] ++ (lib.optionals (pythonAtLeast "3.7") [ - # # python 3.7 compatibility (`async` is now reserved) - (fetchpatch { - name = "async-reserved.patch"; - url = "https://git.skewed.de/count0/graph-tool/commit/0407f41a35b6be7c670927fb5dc578cbd0e88be4.patch"; - sha256 = "1fklznhmfvbb3ykwzyf8p2hiczby6y7r0xnkkjl2jkxlvr24000q"; - }) - ]); - configureFlags = [ "--with-python-module-path=$(out)/${python.sitePackages}" "--with-boost-libdir=${boost}/lib" @@ -48,7 +32,7 @@ buildPythonPackage rec { "--enable-openmp" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index e4fb0914f0a..8b84af18729 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.25.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "988014c714ca654b3b7ca9f4dabfe487b00e023bfdd9eaf1bb0fed82bf8c4255"; + sha256 = "5580b86cf49936c9c74f0def44d3582a7a1bb720eba8a14805c3a61efa790c70"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 16c6921cdd6..75a3d745a3f 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy27 , coverage , mock , pytest @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "gunicorn"; - version = "19.9.0"; + version = "20.0.4"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3"; + sha256 = "1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 52171470c27..d90ded1fb5f 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.15.3"; + version = "0.15.4"; src = fetchPypi { inherit pname version; - sha256 = "18381e13bbd1e2f206a1b88a2af4fb87affd7d06ee7955a6e5e6a79478a9adfc"; + sha256 = "3b930cbe1c76bbd30455b5e82ba723dea94159a5f988e927f443324bf7cc7ddd"; }; postPatch = '' diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix new file mode 100644 index 00000000000..d98a053c418 --- /dev/null +++ b/pkgs/development/python-modules/h3/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, cmake +, fetchPypi +, h3 +, python +}: + +buildPythonPackage rec { + pname = "h3"; + version = "3.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "07dlqpr1r4kzb3gci395plpss8gxvvrij40l6w0mylyg7fkab4m2"; + }; + + patches = [ + ./disable-custom-install.patch + ./hardcode-h3-path.patch + ]; + + preBuild = '' + substituteInPlace h3/h3.py \ + --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/uber/h3-py"; + description = "This library provides Python bindings for the H3 Core Library."; + license = licenses.asl20; + platforms = platforms.unix ++ platforms.darwin; + maintainers = [ maintainers.kalbasit ]; + }; +} diff --git a/pkgs/development/python-modules/h3/disable-custom-install.patch b/pkgs/development/python-modules/h3/disable-custom-install.patch new file mode 100644 index 00000000000..981e3b6e2fc --- /dev/null +++ b/pkgs/development/python-modules/h3/disable-custom-install.patch @@ -0,0 +1,41 @@ +diff --git a/setup.py b/setup.py +index 8e1c220..45297b6 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,20 +25,6 @@ class CustomBuildExtCommand(build_ext): + install_h3(h3_version) + + +-# Tested with wheel v0.29.0 +-class BinaryDistribution(Distribution): +- def __init__(self, attrs=None): +- Distribution.__init__(self, attrs) +- # The values used for the name and sources in the Extension below are +- # not important, because we override the build_ext command above. +- # The normal C extension building logic is never invoked, and is +- # replaced with our own custom logic. However, ext_modules cannot be +- # empty, because this signals to other parts of distutils that our +- # package contains C extensions and thus needs to be built for +- # different platforms separately. +- self.ext_modules = [Extension('h3c', [])] +- +- + long_description = open('README.rst').read() + + setup( +@@ -52,14 +38,10 @@ setup( + url='https://github.com/uber/h3-py.git', + packages=find_packages(exclude=['tests', 'tests.*']), + install_requires=[], +- cmdclass={ +- 'build_ext': CustomBuildExtCommand, +- }, + package_data={ + 'h-py': + ['out/*.dylib' if platform.system() == 'Darwin' else ( + 'out/*.dll' if platform.system() == 'Windows' else + 'out/*.so.*')] + }, +- license='Apache License 2.0', +- distclass=BinaryDistribution) ++ license='Apache License 2.0') diff --git a/pkgs/development/python-modules/h3/hardcode-h3-path.patch b/pkgs/development/python-modules/h3/hardcode-h3-path.patch new file mode 100644 index 00000000000..87549f298d7 --- /dev/null +++ b/pkgs/development/python-modules/h3/hardcode-h3-path.patch @@ -0,0 +1,19 @@ +diff --git a/h3/h3.py b/h3/h3.py +index 18cf168..2cc7812 100644 +--- a/h3/h3.py ++++ b/h3/h3.py +@@ -34,13 +34,7 @@ from ctypes import ( + POINTER, + ) + +-_dirname = os.path.dirname(__file__) +-libh3_path = ('{}/{}'.format(_dirname, 'out/libh3.1.dylib') +- if platform.system() == 'Darwin' else ( +- '{}/{}'.format(_dirname, 'out/h3.dll') if platform.system() == 'Windows' else +- '{}/{}'.format(_dirname, 'out/libh3.so.1'))) +- +-libh3 = cdll.LoadLibrary(libh3_path) ++libh3 = cdll.LoadLibrary('@libh3_path@') + + # Type of an H3 index + H3Index = c_ulonglong diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix new file mode 100644 index 00000000000..e14b97d94ce --- /dev/null +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, acme, aiohttp, snitun, attrs, pytest-aiohttp, warrant, pytest }: + +buildPythonPackage rec { + pname = "hass-nabucasa"; + version = "0.29"; + + src = fetchFromGitHub { + owner = "nabucasa"; + repo = pname; + rev = version; + sha256 = "182nh5i3hlj0kqkbynk69md0ddq83w02l8lz4m03d8xbjixzi1k1"; + }; + + # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119 + postPatch = '' + sed -i 's/"acme.*/"acme>=0.40.0,<2.0"/' setup.py + cat setup.py + ''; + + propagatedBuildInputs = [ acme aiohttp snitun attrs warrant ]; + + checkInputs = [ pytest pytest-aiohttp ]; + + checkPhase = '' + pytest tests/ + ''; + + meta = with lib; { + homepage = "https://github.com/NabuCasa/hass-nabucasa"; + description = "Home Assistant cloud integration by Nabu Casa, inc."; + license = licenses.gpl3; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index e716a185a80..7351b274210 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.23"; + version = "0.8.24"; src = fetchPypi { inherit pname version; - sha256 = "ff60c66591452ceb6bdb7592c560a1ebc7e128a02dd3880e048861f7fea7f78d"; + sha256 = "fe31a7ea0ce2c9babd190a195e491834ff9f64c74daa4ca94fa65a88f701269a"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/histbook/default.nix b/pkgs/development/python-modules/histbook/default.nix deleted file mode 100644 index c9ea7010a6f..00000000000 --- a/pkgs/development/python-modules/histbook/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, pandas }: - -buildPythonPackage rec { - pname = "histbook"; - version = "1.2.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "76d1f143f8abccf5539029fbef8133db84f377fc7752ac9e7e6d19ac9a277967"; - }; - - propagatedBuildInputs = [ numpy pandas ]; - - meta = with lib; { - homepage = https://github.com/scikit-hep/histbook; - description = "Versatile, high-performance histogram toolkit for Numpy"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 32c79b17136..e29c31e6fa7 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "081c53xs5wn5vikwslallwdv0am09w9cbbggl5dbkqpnic9zx4h4"; + sha256 = "8003d5dc55612de8016156abdc7aa1dd995abc2431adb1ef33dd84a6d29e56bf"; }; buildInputs = [ setuptools_scm cython ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 3909651ff26..ebde21a4821 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.9.11"; + version = "0.9.12"; src = fetchPypi { inherit pname version; - sha256 = "1g0irhh4kq3zy1disc9i5746p72a72s5j1q1cxhbdkwnnn9dnpwi"; + sha256 = "3182c4a6fef8d01a829468362ace9c3bba7645873610535fef53454dbb4ea092"; }; propagatedBuildInputs = [ six dateutil ]; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 1bc8f10241d..b12ef64c602 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.12.6"; + version = "1.12.7"; src = fetchPypi { inherit pname version; - sha256 = "4f6ad184fb6136e5ee37a74b5276825fc3d5fce5033ff3c8db8831ec11ea2e75"; + sha256 = "c63f76d1ce2261eb0cd147a24be25daff399e7df2c3d6ade3e813d2e9cb7d42f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index 5851d62842b..5674db53e5a 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -2,13 +2,14 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { pname = "homeassistant_pyozw"; - version = "0.1.4"; + version = "0.1.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a4ec26b95dba630df8c95c617c510e4a33db93a6a39e8a97056eec7dc9a49d1e"; + sha256 = "2d500638270ee4f0e7e9e114d9b4402c94c232f314116cdcf88d7c1dc9a44427"; }; + patches = []; meta.homepage = https://github.com/home-assistant/python-openzwave; }) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix new file mode 100644 index 00000000000..a276bd33b59 --- /dev/null +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +}: + +buildPythonPackage rec { + pname = "hstspreload"; + version = "2019.12.25"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "sethmlarson"; + repo = pname; + rev = version; + sha256 = "1aa7jccwldxw3s0z668qqb0i0plsark1q3jvkmqkyp645w5bfilk"; + }; + + # tests require network connection + doCheck = false; + + meta = with lib; { + description = "Chromium HSTS Preload list as a Python package and updated daily"; + homepage = https://github.com/sethmlarson/hstspreload; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 5a59b63cea4..82b48180709 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , flake8 -, pytest +, pytest_4 , pytest-expect , mock , six @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; }; - checkInputs = [ flake8 pytest pytest-expect mock ]; + checkInputs = [ flake8 pytest_4 pytest-expect mock ]; propagatedBuildInputs = [ six webencodings ]; @@ -42,4 +42,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ domenkozar prikhi ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 77350b09941..c40f3453d6b 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107"; + sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58"; }; # Needs setting up diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix new file mode 100644 index 00000000000..04a0592d750 --- /dev/null +++ b/pkgs/development/python-modules/httpx/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, certifi +, hstspreload +, chardet +, h11 +, h2 +, idna +, rfc3986 +, sniffio +, isPy27 +, pytest +, pytestcov +, trustme +, uvicorn +, trio +, brotli +}: + +buildPythonPackage rec { + pname = "httpx"; + version = "0.9.5"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "140z2j7b5hlcxvfb433hqv5b8irqa88hpq33lzr9m992djbhj2hb"; + }; + + propagatedBuildInputs = [ + certifi + hstspreload + chardet + h11 + h2 + idna + rfc3986 + sniffio + ]; + + checkInputs = [ + pytest + pytestcov + trustme + uvicorn + trio + brotli + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "h11==0.8.*" "h11" + ''; + + checkPhase = '' + PYTHONPATH=.:$PYTHONPATH pytest + ''; + + meta = with lib; { + description = "The next generation HTTP client"; + homepage = https://github.com/encode/httpx; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index ec9c5ecefa0..fdb5a69ddd7 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { # pytz fake_factory django numpy pytest # If you need these, you can just add them to your environment. - version = "4.41.0"; + version = "4.56.1"; pname = "hypothesis"; # Use github tarballs that includes tests @@ -22,7 +22,7 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; - propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ]; + propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) enum34; checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; inherit doCheck; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 3b53038321c..bfe039382ac 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.7"; + version = "1.4.9"; src = fetchPypi { inherit pname version; - sha256 = "0vi9qxgnjgxdk4wj3c5ha3hjmc97j3pw1zh2cg39jprapn4rb4fq"; + sha256 = "6f44e637caa40d1b4cb37f6ed3b262ede74901d28b1cc5b1fc07360871edd65d"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix new file mode 100644 index 00000000000..e37dfe80e58 --- /dev/null +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -0,0 +1,91 @@ +{ buildPythonPackage, lib, fetchFromGitHub, nixosTests +, alembic +, aniso8601 +, Babel +, blinker +, click +, dnspython +, email_validator +, flask +, flask-babel +, flask-cors +, flask_mail +, flask_migrate +, flask-restful +, flask_script +, flask_sqlalchemy +, flask_wtf +, idna +, itsdangerous +, jinja2 +, Mako +, markupsafe +, python-dateutil +, pytz +, six +, sqlalchemy +, werkzeug +, wtforms +, psycopg2 # optional, for postgresql support +, flask_testing +}: + +buildPythonPackage rec { + pname = "ihatemoney"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "spiral-project"; + repo = pname; + rev = version; + sha256 = "1ai7v2i2rvswzv21nwyq51fvp8lr2x2cl3n34p11br06kc1pcmin"; + }; + + propagatedBuildInputs = [ + alembic + aniso8601 + Babel + blinker + click + dnspython + email_validator + flask + flask-babel + flask-cors + flask_mail + flask_migrate + flask-restful + flask_script + flask_sqlalchemy + flask_wtf + idna + itsdangerous + jinja2 + Mako + markupsafe + python-dateutil + pytz + six + sqlalchemy + werkzeug + wtforms + psycopg2 + ]; + + checkInputs = [ + flask_testing + ]; + + passthru.tests = { + inherit (nixosTests) ihatemoney; + }; + meta = with lib; { + homepage = "https://ihatemoney.org"; + description = "A simple shared budget manager web application"; + platforms = platforms.linux; + license = licenses.beerware; + maintainers = [ maintainers.symphorien ]; + }; +} + + diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix index 6374b882718..861a0ed0db3 100644 --- a/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -6,15 +6,28 @@ buildPythonPackage rec { pname = "imagecodecs-lite"; - version = "2019.4.20"; + version = "2019.12.3"; src = fetchPypi { inherit pname version; - sha256 = "1cp88g7g91gdhjhaz6gvb4jzvi5ad817id9f2bnc5r95ag93bqb0"; + sha256 = "0s4xb17qd7vimc46rafbjnibj4sf0lnv8cwl22k1h6zb7jhqmlcm"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy cython ]; + nativeBuildInputs = [ + cython + ]; + + checkInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkPhase = '' + pytest + ''; meta = with lib; { description = "Block-oriented, in-memory buffer transformation, compression, and decompression functions"; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index d8e35d3fcea..568fc825ab6 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.5.0"; + version = "0.6.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "1m8r055mvkws0s449s1dyrkgricls6basnszwbwqwrw6g19n1xsx"; + sha256 = "94f846ff8d19ee9ea42ba6feddfbc85d5b42098bd3b62318f8d3bc5c7133b274"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 32dc23ddfce..48ea6004426 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -1,30 +1,55 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, scikitimage, opencv3, six }: +{ buildPythonPackage +, fetchurl +, imageio +, numpy +, opencv3 +, pytest +, scikitimage +, scipy +, shapely +, six +, stdenv +}: buildPythonPackage rec { pname = "imgaug"; version = "0.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "e1354d41921f1b306b50c5141b4870f17e81b531cae2f5c3093da9dc4dcb3cf4"; + src = fetchurl { + url = "https://github.com/aleju/imgaug/archive/c3d99a420efc45652a1264920dc20378a54b1325.zip"; + sha256 = "sha256:174nvhyhdn3vz0i34rqmkn26840j3mnfr55cvv5bdf9l4y9bbjq2"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "opencv-python-headless" "" + substituteInPlace setup.py \ + --replace "opencv-python-headless" "" + substituteInPlace pytest.ini \ + --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" "" + ''; + propagatedBuildInputs = [ + imageio numpy - scipy - scikitimage opencv3 + scikitimage + scipy + shapely six ]; - # disable tests when there are no tests in the PyPI archive - doCheck = false; + checkPhase = '' + pytest ./test + ''; + + checkInputs = [ opencv3 pytest ]; meta = with stdenv.lib; { homepage = https://github.com/aleju/imgaug; description = "Image augmentation for machine learning experiments"; license = licenses.mit; - maintainers = with maintainers; [ cmcdragonkai ]; - broken = true; # opencv-python bindings aren't available yet, and look non-trivial + maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index bae5d232d0e..5b7a249d65a 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "0.23"; + version = "1.3.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a"; + sha256 = "0ibvvqajphwdclbr236gikvyja0ynvqjlix38kvsabgrf0jqafh7"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -28,9 +28,6 @@ buildPythonPackage rec { checkInputs = [ importlib-resources packaging ]; - # Two failing tests: https://gitlab.com/python-devs/importlib_metadata/issues/72 - doCheck = false; - meta = with lib; { description = "Read metadata from Python packages"; homepage = https://importlib-metadata.readthedocs.io/; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 147cc8753eb..2b856b35f7c 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,15 +1,15 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six }: +{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata }: buildPythonPackage rec { pname = "inflect"; - version = "2.1.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4ded1b2a6fcf0fc0397419c7727f131a93b67b80d899f2973be7758628e12b73"; + sha256 = "ee7c9b7c3376d06828b205460afb3c447b5d25dd653171db249a238f3fc2c18a"; }; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six importlib-metadata ]; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index f670d8f01e0..487ffc35b1a 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1mbjr4xl4i523bg8k08s5986v2289fznd8cr3j3czn5adi8519j7"; + sha256 = "81c3bdadbb81ec10c923b89e118c229d977a584ccbe27466f8fde41c0c274c3f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 739a82aecc5..6b393aea1e7 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.8.1"; + version = "1.9.0"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "1fdb0kr9hzgyh0l8d02khcjpsgyd63nbablhc49ncdsav3dhhr3f"; + sha256 = "1h344c04ipzld4s7xk8d84f80samjjlgzvv3y8zsv0n1c895gymb"; }; propagatedBuildInputs = [ @@ -24,7 +24,8 @@ buildPythonPackage rec { args schema setuptools - ] ++ lib.optional (!isPy3k) backports_csv; + backports_csv + ]; checkInputs = [ pytest responses glibcLocales ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 22a61281af2..5202483ab32 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -1,27 +1,28 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , fetchpatch +, flaky , ipython , jupyter_client , traitlets , tornado , pythonOlder -, pytest +, pytestCheckHook , nose }: buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.2"; + version = "5.1.3"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "04jx6ihj3zpj4c7acqa14gl37mpdnbgmfm4nvv97xkjc1cz920xm"; + sha256 = "1a08y677lpn80qzvv7z0smgggmr5m5ayf0bs6vds47xpxl9sss5k"; }; - checkInputs = [ pytest nose ]; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; # https://github.com/ipython/ipykernel/pull/377 @@ -32,10 +33,17 @@ buildPythonPackage rec { }) ]; - # For failing tests, see https://github.com/ipython/ipykernel/issues/387 - checkPhase = '' - HOME=$(mktemp -d) pytest ipykernel -k "not (test_sys_path or test_sys_path_profile_dir or test_complete)" + checkInputs = [ pytestCheckHook nose flaky ]; + dontUseSetuptoolsCheck = true; + preCheck = '' + export HOME=$(mktemp -d) ''; + disabledTests = lib.optionals stdenv.isDarwin [ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix new file mode 100644 index 00000000000..c097bdbe9e1 --- /dev/null +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +# Runtime dependencies +, jedi +, decorator +, pickleshare +, traitlets +, prompt_toolkit +, pexpect +, appnope +, backcall +, fetchpatch +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "7.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz"; + }; + + prePatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments ]; + + propagatedBuildInputs = [ + jedi + decorator + pickleshare + traitlets + prompt_toolkit + pygments + pexpect + backcall + ] ++ lib.optionals stdenv.isDarwin [appnope]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + pythonImportsCheck = [ + "IPython" + ]; + + meta = with lib; { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor fridh ]; + }; +} diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index f67c5ea941a..6b9da6e882f 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.10.1"; - disabled = pythonOlder "3.5"; + version = "7.10.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "03h3m64k8jq0cc48i34g8xq0r68cx3w7wz721mfhr7k06qdv11pi"; + sha256 = "762d79a62b6aa96b04971e920543f558dfbeedc0468b899303c080c8068d4ac2"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 95dd5ba4617..5828ada7a61 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "irc"; - version = "17.1"; + version = "18.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0c19aeee800dbad792179d70dff1281c06fec220323f8ec34150cd94357f383b"; + sha256 = "1qg5996mzvhnkm74ksaa4d47fz5vrpw6hvxyaq9kf6y4cf1l76wq"; }; doCheck = false; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index 7ad81da27d2..af12ba587d4 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.9.9"; + version = "3.9.10"; src = fetchPypi { inherit pname version; - sha256 = "ba2d5a86a70db0f1951df479205e9144d9e55b8af4995b3857a79a30c6ff16ab"; + sha256 = "1a389556cc5cf82b7ad95924710101e3bd06d809d6f889a3f437975b275af944"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index dadbb810465..8e5458509c4 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,13 +1,16 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six }: +{ buildPythonPackage, fetchPypi, setuptools_scm, six, more-itertools }: buildPythonPackage rec { pname = "jaraco.classes"; - version = "2.0"; + version = "3.0.0"; + src = fetchPypi { inherit pname version; - sha256 = "1xfal9085bjh4fv57d6v9ibr5wf4llj73gp1ybdlqd2bralc9hnw"; + sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six more-itertools ]; + doCheck = false; - buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six ]; } diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 492d903f24d..324eb625014 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c2e9d507d8cf04a3ff916b57eaf46bacb8a9f8895b55ead853de9c47b8f5daa4"; + sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73"; }; doCheck = false; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix new file mode 100644 index 00000000000..54656e1ea99 --- /dev/null +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "javaobj-py3"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0j9532i7bnjd0v4a8c36mjj9rsdnbmckk65dh9sbmvnhy3j6jx55"; + }; + + # Tests assume network connectivity + doCheck = false; + + meta = { + description = "Module for serializing and de-serializing Java objects"; + homepage = "https://github.com/tcalmant/python-javaobj"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 0df9404f156..eb3cdfaadd8 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"; + sha256 = "e909527104a903606dd63bea6e8e888833f0ef087057829b89a18364a856f807"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index bc109c560d8..a5015f4d326 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1wcmn01md6hykblk5zz8wd5zizyisspspakz446jg2kqfv4y3q03"; + sha256 = "1njxww53d92cpgrqlr09w2n0pk6wamjcb0mvpns1mr2pn5hy1jhi"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index df21c0f4186..75520384ff3 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "jieba"; - version = "0.39"; + version = "0.40"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "fxsjy"; repo = pname; rev = "v${version}"; - sha256 = "0hbq0l1jbgcvm58qg4p37im4jl5a9igvq3wlhlk22pmbkbvqqgzs"; + sha256 = "1nasyxva9m3k9fb9g627ppphp3697jdplbb2bavqx71sa7mqim2m"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index b9bc923e7e0..78aaadf690e 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -30,6 +30,6 @@ buildPythonPackage rec { meta = with lib; { description = "This library eases the use of the JIRA REST API from Python."; license = licenses.bsd2; - maintainers = with maintainers; [ globin ma27 ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 255e3e9b3d7..d0c875cfa3b 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1zwkl6hgi8wbygcc6ql6yk1if665hwk43sa9shglb2afrfm5gk3g"; + sha256 = "0630eea4f5664c463f23fbf5dcfc54a2bc6168902719fa8e19daf033022786c8"; }; checkInputs = [ sphinx numpydoc pytest ]; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d94a7742f9e..9ff267b6fce 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f"; + sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix new file mode 100644 index 00000000000..11bd1d60ab0 --- /dev/null +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, python +}: + +buildPythonPackage rec { + pname = "junitparser"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "gastlygem"; + repo = pname; + rev = version; + sha256 = "16xwayr0rbp7xdg7bzmyf8s7al0dhkbmkcnil66ax7r8bznp5lmp"; + }; + + propagatedBuildInputs = [ future ]; + + checkPhase = '' + ${python.interpreter} test.py + ''; + + meta = with lib; { + description = "A JUnit/xUnit Result XML Parser"; + license = licenses.asl20; + homepage = https://github.com/gastlygem/junitparser; + maintainers = with maintainers; [ multun ]; + }; +} diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 7255ee53860..77b56e01b0c 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "c0f853cdad12256ae8c33a80ff6c31a3ce867c481f805b085d554fbb5b5b084f"; + sha256 = "0f8c4763fe2281979bc00350b93d510368992dbae0dae4fea0bafee5904a7e68"; }; diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index f8cf8b3076a..9200e004d0c 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -20,7 +20,6 @@ buildPythonPackage rec { sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ jupyter_client ipython @@ -28,6 +27,12 @@ buildPythonPackage rec { prompt_toolkit pygments ]; + checkInputs = [ nose ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.0,<2.1.0" "prompt_toolkit" + ''; # ValueError: underlying buffer has been detached doCheck = false; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b291a2b0d3b..952e5b781a1 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -16,6 +16,8 @@ , notebook , pythonOlder , nodePackages +, oauthlib +, certipy }: let @@ -51,12 +53,12 @@ in buildPythonPackage rec { pname = "jupyterhub"; - version = "0.9.4"; + version = "1.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7848bbb299536641a59eb1977ec3c7c95d931bace4a2803d7e9b28b9256714da"; + sha256 = "0zx6gw9yhgki05j21p6x1x2sf5a2mg2c2mx0ii8rl6q4b98ilm1k"; }; # Most of this only applies when building from source (e.g. js/css assets are @@ -107,7 +109,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado - traitlets prometheus_client async_generator notebook + traitlets prometheus_client async_generator notebook certipy oauthlib ]; # Disable tests because they take an excessive amount of time to complete. diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 520f342cc1d..32d3ad0bada 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "1.2.3"; + version = "1.2.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2188a9bcaaf0b6a68ff9098a481f37ece8231634b862fd3c9adedc466aac79f2"; + sha256 = "6adb88acd05b51512c37df477a18c36240823a591c2a51bf6556198414026d8f"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 2bb7e22b097..961eb43f03b 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.2.4"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "490e1127033fceed5c49f7b1cde6aabffb059fe0a778a0e8b10d28d9eecef1f0"; + sha256 = "132bad60c63debfb371a691cb6668a19938ec268599e9c49f1531a3bf0be7b1c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix index b1b82f31d76..8643e562fa0 100644 --- a/pkgs/development/python-modules/kajiki/default.nix +++ b/pkgs/development/python-modules/kajiki/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Kajiki"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "85202ff7c2ce2466e9da82f06b25d1d6753d411d0e1b3ab3b145ed1e04c46782"; + sha256 = "bbec46b19285d42769d7c4f5a8a0195b72a62b54cd360a26a8875319d58efef6"; }; propagatedBuildInputs = [ Babel pytz nine ]; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index ace5b862825..b4d647c6075 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kconfiglib"; - version = "13.2.0"; + version = "13.7.0"; src = fetchPypi { inherit pname version; - sha256 = "045yjmn6xqbyb68l1jqlgi3c8cwlw1krsrlfwrrgjijkmbx6yqmd"; + sha256 = "0dkfprrsds64d2jbqnwdzb4why84jaj968s3ccmyqg5385nr9fwd"; }; # doesnt work out of the box but might be possible diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 65f8697e124..8f7ae56de04 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,27 +1,35 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy27 -, dbus-python, setuptools_scm, entrypoints, secretstorage -, pytest, pytest-flake8 }: +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonOlder +, dbus-python +, entrypoints +, importlib-metadata +, pytest +, pytest-flake8 +, secretstorage +, setuptools_scm +}: buildPythonPackage rec { pname = "keyring"; - version = "19.2.0"; + version = "20.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1cvlm48fggl12m19j9vcnrlplidr2sjf8h3pdyki58f9y357q0wi"; + sha256 = "963bfa7f090269d30bdc5e25589e5fd9dad2cf2a7c6f176a7f2386910e5d0d8d"; }; nativeBuildInputs = [ setuptools_scm ]; checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage; + propagatedBuildInputs = [ dbus-python entrypoints ] + ++ lib.optional stdenv.isLinux secretstorage + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # checks try to access a darwin path on linux doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index 3fe986fc335..aa873b63ab9 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,14 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six , pytest, backports_unittest-mock, keyring, setuptools_scm }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "3.1.1"; + version = "3.4.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0lgp2d3hrpvbb2rfz18vrv5lrck72k3l2f2cpkbks2kigrfbgiqb"; + sha256 = "91328ac4229e70b1d0061d21bf61d36b031a6b4828f2682e38c741812f6eb23d"; }; postPatch = '' @@ -21,10 +22,16 @@ buildPythonPackage rec { checkInputs = [ pytest keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock; + # heavily relies on importing tests from keyring package + doCheck = false; checkPhase = '' py.test ''; + pythonImportsCheck = [ + "keyrings.alt" + ]; + meta = with stdenv.lib; { license = licenses.mit; description = "Alternate keyring implementations"; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index c9c98cc9701..d1218ab49b7 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -1,14 +1,14 @@ -{ lib, python, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, six, flask, pygments, dulwich, httpauth, humanize, pytest, requests, python-ctags3, mock }: -python.pkgs.buildPythonPackage rec { +buildPythonPackage rec { pname = "klaus"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jonashaag"; repo = pname; rev = version; - sha256 = "0pagyqfcj47ghd9m7b32hvi17hbl19f0wallkz6ncvmvvy919lfz"; + sha256 = "1432m3ki2g4ma10pfv310q1w4da46b0y2jklb8ajbz8a09ms6mfx"; }; prePatch = '' @@ -16,11 +16,11 @@ python.pkgs.buildPythonPackage rec { --replace "mkdir -p \$builddir" "mkdir -p \$builddir && pwd" ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = [ six flask pygments dulwich httpauth humanize ]; - checkInputs = with python.pkgs; [ + checkInputs = [ pytest requests python-ctags3 ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 47c42a1df45..aec1916c1ff 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # Judging from SyntaxError disabled = isPy3k; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; postInstall = '' mv $out/usr/* $out/ diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 323ab341ec6..5caab5a377e 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "kombu"; - version = "4.6.6"; + version = "4.6.7"; src = fetchPypi { inherit pname version; - sha256 = "1760b54b1d15a547c9a26d3598a1c8cdaf2436386ac1f5561934bc8a3cbbbd86"; + sha256 = "67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1"; }; postPatch = '' diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 18578da764e..c8279835c92 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.1"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "f97f01bf030b115d8b7f7b12a10ec5efe54750ad66b6b3567550b517a543ad11"; + sha256 = "6b515dc29329e8a3adac9d6b4fef84d80c513743be57ae66b54bcb30060172c6"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 4d6336ce757..212f13d00cf 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "leveldb"; - version = "0.194"; + version = "0.201"; src = fetchPypi { inherit pname version; - sha256 = "0f6d1y65k6miimic82n8zsx50z9k982mvzp90crwcv1knjrphcww"; + sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 381c3a2731a..3d505166e4a 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -1,32 +1,34 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi +, isPy27 , mock , pycrypto , requests , pytestrunner , pytest , requests-mock +, typing }: buildPythonPackage rec { pname = "apache-libcloud"; - version = "2.6.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "fcc165f2cc2db9a379c6d3a17b3beb9081bb64ba5c0bf7bbb58da864810092f0"; + sha256 = "29ee7d13b9b12d1335e752a489c01eed0c270940147f418cfff89ab66faf1305"; }; checkInputs = [ mock pytest pytestrunner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ]; + propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; # requires a certificates file doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A unified interface to many cloud providers"; homepage = http://incubator.apache.org/libcloud/; license = licenses.asl20; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 2b9843e303d..0a711b31d1a 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "37225b9f816ea3365ff5988fc8a3717e46ac99a5f223986c86c86cec4f111b54"; + sha256 = "bd1817be401e74c0d8b049e97ea2f35d2ce155cfa130119ce4195ea207bd6388"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 57f47ff5fd8..614945d1364 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.3"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a017b8d9e9da6761f4574642149c337f8f540d4edfe573fb91ad2c4001a2bc76"; + sha256 = "c071295307c447f85aaa3c3ab3ce058e29d67010f4fabf278a8e163916e4deab"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 9bcc95ddc30..7cd3ef85822 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2019.11.09"; + version = "2019.11.22"; src = fetchPypi { inherit pname version; - sha256 = "1ni25jmri0928jj2c24xw5f2fzljjla54zh80fimks1aa5752j29"; + sha256 = "6ccc6906fd644444a1edd0984d10bddf5abf4dd91c94eeeaa4660f7dc3eca320"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 13adad603d1..5f31511451d 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.97"; + version = "0.98"; src = fetchPypi { inherit pname version; - sha256 = "0jw3n14x6qg5wps2w4qkqf4pyan949h1s2nbkrz2qh7xwnnp2g8p"; + sha256 = "0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index bc91139728b..d05acd21c10 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lmtpd"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "192d1j9lj9i6f4llwg51817am4jj8pjvlqmkx03spmsay6f832bm"; + sha256 = "256e23a3292818ecccf9a76ef52e0064c6f7e1f8602904e15337c8917ed0fafe"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 99ff8d45e6a..8a23b69cf67 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -1,12 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, unittest2, six }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, unittest2, six }: buildPythonPackage rec { pname = "logilab-common"; - version = "1.4.4"; + version = "1.5.2"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8c1bf26431a3b487940cd4a7c0eefde328f5ff7098222ee695805752dae94aa6"; + sha256 = "1n20znamai7jksimbdshy03rgw235qwa9vbx3lyajzwysblq4s4d"; }; propagatedBuildInputs = [ unittest2 six ]; diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 67134fdfd95..ceb9f841a46 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -1,21 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, colorama }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, colorama, pytestCheckHook }: buildPythonPackage rec { pname = "loguru"; - version = "0.3.2"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0apd3wcjbyhwzgw0fgzzn4dcgy10pqa8f1vf58d4hmszxvyqn4z3"; + sha256 = "d5ddf363b7e0e562652f283f74a89bf35601baf16b70f2cd2736a2f8c6638748"; }; - checkInputs = [ pytest colorama ]; - checkPhase = '' - pytest -k 'not test_time_rotation_reopening' - ''; + checkInputs = [ pytestCheckHook colorama ]; - meta = with lib; { + disabledTests = [ "test_time_rotation_reopening" "test_file_buffering" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" ]; + + meta = with stdenv.lib; { homepage = https://github.com/Delgan/loguru; description = "Python logging made (stupidly) simple"; license = licenses.mit; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 56e1de49f20..0ccf55e5bc4 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27"; }) ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; nativeBuildInputs = [ swig2 ]; buildInputs = [ swig2 openssl ]; diff --git a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 0f3e793b1d5..28d09672584 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock, pytest }: buildPythonPackage rec { version = "0.4.1"; @@ -10,7 +10,13 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ]; - checkInputs = [ treq mock ]; + + # zope.interface import issue + doCheck = !isPy27; + checkInputs = [ treq mock pytest ]; + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "Securely transfer data between computers"; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 532eeca07df..5db5c28a4cb 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , spake2 , pynacl , six @@ -41,6 +42,8 @@ buildPythonPackage rec { install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 ''; + # zope.interface issue + doCheck = !isPy27; preCheck = '' export PATH=$out/bin:$PATH export LANG="en_US.UTF-8" @@ -55,6 +58,9 @@ buildPythonPackage rec { description = "Securely transfer data between computers"; homepage = https://github.com/warner/magic-wormhole; license = licenses.mit; + # Currently broken on Python 2.7. See + # https://github.com/NixOS/nixpkgs/issues/71826 + broken = isPy27; maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 19ec1ddb5c5..9b521689936 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -1,22 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, mozlog , moznetwork , mozprocess }: buildPythonPackage rec { pname = "mozdevice"; - version = "3.0.5"; + version = "3.0.6"; format = "wheel"; src = fetchPypi { inherit pname version; - sha256 = "1gpz0y81407pk71p9yzf15kqqk10fcansw8a607488d11m1jn3yf"; + sha256 = "1gw2lk16fz2n1953i29hgw47s2h0c6z911zzg8am1in8qq2318xv"; format = "wheel"; }; - propagatedBuildInputs = [ moznetwork mozprocess ]; + propagatedBuildInputs = [ mozlog moznetwork mozprocess ]; meta = { description = "Mozilla-authored device management"; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 0036ac3eb57..834bf48adbd 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "mozlog"; - version = "4.2.0"; + version = "5.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "dc85cfb9d47af6811f2367f471de7028c36204340c5e68a928115409ea75d9a9"; + sha256 = "0h1hgs13c1w0wvz60400i37m00077li1ky28j7kgx4bl75pkd3sw"; }; propagatedBuildInputs = [ blessings mozterm six ]; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index fddb7d67dae..dda9e07d5e5 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -4,18 +4,21 @@ , mozlog , mozfile , mozhttpd +, wptserve }: buildPythonPackage rec { pname = "mozprofile"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "95e7410ff2a65775422936749b346da8abf09fe0aafa3bb5dd1651b17da137d1"; + sha256 = "09l18x72vahq7il9nj6qj7la2d21vvbcn9szlm3vsvsbkz68w0yk"; }; - propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; + propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; + + checkInputs = [ wptserve ]; meta = { description = "Mozilla application profile handling library"; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index ba0fa476906..8cabe18e3c6 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "mozrunner"; - version = "7.6.0"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0ae84147f0fd784daa32c1d74f94b6e384967831aaf0c635bb3d9d0af3c4b112"; + sha256 = "04s6w0sp83bn3c6ym75rnlpmcy3yr7d35jxkxhgzmy75gbcps7bi"; }; propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index f9e962bb77c..12925f3575a 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mozversion"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "65f41d7dc14002f83d8f147c82ca34f7213ad07065d250939daaeeb3787dc0fa"; + sha256 = "0jczc1yr2yi3mf1qdgpvg9sidp5hf3jplzs4917j65ymvk2zw9na"; }; propagatedBuildInputs = [ mozlog mozdevice ]; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 76e641bae2c..2f85c33e757 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.19.0"; + version = "0.21.0"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "175ydlxmj8pbkrv3wcrsd9jg7smnxhln2y0i691yafhidxgy8fmm"; + sha256 = "93fd8fad2b33d92a1ae58328eeb0f39ed174858d82f9e7084a174df7b41fd3a4"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 5b07fe24441..7b7cadc9889 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,10 +1,11 @@ { lib, buildPythonPackage, fetchPypi, - dateutil, simplejson + dateutil, simplejson, isPy27 }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.2.2"; + version = "3.3.0"; + disabled = isPy27; meta = { homepage = "https://github.com/marshmallow-code/marshmallow"; @@ -17,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1a358beb89c2b4d5555272065a9533591a3eb02f1b854f3c4002d88d8f2a1ddb"; + sha256 = "0ba81b6da4ae69eb229b74b3c741ff13fe04fb899824377b1aff5aaa1a9fd46e"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 9f9d1010d98..44d2bf67247 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -20,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.1.1"; + version = "3.1.2"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1febd22afe1489b13c6749ea059d392c03261b2950d1d45c17e3aed812080c93"; + sha256 = "8e8e2c2fe3d873108735c6ee9884e6f36f467df4a143136209cff303b183bada"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/mautrix-appservice/0001-Remove-coding-annotations.patch b/pkgs/development/python-modules/mautrix-appservice/0001-Remove-coding-annotations.patch deleted file mode 100644 index d00264efe8c..00000000000 --- a/pkgs/development/python-modules/mautrix-appservice/0001-Remove-coding-annotations.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6750cda26821f703b120ba5c925cc696200570d3 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 26 Oct 2019 10:31:02 +0200 -Subject: [PATCH] Remove coding annotations - -Those used to be needed for Python <=3.5. With `pluggy` 0.13.0 this breaks -tests on newer python3 versions. ---- - mautrix_appservice/appservice.py | 1 - - mautrix_appservice/errors.py | 1 - - mautrix_appservice/intent_api.py | 1 - - mautrix_appservice/state_store.py | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/mautrix_appservice/appservice.py b/mautrix_appservice/appservice.py -index 3a141b1..47e37fe 100644 ---- a/mautrix_appservice/appservice.py -+++ b/mautrix_appservice/appservice.py -@@ -1,4 +1,3 @@ --# -*- coding: future_fstrings -*- - # Partly based on github.com/Cadair/python-appservice-framework (MIT license) - from contextlib import contextmanager - from typing import Optional, Callable, Awaitable, Union -diff --git a/mautrix_appservice/errors.py b/mautrix_appservice/errors.py -index 90d040f..702f541 100644 ---- a/mautrix_appservice/errors.py -+++ b/mautrix_appservice/errors.py -@@ -1,4 +1,3 @@ --# -*- coding: future_fstrings -*- - from typing import Optional - - -diff --git a/mautrix_appservice/intent_api.py b/mautrix_appservice/intent_api.py -index 4021bf8..7236cbb 100644 ---- a/mautrix_appservice/intent_api.py -+++ b/mautrix_appservice/intent_api.py -@@ -1,4 +1,3 @@ --# -*- coding: future_fstrings -*- - from urllib.parse import quote as urllib_quote - from time import time - from json.decoder import JSONDecodeError -diff --git a/mautrix_appservice/state_store.py b/mautrix_appservice/state_store.py -index 47bb970..6ebec2a 100644 ---- a/mautrix_appservice/state_store.py -+++ b/mautrix_appservice/state_store.py -@@ -1,4 +1,3 @@ --# -*- coding: future_fstrings -*- - from typing import Optional - from abc import ABC, abstractmethod - import json --- -2.23.0 - diff --git a/pkgs/development/python-modules/mautrix-appservice/default.nix b/pkgs/development/python-modules/mautrix-appservice/default.nix deleted file mode 100644 index 41ad167929a..00000000000 --- a/pkgs/development/python-modules/mautrix-appservice/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder }: - -buildPythonPackage rec { - pname = "mautrix-appservice"; - version = "0.3.11"; - - src = fetchPypi { - inherit pname version; - sha256 = "60192920cff75afdd096eea3a43276e33ec15f4f00bd04d2d1dda616c84f22a5"; - }; - - patches = lib.optional (!(pythonOlder "3.6")) [ - ./0001-Remove-coding-annotations.patch - ]; - - propagatedBuildInputs = [ - aiohttp - future-fstrings - ]; - - # No tests available - doCheck = false; - - disabled = pythonOlder "3.5"; - - meta = with lib; { - homepage = https://github.com/tulir/mautrix-appservice-python; - description = "A Python 3 asyncio-based Matrix application service framework"; - license = licenses.mit; - maintainers = with maintainers; [ nyanloutre ]; - }; -} diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix new file mode 100644 index 00000000000..d3b12d5ab60 --- /dev/null +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder +, sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch +}: + +buildPythonPackage rec { + pname = "mautrix"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03m59d683nr547v5xr80wc3j07das2d2sc3i4bf03dpbkfg0h17w"; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/tulir/mautrix-python/commit/ac46f3bb1bea11d22d8a486cc4821604c844da5e.patch"; + sha256 = "198g63s0iv8g1w22g4g5hb54y41ws82wraglibz33qhrwsfn8axn"; + }) + ]; + + propagatedBuildInputs = [ + aiohttp + future-fstrings + + # defined in optional-requirements.txt + sqlalchemy + ruamel_yaml + CommonMark + lxml + ]; + + disabled = pythonOlder "3.5"; + + # no tests available + doCheck = false; + + meta = with lib; { + homepage = https://github.com/tulir/mautrix-python; + description = "A Python 3 asyncio Matrix framework."; + license = licenses.mpl20; + maintainers = with maintainers; [ nyanloutre ma27 ]; + }; +} diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index 645ecddd163..6556ade818a 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5.1"; + version = "1.5.2"; pname = "maxminddb"; src = fetchPypi { inherit pname version; - sha256 = "0y9giw81k4wdmpryr4k42w50z292mf364a6vs1vxf83ksc9ig6j4"; + sha256 = "d0ce131d901eb11669996b49a59f410efd3da2c6dbe2c0094fe2fef8d85b6336"; }; propagatedBuildInputs = [ ipaddress ]; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index b342086d655..260d6262102 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "measurement"; - version = "2.0.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "36ca385ffdccf140a75a7e1d816a4df97a6dd255f16fd2f53dd7ab43632a8835"; + sha256 = "352b20f7f0e553236af7c5ed48d091a51cf26061c1a063f46b31706ff7c0d57a"; }; propagatedBuildInputs = [ pbr six sympy ]; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index df691fb05c8..263a71254ed 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "0.996.2"; + version = "0.996.3"; src = fetchPypi { inherit pname version; - sha256 = "a80383fba343dad247b486a9afa486b7f0ec6244cb8bbf2d6a24d2fab5f19180"; + sha256 = "1cedc968ef5bcbb2a6ece3bb4eb26e9569d89f3277dc2066ea0ce1341ab7d3b9"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mechanize/default.nix b/pkgs/development/python-modules/mechanize/default.nix index 9669bcc30e7..1d63a6e2b6a 100644 --- a/pkgs/development/python-modules/mechanize/default.nix +++ b/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "9fff89e973bdf1aee75a351bd4dde53ca51a7e76944ddeae3ea3b6ad6c46045c"; + sha256 = "6355c11141f6d4b54a17fc2106944806b5db2711e60b120d15d83db438c333fd"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 6222921db74..5fd39d9b347 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "mlrose"; - version = "1.2.0"; + version = "1.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0vsvqrf1wbbj8i198rqd87hf8rlq7fmv8mmibv8f9rhj0w8729p5"; + sha256 = "cec83253bf6da67a7fb32b2c9ae13e9dbc6cfbcaae2aa3107993e69e9788f15e"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index bfef79b0f72..f0673b64ef3 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,20 +1,19 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.1.1"; + version = "1.2.0"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "142f5e8865a422ad2d67b9c67a382e3296e8f1633dbccd0e322180fba7d5303d"; + sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb"; }; - # Failing tests due 2to3 - doCheck = !isPy3k; - propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ]; checkInputs = [ pytest numpy ]; + # tests are no longer packaged in pypi tarball + doCheck = false; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 361be1bf184..427f0af4573 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , nose , numpy , six @@ -15,6 +16,7 @@ buildPythonPackage rec { pname = "monty"; version = "3.0.2"; + disabled = isPy27; # uses type annotations # No tests in Pypi src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index ad41043496a..37152b3a502 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "7.2.0"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"; + sha256 = "b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 500645b81e8..cb1bb6dd980 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -22,30 +22,18 @@ , sure , werkzeug , xmltodict -, isPy38 +, parameterized }: buildPythonPackage rec { pname = "moto"; - version = "1.3.13"; + version = "1.3.14"; src = fetchPypi { inherit pname version; - sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m"; + sha256 = "0fm09074qic24h8rw9a0paklygyb7xd0ch4890y4v8lj2pnsxbkr"; }; - # 3.8 is not yet support - # https://github.com/spulec/moto/pull/2519 - disabled = isPy38; - - # Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198. - patches = [ - (fetchpatch { - url = "https://github.com/spulec/moto/commit/e4a4e6183560489e98b95e815b439c7a1cf3566c.diff"; - sha256 = "1fixr7riimnldiikv33z4jwjgcsccps0c6iif40x8wmpvgcfs0cb"; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "jsondiff==1.1.2" "jsondiff~=1.1" @@ -74,13 +62,21 @@ buildPythonPackage rec { xmltodict ] ++ lib.optionals isPy27 [ backports_tempfile ]; - checkInputs = [ boto3 freezegun nose sure ]; + checkInputs = [ boto3 freezegun nose sure parameterized ]; - checkPhase = ''nosetests -v ./tests/ \ - -e test_invoke_function_from_sns \ - -e test_invoke_requestresponse_function \ - -e test_context_manager \ - -e test_decorator_start_and_stop''; + checkPhase = '' + nosetests -v ./tests/ \ + -e test_invoke_function_from_sns \ + -e test_invoke_requestresponse_function \ + -e test_context_manager \ + -e test_decorator_start_and_stop \ + -e test_invoke_event_function \ + -e test_invoke_function_from_dynamodb \ + -e test_invoke_function_from_sqs \ + -e test_invoke_lambda_error \ + -e test_invoke_async_function \ + -e test_passthrough_requests + ''; meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index 5a6fa42f286..a74150f971b 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "mpv"; - version = "0.3.10"; + version = "0.4.5"; disabled = isPy27; src = fetchFromGitHub { owner = "jaseg"; repo = "python-mpv"; rev = "v${version}"; - sha256 = "1w67rrxsvxl7glh5lri7c5hn1011jij1yh1dn50dxlz79n4h51b5"; + sha256 = "1y80c2k4s42lzvm5dz8wi186i7rsn1vs1wn30hp6v6vs62fb91fi"; }; buildInputs = [ mpv ]; diff --git a/pkgs/development/python-modules/msal-extensions/default.nix b/pkgs/development/python-modules/msal-extensions/default.nix new file mode 100644 index 00000000000..c866382b103 --- /dev/null +++ b/pkgs/development/python-modules/msal-extensions/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, msal +, portalocker +}: + +buildPythonPackage rec { + pname = "msal-extensions"; + version = "0.1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p05cbfksnhijx1il7s24js2ydzgxbpiasf607qdpb5sljlp3qar"; + }; + + propagatedBuildInputs = [ + msal + portalocker + ]; + + # No tests found + doCheck = false; + + meta = with lib; { + description = "The Microsoft Authentication Library Extensions (MSAL-Extensions) for Python"; + homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix new file mode 100644 index 00000000000..6f2566c2c1c --- /dev/null +++ b/pkgs/development/python-modules/msal/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyjwt +, requests +}: + +buildPythonPackage rec { + pname = "msal"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc"; + }; + + propagatedBuildInputs = [ + pyjwt + requests + ]; + + # Tests assume Network Connectivity: + # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73 + doCheck = false; + + meta = with lib; { + description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect"; + homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index a820dd89f51..04f7428e6b6 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ adal msrest ]; checkInputs = [ httpretty mock pytest ] - ++ lib.optional isPy3k [ pytest-asyncio ]; + ++ lib.optionals isPy3k [ pytest-asyncio ]; checkPhase = '' pytest tests/ diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index e7f382f8ac7..f31bb4c064e 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.18.0"; + version = "4.19.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "e5b6469e9bc64522125efae1de0e557f76884c961f122028098533d6f2a98f23"; + sha256 = "5d109e8dc4b490a4b92ec0153713710eb067b36b350ce1ff60c406afddc7d3cd"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 1539592dc6b..4673f841ee3 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multidict"; - version = "4.5.2"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "024b8129695a952ebd93373e45b5d341dbb87c17ce49637b34000093f243dd4f"; + sha256 = "d4dafdcfbf0ac80fc5f00603f0ce43e487c654ae34a656e4749f175d9832b1b5"; }; checkInputs = [ pytest pytestrunner pytestcov ]; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index f4ecc2ff306..764523e0cf7 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchPypi , six +, pbr }: buildPythonPackage rec { pname = "munch"; - version = "2.3.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "6ae3d26b837feacf732fb8aa5b842130da1daf221f5af9f9d4b2a0a6414b0d51"; + sha256 = "2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six pbr ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index b2731f5bb62..90b00ba1717 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.750"; + version = "0.761"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0k0l74g3jcq7ppzn234sffsaacn6qaq242famckk0cviwgld1jvf"; + sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 74249224d92..72bf06893ed 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05ifrfz7rrl7j4gq4xz5acd76lrnmry9vrvg98hknakm72damzgk"; + sha256 = "f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix new file mode 100644 index 00000000000..ef46e7ccafd --- /dev/null +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, twine +, numpy +, pytest +, fetchPypi +}: + +buildPythonPackage rec { + pname = "nagiosplugin"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vr3zy0zfvbrqc4nf81zxv4gs2q82sv5sjamdm4573ld529mk2nv"; + }; + + nativeBuildInputs = [ twine ]; + checkInputs = [ pytest numpy ]; + + checkPhase = '' + # this test relies on who, which does not work in the sandbox + pytest -k "not test_check_users" tests/ + ''; + + meta = with lib; { + description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; + homepage = https://github.com/mpounsett/nagiosplugin; + license = licenses.zpl21; + maintainers = with maintainers; [ symphorien ]; + }; +} diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index e8d2c209eb5..984304e9ccb 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "1kc2phcz22r7vim3hmq0vrp2zqxl6v49hq40jmp4p81pdvgh5c6b"; + sha256 = "79b5f81b9315b03ac3744d12448032490f5028b5117b721775ba97118ecd5e45"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/names/default.nix b/pkgs/development/python-modules/names/default.nix new file mode 100644 index 00000000000..b65bb463475 --- /dev/null +++ b/pkgs/development/python-modules/names/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, pytest +}: + +buildPythonPackage rec { + pname = "names"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "treyhunner"; + repo = pname; + rev = version; + sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = "Generate random names"; + homepage = "https://github.com/treyhunner/names"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index da8e953826f..8bdfdb9d720 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "natsort"; - version = "6.0.0"; + version = "6.2.0"; checkInputs = [ pytest @@ -26,13 +26,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ff3effb5618232866de8d26e5af4081a4daa9bb0dfed49ac65170e28e45f2776"; + sha256 = "58c6fb2f355117e88a19808394ec1ed30a2ff881bdd2c81c436952caebd30668"; }; # testing based on project's tox.ini + # natsort_keygen has pytest mock issues checkPhase = '' pytest --doctest-modules natsort - pytest + pytest --ignore=tests/test_natsort_keygen.py ''; meta = { diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index ee4434c1d1d..6fff7857565 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -4,6 +4,7 @@ , pytest , jupyter_client , ipykernel +, holoviews , nbformat , nbconvert , pyflakes @@ -13,15 +14,16 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.2.8"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "eeda6c59b61130b9116a3d935e7c80ec5f617d7db8918d23289b2426efa229eb"; + sha256 = "070e999db3902a0c62a94d76de8fb98da21eaee22d9e90eb42f1636c87e1b805"; }; propagatedBuildInputs = [ pytest + holoviews jupyter_client ipykernel nbformat diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 812f68d5c4e..ff9d6f134e0 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "nbval"; - version = "0.9.3"; + version = "0.9.4"; src = fetchPypi { inherit pname version; - sha256 = "0613drjl740ppam3spm4b8mdcwwvl1lfmqy3vkgznbvzfxfpb3zj"; + sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 58d88e8dbf8..ca0a9d34b3e 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.6"; + version = "0.6.7"; src = fetchPypi { inherit pname version; - sha256 = "2b367354d1cd25b79b8798a0b4c1949590d890057f2a252e6e970a9ab744e009"; + sha256 = "efdf3c868cd9f104d4e9fe4c233df78bfbbed4b3d78ba19dc27cec3cf6a63680"; }; checkInputs = [ nose rednose ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 3dec538c6d3..a88c07c9968 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.2.1"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "f5b22dd23ee6195cea509c344d9ec34274f45bff078d8f18e9dc322dc74c6008"; + sha256 = "7d4d7c1ca2aad0e5c2706d0222c8ff006805abfd05caa97e6127c8811d0f6adc"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index fa11ab3fb90..6054e6d3a73 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -1,13 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k, twisted }: +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, isPy3k, twisted }: buildPythonPackage rec { pname = "Nevow"; - version = "0.14.4"; + version = "0.14.5"; disabled = isPy3k; src = fetchPypi { inherit version pname; - sha256 = "2299a0d2a0c1312040705599d5d571acfea74df82b968c0b9264f6f45266cf6e"; + sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3"; }; propagatedBuildInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index f118e4d5a43..979f12c8d98 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy3k +, isPy27 , bz2file , mock , nose @@ -11,11 +12,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "2.5.1"; + version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "83ecac4773ece02c49c364d99b465644c17cc66f1719560117e74991d9eb566b"; + sha256 = "0f5bc325c9cb203c6f0ab876ba1a5ada811284bb3a4c5d063eeaafaefbad873d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 2da580abd92..9158ee77e50 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "18b763d641e6903bdf8512e0ec5cdc14133fb4679e9a15648415e9be62c81b56"; + sha256 = "07eb764f2b7b39b487f806a067e394d8ebffff21f57cd1ecdb5c4030b7210210"; }; # disable some failing tests diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 13c35999cf9..ab81b2b190b 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -48,11 +48,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.2.3"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "a79c7a72897d81985d20a8c805465285400b59a45ddc527cda44026795fd1c47"; + sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; }; postPatch = '' @@ -79,7 +79,7 @@ buildPythonPackage rec { simplejson traits xvfbwrapper - ] ++ stdenv.lib.optional (!isPy3k) [ + ] ++ stdenv.lib.optionals (!isPy3k) [ configparser futures pathlib2 # darwin doesn't receive this transitively, but it is in install_requires diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 3042f715687..33526bebd55 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "neurdflib"; - version = "5.0.0.post1"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1qgmprixqxycxpjk9wjdmjykma14qqa2wcbx4nsldxi0ga7i7vv5"; + sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; }; propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ]; diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix new file mode 100644 index 00000000000..c1dacc84da0 --- /dev/null +++ b/pkgs/development/python-modules/notedown/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nbconvert +, nbformat +, notebook +, pandoc-attributes +, six +}: + +buildPythonPackage rec { + pname = "notedown"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee"; + }; + + propagatedBuildInputs = [ + notebook + nbconvert + nbformat + pandoc-attributes + six + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/notedown; + description = "Convert IPython Notebooks to markdown (and back)"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index ba6dbced66e..0413d224bcd 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -12,13 +12,13 @@ let # Therefore we create a separate env for it. scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]); in buildPythonPackage rec { - version = "0.6.5"; + version = "0.6.6"; pname = "Nuitka"; # Latest version is not yet on PyPi src = fetchurl { url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz"; - sha256 = "18vcmbyqdwsfa9gyj1sf518hsqczx7qlzrdc22hdb1zawzknb1pb"; + sha256 = "1ia37072qdbgdvh9qxkrhi3mlqn3kcn0qm5xjz6f68sis6ni9kw2"; }; checkInputs = [ vmprof pyqt4 ]; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index e49e6e19239..9725f131111 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -7,6 +7,7 @@ , msgpack , pytest , python +, gcc8 }: buildPythonPackage rec { @@ -21,6 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm cython + gcc8 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 775d279b317..d0bb0a88cff 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217"; + sha256 = "1c82z0zx0542j9df6ckjz6pn1g13b21hbza4hghcw6vyhbckklmh"; }; # Remove existing site.cfg, use the one we built for numpy. diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 61f85773949..bdd76696885 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -1,4 +1,15 @@ -{ lib, fetchPypi, python, buildPythonPackage, gfortran, pytest, blas, writeTextFile, isPyPy }: +{ lib +, fetchPypi +, python +, buildPythonPackage +, gfortran +, pytest +, blas +, writeTextFile +, isPyPy +, cython +, setuptoolsBuildHook + }: let blasImplementation = lib.nameFromURL blas.name "-"; @@ -16,15 +27,16 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.4"; + version = "1.18.0"; + format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316"; + sha256 = "a9d72d9abaf65628f0f31bbb573b7d9304e43b1e6bbae43149c17737a42764c4"; }; - nativeBuildInputs = [ gfortran pytest ]; + nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; buildInputs = [ blas ]; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index e965f332fc9..fb3b9af76f6 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname; inherit version; - sha256 = "09x6l1a4dcvj7001bvcmcayg1nwqwhaxlwbp6kzj9qrk57lqx3z0"; + sha256 = "9140669e6b915f42c6ce7fef704483ba9b0aaa9ac8e425ea89c76fe40478f642"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 81c6daaf2de..d8a97692976 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0ce31c929bb456ad8734b9b8a7f539e44ab3afff07169e25e974ca576f4c836c"; + sha256 = "cb4e23fcfe8dc9099c4ca005f8991b0f605b03a3e1cf4fed654b2470f6065bdf"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index bd0a7a5b2be..a3f74f00093 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.1"; + version = "3.0.2"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "a3ee361d3ff04af6048d594775b3a54ffdf215d40fa5c6c78b2a41c0d0b020d3"; + sha256 = "eb68c08a72ac6d9812df181e88ebece3a68436364353eb6eda3bed863e3d73a6"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 8e771f2d46a..f20ca7285e6 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "opentracing"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "cfd231ba5c58f90bc277787e62861eb0c6e4af76e42957bec240bbdf71fb7e0e"; + sha256 = "0rcpmhy7hm6ljlm1w455il53s1amq2vii2x1wfkrcx3sj4s0dc9k"; }; propagatedBuildInputs = lib.optional isPy27 futures; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index bc96c4a2d47..26c72899317 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytest , mock , bokeh @@ -13,6 +13,7 @@ , mxnet , scikit-optimize , tensorflow +, cma , sqlalchemy , numpy , scipy @@ -21,6 +22,7 @@ , colorlog , pandas , alembic +, tqdm , typing , pythonOlder , isPy27 @@ -28,12 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "0.17.1"; + version = "0.19.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "3d1d3547340c47f34f3a416a2e0761a0ff887ae8ce06474e84ebcc8600afd438"; + src = fetchFromGitHub { + owner = "optuna"; + repo = pname; + rev = "v${version}"; + sha256 = "179x2lsckpmkrkkdnvvbzky86g1ba882z677qwbayhsc835wbp0y"; }; checkInputs = [ @@ -49,6 +53,7 @@ buildPythonPackage rec { mxnet scikit-optimize tensorflow + cma ]; propagatedBuildInputs = [ @@ -60,16 +65,22 @@ buildPythonPackage rec { colorlog pandas alembic - ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; + tqdm + ] ++ lib.optionals (pythonOlder "3.5") [ + typing + ]; configurePhase = if !(pythonOlder "3.5") then '' substituteInPlace setup.py \ - --replace "'typing'" "" + --replace "'typing'," "" '' else ""; checkPhase = '' pytest --ignore tests/test_cli.py \ - --ignore tests/integration_tests/test_chainermn.py + --ignore tests/integration_tests/test_chainermn.py \ + --ignore tests/integration_tests/test_pytorch_lightning.py \ + --ignore tests/integration_tests/test_pytorch_ignite.py \ + --ignore tests/integration_tests/test_fastai.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix new file mode 100644 index 00000000000..c2f6bc4fc57 --- /dev/null +++ b/pkgs/development/python-modules/orm/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, databases +, typesystem +, aiosqlite +, pytest +, pytestcov +}: + +buildPythonPackage rec { + pname = "orm"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "encode"; + repo = "orm"; + rev = version; + sha256 = "1g70cr0559iyqfzidwh6n2qq6d4dcnrr4sg0jkn1s4qzka828mj7"; + }; + + propagatedBuildInputs = [ + databases + typesystem + ]; + + checkInputs = [ + aiosqlite + pytest + pytestcov + ]; + + checkPhase = '' + PYTHONPATH=$PYTHONPATH:. pytest + ''; + + meta = with lib; { + description = "An async ORM"; + homepage = https://github.com/encode/orm; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index def8ecb8458..c9ce8324b18 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -1,23 +1,20 @@ -{ stdenv, buildPythonPackage , fetchFromGitHub -, bashInteractive , urlgrabber, m2crypto -}: +{ stdenv, buildPythonPackage , fetchFromGitHub , bashInteractive , urlgrabber, m2crypto, rpm }: buildPythonPackage rec { pname = "osc"; - version = "0.165.4"; + version = "0.167.1"; src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; rev = version; - sha256 = "1f8q65wlgchzwzarwrv6a0p60gw0ykpf4d5s7cks835hyawgcbyl"; + sha256 = "0f3c6mzvk9yjicwfdh47j4s2l1wrfgpa6lmqdchasdqfsacps4r6"; }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper + checkInputs = [ rpm ]; propagatedBuildInputs = [ urlgrabber m2crypto ]; - doCheck = false; - postInstall = '' ln -s $out/bin/osc-wrapper.py $out/bin/osc install -D -m444 osc.fish $out/etc/fish/completions/osc.fish @@ -32,6 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { + homepage = "https://github.com/openSUSE/osc"; description = "opensuse-commander with svn like handling"; maintainers = [ maintainers.peti ]; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix new file mode 100644 index 00000000000..6012398db98 --- /dev/null +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, asn1crypto +, fetchPypi +, lib +, openssl +}: + +buildPythonPackage rec { + pname = "oscrypto"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vlryamwr442w2av8f54ldhls8fqs6678fg60pqbrf5pjy74kg23"; + }; + + testSources = fetchPypi { + inherit version; + pname = "oscrypto_tests"; + sha256 = "1crndz647pqdd8148yn3n5l63xwr6qkwa1qarsz59nk3ip0dsyq5"; + }; + + preCheck = '' + tar -xf ${testSources} + mv oscrypto_tests-${version} tests + + # remove tests that require network + sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py + ''; + + propagatedBuildInputs = [ + asn1crypto + openssl + ]; + + meta = with lib; { + description = "A compilation-free, always up-to-date encryption library for Python that works on Windows, OS X, Linux and BSD."; + homepage = "https://www.snowflake.com/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/oyaml/default.nix b/pkgs/development/python-modules/oyaml/default.nix new file mode 100644 index 00000000000..e445086d0c7 --- /dev/null +++ b/pkgs/development/python-modules/oyaml/default.nix @@ -0,0 +1,41 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, pytest +, pyyaml +}: + +buildPythonPackage rec { + pname = "oyaml"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "wimglenn"; + repo = "oyaml"; + rev = "v${version}"; + sha256 = "13xjdym0p0jh9bvyjsbhi4yznlp68bamy3xi4w5wpcrzlcq6cfh9"; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest test_oyaml.py + ''; + + meta = { + description = "Ordered YAML: drop-in replacement for PyYAML which preserves dict ordering"; + homepage = "https://github.com/wimglenn/oyaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index efb4e0685ab..53218146557 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, youtube-dl, fetchPypi }: buildPythonPackage rec { pname = "pafy"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "e842dc589a339a870b5869cc3802f2e95824edf347f65128223cd5ebdff21024"; + sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix new file mode 100644 index 00000000000..8b5652bfb54 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pandocfilters +}: + +buildPythonPackage rec { + pname = "pandoc-attributes"; + version = "0.1.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c"; + }; + + propagatedBuildInputs = [ + pandocfilters + ]; + + # No tests in pypi source + doCheck = false; + + meta = { + homepage = https://github.com/aaren/pandoc-attributes; + description = "An Attribute class to be used with pandocfilters"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ vcanadi ]; + }; +} diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index aefab404668..0047548779c 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "panel"; - version = "0.6.4"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "9b86a827f24dcfd1b6d821836e691fca7aab21b79a293031297f83cf2f8d6cef"; + sha256 = "71d446f469b424cb190bc896e78d0415b2bbebf17c6e5b024ed1a73b4448f8f4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index b930b8dcd17..f5dd38cc743 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "parameterized"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "d8c8837fb677ed2d5a93b9e2308ce0da3aeb58cf513120d501e0b7af14da78d5"; + sha256 = "6a94dbea30c6abde99fd4c2f2042c1bf7f980e48908bf92ead62394f93cf57ed"; }; # Tests require some python3-isms but code works without. diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 7ea4a5ee533..2fefbde7448 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -3,6 +3,7 @@ , fetchPypi , cryptography , bcrypt +, invoke , pynacl , pyasn1 , pytest @@ -12,21 +13,24 @@ buildPythonPackage rec { pname = "paramiko"; - version = "2.6.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0h9hb2kp07zdfbanad527ll90n9ji7isf7m39jyp0sr21pxfvcpl"; + sha256 = "920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f"; }; - checkInputs = [ pytest mock pytest-relaxed ]; + checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; __darwinAllowLocalNetworking = true; # 2 sftp tests fail (skip for now) + # test_config relies on artifacts to be to downloaded checkPhase = '' - pytest tests --ignore=tests/test_sftp.py + pytest tests \ + --ignore=tests/test_sftp.py \ + --ignore=tests/test_config.py ''; meta = with pkgs.lib; { diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 32247fcc388..914d5e2680f 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "parsedatetime"; - version = "2.4"; + version = "2.5"; src = fetchPypi { inherit pname version; - sha256 = "3d817c58fb9570d1eec1dd46fa9448cd644eeed4fb612684b02dfda3a79cb84b"; + sha256 = "d2e9ddb1e463de871d32088a3f3cea3dc8282b1b2800e081bd0ef86900451667"; }; buildInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index da42b279c75..24fc5789405 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6"; + sha256 = "55cf25df1a35fd88b878715874d2c4dc1ad3f0eebd1e0266a67e1f55efccfbe1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index b400e8030f9..e8a148edb23 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , locket , numpy @@ -11,11 +12,12 @@ buildPythonPackage rec { pname = "partd"; - version = "1.0.0"; + version = "1.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "54fd91bc3b9c38159c790cd16950dbca6b019a2ead4c51dee4f9efc884f8ce0e"; + sha256 = "6e258bf0810701407ad1410d63d1a15cfd7b773fd9efe555dac6bb82cc8832b0"; }; checkInputs = [ pytest ]; @@ -32,4 +34,4 @@ buildPythonPackage rec { license = with lib.licenses; [ bsd3 ]; homepage = https://github.com/dask/partd/; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 6f82c446a1f..e49ad50d91f 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "passlib"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0"; + sha256 = "8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index a03975e1b39..310d16026a9 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.4.3"; + version = "5.4.4"; src = fetchPypi { inherit pname version; - sha256 = "2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8"; + sha256 = "139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b"; }; # circular dependencies with fixtures diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix new file mode 100644 index 00000000000..1c032ea62b4 --- /dev/null +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchFromGitHub +, stdenv +}: + +buildPythonPackage rec { + pname = "pcpp"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "ned14"; + repo = "pcpp"; + rev = "v${version}"; + sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; + fetchSubmodules = true; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/ned14/pcpp; + description = "A C99 preprocessor written in pure Python"; + license = licenses.bsd0; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 20da40560e2..5c66eb6cad0 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.8.2"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1aff4g3i2z08cx7z17nbxbf32ddrnvqlk16h6d8h9s9w5ymivjq1"; + sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index fec9de45f68..10001d1d602 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "1.6.12"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "13q83yba01hzm9mlk5y1klqirxdmsm2yx1yll5zdik9fd8hg0rf6"; + sha256 = "a8a35e7eb212616b2964d70d8a134d41d16649c943ab206b90c749c005e60999"; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index eef72793776..bc54c18ac81 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.6"; + version = "1.8"; src = fetchPypi { inherit pname version; - sha256 = "dcbd8061c553b90440741b77fbb274beca84716641a50be8675a6afe6dfbcea2"; + sha256 = "115067100fbb9eb36f530d94b64b4e1e36a8d304537af0847d562ff9ed399c05"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index cc10789f610..ccca0dd155e 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.8"; + version = "1.11.9"; src = fetchPypi { inherit pname version; - sha256 = "8c53fa2b2490fa9ec34ede4eafff8ddbe8bce5cba3dcae96509be36ec8c75575"; + sha256 = "77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index d9b3cb6b172..461d70497bf 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.0"; + version = "8.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1gc38v26hp638vnx4hmyv2gfyjs8k8lbvnlxfixgm60v4v7wykln"; + sha256 = "239507184ee5b1b83557005af1d5fcce70f83ae18f5dff45b94a67226db10d63"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e8f92bd8d78..e67932f4a88 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.3.2.post11"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "4b4ef1c11bafa161a409ad018cbf8469aacd42fc77fd954442760161f63dd345"; + sha256 = "6e6ce41ce8a51723b94d974adfee032cddce5b9300984dd23b59e101ed0a2861"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 8712a8de431..ec99edcc0c1 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.8.1"; + version = "1.8.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a57a295296820087e66a3c62569d288958f29d1a354701ace6639a7692cc3022"; + sha256 = "1n3fd7i1br1s4f90yismgfcq9ix5kcqfacr7yy0hhhrabkf2sm37"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 08ed0c43a22..93f38fb3779 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pipdate"; - version = "0.3.4"; + version = "0.3.5"; src = fetchPypi { inherit pname version; - sha256 = "26bd12075e63ef7f8094da36c27bf5539d298f4ef2af6acba20e98b502439d6d"; + sha256 = "240c0f270ddb7470ad7b8c8fba4106e3dbd8817a370624fd8c32cf19155c9547"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 93aa5ad144c..f7ec55bba05 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { libXi libXext libSM libICE libX11 ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${pkgs.qt5.qtbase.dev}/include/QtCore" "-I${pkgs.qt5.qtbase.dev}/include/QtGui" "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 37ca1a33d65..91592596ed4 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plone.testing"; - version = "7.0.2"; + version = "7.0.3"; src = fetchPypi { inherit pname version; - sha256 = "2533c48b7bd54ff19da2b4f0c3ccd0a8878c46f03fadbf5f933baaf749d17690"; + sha256 = "160f130f641578fbede2e47686f1b58179efa9ff98ccdd1ad198b5d0c7e02474"; }; propagatedBuildInputs = [ six setuptools zope_testing ]; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 9bf22b939d1..a71506c6197 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.2.1"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "6650ddb4da3aa94dcaa32e0779e611c6b17f371b5250ffdbf5ece6d66ba4483b"; + sha256 = "acc94f17452471ca3446c2ce491c4d1affb99b9ddd9eac4e05614ac4318f8780"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index d094a2a26fc..ecb01f252f4 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.13.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34"; + sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 2b00a007f90..7a893384996 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://github.com/wbsoft/python-poppler-qt5; license = licenses.gpl2; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 9cc88983a30..6d7d7b2563d 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, setuptools_scm, tempora, pytest-black }: +, pytest, setuptools_scm, tempora, pytest-black, pytestcov }: buildPythonPackage rec { pname = "portend"; - version = "2.5"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "19dc27bfb3c72471bd30a235a4d5fbefef8a7e31cab367744b5d87a205e7bfd9"; + sha256 = "600dd54175e17e9347e5f3d4217aa8bcf4bf4fa5ffbc4df034e5ec1ba7cdaff5"; }; patches = [ ./black-19.10b0.patch ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black ]; + checkInputs = [ pytest pytest-black pytestcov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 5beed26cb20..101c10b1d12 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -13,12 +13,11 @@ buildPythonPackage rec { sha256 = "9e2173042edd5cc9c7bee0d7731873f17fcdce0e42e4b7ab68857d0de7b631fc"; }; - checkPhase = '' - python -m ppft.tests - ''; - propagatedBuildInputs = [ six ]; + # tests no longer packages on pypi + doCheck = false; + meta = with stdenv.lib; { description = "Distributed and parallel python"; homepage = https://github.com/uqfoundation; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 38133172ecf..972520793a4 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "prance"; - version = "0.15.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "793f96dc8bba73bf4342f57b3570f5e0a94c30e60f0c802a2aaa302759dd8610"; + sha256 = "a128d0d5f639a6a19eefedd787a6ce9603634c3908927b1215653e4a8375195f"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 27d56bab06e..d3808bbb911 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -14,12 +14,12 @@ buildPythonApplication rec { pname = "pre-commit"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0vmv3hrivm0sm81cn59n2pmw8h323sg4sgncl910djby2a3jc5cz"; + sha256 = "0l5qg1cw4a0670m96s0ryy5mqz5aslfrrnwpriqgmrnsgdixhj4g"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index b88366de88f..cf2867322f7 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "preggy"; - version = "1.4.2"; + version = "1.4.4"; propagatedBuildInputs = [ six unidecode ]; checkInputs = [ nose yanc ]; src = fetchPypi { inherit pname version; - sha256 = "0g4ifjh01dkmdzs4621ahk8hpkngid1xxhl51jvzy4h4li4590hw"; + sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 73216f63f82..e414dff8aa1 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -9,10 +9,11 @@ buildPythonPackage { inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # work around python distutils compiling C++ with $CC optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" - ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; + ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" + ); propagatedBuildInputs = [ google_apputils ]; propagatedNativeBuildInputs = [ protobuf ]; # For protoc. diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix new file mode 100644 index 00000000000..2568620f539 --- /dev/null +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -0,0 +1,50 @@ +{ lib +, blas +, buildPythonPackage +, cffi +, fetchFromGitHub +, liblapack +, nose +, numpy +, openblas +, useOpenblas ? true +}: + +buildPythonPackage { + pname = "prox-tv"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "albarji"; + repo = "proxTV"; + rev = "e621585d5aaa7983fbee68583f7deae995d3bafb"; + sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; + }; + + patches = lib.optional useOpenblas ./use-openblas.patch; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + numpy + cffi + ]; + + buildInputs = ( + if useOpenblas then + [ openblas ] + else + [ blas liblapack ] + ); + + enableParallelBuilding = true; + + meta = with lib; { + homepage = https://github.com/albarji/proxTV; + description = "A toolbox for fast Total Variation proximity operators"; + license = licenses.bsd2; + maintainers = with maintainers; [ multun ]; + }; +} diff --git a/pkgs/development/python-modules/prox-tv/use-openblas.patch b/pkgs/development/python-modules/prox-tv/use-openblas.patch new file mode 100644 index 00000000000..e96faa4d600 --- /dev/null +++ b/pkgs/development/python-modules/prox-tv/use-openblas.patch @@ -0,0 +1,11 @@ +index f100b35..448bbaf 100644 +--- a/prox_tv/prox_tv_build.py ++++ b/prox_tv/prox_tv_build.py +@@ -109,6 +109,6 @@ ffi.set_source( + define_macros=[('NOMATLAB', 1)], + extra_compile_args=extra_compile_args, + extra_link_args=extra_link_args, +- libraries=['blas', 'lapack'], ++ libraries=['openblas'], + include_dirs=['/usr/include'] + ) diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index bdabdae2691..edf502171e7 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -1,21 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, - docopt, pillow +{ lib, buildPythonPackage, fetchPypi, isPy27 +, docopt +, pillow +, enum34 }: buildPythonPackage rec { pname = "psd-tools"; - version = "1.8.30"; + version = "1.8.35"; + + src = fetchPypi { + inherit pname version; + sha256 = "379211cf98ebafbe129088a5c92f575e1ccd7987c40bad9520c209e51008df00"; + }; + + propagatedBuildInputs = [ + docopt + pillow + ] ++ lib.optionals isPy27 [ enum34 ]; meta = { description = "Python package for reading Adobe Photoshop PSD files"; homepage = https://github.com/kmike/psd-tools; license = lib.licenses.mit; + broken = true; # missing packbits from nixpkgs }; - - src = fetchPypi { - inherit pname version; - sha256 = "101d7df09f9a745f7729c25a1621428e501910ed6436d639e1aded4b03c14e02"; - }; - - propagatedBuildInputs = [ docopt pillow ]; } diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index a3d909bb3d4..388716cb700 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.6.5"; + version = "5.6.7"; src = fetchPypi { inherit pname version; - sha256 = "d051532ac944f1be0179e0506f6889833cf96e466262523e57a871de65a15147"; + sha256 = "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa"; }; # No tests in archive diff --git a/pkgs/development/python-modules/publicsuffix/default.nix b/pkgs/development/python-modules/publicsuffix/default.nix index 9c90161c6ea..027b017c23e 100644 --- a/pkgs/development/python-modules/publicsuffix/default.nix +++ b/pkgs/development/python-modules/publicsuffix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "publicsuffix"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf"; + sha256 = "22ce1d65ab6af5e9b2122e2443facdb93fb5c4abf24138099cb10fe7989f43b6"; }; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 09fddad0158..414c21b263c 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "1.6.8"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "1irzpfnnm5f0qf8y9ddxi489nwixyj0q4zlvqafm621bijkxdv6g"; + sha256 = "fb0b0e8073aa82f3459c4241b9625e0ccd26c0838ad8253c6bc67e041901b765"; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index fbaa1cfad71..c6f28067bf6 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { sha256 = "1ag0pji3p012hmj8kadcd0vydv9702188c0isizsi964qcl4va6m"; }) ]; - patchFlags = "-p1 -d code"; + patchFlags = [ "-p1" "-d" "code" ]; # cython is optional - if not supplied, the "pure python" implementation will be used nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index cdd6011aba2..7e561089a18 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.6.3"; + version = "0.7.0"; # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019. disabled = pythonOlder "3.5"; src = fetchPypi{ inherit pname version; - sha256 = "03nvgpmnscd7rh9jwm2h579zvriq5lva6rsdhb6jckpra5wjkn69"; + sha256 = "ee935ba52f1d4a514cc3baa743db0377af732952faf800f20ffd8071fa2107c2"; }; checkInputs = [ pytest mock pytest-mock ]; diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 9c5ada22b14..7b84d72fde4 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw"; + sha256 = "5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 79b80fb11f0..d2a2b50d3c0 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.21"; + version = "3.22"; src = fetchPypi { inherit pname version; - sha256 = "c208c680d1511e8c1dc950a930d3ee1b83f2dbfaac1308cd43c4773810fee89b"; + sha256 = "5e9884dde128e1bd82f8746e8f8806c8d7d89d95ce9ed7bacf7cc5fdb094aa21"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index d09862184c0..3f5d3a5bd8c 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.44.1"; + version = "1.45"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "16ngnnm7xj9bd97pvyddag17dx28c5wi0gjx4ws8c8nrmf5w3iqk"; + sha256 = "1aiyqwdxpcr7yzz7aqmmjn1g2ajs5bpbln4sax5zw19dqi6qgp9z"; }; propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 8601488bcf4..6aeb37cfff6 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "19.4.1"; + version = "19.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c79ae98ececda136a034115ca178ee8bf3aa7df236c488c2f55d12f177b88f1e"; + sha256 = "b3f636b467864319d7ded1558f86bb305b8612a274f5d443a62dc5eceb1b7176"; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 795f623ba53..5036307982b 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "2.3.3"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b884402c62d589a38444e8f4b3892b18312e8f9442cd8d12e7ec01c698328f54"; + sha256 = "8fbcc3a88f8c51d190b697c80515e67530143de71f89cc6ecf99bbf2cbf3ef30"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 84f5a41c45b..dc9cbefe0b5 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.9.5"; + version = "0.10.0"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "0e8f8466067ff3023f53661c390c02702fcd5fe712bdd5bf167ffb0c2b920430"; + sha256 = "b37ba89eb7407bbfdf8e26e1230b6ef452da3d986df5eed21aab96be61b6e844"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch new file mode 100644 index 00000000000..d5b669dab7a --- /dev/null +++ b/pkgs/development/python-modules/pybind11/0001-Find-include-directory.patch @@ -0,0 +1,53 @@ +From a027e2590d5d2d384d23568a8d47b7095054b6b7 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk <fridh@fridh.nl> +Date: Thu, 19 Dec 2019 19:51:07 +0100 +Subject: [PATCH] Find include directory + +--- + pybind11/__init__.py | 33 +-------------------------------- + 1 file changed, 1 insertion(+), 32 deletions(-) + +diff --git a/pybind11/__init__.py b/pybind11/__init__.py +index c625e8c..c8a707b 100644 +--- a/pybind11/__init__.py ++++ b/pybind11/__init__.py +@@ -2,35 +2,4 @@ from ._version import version_info, __version__ # noqa: F401 imported but unuse + + + def get_include(user=False): +- from distutils.dist import Distribution +- import os +- import sys +- +- # Are we running in a virtual environment? +- virtualenv = hasattr(sys, 'real_prefix') or \ +- sys.prefix != getattr(sys, "base_prefix", sys.prefix) +- +- # Are we running in a conda environment? +- conda = os.path.exists(os.path.join(sys.prefix, 'conda-meta')) +- +- if virtualenv: +- return os.path.join(sys.prefix, 'include', 'site', +- 'python' + sys.version[:3]) +- elif conda: +- if os.name == 'nt': +- return os.path.join(sys.prefix, 'Library', 'include') +- else: +- return os.path.join(sys.prefix, 'include') +- else: +- dist = Distribution({'name': 'pybind11'}) +- dist.parse_config_files() +- +- dist_cobj = dist.get_command_obj('install', create=True) +- +- # Search for packages in user's home directory? +- if user: +- dist_cobj.user = user +- dist_cobj.prefix = "" +- dist_cobj.finalize_options() +- +- return os.path.dirname(dist_cobj.install_headers) ++ return "@include@" +-- +2.23.0 + diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 0f386a7c42f..a8c66a49fb8 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , fetchpatch @@ -28,7 +29,7 @@ buildPythonPackage rec { cmakeFlags = [ "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3" - ] ++ lib.optionals (!python.isPy2) [ + ] ++ lib.optionals (python.isPy3k && !stdenv.cc.isClang) [ # Enable some tests only on Python 3. The "test_string_view" test # 'testTypeError: string_view16_chars(): incompatible function arguments' # fails on Python 2. @@ -39,6 +40,14 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; + patches = [ + ./0001-Find-include-directory.patch + ]; + + postPatch = '' + substituteInPlace pybind11/__init__.py --subst-var-by include "$out/include" + ''; + preFixup = '' pushd .. export PYBIND11_USE_CMAKE=1 @@ -50,8 +59,6 @@ buildPythonPackage rec { popd ''; - installCheckTarget = "pytest"; - doInstallCheck = true; checkInputs = [ pytest numpy diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index f4c12f48542..d7b46f07749 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.5.7"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "82a235a8fe3c8dee753d765c295ff0da92bcb5096209d26a0cfc3f5c6054e374"; + sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index f68a10d6186..22f519c0486 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd"; + sha256 = "663c000625725d3a63466a674df4ee7f62bf8ca1ae8a0b87a6411eb811e0e794"; }; buildInputs = [ c-ares ]; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix new file mode 100644 index 00000000000..e8daa382076 --- /dev/null +++ b/pkgs/development/python-modules/pycm/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, numpy, pytest }: + +buildPythonPackage rec { + pname = "pycm"; + version = "2.5"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "sepandhaghighi"; + repo = pname; + rev = "v${version}"; + sha256 = "0zfv20hd7zq95sflsivjk47b0sm7q76w7fv2i2mafn83ficzx0p0"; + }; + + # remove a trivial dependency on the author's `art` Python ASCII art library + postPatch = '' + rm pycm/__main__.py + substituteInPlace setup.py --replace '=get_requires()' '=[]' + ''; + + checkInputs = [ pytest ]; + propagatedBuildInputs = [ numpy ]; + + checkPhase = '' + pytest Test/ + ''; + + meta = with stdenv.lib; { + description = "Multiclass confusion matrix library"; + homepage = https://pycm.ir; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index ce11b8497cf..153a6e0377d 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkPhase = '' - pytest tests -k "not test_ssl_in_static_libs \ + HOME=$TMPDIR pytest tests -k "not test_ssl_in_static_libs \ and not test_keyfunction \ and not test_keyfunction_bogus_return \ and not test_libcurl_ssl_gnutls \ diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 3e8e5086ead..088c6636fdc 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,21 +1,25 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , ujson , email_validator , typing-extensions , python , isPy3k +, pytest +, pytestcov }: buildPythonPackage rec { pname = "pydantic"; - version = "1.0"; + version = "1.3"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "bf474cebe007701806f5f8b076fb8508116606e5c721734bb855bfec4185263c"; + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = pname; + rev = "v${version}"; + sha256 = "0s85nzlsyj97j54zsgv569hkzv617z0vqsifsxkkyiimgbvnx7g8"; }; propagatedBuildInputs = [ @@ -24,22 +28,13 @@ buildPythonPackage rec { typing-extensions ]; - checkPhase = '' - ${python.interpreter} -c """ -from datetime import datetime -from typing import List -from pydantic import BaseModel - -class User(BaseModel): - id: int - name = 'John Doe' - signup_ts: datetime = None - friends: List[int] = [] + checkInputs = [ + pytest + pytestcov + ]; -external_data = {'id': '123', 'signup_ts': '2017-06-01 12:22', 'friends': [1, '2', b'3']} -user = User(**external_data) -assert user.id is "123" -""" + checkPhase = '' + pytest ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 1715749fa2d..c619df297fe 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.25"; + version = "0.26"; src = fetchPypi { inherit pname version; - sha256 = "89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24"; + sha256 = "86ac6cee19f6c945e8dedf78c6ee74f1112bd14da5a658d8c9d4103aed5756a2"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 26c36e70d0c..eb0b573c438 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.5.2"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "1akc8hk8rlw7sv07bv1n2r471acvmxwc57gb69frjpcwggf2phls"; + sha256 = "512c409b36eadfe39c40e46112d8f96b29fdc1032dc424da2bdc783d476f5b0a"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index b2dbfdba819..6bc2be39fd3 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { - version = "3.6.1"; + version = "3.7.1"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "2654c665500ea8117b55cab51d4683a83ec1c76ddfae13640e509e4aac64b308"; + sha256 = "1eb68bb250cc14310a6e33c197cbe2c8d93832b543f534e29b58286712f7e2b2"; }; postPatch = '' @@ -24,6 +24,8 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); + # https://github.com/jmcgeheeiv/pyfakefs/issues/508 + doCheck = !isPy37; checkInputs = [ pytest glibcLocales ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index d685e3541f9..a7b25e57a33 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }: +{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib, isPy3k }: buildPythonPackage rec { pname = "pygobject"; - version = "2.28.6"; + version = "2.28.7"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${pname}-${version}.tar.xz"; - sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; + sha256 = "0nkam61rsn7y3wik3vw46wk5q2cjfh2iph57hl9m39rc8jijb7dv"; }; outputs = [ "out" "devdoc" ]; - patches = [ - # Fix warning spam - ./pygobject-2.28.6-set_qdata.patch - ./pygobject-2.28.6-gio-types-2.32.patch - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + patches = stdenv.lib.optionals stdenv.isDarwin [ ./pygobject-2.0-fix-darwin.patch ]; @@ -29,7 +25,7 @@ buildPythonPackage rec { # same site-packages: we need a pth file for both. pygtk.py would be # used to select a specific version, in our setup it should have no # effect, but we leave it in case somebody expects and calls it. - postInstall = '' + postInstall = stdenv.lib.optionalString (!isPy3k) '' mv $out/lib/${python.libPrefix}/site-packages/{pygtk.pth,${pname}-${version}.pth} # Prevent wrapping of codegen files as these are meant to be @@ -38,8 +34,8 @@ buildPythonPackage rec { ''; meta = { - homepage = http://live.gnome.org/PyGObject; - description = "Python bindings for Glib"; + homepage = "https://pygobject.readthedocs.io/"; + description = "Python bindings for GLib"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch b/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch deleted file mode 100644 index fa0adf54ad0..00000000000 --- a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: [PATCH] gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.8.5 - diff --git a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch b/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch deleted file mode 100644 index 55376b59d82..00000000000 --- a/pkgs/development/python-modules/pygobject/pygobject-2.28.6-set_qdata.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001 -From: Ivan Stankovic <ivan.stankovic@avl.com> -Date: Tue, 21 Feb 2012 12:24:58 +0100 -Subject: [PATCH] Fix set_qdata warning on accessing NULL gobject property - -https://bugzilla.gnome.org/show_bug.cgi?id=661155 ---- - gobject/pygobject.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/gobject/pygobject.c b/gobject/pygobject.c -index 6c2f06c..70dc89a 100644 ---- a/gobject/pygobject.c -+++ b/gobject/pygobject.c -@@ -991,7 +991,9 @@ pygobject_new(GObject *obj) - PyObject * - pygobject_new_sunk(GObject *obj) - { -- g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); -+ if (obj) -+ g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); -+ - return pygobject_new_full(obj, TRUE, NULL); - } - --- -1.7.8.5 - diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index e55ef007eab..33df2985cfc 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.61"; + version = "0.1.62"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7ef0f3b2ed30023297840d365cf94dcf81b7ee6d2be62fff14730e9eb7b59c00"; + sha256 = "3547ad176f287a9d3b4409692485b6fb456107d70350a32071423e13803cfdab"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyjks/default.nix b/pkgs/development/python-modules/pyjks/default.nix new file mode 100644 index 00000000000..d9e2074fb28 --- /dev/null +++ b/pkgs/development/python-modules/pyjks/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyasn1-modules +, pycryptodomex +, twofish +}: + +buildPythonPackage rec { + pname = "pyjks"; + version = "19.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "06h1cybsdj2wi0jf7igbr722xfm87crqn4g7m3bgrpxwi41b9rcw"; + }; + + propagatedBuildInputs = [ + pyasn1-modules + pycryptodomex + twofish + ]; + + # Tests assume network connectivity + doCheck = false; + + meta = { + description = "Pure-Python Java Keystore (JKS) library"; + homepage = "https://github.com/kurtbrose/pyjks"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index bb1f60025db..1467783d76a 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.0.3"; + version = "3.1.2"; src = fetchPypi { inherit pname version; - sha256 = "2c9e2ddb03ee696ed8aa72c2cddfb81280614864e003226141d68b975aa56f6f"; + sha256 = "280b0884243d059df888a61fd3fc77b2ea76dce4fdb1c1f60f3ab9139ca1259c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index b60aea364c6..ecc35d35736 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2019.10.16"; + version = "2019.12.22"; src = fetchPypi { inherit pname version; - sha256 = "a8e8b169001737cdf16bb89b26c391963ba2bead54ea510530a52586e2072234"; + sha256 = "0ffc6efcc2ba15bff22cca29c07b93b01fac400f649c41d5dd01bfff7915f80b"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 2d137ec01aa..b909886ddb5 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "0y9rz3piddzdjpp7d5w9xi6lc9v9b4p4375a5hrfiphrmhds85i3"; + sha256 = "332d3d0291b4482641a5b3cd97e879817f50eb9c2b2ddcc30d51d619bad01b51"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 35e5f7aa69a..39472bb3177 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.7"; + version = "3.8"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0ijna2ghvniryllr56qr4vi4k9q58mq21yx36nj5kg2j17f7rkbr"; + sha256 = "1bb2915e4a29877c681ead13932b0b7d276f7f496e9c3f09ba96b977c99caf00"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index 8748b0e559d..a10bb9169ed 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4249c6ba45587b959292a727532826c5032d59171f923f7f823788f413c2a5a3"; + sha256 = "c43879fe427ea6aa6e84dae9fbdc5aa14428a4cfe613fe0fee2cc004bf3f307c"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index c162f065b79..954be3f40e2 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymssql"; - version = "2.1.4"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1yvs3azd8dkf40lybr9wvswvf4hbxn5ys9ypansmbbb328dyn09j"; + sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; }; buildInputs = [cython setuptools-git]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index c3f36c9c219..4ff50ad7b96 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.9"; + version = "1.16.10"; src = fetchPypi { inherit pname version; - sha256 = "09h960ns42bbrv10bg99fad193yvg64snhw8x7d78wg3qqvnnicc"; + sha256 = "d7893954f97fa6087629f3875f3be066dab51302e7c73f4c98c0516a8e2893fb"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index e71ab630b84..8576de1b379 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "6.0.1"; + version = "6.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f19dcd668473d61e500440569936b2272333ec385a603730c39f68a8d42b474b"; + sha256 = "53ae86caaedc48350c6e93d6e778a0c5044e802340b6d6a679e55014758be540"; }; meta = { diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 8064d9b6d57..bef4969d7d2 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.27"; + version = "4.0.28"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "1kd2i7hc1330cli72vawzby17c3039cqn1aba4i0zrjnpghjhmib"; + sha256 = "510643354c4c687ed96bf7e7cec4d02d6c626ecf3e18696f5a0228dd6d11b769"; }; buildInputs = [ unixODBC ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 958711754bd..14ccdaa64c3 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pyutilib , appdirs , ply @@ -11,6 +12,7 @@ buildPythonPackage rec { pname = "pyomo"; version = "5.6.1"; + disabled = isPy27; # unable to import pyutilib.th src = fetchPypi { pname = "Pyomo"; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index b00502700e8..a425fcf5be9 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -7,11 +7,12 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.0"; + version = "3.1.4"; src = fetchPypi { - inherit pname version; - sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; + pname = "PyOpenGL"; + inherit version; + sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee"; }; propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 018463ead54..8d5f6291c26 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -10,6 +10,7 @@ , flaky , glibcLocales , six +, fetchpatch }: with stdenv.lib; @@ -64,11 +65,11 @@ in buildPythonPackage rec { pname = "pyOpenSSL"; - version = "19.0.0"; + version = "19.1.0"; src = fetchPypi { inherit pname version; - sha256 = "aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200"; + sha256 = "9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507"; }; outputs = [ "out" "dev" ]; @@ -80,6 +81,27 @@ buildPythonPackage rec { runHook postCheck ''; + patches = [ + # 4 patches for 2020 bug + # https://github.com/pyca/pyopenssl/pull/828 + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch; + sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch; + sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch; + sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j"; + }) + (fetchpatch { + url = https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch; + sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2"; + }) + ]; + # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 854ca4d90ee..a47c271b76f 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.5"; + version = "2.4.6"; src = fetchPypi { inherit pname version; - sha256 = "4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"; + sha256 = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f"; }; # Not everything necessary to run the tests is included in the distribution diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 51a08e1f7ea..4b14e2e5cc6 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8d0143a22a13ee10c997a648f30b82cdc40175d5a20b11055ae058a82e45d371"; + sha256 = "0d214aa65e085d3e4108a36152cb12f7cd0f4e7fda93b5134b43a9687c975786"; }; checkInputs = [ nose psutil ] ++ diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix new file mode 100644 index 00000000000..36182e9986b --- /dev/null +++ b/pkgs/development/python-modules/pyrabbit2/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "pyrabbit2"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "d27160cb35c096f0072df57307233d01b117a451236e136604a8e51be6f106c0"; + }; + + propagatedBuildInputs = [ + requests + ]; + + meta = with lib; { + description = "A Pythonic interface to the RabbitMQ Management HTTP API"; + homepage = https://github.com/deslum/pyrabbit2; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index 3c76da67b7b..a851344b4ce 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -1,8 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, docutils -, virtualenv , webtest , zope_component , hupper @@ -10,7 +8,6 @@ , plaster , plaster-pastedeploy , repoze_lru -, repoze_sphinx_autointerface , translationstring , venusian , webob @@ -28,9 +25,9 @@ buildPythonPackage rec { sha256 = "d80ccb8cfa550139b50801591d4ca8a5575334adb493c402fce2312f55d07d66"; }; - checkInputs = [ docutils virtualenv webtest zope_component ]; + checkInputs = [ webtest zope_component ]; - propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru repoze_sphinx_autointerface translationstring venusian webob zope_deprecation zope_interface ]; + propagatedBuildInputs = [ hupper PasteDeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; # Failing tests # https://github.com/Pylons/pyramid/issues/1899 diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index daed808deb1..a0545ece74a 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "0.5.1"; + version = "1.1.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "cac2cb2a283c65d4187b7e19f0ff3b10a0ded1f377caba4f279c7898b206cd42"; + sha256 = "5ca2fd19276fcfcf52babb48d22892a41d6238d7a6c65e63f704b070a3816479"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index b4edb02258a..bbed677dfaf 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.15.5"; + version = "0.15.6"; src = fetchPypi { inherit pname version; - sha256 = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778"; + sha256 = "f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 9e9d15e5295..2865380076a 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyscreenshot"; - version = "0.5.1"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "19ec6d17a61c0cd4e7fcf3ab2685598a54b53dc781755393cc5f76dcb7bf359c"; + sha256 = "7322ad9454652b1702a3689646ce53ef01ed2b14869ea557030bd4e03a06fc0e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 3f20a6ae478..df309c5c68a 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ mesa libGL ]; - makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner"; + makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index 42ad55ad0b9..a968935dc06 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 patches = [ ./gcc6.patch ] ++ (lib.optional (isPy35 || isPy36 || isPy37) ./shiboken_py35.patch); - cmakeFlags = if isPy3k then "-DUSE_PYTHON3=TRUE" else null; + cmakeFlags = lib.optional isPy3k "-DUSE_PYTHON3=TRUE"; meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 974ac4499ac..7b0fba1a5ae 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = https://github.com/PySlurm/pyslurm; description = "Python bindings to Slurm"; license = licenses.gpl2; - maintainers = [ maintainers.veprbl ]; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix new file mode 100644 index 00000000000..07de522f796 --- /dev/null +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, pyasn1 +}: + +buildPythonPackage rec { + pname = "pysmb"; + version = "1.1.28"; + + src = fetchPypi { + inherit pname version; + format = "setuptools"; + extension = "zip"; + sha256 = "0x44yq440c1j3xnl7qigz2fpfzhx68n9mbj7ps7rd0kj0plcmr2q"; + }; + + propagatedBuildInputs = [ + pyasn1 + ]; + + # Tests require Network Connectivity and a server up and running + # https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt + doCheck = false; + + meta = { + description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines"; + homepage = "https://miketeo.net/wp/index.php/projects/pysmb"; + license = lib.licenses.zlib; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix new file mode 100644 index 00000000000..bb41a4d1855 --- /dev/null +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-toolbox +, pytest +, isPy27 +}: + +buildPythonPackage rec { + version = "0.3.0"; + pname = "pysnooper"; + + src = fetchPypi { + inherit version; + pname = "PySnooper"; + sha256 = "14vcxrzfmfhsmdck1cb56a6lbfga15qfhlkap9mh47fgspcq8xkx"; + }; + + # test dependency python-toolbox fails with py27 + doCheck = !isPy27; + + checkInputs = [ + python-toolbox + pytest + ]; + + meta = with lib; { + description = "A poor man's debugger for Python"; + homepage = https://github.com/cool-RR/PySnooper; + license = licenses.mit; + maintainers = with maintainers; [ seqizz ]; + }; +} diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix index ae17ed35105..e8d853d625d 100644 --- a/pkgs/development/python-modules/pysocks/default.nix +++ b/pkgs/development/python-modules/pysocks/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pysocks"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { pname = "PySocks"; inherit version; - sha256 = "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr"; + sha256 = "184sg65mbmih6ljblfsxcmq5js5l7dj3gpn618w9q5dy3rbh921z"; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 0ba230075f9..8f1fc795ea9 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -1,16 +1,21 @@ -{ lib, buildPythonPackage, fetchPypi, pydns }: +{ lib, python, buildPythonPackage, fetchFromGitHub, pydns }: buildPythonPackage rec { pname = "pyspf"; - version = "2.0.13"; # version 2.0.13 should not be used, see #72791 + version = "2.0.14"; - src = fetchPypi { - inherit pname version; - sha256 = "62dc1be39519e343202d480da7ef93d834b5a50cd4f217bef9335ed15292929b"; + src = fetchFromGitHub { + owner = "sdgathman"; + repo = pname; + rev = "pyspf-${version}"; + sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi"; }; propagatedBuildInputs = [ pydns ]; + # requires /etc/resolv.conf to exist + doCheck = false; + meta = with lib; { homepage = http://bmsi.com/python/milter.html; description = "Python API for Sendmail Milters (SPF)"; diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index 9316e85b260..c30b8ee891a 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyspotify"; - version = "2.0.5"; + version = "2.1.2"; src = fetchurl { url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz"; - sha256 = "1ilbz2w1gw3f1bpapfa09p84dwh08bf7qcrkmd3aj0psz57p2rls"; + sha256 = "0g3dvwpaz7pqrdx53kyzkh31arlmdzz1hb7jp8m488lbsf47w6nd"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 0f10ed601f7..b6d45980e53 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0n9vasm5fp25fmr9ns9i3bf4kri63s1mvmjgc6q8w7rx840ww7df"; + sha256 = "1j7d4aa6v1nd3pd1vrfmkv8mbmw0x78cjfpkq3nxpy1r4hj5nwq3"; }; patches = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { homepage = https://pypi.org/project/pytesseract/; - license = licenses.gpl3; + license = licenses.asl20; description = "A Python wrapper for Google Tesseract"; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch index f7eb9fb1d42..27b042bbaa5 100644 --- a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch +++ b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch @@ -1,13 +1,13 @@ diff --git a/src/pytesseract.py b/src/pytesseract.py -index 32713cf..5f9209d 100755 +index 132f59b..f161e5c 100755 --- a/src/pytesseract.py +++ b/src/pytesseract.py -@@ -25,7 +25,7 @@ if numpy_installed: - from numpy import ndarray +@@ -23,7 +23,7 @@ except ImportError: + import Image + - # CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY -tesseract_cmd = 'tesseract' +tesseract_cmd = '@drv@/bin/tesseract' - RGB_MODE = 'RGB' - OSD_KEYS = { - 'Page number': ('page_num', int), + + numpy_installed = find_loader('numpy') is not None + if numpy_installed: diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index b43c00e42d9..924f16694c5 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1hslzzinpwc1zqhbpllqh3sllmiyk69pcycl7ahr0rz3micgwczj"; }; - propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optional (pythonOlder "3.4") [ pathlib statistics ]; + propagatedBuildInputs = [ pytest py-cpuinfo ] ++ lib.optionals (pythonOlder "3.4") [ pathlib statistics ]; meta = { description = "Py.test fixture for benchmarking code"; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 4480cc1afcf..6b60eb6d3c5 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "b6c900461a6a7c450dcf11736cabc289a90f5d6f28ef74c46e32e86ffd16a4bd"; + sha256 = "17592f06d51c2ef4b7a0fb24aa32c8b6998506a03c8439606cb96db160106659"; }; nativeBuildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index aa155e6b6ff..cdf60b7b07c 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8872b9c236924af20c39c2813d7f1bde50a1edca7c4aba5a8bfbae3a32360e87"; + sha256 = "41386187b9261cd59a3ffe4cf9df58d517288a1d3f11d96749b39b4e38b0a02c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c6c8b6f4f5c..c4ef0d81111 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.11.2"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "04fgqm06vkg3k1ngha65g1k5a80x1g7pr11s78j2d72rj4w2ql7a"; + sha256 = "e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index edf0450366c..d86647b7503 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -4,15 +4,16 @@ , pytest , matplotlib , nose +, pillow }: buildPythonPackage rec { pname = "pytest-mpl"; - version = "0.10"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "7006e63bf1ca9c50bea3d189c0f862751a16ce40bb373197b218f57af5b837c0"; + sha256 = "26c5a47a8fdbc04652f18b65c587da642c6cc0354680ee44b16c161d9800a2ce"; }; buildInputs = [ pytest ]; @@ -20,6 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib nose + pillow ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index 4ce0241f415..201da93b018 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "3.2.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f6ecf4b38088ae1092cbd5beeaf714516d1f81f8938626a2eac546206cdfe7fa"; + sha256 = "714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 2a4c5591a5f..c940dcadc7e 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -6,21 +6,23 @@ , psutil , pytest , subprocess32 +, zc_lockfile }: buildPythonPackage rec { pname = "pytest-services"; - version = "1.3.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "035bc9ce8addb33f7c2ec95a9c0c88926d213a6c2e12b2c57da31a4ec0765f2c"; + sha256 = "0848cead86d3816b9c4e37cecfda31d21a4366f0dca2313ea29f3ca375c6295d"; }; propagatedBuildInputs = [ requests psutil pytest + zc_lockfile ] ++ lib.optional (!isPy3k) subprocess32; # no tests in PyPI tarball diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index ed1b754a996..b8535da4c7a 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -7,21 +7,22 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "0.9.19"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "f622fd9d0f5a0df253f0e6773713c3df61306b64abdfb202d39a85dcba1d1f59"; + sha256 = "b823b03faf5778d1e15fb9f52e104df4da9c1021daeb313b339fccbbfb8dbd5f"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage ]; checkInputs = [ pytest ]; + # avoid tests which try to import unittest_mixins + # unittest_mixins doesn't seem to be very active checkPhase = '' - pytest --deselect=test/test_testmon.py::TestmonDeselect::test_dependent_testmodule + cd test + pytest test_{core,process_code,pytest_assumptions}.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index a3beae4e0cf..2524dc61afd 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy }: buildPythonPackage rec { - version = "4.6.6"; + version = "4.6.8"; pname = "pytest"; preCheck = '' @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "692d9351353ef709c1126266579edd4fd469dcf6b5f4f583050f72161d6f3592"; + sha256 = "6192875be8af57b694b7c4904e909680102befcb99e610ef3d9f786952f795aa"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index a0e26b44201..48b6e89a10e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { - version = "5.2.4"; + version = "5.3.2"; pname = "pytest"; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ff0090819f669aaa0284d0f4aad1a6d9d67a6efdc6dd4eb4ac56b704f890a0d6"; + sha256 = "6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index ebe1c588faa..fa937e9626c 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "25a013c8d84f0ca60bb01bd11913a3bcab420f601f0f236de4423074af656e7a"; + sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; }; nativeBuildInputs = [ setuptools_scm pytest ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 4858ef8f8a6..bbdf7aa6033 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "1.13.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "125zimbdprfx2j90dp19hyh60lzj11264bm494awc585pr6v9d3k"; + sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix index 79e7efc514c..aea31053c5a 100644 --- a/pkgs/development/python-modules/python-jenkins/default.nix +++ b/pkgs/development/python-modules/python-jenkins/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-jenkins"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0b11f7c1dffc48579afefa8a310cba5b1c98785b9132892ff8cf5312f32ebc90"; + sha256 = "1aa6rnzlzdgndiwjdbnklgz5pqy5zd7d6g7bhzsvyf0614z1w010"; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix new file mode 100644 index 00000000000..e8b89563f03 --- /dev/null +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.2.4"; + pname = "python-lzf"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8m6vzwm1m8hn7ldw8j8r2b6r199k8z3q0wnhdyy4p68hahyhni"; + }; + + meta = with stdenv.lib; { + description = "liblzf python bindings"; + homepage = https://github.com/teepark/python-lzf; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix new file mode 100644 index 00000000000..5025b86361a --- /dev/null +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, lzo, nose }: + +buildPythonPackage rec { + pname = "python-lzo"; + version = "1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p"; + }; + + buildInputs = [ lzo ]; + propagatedBuildInputs = [ ]; + checkInputs = [ nose ]; + + meta = with lib; { + homepage = "https://github.com/jd-boyd/python-lzo"; + description = "Python bindings for the LZO data compression library"; + license = licenses.gpl2; + maintainers = [ maintainers.jbedo ]; + }; +} diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix new file mode 100644 index 00000000000..e3e75d88604 --- /dev/null +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytestcov +, mock +, pyyaml +, six +}: + +buildPythonPackage rec { + pname = "python-multipart"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "f7bb5f611fc600d15fa47b3974c8aa16e93724513b49b5f95c81e6624c83fa43"; + }; + + checkInputs = [ + pytest + pytestcov + mock + pyyaml + ]; + + propagatedBuildInputs = [ + six + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "A streaming multipart parser for Python"; + homepage = https://github.com/andrew-d/python-multipart; + license = licenses.asl20; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 213a1386a9b..9c2b18ba006 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.9.1"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "13fgy5bqslx913p9gachj9djk3g6wx1igwaccfnxjl2msrbwclwp"; + sha256 = "ad80bd7e4bb15d9705227630037a433e2e2a7982b54b51de2ebabdd1611394a1"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index 65c5e08d934..8aad5a1a7d2 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5316d473ce6ce86a774b9f9c110d84c3a9bd1a2abfda5d99e9c0c8a872a8e6d6"; + sha256 = "8e3ef458b9424daf35d587e69b63416a0c55ac46303f3aaff1bab4fe5a8f1e92"; }; checkInputs = [ pytest process-tests pkgs.redis ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index a666a6428e7..8f85f991534 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "4.3.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "506b2cf7a520b40ea0b3f25e1272eff8de134dce6f471c1f6bc0de8c90fe8c57"; + sha256 = "48cba5b827ac665dbf923a4f5ec590812aed5299a831fc43576a9af346272534"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix new file mode 100644 index 00000000000..5170c5a8a09 --- /dev/null +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, isPy27 +, nose +}: + +buildPythonPackage rec { + version = "0.9.4"; + pname = "python_toolbox"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cool-RR"; + repo = pname; + rev = version; + sha256 = "1qy2sfqfrkgxixmd22v5lkrdykdfiymsd2s3xa7ndlvg084cgj6r"; + }; + + checkInputs = [ + docutils + nose + ]; + + meta = with lib; { + description = "Tools for testing PySnooper"; + homepage = https://github.com/cool-RR/python_toolbox; + license = licenses.mit; + maintainers = with maintainers; [ seqizz ]; + }; +} diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ba5a527fdb0..8f6c7c54cb2 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ udev ]; - NIX_CFLAGS_LINK = [ "-ludev" ]; + NIX_CFLAGS_LINK = "-ludev"; meta = with stdenv.lib; { description = "Pythonic API to Linux uinput kernel module"; diff --git a/pkgs/development/python-modules/python2-pythondialog/default.nix b/pkgs/development/python-modules/python2-pythondialog/default.nix index 144887c75b3..a19156d1018 100644 --- a/pkgs/development/python-modules/python2-pythondialog/default.nix +++ b/pkgs/development/python-modules/python2-pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "python2-pythondialog"; - version = "3.4.0"; + version = "3.5.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a96d9cea9a371b5002b5575d1ec351233112519268d382ba6f3582323b3d1335"; + sha256 = "ad159c7b455d9cb2a5173590656d19a26e9cc208264cfab755f5827070d18613"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/python_openzwave/cython.patch b/pkgs/development/python-modules/python_openzwave/cython.patch new file mode 100644 index 00000000000..e01ffdbdc0d --- /dev/null +++ b/pkgs/development/python-modules/python_openzwave/cython.patch @@ -0,0 +1,20 @@ +diff --git a/pyozw_setup.py b/pyozw_setup.py +index b201840..37bf2a8 100644 +--- a/pyozw_setup.py ++++ b/pyozw_setup.py +@@ -257,13 +257,13 @@ class Template(object): + if sys.platform.startswith("win"): + return ['Cython'] + else: +- return ['Cython==0.28.6'] ++ return ['Cython>=0.28.6'] + + def build_requires(self): + if sys.platform.startswith("win"): + return ['Cython'] + else: +- return ['Cython==0.28.6'] ++ return ['Cython>=0.28.6'] + + def build(self): + if len(self.ctx['extra_objects']) == 1 and os.path.isfile(self.ctx['extra_objects'][0]): diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index ae3f0ba933a..bb8d236335c 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k , pkgconfig -, systemd, libyaml, openzwave, cython +, systemd, libyaml, openzwave, cython, pyserial , six, pydispatcher, urwid }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ systemd libyaml openzwave cython ]; - propagatedBuildInputs = [ six urwid pydispatcher ]; + propagatedBuildInputs = [ six urwid pydispatcher pyserial ]; # primary location for the .xml files is in /etc/openzwave so we override the # /usr/local/etc lookup instead as that allows us to dump new .xml files into @@ -27,6 +27,8 @@ buildPythonPackage rec { --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave ''; + patches = [ ./cython.patch ]; + # no tests available doCheck = false; diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix index d19fbd27116..4f54c5a8fad 100644 --- a/pkgs/development/python-modules/pythondialog/default.nix +++ b/pkgs/development/python-modules/pythondialog/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pythondialog"; - version = "3.5.0"; + version = "3.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11ydvllwll23qmcd3saachcxzn1dj5if3kc36p37ncf06xc5c0m4"; + sha256 = "34a0687290571f37d7d297514cc36bd4cd044a3a4355271549f91490d3e7ece8"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pythonirclib/default.nix b/pkgs/development/python-modules/pythonirclib/default.nix index d4f81a82546..6074b76d300 100644 --- a/pkgs/development/python-modules/pythonirclib/default.nix +++ b/pkgs/development/python-modules/pythonirclib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e"; })]; - patchFlags = "irclib.py"; + patchFlags = [ "irclib.py" ]; propagatedBuildInputs = [ paver ]; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index f2395605d3a..c87d9d465bc 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyunifi"; - version = "2.18"; + version = "2.19.0"; src = fetchPypi { inherit pname version; - sha256 = "0875b830db93ed3270aee38ea24d3da9328672f0c499f0e432c895e0b02eadc9"; + sha256 = "f022eb2135b88a9d391f4553fac1bf90f3808d660fd0058203f6f9e57214626b"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 8d9157fd7fb..e9397ad6fa8 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyutilib"; - version = "5.7.1"; + version = "5.7.2"; src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "1m5ijc5qmv8hg4yj496ix77hbcf7ylk4sa98ym53sfsyz0mg3kxr"; + sha256 = "0bdb5hlj6kyb9m3xnpxzasfv5psnxfj21qx6md8ym8zkcqyq1qs5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index b3d4483d65d..aff3280e86c 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -6,12 +6,12 @@ , pytest }: buildPythonPackage rec { - version = "0.1.4"; + version = "0.1.6"; pname = "pyvcd"; src = fetchPypi { inherit pname version; - sha256 = "0dv9wac5y5z9j54ypyc59csxdiy9ybpphw9ipxp1k8nfg65q9jxx"; + sha256 = "285fcd96c3ee482e7b222bdd01d5dd19c2f5a0ad9b8e950baa98d386a2758c8f"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index d87d772db14..c5ffb79a5d6 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.14.6"; + version = "0.15.0"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "5ed6ac486a0a363848f2091a49ddc1c4e0871c6feb71766cc0e266e9c6fd084f"; + sha256 = "6f4304518b2ba89a97bd4f5f0decc8ad382b38a9303032ae17a1a601d95d24b8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index e6bf9f3ba48..ff9b20f8177 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "de8b7e638c6b595c6405f16fd5356e92d2feb8237ab4e50a89770e4ed93aebd6"; + sha256 = "e80ae0ea978b2e3b7860d2a9ae836528f5fa2e13936673e0b6613589965937ee"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 3bdc5efaaa5..9ed44c83b60 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pywinrm"; - version = "0.3.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "799fc3e33fec8684443adf5778860388289102ea4fa1458f1bf307d167855573"; + sha256 = "4ede5c6c85b53780ad0dbf9abef2fa2ea58f44c82256a84a63eae5f1205cea81"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 7a137f5204c..cba29c5cc9e 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.6.1"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + sha256 = "965388dd629334e850aa989a67d2360ec8257cfe8f67d07c29f980d3152f2882"; }; # IOError: [Errno 95] Operation not supported (expected) diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index 2f73a85db7b..c30dd0f024f 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pyxl3"; - version = "1.2"; + version = "1.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f1fc74d2ab59073ef6bf0ce01b4f2891366bbf89a8187de85433486b284df758"; + sha256 = "23831c6d60b2ce3fbb39966f6fb21a5e053d6ce0bd08b00bb50fa388631b69ee"; }; checkInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index a5cf530a300..316e9974cfe 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyYAML"; - version = "5.1.2"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4"; + sha256 = "c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"; }; # force regeneration using Cython diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 73a0004e654..646d326fede 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8"; + version = "1.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7b9eb08a9be27f5439289d90d7d5a5942aad403d5634fe336eb915678c65db48"; + sha256 = "0f792693a0f1cd5f93fbf73bc3fb2d511fb9cceed3c9308bfb200f38c19a5545"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 4d84ac07a04..89d02f7b803 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "qiskit"; - version = "0.13.0"; + version = "0.14.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e9c0f23dddb0af27e2bfb920f6ea8600516fa68ec9ae97639faf858ba5d28020"; + sha256 = "d086a21d0eee61bb12e1f2cd6148a7292005fd10584ca33d6c404dd5c53ba95f"; }; buildInputs = [ cmake ] diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index 96485bd1f06..b5ce1eb26fe 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -12,8 +12,7 @@ buildPythonPackage { format = "other"; nativeBuildInputs = [ lndir sip qtbase ]; - buildInputs = [ qscintilla ]; - propagatedBuildInputs = [ pyqt5 ]; + buildInputs = [ qscintilla pyqt5 ]; postPatch = '' substituteInPlace Python/configure.py \ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 95ee3a864e6..885eee8d4b6 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.5.5"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1nf64wl3ni0q69ihcm5y6zl12mmg7gvkhrb98hbgwv3yb09787mr"; + sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index fc4c192968f..385c51bcd3b 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { python-dateutil six more-itertools - ] ++ lib.optional (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ pyOpenSSL ndg-httpsclient pyasn1 diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index ca6e4614f33..7fc7f057009 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "rainbowstream"; - version = "1.4.0"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "16881d8bb15416389eeaf4ceee7a588069060c216b55e7602dbcff5134feb7cc"; + sha256 = "527d39778c55d88300fe2017913341bfa1b1f0ffdc1fe5eab57a82bf4cd2edb3"; }; patches = [ ./image.patch ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 5da97c964c1..4fe5fd9e63b 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.1.1"; + version = "1.1.2"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1d0y16c5da252nj3pbdjwbzmd5kmh533s8jwlvg3aappa7h7qc1s"; + sha256 = "12szhfify7wn02cbiz9xapwfyp7bg0zm2ja9wq4jyaz5ijy6rm45"; }; checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index df943cfcca4..8369c3df943 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { checkPhase = '' # disable one failing test case - py.test -k "not test_invalid_link" + # fixtures test is failing for incorrect class name + py.test -k "not test_invalid_link and not fixtures" ''; meta = { diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index ec2b872c7f8..5a0cb50903a 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2019.08.19"; + version = "2019.12.20"; src = fetchPypi { inherit pname version; - sha256 = "587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849"; + sha256 = "106e25a841921d8259dcef2a42786caae35bc750fb996f830065b3dfaa67b77e"; }; postCheck = '' diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index a4d1dcc485e..5c401fe799b 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -34,5 +34,6 @@ buildPythonPackage rec { homepage = https://github.com/thumbor/remotecv/wiki; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; + broken = true; # no longer compatible with latest pillow }; } diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix new file mode 100644 index 00000000000..a0f312389f1 --- /dev/null +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -0,0 +1,38 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy27 +, lib + +# pythonPackages +, pytest +}: + +buildPythonPackage rec { + pname = "requirements-detector"; + version = "0.6"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "yuvadm"; + repo = pname; + rev = version; + sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = "Python tool to find and list requirements of a Python project"; + homepage = "https://github.com/landscapeio/requirements-detector"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index d154499c03b..e98aad824b6 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.6"; + version = "0.10.9"; src = fetchPypi { inherit pname version; - sha256 = "502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790"; + sha256 = "8ce8cb4e7e1ad89336f8865af152e0563d2e7f0e0b86d2cf75f015f819409243"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix new file mode 100644 index 00000000000..5163c7389b2 --- /dev/null +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi + +# Test dependencies +, pytest, pytest-mock +}: + +buildPythonPackage rec { + pname = "RestrictedPython"; + version = "5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1g0sffn6ifkl1w8gq15rpaqm8c7l68bsnm77wcd3flyzzydmd050"; + }; + + #propagatedBuildInputs = [ xmltodict requests ifaddr ]; + + checkInputs = [ + pytest pytest-mock + ]; + + checkPhase = '' + pytest + ''; + + meta = { + homepage = https://github.com/zopefoundation/RestrictedPython; + description = "A restricted execution environment for Python to run untrusted code"; + license = lib.licenses.zpl21; + maintainers = with lib.maintainers; [ juaningan ]; + }; +} diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index c8c4315b66b..303a8bc6d7f 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0742hdnhwcx1bm7pdk83290rxfcb0i2xskgl8yn6lg8fql1hms7b"; + sha256 = "27273fc2dbc3513c1e05ea6b8af28aac8745fb09c164e39e2ed2807bf7e1b342"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index bc4bc0bcb5b..5a00b18557a 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.2.2"; + version = "3.2.4"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "0b3jpn9x7m2pccriyzgfsdb68qp6nq4ffhvjy1q2ar8wdxvmf5xp"; + sha256 = "3daf1a4b28c4e354ef989093f03b066908bf6e5082a6f4af72cc3fd928a28dc6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index eba8871fd02..b3a38320a2b 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "runsnakerun"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef"; + sha256 = "a66a0cdf0333dc3c0830c18e2f3d62f741dea197cd01a7e0059da4886a3a123f"; }; propagatedBuildInputs = [ squaremap wxPython ]; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 3c893a9a227..5c60b6379e9 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.5.3"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "30046ced74b5502eca604b1ae766fd3daa1b5ed6379fbe1210730710c752d4f6"; + sha256 = "06e0138cc4cf2ddb7304502f5c7b53269ce73679c5784c8d6b423db04d179c18"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index f04274d6b50..0f800c14fa9 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,16 +1,16 @@ -{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3 }: +{ stdenv, buildPythonPackage, fetchPypi, docutils, boto3, fsspec }: buildPythonPackage rec { pname = "s3fs"; - version = "0.3.5"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "f1d8d80ae7789e6c95f8432e3ec12d1c28e624aecf8c84afed373fb182b505ab"; + sha256 = "504a41ecb9edf0bd7798847b61839954e50508c5235ec7ee48c539ce46b4fa18"; }; buildInputs = [ docutils ]; - propagatedBuildInputs = [ boto3 ]; + propagatedBuildInputs = [ boto3 fsspec ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 8f51b1eda21..4f058a0761b 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -34,13 +34,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ pycrypto ecdsa ] - ++ lib.optional withOptionalDeps [ tcpdump ipython ] - ++ lib.optional withCryptography [ cryptography ] - ++ lib.optional withVoipSupport [ sox ] - ++ lib.optional withPlottingSupport [ matplotlib ] - ++ lib.optional withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ] - ++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ] - ++ lib.optional doCheck [ mock ]; + ++ lib.optionals withOptionalDeps [ tcpdump ipython ] + ++ lib.optional withCryptography cryptography + ++ lib.optional withVoipSupport sox + ++ lib.optional withPlottingSupport matplotlib + ++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ] + ++ lib.optional (isPy3k && pythonOlder "3.4") enum34 + ++ lib.optional doCheck mock; # Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate) doCheck = if isPy3k then false else true; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 5132d32bfba..8d459e24984 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -12,9 +12,6 @@ buildPythonPackage rec { sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; }; - # Fixes incorrect specified requirement (part of next release) - patches = [ ./fix_pytestrunner_req.patch ]; - propagatedBuildInputs = [ wheel setuptools packaging ]; checkInputs = [ cmake ninja cython codecov coverage six pathpy diff --git a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch b/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch deleted file mode 100644 index e8e19f84a5d..00000000000 --- a/pkgs/development/python-modules/scikit-build/fix_pytestrunner_req.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index dd348fa..4de89c6 100755 ---- a/setup.py -+++ b/setup.py -@@ -22,7 +22,7 @@ with open('requirements-dev.txt', 'r') as fp: - dev_requirements = list(filter(bool, (line.strip() for line in fp))) - - # Require pytest-runner only when running tests --pytest_runner = (['pytest-runner>=2.0,<3dev'] -+pytest_runner = (['pytest-runner>=2.0'] - if any(arg in sys.argv for arg in ('pytest', 'test')) - else []) - diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index dd561c54853..6c62adb7821 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,17 +1,24 @@ -{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy}: - -buildPythonPackage rec { +{lib, fetchPypi, python, buildPythonPackage, gfortran, nose, pytest, numpy, pybind11}: + +let + pybind = pybind11.overridePythonAttrs(oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + }); +in buildPythonPackage rec { pname = "scipy"; - version = "1.3.2"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4"; + sha256 = "dee1bbf3a6c8f73b6b218cb28eed8dd13347ea2f87d572ce19b289d6fd3fbc59"; }; checkInputs = [ nose pytest ]; nativeBuildInputs = [ gfortran ]; - buildInputs = [ numpy.blas ]; + buildInputs = [ numpy.blas pybind ]; propagatedBuildInputs = [ numpy ]; # Remove tests because of broken wrapper @@ -19,9 +26,7 @@ buildPythonPackage rec { rm scipy/linalg/tests/test_lapack.py ''; - # INTERNALERROR, solved with https://github.com/scipy/scipy/pull/8871 - # however, it does not apply cleanly. - doCheck = false; + doCheck = true; preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 14ab6e51582..8fee4b6631a 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -2,7 +2,7 @@ testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl, service-identity, parsel, pydispatcher, cssselect, lib }: buildPythonPackage rec { - version = "1.7.4"; + version = "1.8.0"; pname = "Scrapy"; checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f0813d23a3f5659f403f469b11488ecd81e989e834205c4366cd231536496513"; + sha256 = "fe06576f9a4971de9dc0175c60fd92561e8275f2bad585c1cb5d65c5181b2db0"; }; postInstall = '' diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index f4cf61fbb4d..f2df3c99b2a 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "semantic_version"; - version = "2.8.2"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "71c716e99086c44d068262b86e4775aa6db7fabee0743e4e33b00fbf6f672585"; + sha256 = "352459f640f3db86551d8054d1288608b29a96e880c7746f0a59c92879d412a3"; }; # ModuleNotFoundError: No module named 'tests' diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index daba816cfdb..67584789995 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.13.2"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "ff1fa7fb85703ae9414c8b427ee73f8363232767c9cd19158f08f6e4f0b58fc7"; + sha256 = "c6b919623e488134a728f16326c6f0bcdab7e3f59e7f4c472a90eea4d6d8fe82"; }; checkInputs = [ django flask tornado bottle rq falcon ] diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index ae39271a4b0..f52a4931377 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -13,7 +13,7 @@ let pname = "setuptools"; - version = "41.6.0"; + version = "42.0.2"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - sha256 = "0j7bfxq9fwa55ijzw8zn9aa2z2zx4lw2n4jbn1662pjg7v62knv1"; + sha256 = "1xqx3sha5ir40g1h15r7q063bcbl9bvh967vig574k3jgwxrz2ik"; name = "${pname}-${version}-source"; }; diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 8cad6885570..52dc89e3a96 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.20.0"; + version = "1.21.1"; src = fetchPypi { inherit pname version; - sha256 = "163fbz06xg4ncvmgsg85x2689zd1bvycc3506xqvcgh8xcz3izif"; + sha256 = "834dfd084fed290b2b445545b0d1cac7822f3c0ed6ba09707efb1716bb485ede"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix new file mode 100644 index 00000000000..d88141c8b35 --- /dev/null +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "shutilwhich"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = pname; + rev = version; + sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest -rs + ''; + + meta = with lib; { + description = "Backport of shutil.which"; + license = licenses.psfl; + homepage = https://github.com/mbr/shutilwhich; + maintainers = with maintainers; [ multun ]; + }; +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index abd4854c73f..54e19d2e604 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.16.1"; + version = "3.17.0"; doCheck = !stdenv.isDarwin; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq"; + sha256 = "1b1hhh1dia673vhq3jl2br1iqwb9yjii6iak56w96s9972vjbz3z"; }; # Package does not need pytest, but its a bit easier debugging. diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 78e7a5f0538..8bfd32aa093 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "six"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"; + sha256 = "30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index edc21e3292d..3273e5fe3a3 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "slicedimage"; - version = "4.0.5"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "c8e8759a013a0936ec9f7ffcd37fc64df69af913b4f26342c2501b8c3663d9bb"; + sha256 = "7369f1d7fa09f6c9969625c4b76a8a63d2507a94c6fc257183da1c10261703e9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 1619d9e112c..0f12dbb8850 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.3.0"; + version = "0.6.9"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10vrcqm371kqmf702xmqmzimv3xgrn3k3ip06nr1l6gnj3jk138g"; + sha256 = "fb057eb7f5416ac76b6ab03bb5c20c39cb7b97c7689ce1e7244c9088bd28f513"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix new file mode 100644 index 00000000000..da9dbd79845 --- /dev/null +++ b/pkgs/development/python-modules/snitun/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }: + +buildPythonPackage rec { + pname = "snitun"; + version = "0.20"; + + src = fetchFromGitHub { + owner = "NabuCasa"; + repo = pname; + rev = version; + sha256 = "1nscfwycclfbll709w1q46w6rl0r5c3b85rsc7zwc3ixd1k8aajp"; + }; + + propagatedBuildInputs = [ attrs cryptography async-timeout ]; + + checkInputs = [ pytest pytest-aiohttp ]; + + checkPhase = '' + pytest tests/ + ''; + + meta = with lib; { + homepage = "https://github.com/nabucasa/snitun"; + description = "SNI proxy with TCP multiplexer"; + license = licenses.gpl3; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix new file mode 100644 index 00000000000..eb8be17797f --- /dev/null +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -0,0 +1,65 @@ +{ buildPythonPackage +, asn1crypto +, azure-storage-blob +, boto3 +, certifi +, cffi +, fetchPypi +, future +, idna +, ijson +, isPy3k +, lib +, oscrypto +, pyarrow +, pyasn1-modules +, pycryptodomex +, pyjwt +, pyopenssl +, pytz +, requests +, six +, urllib3 +}: + +buildPythonPackage rec { + pname = "snowflake-connector-python"; + version = "2.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "06061d59lapqrlg3gzdk4bi3v9c3q5zxfs0if5v2chg1f2l80ncr"; + }; + + propagatedBuildInputs = [ + azure-storage-blob + asn1crypto + boto3 + certifi + cffi + future + idna + ijson + oscrypto + pycryptodomex + pyjwt + pyopenssl + pytz + requests + six + ] ++ lib.optionals (!isPy3k) [ + pyarrow + pyasn1-modules + urllib3 + ]; + + # tests are not working + # XXX: fix the tests + doCheck = false; + + meta = with lib; { + description = "Snowflake Connector for Python"; + homepage = "https://www.snowflake.com/"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix new file mode 100644 index 00000000000..d8c557eddc7 --- /dev/null +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage +, lib +, fetchPypi +, sqlalchemy +, snowflake-connector-python +}: + +buildPythonPackage rec { + pname = "snowflake-sqlalchemy"; + version = "1.1.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pmmwkw29944zh044azwbc1gf4s04fm55920d9if2a3zpjm6c5d7"; + }; + + propagatedBuildInputs = [ + sqlalchemy + snowflake-connector-python + ]; + + meta = with lib; { + description = "Snowflake SQLAlchemy Dialect"; + homepage = "https://www.snowflake.net/"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 829874f25ad..52d7d7539f9 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -48,5 +48,6 @@ homepage = "https://github.com/solokeys/solo-python"; maintainers = with maintainers; [ wucke13 ]; license = with licenses; [ asl20 mit ]; + broken = true; # no longer compatible with fido2 }; } diff --git a/pkgs/development/python-modules/sparqlwrapper/default.nix b/pkgs/development/python-modules/sparqlwrapper/default.nix index 0a51bb5f9e8..fe400630507 100644 --- a/pkgs/development/python-modules/sparqlwrapper/default.nix +++ b/pkgs/development/python-modules/sparqlwrapper/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SPARQLWrapper"; - version = "1.8.4"; + version = "1.8.5"; src = fetchPypi { inherit pname version; - sha256 = "21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9"; + sha256 = "d6a66b5b8cda141660e07aeb00472db077a98d22cb588c973209c7336850fb3c"; }; # break circular dependency loop diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix index 3c7a1c8d839..ef97617225c 100644 --- a/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Command line interface for testing internet bandwidth using speedtest.net"; homepage = https://github.com/sivel/speedtest-cli; license = licenses.asl20; - maintainers = with maintainers; [ makefu domenkozar ndowens ]; + maintainers = with maintainers; [ makefu domenkozar ]; }; } diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 307232903e8..d9f64a93813 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -16,7 +16,6 @@ , Babel , snowballstemmer , six -, sqlalchemy , whoosh , imagesize , requests @@ -33,11 +32,11 @@ buildPythonPackage rec { pname = "sphinx"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { pname = "Sphinx"; inherit version; - sha256 = "0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845"; + sha256 = "1wjcm382824rq8ijls9mlqwl2h8l26s201v5fwprhnins671m72m"; }; LC_ALL = "en_US.UTF-8"; @@ -56,7 +55,6 @@ buildPythonPackage rec { setuptools snowballstemmer six - sqlalchemy whoosh imagesize requests diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 1eeb40ddbc2..b8f23afabcd 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-blockdiag"; - version = "1.5.5"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1w7q2hhpzk159wd35hlbwkh80hnglqa475blcd9vjwpkv1kgkpvw"; + sha256 = "91fd35b64f1f25db59d80b8a5196ed4ffadf57a81f63ee207e34d53ec36d8f97"; }; buildInputs = [ mock sphinx-testing ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch new file mode 100644 index 00000000000..847a6e07691 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch @@ -0,0 +1,22 @@ +diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py +index ee21113..a4f4589 100644 +--- a/sphinxcontrib/tikz.py ++++ b/sphinxcontrib/tikz.py +@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + tf.write(latex) + tf.close() + +- system([self.builder.config.latex_engine, '--interaction=nonstopmode', ++ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', + 'tikz-%s.tex' % shasum], + self.builder) + +@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): + '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, + '-f', 'tikz-%s.pdf' % shasum], self.builder) + elif self.builder.config.tikz_proc_suite == "pdf2svg": +- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) ++ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) + else: + self.builder._tikz_warned = True + raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix new file mode 100644 index 00000000000..15585679a29 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -0,0 +1,38 @@ +{ lib +, substituteAll +, buildPythonPackage +, fetchPypi +, sphinx +, pdf2svg +, texLive +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-tikz"; + version = "0.4.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f362b11e3c2bd17d5f0f07fec03917c16fc5bbcda6fe31ee137c547ed6b03a3"; + }; + + patches = [ + (substituteAll { + src = ./binary-paths.patch; + inherit texLive pdf2svg; + }) + ]; + + propagatedBuildInputs = [ sphinx ]; + + # no tests in package + doCheck = false; + + meta = with lib; { + description = "TikZ extension for Sphinx"; + homepage = https://bitbucket.org/philexander/tikz; + maintainers = with maintainers; [ costrouc ]; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 274a5148d8a..fac73dc8715 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.11.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddv80dv54rraa18lg9v7m9z61wzfwv6ww9ld83mr32gy3a2238p"; + sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; }; propagatedBuildInputs = [ selenium ]; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 86daec23d95..f4d57ce579e 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "0.5.2"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7"; + sha256 = "a782fc5961a9dd48d520ddc1c868b960d54b8edb1116c21fc2e3c347fe5a4474"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index b707d4a0abc..47094fcb993 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "spyder"; - version = "3.3.6"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + sha256 = "f2bfece9743188e3d1da68f02271a7c6eb7f0a3b692c3df4952458ab96b037a8"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3db00057c90..c58ec72498a 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.35.0"; + version = "0.36.0"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "0phsdcnm21qvxd00zmjd6yxbm1s0i7b1q8zrgfy8cqv9xpmz1w01"; + sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 56d2c6799b4..17141897d58 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.11"; + version = "1.3.12"; src = fetchPypi { inherit pname version; - sha256 = "27ef900b1116776128d0d09bff21f8d2f6bb2ea887cd59fe1a32aec5563aacb0"; + sha256 = "3bad3275e2f29ffa54d4013a2ac2c77e87d01a1d745065d54ed5e60bc68dfbf0"; }; # No tests in archive diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index 52b2fad62a2..05dab8d0265 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.7.3"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0dgzmzdv3alfdqcrl4x0xf9161ls80h33rnqbz0yhmfpkjg99b9n"; + sha256 = "00fb93313067cdbe52fe436eef1e79038b42c969cf44016b24f9eae0511db2d7"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index 3a0e95ab77e..fb339550062 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -2,22 +2,28 @@ , buildPythonPackage , isPy3k , fetchPypi +, six +, wxPython }: buildPythonPackage rec { pname = "squaremap"; - version = "1.0.4"; + version = "1.0.5"; disabled = isPy3k; src = fetchPypi { - inherit pname version; - sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8"; + pname = "SquareMap"; + inherit version; + sha256 = "1a79jm7mp0pvi3a19za5c3idavnj7hlral01hhr3x9mz1jayav5i"; }; + propagatedBuildInputs = [ six wxPython ]; + meta = with stdenv.lib; { description = "Hierarchic visualization control for wxPython"; homepage = https://launchpad.net/squaremap; license = licenses.bsd3; + broken = true; # wxPython doesn't seem to be able to be detected by pip }; } diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 38934d9497a..8fc0a23b065 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "starfish"; - version = "0.1.9"; + version = "0.1.10"; src = fetchPypi { inherit pname version; - sha256 = "02002b908572fcd2c7471475936a6c375f143d15df871399ce86ced6d7aef865"; + sha256 = "0340e37b732e184081b150f21bbbd4eed3643ab49f74633b9c4d827bda663235"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 6580a87b2fe..a2170db1bd4 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -9,21 +9,23 @@ , pyyaml , requests , ujson +, python-multipart , pytest -, python , uvicorn , isPy27 , darwin +, databases +, aiosqlite }: buildPythonPackage rec { pname = "starlette"; - version = "0.12.13"; + version = "0.13.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9597bc28e3c4659107c1c4a45ec32dc45e947d78fe56230222be673b2c36454a"; + sha256 = "6bd414152d40d000ccbf6aa40ed89718b40868366a0f69fb83034f416303acef"; }; propagatedBuildInputs = [ @@ -35,13 +37,17 @@ buildPythonPackage rec { requests ujson uvicorn + python-multipart + databases ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ]; + checkInputs = [ + pytest + aiosqlite + ]; + checkPhase = '' - ${python.interpreter} -c """ -from starlette.applications import Starlette -app = Starlette(debug=True) -""" + pytest --ignore=tests/test_graphql.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 46daaa21a99..e45ccdd49c6 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.10.1"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10"; + sha256 = "9cd2194c6642a8754e85f9a6e6912cdf996bebf6ff715d3cc67f65dadfd37cc9"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 13272a5a0b7..c7ea7804198 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "stm32loader"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1w6jg4dcyz6si6dcyx727sxi75wnl0j89xkiwqmsw286s1y8ijjw"; + sha256 = "0135qzxlrivvkq6wgkw7shfz94n755qs2c1754p1hc2jk0nqayrg"; }; propagatedBuildInputs = [ progress pyserial ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index b60aa7666fb..d564adbc6e2 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.37.2"; + version = "2.41.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7ad8ee6d9bdca86d6ed38c4eb48b1b67b9529ac4fee6c26d3f9aa4d5e98b50d6"; + sha256 = "2f0ec677136985ece9cca232f106c2a87193261cac1fe58d4e959215310a0da8"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 3a11bf67e13..ac62b8b415d 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; - version = "3.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "7b568f90f67fd25413c8da9f8bc9f9f8ab089425c20fa03330e97e77d13880ee"; + sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 7af7a16e7fa..186bf0a1ce2 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -1,7 +1,6 @@ -{ stdenv +{ lib , buildPythonPackage -, fetchPypi -, setuptools +, fetchFromGitHub , pyparsing , pytest }: @@ -10,21 +9,27 @@ buildPythonPackage rec { pname = "svgwrite"; version = "1.3.1"; - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "11e47749b159ed7004721e11d380b4642a26154b8cb2f7b0102fea9c71a3dfa1"; + src = fetchFromGitHub { + owner = "mozman"; + repo = "svgwrite"; + rev = "v${version}"; + sha256 = "14wz0y118a5wwfzin6cirr9254p4y825lnrnackihdbpw22gcw11"; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ pytest ]; + propagatedBuildInputs = [ + pyparsing + ]; - checkPhase = '' + checkInputs = [ pytest + ]; + + # embed_google_web_font test tried to pull font from internet + checkPhase = '' + pytest -k "not test_embed_google_web_font" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Python library to create SVG drawings"; homepage = https://github.com/mozman/svgwrite; license = licenses.mit; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index c09267662c1..87ef13bba0f 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.4"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.5"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "1q937csy8rd18pk2fz1ssj7jyj7l3rjx4nzbiz5vcymfhrb1x8bi"; + sha256 = "1s4w7q8gndim2ky825a84jmwcf7ryfn10wm8yxz9dw5z2307smii"; }; checkInputs = [ glibcLocales ]; @@ -22,14 +22,6 @@ buildPythonPackage rec { # tests take ~1h doCheck = false; - patches = [ - # to be fixed by https://github.com/sympy/sympy/pull/13476 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/sympy/patches/03_undeffun_sage.patch?id=3277ba76d0ba7174608a31a0c6623e9210c63e3d"; - sha256 = "0xcp1qafvqnivvvi0byh51mbgqicjhmswwvqvamjz9rxfzm5f7d7"; - }) - ]; - preCheck = '' export LANG="en_US.UTF-8" ''; diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 62e7faa121f..55a164773ca 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tblib"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1735ff8fd6217446384b5afabead3b142cf1a52d242cfe6cab4240029d6d131a"; + sha256 = "229bee3754cb5d98b4837dd5c4405e80cfab57cb9f93220410ad367f8b352344"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 375667e91dc..b94796b708e 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.10.8"; + version = "1.10.10"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1v0zq6kdvcff6pygi8syylqndamz884gaby4v16p5brg5rz6k25g"; + sha256 = "0zm3577f1l5g0i0gcxr3s0nrqy0i81ppr6vp31p550vvnlnkjsqj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 254b91891c7..fa039e7b170 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.1.5"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e664bd94f088b17f46da33255ae33911ca6a0fe04b156d334b601a4ef66d3c5f"; + sha256 = "72f397c2bb1887e048726603f3f629ea16f88cb3e61e4ed3c57e98582b8e3571"; }; nativeBuildInputs = [ pbr setuptools_scm ]; diff --git a/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch b/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch new file mode 100644 index 00000000000..25f1ba7a551 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/cuda-10.2-no-bin2c-path.patch @@ -0,0 +1,10 @@ +--- a/third_party/nccl/build_defs.bzl.tpl ++++ b/third_party/nccl/build_defs.bzl.tpl +@@ -113,7 +113,6 @@ def _device_link_impl(ctx): + "--cmdline=--compile-only", + "--link", + "--compress-all", +- "--bin2c-path=%s" % bin2c.dirname, + "--create=%s" % tmp_fatbin.path, + "--embedded-fatbin=%s" % fatbin_h.path, + ] + images, diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index cc64e49e1b7..a9f3ebf9e48 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -124,6 +124,10 @@ let sha256 = "077cpj0kzyqxzdya1dwh8df17zfzhqn7c685hx6iskvw2979zg2n"; }) ./lift-gast-restriction.patch + + # cuda 10.2 does not have "-bin2c-path" option anymore + # https://github.com/tensorflow/tensorflow/issues/34429 + ./cuda-10.2-no-bin2c-path.patch ]; # On update, it can be useful to steal the changes from gentoo @@ -266,7 +270,7 @@ let ''; # FIXME: Tensorflow uses dlopen() for CUDA libraries. - NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ]; + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index caad4940904..8fca654632e 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.2"; + version = "6.10.3"; src = fetchPypi { inherit pname version; - sha256 = "c0eb9d20ce3b53e0cf543da7c46c263cc9792f13223def8b26edb6180ecdc895"; + sha256 = "8f22100d4fb841b958f64e71c8820a32dc46f57d4d7e077777b932acd87b7327"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index d5a83832cb2..7d80be987f7 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "thrift"; - version = "0.11.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "7d59ac4fdcb2c58037ebd4a9da5f9a49e3e034bf75b3f26d9fe48ba3d8806e6b"; + sha256 = "9af1c86bf73433afc6010ed376a6c6aca2b54099cc0d61895f640870a9ae7d89"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 720391772b5..6f2d0de9acc 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -85,6 +85,6 @@ buildPythonPackage rec { description = "A smart imaging service"; homepage = https://github.com/thumbor/thumbor/wiki; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 03ab35e9e19..fbf36b4ef97 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 -, numpy, enum34, futures, pathlib +{ lib +, fetchPypi +, buildPythonPackage +, isPy27 +, isPy3k +, numpy +, imagecodecs-lite +, enum34 +, futures +, pathlib , pytest }: buildPythonPackage rec { pname = "tifffile"; - version = "2019.7.26"; + version = "2019.7.26.2"; src = fetchPypi { inherit pname version; - sha256 = "82c5c72de4dc19cc7011e4e8c45492e17121bd02cfa98c015ddd2a83e36f09bc"; + sha256 = "2abb91c3a23a61593c5635ac1a19f67e732b46291c305fcee0eeaad41181a13f"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; @@ -17,17 +25,28 @@ buildPythonPackage rec { # Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles # and test data missing from PyPI tarball doCheck = false; - checkInputs = [ pytest ]; + + checkInputs = [ + pytest + ]; + checkPhase = '' pytest ''; - propagatedBuildInputs = [ numpy ] - ++ lib.optional isPy27 [ futures enum34 pathlib ]; + propagatedBuildInputs = [ + numpy + ] ++ lib.optionals isPy3k [ + imagecodecs-lite + ] ++ lib.optionals isPy27 [ + futures + enum34 + pathlib + ]; meta = with lib; { description = "Read and write image data from and to TIFF files."; - homepage = https://www.lfd.uci.edu/~gohlke/; + homepage = "https://www.lfd.uci.edu/~gohlke/"; maintainers = [ maintainers.lebastr ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index b8894f12c6a..cddfb81d609 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.5.0"; + version = "0.5.3"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "1c9wl207c8jz0695gy8p6bxywyd1k7wmczcfl7s0hlbknliamvyx"; + sha256 = "1wzzq3ggrprnjqgx9168r4x8cj1rh2ikr6mlxgbi463p5hnlkb5m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix new file mode 100644 index 00000000000..f4339bbce4a --- /dev/null +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, lib +, fetchPypi +, isPy27 +, numba +, numpy +}: + +buildPythonPackage rec { + pname = "timezonefinder"; + version = "4.2.0"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0q8nd279labn03dz17s4xrglk1d31q9y8wcx99l51i5cxx53zsap"; + }; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ numba ]; + + meta = with lib; { + description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; + homepage = "https://github.com/MrMinimal64/timezonefinder"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 719ea78b732..5e7380f7bb3 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.9.8"; + version = "0.11.9"; src = fetchPypi { inherit pname version; - sha256 = "5963b22029e632a17bde87e35a19dc8c5b17266fb8c58e4d550d5593307e3a72"; + sha256 = "c5fe79df74b68ebc33406dfadc69f6484dee8005035a129fdb40b8fabfd06e9f"; }; propagatedBuildInputs = with python.pkgs; [ six ]; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 2c43ebf2c7e..6834876d8f8 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,5 +1,6 @@ { stdenv, buildPythonPackage, fetchPypi, twine, pbr, click, click-completion, validate-email, -pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy }: +pendulum, ptable, requests, inquirer, pythonOlder, pytest, pytestcov, pytest-mock, faker, factory_boy, +setuptools }: buildPythonPackage rec { @@ -16,6 +17,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ + --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ --replace "pbr==5.1.2" "pbr>=5.1.2" \ --replace "inquirer==2.5.1" "inquirer>=2.5.1" @@ -37,6 +39,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + setuptools click click-completion validate-email diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index c24343b4695..5cec769decc 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.14.1"; + version = "3.14.3"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "bcfa3e40abc1e9b70607b56adfd976fe7dc8286ad56aab44e3151daca7d2d0d0"; + sha256 = "06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 20f12485435..0ed6f84ff30 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "transaction"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "17wz1y524ca07vr03yddy8dv0gbscs06dbdywmllxv5rc725jq3j"; + sha256 = "3b0ad400cb7fa25f95d1516756c4c4557bb78890510f69393ad0bd15869eaa2d"; }; propagatedBuildInputs = [ zope_interface mock ]; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index f49c7a0d243..1d488eed4e1 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { incremental service-identity twisted + ] # twisted [tls] requirements (we should find a way to list "extras") - twisted.extras.tls - ]; + ++ twisted.extras.tls; checkInputs = [ pep8 diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index cdf29cb565d..2d40ad971db 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.5"; + version = "0.11.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cd8aafd70a281daa644c4a3fb021ffac20b7a88e86226ecc8bb3e78e1734a184"; + sha256 = "1i73j812i0dgjw9n106pipc6qksd9cgs59d0as0b4j5iyl0087hh"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 458a580a170..11f3c94aece 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.12.1"; + version = "0.13.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0wnnrs36arvimrfgrlbpjw3nx7lppx43yvk2b380ivv69h52i6hl"; + sha256 = "f1cf00054ad974c86d9b7afa187a65d79fd5995340abe01e8e4784d86f4acb30"; }; checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 8784dad7ad1..42cbf23e56f 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.3"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f0f96a21b430cc29661644d3569a1112a397ca9cc8595b964d4ae71e5e957529"; + sha256 = "9dfb18b568729d0219f758cddca1a91bab59f62ca41ee0e8acce5e657ec97b6c"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 9098d41bd69..fa167896ea0 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.33.1"; + version = "6.35.1"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "1k8hf4azgjzb4fifclzi8gj6v22368jk3y9f7f9qhq9ina7ilycj"; + sha256 = "10a1hqvxn0w6z696ay1bbxra6qn8bxg87d6g9iryd2hjnn8sfh4b"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 92288b6c774..762df433f97 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -1,26 +1,35 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, importlib-metadata +, keyring , pkginfo +, pyblake2 +, readme_renderer , requests , requests_toolbelt +, setuptools_scm , tqdm -, pyblake2 -, readme_renderer }: buildPythonPackage rec { pname = "twine"; - version = "2.0.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9fe7091715c7576df166df8ef6654e61bada39571783f2fd415bdcba867c6993"; + sha256 = "d561a5e511f70275e5a485a6275ff61851c16ffcb3a95a602189161112d9f160"; }; - propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 readme_renderer ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + keyring + pkginfo + pyblake2 + readme_renderer + requests + requests_toolbelt + tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Requires network doCheck = false; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index a87cacdc29e..5c4fea3f9b1 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -16,12 +16,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "19.7.0"; + version = "19.10.0"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d"; + sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; diff --git a/pkgs/development/python-modules/twofish/default.nix b/pkgs/development/python-modules/twofish/default.nix new file mode 100644 index 00000000000..1fe541b0729 --- /dev/null +++ b/pkgs/development/python-modules/twofish/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchPypi +, lib + +# pythonPackages +, javaobj-py3 +}: + +buildPythonPackage rec { + pname = "twofish"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1yihp2n42amrxw0wk9f66llpb3w5kwhgkcdg9krkzcik1nsqp7dh"; + }; + + propagatedBuildInputs = [ + javaobj-py3 + ]; + + # No tests implemented + doCheck = false; + + meta = { + description = "Bindings for the Twofish implementation by Niels Ferguson"; + homepage = "https://github.com/keybase/python-twofish"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 93c01fe7acb..3b60c63d964 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -1,6 +1,6 @@ {lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted , automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof -, GeoIP}: +, GeoIP, isPy27}: buildPythonPackage rec { pname = "txtorcon"; @@ -18,6 +18,8 @@ buildPythonPackage rec { sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15"; }; + # zope.interface issue + doCheck = isPy3k; # Skip a failing test until fixed upstream: # https://github.com/meejah/txtorcon/issues/250 checkPhase = '' @@ -28,6 +30,9 @@ buildPythonPackage rec { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; homepage = https://github.com/meejah/txtorcon; maintainers = with lib.maintainers; [ jluttine ]; + # Currently broken on Python 2.7. See + # https://github.com/NixOS/nixpkgs/issues/71826 + broken = isPy27; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index af9301571de..51dc3555250 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.5.1"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "5269435c8c98f4c4861dd69f3de755aaab5e163991b7ce1e0eff7ae6472957dd"; + sha256 = "2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix new file mode 100644 index 00000000000..8a66d6cbcc9 --- /dev/null +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, pytestcov +, jinja2 +, pyyaml +}: + +buildPythonPackage rec { + pname = "typesystem"; + version = "0.2.4"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "1k0jwcky17zwaz2vx4x2zbsnp270g4mgn7kx5bpl8jgx76qmsnba"; + }; + + propagatedBuildInputs = [ + jinja2 + pyyaml + ]; + + checkInputs = [ + pytest + pytestcov + ]; + + # for some reason jinja2 not picking up forms directory (1% of tests) + checkPhase = '' + pytest --ignore=tests/test_forms.py + ''; + + meta = with lib; { + description = "A type system library for Python"; + homepage = https://github.com/encode/typesystem; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index af1e2dc6de3..8e74c6460fe 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.3"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "9d15cb12d61a6481f7de412c2d53a99f87650e0d1e5394b047aeee5514964fb8"; + sha256 = "02d78242fcd0a58489aaf275964a6cf7581d7a2334ee240d2d547f8aca8607c6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ueberzug/default.nix b/pkgs/development/python-modules/ueberzug/default.nix new file mode 100644 index 00000000000..c956e5d8b34 --- /dev/null +++ b/pkgs/development/python-modules/ueberzug/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, libX11, libXext +, attrs, docopt, pillow, psutil, xlib }: + +buildPythonPackage rec { + pname = "ueberzug"; + version = "18.1.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1rj864sdn1975v59i8j3cfa9hni1hacq0z2b8m7wib0da9apygby"; + }; + + buildInputs = [ libX11 libXext ]; + propagatedBuildInputs = [ attrs docopt pillow psutil xlib ]; + + meta = with lib; { + homepage = "https://github.com/seebye/ueberzug"; + description = "An alternative for w3mimgdisplay"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index d4e8d1505d6..c03e8724d3d 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uncompyle6"; - version = "3.5.1"; + version = "3.6.2"; src = fetchPypi { inherit pname version; - sha256 = "af6aea84ca42c889986f8baf86ccb9e3faae5ac1eaef470d2317dfe4131708b3"; + sha256 = "aac071daef4b6cf95143ef08cd35d762a2bf2ea8249119a9371a91149c9996e7"; }; checkInputs = [ nose pytest hypothesis six ]; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 725c73960f5..86542439439 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -1,23 +1,23 @@ -{ stdenv, buildPackages, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, setuptools, unicorn-emu }: buildPythonPackage rec { pname = "unicorn"; - version = "1.0.1"; + version = stdenv.lib.getVersion unicorn-emu; - src = fetchPypi { - inherit pname version; - sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; - }; + src = unicorn-emu.src; + sourceRoot = "unicorn-${version}/bindings/python"; - # needs python2 at build time - PYTHON=buildPackages.python2.interpreter; + prePatch = '' + ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/ + ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/ + ''; - setupPyBuildFlags = [ "--plat-name" "linux" ]; + propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - description = "Unicorn CPU emulator engine"; + description = "Python bindings for Unicorn CPU emulator engine"; homepage = "http://www.unicorn-engine.org/"; license = [ licenses.gpl2 ]; - maintainers = [ maintainers.bennofs ]; + maintainers = with maintainers; [ bennofs ris ]; }; } diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index b0caaf3d96a..7bb8d4a16ea 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.7.1"; + version = "0.7.2"; pname = "uproot-methods"; src = fetchPypi { inherit pname version; - sha256 = "d7bfcc84c28a0b61669232ad43b86bbb944504f6bf4612fd395f4e5cc45d0ba5"; + sha256 = "4382983e4e6c5e1aeb3013d04334907f87f62b0d7c19a29968e5a0aac1653ae1"; }; propagatedBuildInputs = [ numpy awkward ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index f98b3411242..812ff15242c 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.12"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "34953903abe09bbab3ec1a9a4843b05c75b218daa6132c8275d871e88b6e3447"; + sha256 = "a9521786d0e16d00a457807e364229ba844ea5f8b0ac6653b00277351f12ab49"; }; nativeBuildInputs = [ pytestrunner ]; @@ -43,8 +43,11 @@ buildPythonPackage rec { ]; # skip tests which do network calls + # test_compression.py is missing zstandard package checkPhase = '' - pytest tests -k 'not hist_in_tree and not branch_auto_interpretation' + pytest tests -k 'not hist_in_tree \ + and not branch_auto_interpretation' \ + --ignore=tests/test_compression.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index c469fd8dd1c..64a2fd51ee3 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "uritemplate"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "c02643cebe23fc8adb5e6becffe201185bf06c40bda5c0b4028a93f1527d011d"; + sha256 = "5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae"; }; propagatedBuildInputs = [ simplejson ]; diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index cf3d36c3e5d..570fc5dc718 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -1,16 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, ipaddress }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27 }: buildPythonPackage rec { pname = "uritools"; - version = "2.2.0"; + version = "3.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "80e8e23cafad54fd85811b5d9ba0fc595d933f5727c61c3937945eec09f99e2b"; + sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; }; - propagatedBuildInputs = [ ipaddress ]; - meta = with stdenv.lib; { description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; license = licenses.mit; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 885595ef6d4..8e255dc69dc 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,14 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi }: +{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: buildPythonPackage rec { pname = "urwid"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1g6cpicybvbananpjikmjk8npmjk4xvak1wjzji62wc600wkwkb4"; + sha256 = "0896f36060beb6bf3801cb554303fef336a79661401797551ba106d23ab4cd86"; }; + # tests need to be able to set locale + LC_ALL = "en_US.UTF-8"; + checkInputs = [ glibcLocales ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = http://excess.org/urwid; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index b69bb62a875..468420f0e5c 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchFromGitHub +, glibcLocales , urwid }: @@ -17,6 +18,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ urwid ]; + checkInputs = [ glibcLocales ]; + LC_ALL="en_US.UTF-8"; + meta = with stdenv.lib; { description = "Tree widgets for urwid"; homepage = https://github.com/pazz/urwidtrees; diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 241dffe7167..5efd676f53d 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "validators"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "1bhla1l8gbks572zp4f254acz23822dz2mp122djxvp328i87b7h"; + sha256 = "0bfe836a1af37bb266d71ec1e98b530c38ce11bc7fbe0c4c96ef7b1532d019e5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index ef3e92f01a7..c518314d964 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "2.1.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "27cc696df66d77703eab5cdfa041b2f9877bbf2b54bcd390de89a4be964ca536"; + sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index 2d3dda551fb..f028f85f3ec 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "vega_datasets"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "20d490b417f84607eb5079400f608f2e9c135b7092bee10f6857f6d23136e459"; + sha256 = "db8883dab72b6f414e1fafdbf1e8db7543bba6ed77912a4e0c197d74fcfa1c20"; }; propagatedBuildInputs = [ pandas ]; diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index f420d88e816..fb81a79f10e 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,18 +2,19 @@ , buildPythonPackage , fetchPypi , pytest +, pytestcov }: buildPythonPackage rec { pname = "venusian"; - version = "1.2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "64ec8285b80b110d0ae5db4280e90e31848a59db98db1aba4d7d46f48ce91e3e"; + sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytestcov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/viewstate/default.nix b/pkgs/development/python-modules/viewstate/default.nix new file mode 100644 index 00000000000..cd64dcc7564 --- /dev/null +++ b/pkgs/development/python-modules/viewstate/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, isPy3k +, lib +, pytest +}: + +buildPythonPackage rec { + pname = "viewstate"; + version = "0.4.3"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "yuvadm"; + repo = pname; + rev = "v${version}"; + sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; + }; + + checkInputs = [ + pytest + ]; + + checkPhase = '' + pytest + ''; + + meta = { + description = ".NET viewstate decoder"; + homepage = "https://github.com/yuvadm/viewstate"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kamadorueda + ]; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 130c94bc170..1b56f046610 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "0.2.4"; + version = "0.2.5"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "0nybvd7sajig6vya2v3fd20dls6f3nnf12x8anrfxnjs41chgx87"; + sha256 = "5b267c8ffc98fcbd084ba852ab4caef3f22e9362bc5d117e1697e767553eaf41"; }; # requires X server diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 5d7e2c6b663..62c86567655 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "16.7.7"; + version = "16.7.9"; src = fetchPypi { inherit pname version; - sha256 = "d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136"; + sha256 = "0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"; }; # Doubt this is needed - FRidh 2017-07-07 diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index b9fae783074..d23f45b122f 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.7.0.post1"; + version = "8.8.0"; src = fetchPypi{ inherit pname version; - sha256 = "de9529660858b380127b2bea335b41a29e8f264551315042300022eb4e6524ea"; + sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; }; # Should be fixed in next Python release after 8.5.0: diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 28912f70471..8a6af2e69db 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0w2jkgrf0x58v8x90v4nifbwcb87pp613vp3sld1fk2avn80imnw"; + sha256 = "0qv0zpr6kwjwygx9k8jgafiil5wh2zsyryvbxghzv4yn7jb3xpdq"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix new file mode 100644 index 00000000000..a43aa915ea0 --- /dev/null +++ b/pkgs/development/python-modules/wfuzz/default.nix @@ -0,0 +1,51 @@ +{ buildPythonPackage +, chardet +, configparser +, fetchFromGitHub +, future +, isPy27 +, lib +, mock +, netaddr +, pkgs +, pyparsing +, pycurl +, pytest +, six +}: + +buildPythonPackage rec { + pname = "wfuzz"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "xmendez"; + repo = pname; + rev = "v.${version}"; + sha256 = "15dihrc7jsvpxcmb4fp254s633mkjm7ksjfkr9pqaai49qmnddyf"; + }; + + buildInputs = [ pyparsing configparser ]; + + propagatedBuildInputs = [ + chardet + future + pycurl + six + ]; + + checkInputs = [ netaddr pytest ] ++ lib.optionals isPy27 [ mock ]; + + # Skip tests requiring a local web server. + checkPhase = '' + HOME=$TMPDIR pytest \ + tests/test_{moduleman,filterintro,reqresp,api,clparser,dotdict}.py + ''; + + meta = with lib; { + description = "Web content fuzzer, to facilitate web applications assessments"; + homepage = "https://wfuzz.readthedocs.io"; + license = licenses.gpl2; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 8d5f8b8813a..565032ad523 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27 }: buildPythonPackage rec { pname = "whitenoise"; - version = "4.1.4"; + version = "5.0.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "22f79cf8f1f509639330f93886acaece8ec5ac5e9600c3b981d33c34e8a42dfd"; + sha256 = "0f9137f74bd95fa54329ace88d8dc695fbe895369a632e35f7a136e003e41d73"; }; # No tests diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 58f54aa15b9..c7f0fb1ecf8 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "a8b93e1b0af27fa7de199a2d36933f1f5acc9854783646b0f1b37fed9b4da091"; + sha256 = "04b2f4d24707b8871a7ffa37328d0a2de74e81bd30791c9608712612601abd23"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index c8940b54c46..35c11e90088 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "xattr"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "7cb1b28eeab4fe99cc4350e831434142fce658f7d03f173ff7722144e6a47458"; + sha256 = "b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index e8643a6b540..1bb421194f9 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.8.1"; + version = "0.9.0"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "03nf3xrqq25sj9phqc9ngvqxrrp14s4ifsx9hv41kp7zi3xamsfn"; + sha256 = "1r03yvxwbimh8ngfrbd436f9r535vvj6m1b3zfgz9kl76c8yn5ic"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 533e8d8b577..831dd888fae 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.1.3"; + version = "4.2.2"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0ixx9svyi0kw3z2i51cv1cyg4l5z8hy432kxgsvz20mr9a8z5c91"; + sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb"; }; checkInputs = [ pytest ]; @@ -28,5 +28,4 @@ buildPythonPackage rec { homepage = https://github.com/rocky/python-xdis/; license = licenses.gpl2; }; - } diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 1a54b8b4049..cf4eadd99d8 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.35.0"; + version = "2.37.3"; src = fetchPypi { inherit pname version; - sha256 = "0jpg9rxxw28n66wzznlhzdgv7b7gd1crcffjhlw7lam93ils4ah5"; + sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 19e2ed95328..788ccc0ed81 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "1.0.16"; + version = "1.0.18"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "0mxvpafkaxib3qiz3zl7fbsgjaq9hbx4kb0w646azwhg7n7nxghj"; + sha256 = "1pwq2sfh7klcxismsqzgw80cp3cdkq9wv8x9g3h1zx1p66xpas9p"; }; propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix new file mode 100644 index 00000000000..00a0bfb6043 --- /dev/null +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, which, lrzsz }: + +buildPythonPackage rec { + pname = "xmodem"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "tehmaze"; + repo = "xmodem"; + rev = version; + sha256 = "0nz2gxwaq3ys1knpw6zlz3xrc3ziambcirg3fmp3nvzjdq8ma3h0"; + }; + + checkInputs = [ pytest which lrzsz ]; + + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "Pure python implementation of the XMODEM protocol"; + maintainers = with maintainers; [ emantor ]; + homepage = https://github.com/tehmaze/xmodem; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index 1b83c8987a1..b4d5834b242 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.19.0"; + version = "1.20.0"; src = fetchPypi { inherit pname version; - sha256 = "05fg2i27bq40z83avmz3h91i206dx5k6nyyvpa5vja54sqg14q02"; + sha256 = "1gx3f9wcf8af9cz2v3x3196pab34n8mlqk5iswahhzpxc9i2p4bn"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index abff04f2372..f4e154f2cbc 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yapf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchPypi { inherit pname version; - sha256 = "06x409cgr5im9cppzypj1kqy1fsry906vn5slv7i9hd7fshvd53g"; + sha256 = "712e23c468506bf12cadd10169f852572ecc61b266258422d45aaf4ad7ef43de"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index c98bc1f303e..f7a18bba903 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "1gs48c5sy771lsjhca3m4j8ljc6yhk5qnim3n5idnlaxa4ql30bz"; + sha256 = "b8db9bc607610d6da4e27e87ec828ebddec4bdaac89ca07ebfe9a153b0641580"; }; patches = [ ./tests.patch ]; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index d07690503f3..19314e19611 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "yarl"; - version = "1.3.0"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9"; + sha256 = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index e39b11f6200..99aedd4e681 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yubico-client"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "c1d1c1f918c058932493c5a50341583e48487264129ed5b973c327ae48afed87"; + sha256 = "1d74c6341210c94b639f7c7c8930550e73d5c1be60402e418e9dc95e038f8527"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index dbf84aa182b..ef45f663ceb 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.23.0"; + version = "0.24.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1xgfs38wv52a73p9gmyz0vxj6c49516isjn9bhp8p3y4cywk7hz0"; + sha256 = "de62e5067ea7ab356f7168a3562d79fececa8632ed0fad0e82f505e01fafbc6d"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 1f490fea05f..d819a881f9f 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.28"; + version = "0.0.30"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "021z5f5dm74amxkqnz4s1690ydprciqg23jz3n4mpjlxyxbdfj73"; + sha256 = "00731a9b9c58c4e59f6765ac0cec5e2301bdda28ef19e00e2ba752be457a61b9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 72c32ef8277..4cd5e9b1d20 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zm-py"; - version = "0.3.3"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7cac73bd4f5e729fd8b3cff6f456652c3fd76b1a11f5d539bc7e14ffc7a87e9a"; + sha256 = "f9693ca046de4ea12c1afb5c67709ec0c2a48744566c0a1a9327348e1a1617b0"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index bbe635b712f..25452fdd070 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "4.5"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "6edfd626c3b593b72895a8cfcf79bff41f4619194ce996a85bce31ac02b94e55"; + sha256 = "ec2afc5bbe611dcace98bb39822c122d44743d635dafc7315b9aef25097db9e6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index fc28a740d62..6db39d6c5b5 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "zope.contenttype"; - version = "4.4"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "08c0408f515668e6f0c4fd492b66fbe87a074c1aa21cfc6be8c6292482d8b2f4"; + sha256 = "c12d929c67ab3eaef9b8a7fba3d19cce8500c8fd25afed8058c8e15f324cbd5b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index cddcad00774..fe9a6b56ed8 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.i18nmessageid"; - version = "4.3.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e511edff8e75d3a6f84d8256e1e468c85a4aa9d89c2ea264a919334fae7081e3"; + sha256 = "03318270df5320c57b3416744f9cb2a85160a8d00345c07ac35d2b7ac01ff50c"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index a5855697ad6..d208d4a3529 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "4.6.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1b3d0dcabc7c90b470e59e38a9acaa361be43b3a6ea644c0063951964717f0e5"; + sha256 = "4bb937e998be9d5e345f486693e477ba79e4344674484001a0b646be1d530487"; }; propagatedBuildInputs = [ zope_event ]; diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index a093cc4dc95..35307a3fbd9 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -64,7 +64,7 @@ in rec { "${ruby}/bin/ruby" \ "${confFiles}/Gemfile" \ "$out/${ruby.gemPath}" \ - "${bundler}/${ruby.gemPath}" \ + "${bundler}/${ruby.gemPath}/gems/bundler-${bundler.version}" \ ${lib.escapeShellArg binPaths} \ ${lib.escapeShellArg groups} ''; diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index fe8c43f55ed..add5db56d1d 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -8,7 +8,7 @@ out = ENV["out"] ruby = ARGV[0] gemfile = ARGV[1] bundle_path = ARGV[2] -bundler_gem_path = ARGV[3] +bundler_path = ARGV[3] paths = ARGV[4].split groups = ARGV[5].split @@ -35,7 +35,7 @@ ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} ENV["BUNDLE_PATH"] = #{bundle_path.dump} ENV['BUNDLE_FROZEN'] = '1' -Gem.use_paths(#{bundler_gem_path.dump}, ENV["GEM_PATH"]) +$LOAD_PATH.unshift #{bundler_path.dump} + "/lib" require 'bundler' Bundler.setup(#{groups.map(&:dump).join(', ')}) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index de9d06f7ce0..c1eb82c5fa8 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -236,7 +236,7 @@ in nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; hardeningDisable = [ "format" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" "-Wno-error=sizeof-pointer-memaccess" @@ -244,6 +244,7 @@ in "-Wno-error=class-memaccess" "-Wno-error=ignored-qualifiers" "-Wno-error=tautological-compare" + "-Wno-error=stringop-truncation" ]; dontBuild = false; postPatch = '' @@ -495,23 +496,22 @@ in sassc = attrs: { nativeBuildInputs = [ rake ]; dontBuild = false; - SASS_LIBSASS_PATH = libsass; + SASS_LIBSASS_PATH = toString libsass; postPatch = '' substituteInPlace lib/sassc/native.rb \ --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")' ''; - } // (if stdenv.isDarwin then { + } // (lib.optionalAttrs stdenv.isDarwin { # https://github.com/NixOS/nixpkgs/issues/19098 - buildFlags = "--disable-lto"; - } else {}); + buildFlags = [ "--disable-lto" ]; + }); - scrypt = attrs: - if stdenv.isDarwin then { - dontBuild = false; - postPatch = '' - sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile - ''; - } else {}; + scrypt = attrs: lib.optionalAttrs stdenv.isDarwin { + dontBuild = false; + postPatch = '' + sed -i -e "s/-arch i386//" Rakefile ext/scrypt/Rakefile + ''; + }; semian = attrs: { buildInputs = [ openssl ]; diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix index 73f8f02b27b..dc1da3de492 100644 --- a/pkgs/development/ruby-modules/with-packages/test.nix +++ b/pkgs/development/ruby-modules/with-packages/test.nix @@ -9,6 +9,7 @@ let ruby_2_4 ruby_2_5 ruby_2_6 + ruby_2_7 ]; gemTests = diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 009458d4176..985dd8dfd8c 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.27"; + version = "8.28"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1x3klaww0x5ql0jrqfmirni7jbph4hybmkslc268f6knsbs5lijl"; + sha256 = "014jsj6pbpf3y4c1vx606f82c7pic6q4lcsbl7wwqn67dr0g0v1m"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix new file mode 100644 index 00000000000..e5770800199 --- /dev/null +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -0,0 +1,61 @@ +{ stdenv +, fetchzip +, zlib +, xorg +, freetype +, alsaLib +, jdk11 +, curl +, lttng-ust +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "codeql"; + version = "2.0.0"; + + dontConfigure = true; + dontBuild = true; + dontStrip = true; + + src = fetchzip { + url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; + sha256 = "1v6wzjdhfws77fr5r15s03f1ipzc1gh7sl8gvw1fb4pplpa2d08s"; + }; + + nativeBuildInputs = [ + zlib + xorg.libX11 + xorg.libXext + xorg.libXi + xorg.libXtst + xorg.libXrender + freetype + alsaLib + jdk11 + stdenv.cc.cc.lib + curl + lttng-ust + autoPatchelfHook + ]; + + installPhase = '' + # codeql directory should not be top-level, otherwise, + # it'll include /nix/store to resolve extractors. + mkdir -p $out/{codeql,bin} + cp -R * $out/codeql/ + + ln -sf $out/codeql/tools/linux64/lib64trace.so $out/codeql/tools/linux64/libtrace.so + + sed -i 's;"$CODEQL_DIST/tools/$CODEQL_PLATFORM/java/bin/java";"${jdk11}/bin/java";' $out/codeql/codeql + + ln -s $out/codeql/codeql $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Semantic code analysis engine"; + homepage = "https://semmle.com/codeql"; + maintainers = [ maintainers.dump_stack ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 8b6eb71f90f..1b7467608be 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; - makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg HAVE_RULES=yes''; + makeFlags = [ "PREFIX=$(out)" "CFGDIR=$(out)/cfg" "HAVE_RULES=yes" ]; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 6f3df32f3c0..a882d158f32 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost gmp clang llvm sqlite python ocamlPackages.apron mpfr ppl doxygen graphviz ]; - cmakeFlags = "-DAPRON_ROOT=${ocamlPackages.apron}"; + cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ]; postBuild = "make doc"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 111c41ea95b..79dedb3afba 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.13.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "16iv2z4krx8ixifpq0r784xspknmj0bbvhx10mnq97v49j5c03qi"; + sha256 = "13azczm5lg9v5mvf1jx165qy2nj2941qlr9vvxa7q3gqmhxcg271"; }; - modSha256 = "1rk22w4b5iq6fp3jwpcpnb6y2frbrggxkhdm3ipp8c5savq2wbqh"; + modSha256 = "0xckzyfc144bc212amw1n63jkmdljbmj0rq0midr37h6bg5a10q3"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 15303c2c87f..f6dd4687dab 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "1pv113sk7hfxp4m2rcriqqp6mbbzcfdr0yrx4g1yiam93rx34yb7"; + sha256 = "1rjv21jwq2lkyq60qqg6bd8226dz90hanl3zd9fjlms3vm0zarf8"; }; modSha256 = "0gs8y618izqi0gfa46jqh79yj8lzsmc6yj95fakhp2f5i8v1xrmx"; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e82bbb4aba1..da69000a5e4 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -25,11 +25,11 @@ }: let - version = "1.2.1"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95"; + sha256 = "1fvc7lakdczim1i99hrwhwx2w75afd3q9fgbhrx7i3pnav3a6kbj"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -49,8 +49,8 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v6.1.zip" - else srcs."java_tools_javac11_linux-v6.1.zip") + then srcs."java_tools_javac11_darwin-v7.0.zip" + else srcs."java_tools_javac11_linux-v7.0.zip") srcs."coverage_output_generator-v2.0.zip" srcs.build_bazel_rules_nodejs srcs."android_tools_pkg-0.12.tar.gz" @@ -110,7 +110,7 @@ let remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json index e86e6a1c945..171b1f9fc64 100644 --- a/pkgs/development/tools/build-managers/bazel/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/src-deps.json @@ -15,20 +15,12 @@ "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz" ] }, - "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { - "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { + "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" - ] - }, - "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { - "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" ] }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { @@ -39,6 +31,14 @@ "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" ] }, + "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip": { + "name": "8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", + "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", + "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip" + ] + }, "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", @@ -67,7 +67,7 @@ "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", "strip_prefix": "j2objc-2.5", "urls": [ - "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" ] }, @@ -165,25 +165,25 @@ "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" ] }, - "java_tools_javac11_darwin-v6.1.zip": { - "name": "java_tools_javac11_darwin-v6.1.zip", - "sha256": "f0c488dac18f18ab1a0d18bbd65288c7a128e90a24d9c16f65bd8243f79483a0", + "java_tools_javac11_darwin-v7.0.zip": { + "name": "java_tools_javac11_darwin-v7.0.zip", + "sha256": "373a4226906ae9ba908550da16e133c4cd1f01b8973af82b9a2eb6903cb4d645", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_darwin-v6.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_darwin-v7.0.zip" ] }, - "java_tools_javac11_linux-v6.1.zip": { - "name": "java_tools_javac11_linux-v6.1.zip", - "sha256": "12f7940ed0bc4c2e82238951cdf19b4179c7dcc361d16fe40fe4266538fb4ac6", + "java_tools_javac11_linux-v7.0.zip": { + "name": "java_tools_javac11_linux-v7.0.zip", + "sha256": "3ff465e82954a70f49982610dd63f6f651beaa83c707dd637870b0e41cdcd2f0", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_linux-v6.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_linux-v7.0.zip" ] }, - "java_tools_javac11_windows-v6.1.zip": { - "name": "java_tools_javac11_windows-v6.1.zip", - "sha256": "e2deb2efff684de78787e0bdc7620f9672d13f04a12856d8e7f677369a8e286b", + "java_tools_javac11_windows-v7.0.zip": { + "name": "java_tools_javac11_windows-v7.0.zip", + "sha256": "11d90a147919e74d11870cdd58c4ee5de3062c08d11b16aa72d3f3bbfa9497a0", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_windows-v6.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v7.0/java_tools_javac11_windows-v7.0.zip" ] }, "java_tools_langtools_javac10": { @@ -362,20 +362,20 @@ }, "platforms": { "name": "platforms", - "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", - "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", + "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", + "strip_prefix": "platforms-46993efdd33b73649796c5fc5c9efb193ae19d51", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", - "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip", + "https://github.com/bazelbuild/platforms/archive/46993efdd33b73649796c5fc5c9efb193ae19d51.zip" ] }, "rules_cc": { "name": "rules_cc", - "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", - "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "sha256": "1d4dbbd1e1e9b57d40bb0ade51c9e882da7658d5bfbf22bbd15b68e7879d761f", + "strip_prefix": "rules_cc-8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", - "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip", + "https://github.com/bazelbuild/rules_cc/archive/8bd6cd75d03c01bb82561a96d9c1f9f7157b13d0.zip" ] }, "rules_java": { diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch index 0373ca2d67c..e0399d0a6c6 100644 --- a/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -23,12 +23,12 @@ index e353a37..b06f842 100644 struct cmLinkImplementation; --#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__) +-#if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) -# define HAVE_APPLICATION_SERVICES -# include <ApplicationServices/ApplicationServices.h> -#endif - - #if defined(CMAKE_BUILD_WITH_CMAKE) + #if !defined(CMAKE_BOOTSTRAP) # include "cmXMLParser.h" diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 37a44f15e9c..93e75a855d3 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.15.5"; + version = "3.16.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1d5y8d92axcc6rfqlsxamayfs3fc1vdby91hn5mx1kn02ppprpgv"; + sha256 = "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc"; }; patches = [ @@ -37,12 +37,6 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - # Fix for harfbuzz with pango versions > 1.43. - # Should be removed with cmake >= 3.16 - (fetchpatch { - url = "https://gitlab.kitware.com/cmake/cmake/commit/effafca77eacbb4988006b1f3f4d9154df6c33f8.diff"; - sha256 = "0vxam5kka1dffygp1nd0g21ib9qk8kds8iprbfga2gimzyrlfmfr"; - }) ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch index c5b9cdff1d0..eb3df1e4ff6 100644 --- a/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch +++ b/pkgs/development/tools/build-managers/cmake/libuv-application-services.patch @@ -31,8 +31,8 @@ diff -ur cmake-3.12.1/Utilities/cmlibuv/src/unix/fsevents.c cmake-3.12.1-patched #include "uv.h" #include "internal.h" --#if TARGET_OS_IPHONE -+#if !HAVE_CORESERVICES_CORESERVICES_H +-#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 ++#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 52b9c3ab5f5..6f3d33bcaa7 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -96,8 +96,8 @@ cmakeConfigurePhase() { # and unecessary attempts to access non-existent home folder # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags" if [ "${buildPhase-}" = ninjaBuildPhase ]; then cmakeFlags="-GNinja $cmakeFlags" diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index 6fc03a55094..8fd2514c4a0 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -3,14 +3,14 @@ let name = "doit"; - version = "0.31.1"; + version = "0.32.0"; in python3Packages.buildPythonApplication { name = "${name}-${version}"; src = fetchurl { url = "mirror://pypi/d/${name}/${name}-${version}.tar.gz"; - sha256 = "1spm8vfjh4kvalaj0i2ggbdln1yy5k68d8mfwfnpqlzxxx4ikl5s"; + sha256 = "033m6y9763l81kgqd07rm62bngv3dsm3k9p28nwsn2qawl8h8g9j"; }; buildInputs = with python3Packages; [ mock pytest ]; diff --git a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index b543565758c..37467f225ea 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "12f5zzyq2w56g95nni65hc0g5p7154033y2f3qmjvd016szn5qnn"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ # Purity: don't look for library dependencies (of the form `-lfoo') in /lib # and /usr/lib. It's a stupid feature anyway. Likewise, when searching for diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 5e01438844c..a15eb275231 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -54,12 +54,12 @@ rec { gradle_latest = gradle_5_6; gradle_5_6 = gradleGen rec { - name = "gradle-5.6.1"; + name = "gradle-5.6.4"; nativeVersion = "0.18"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "04pccfcry5c59xwm6rr4r3baanwbfr5yrwhxv4r5v8z4414291h9"; + sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d"; }; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 1d1bee9c04f..48a719c7c26 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "icmake"; - version = "9.02.08"; + version = "9.02.09"; src = fetchFromGitLab { - sha256 = "1pr5lagmdls3clzwa2xwcfa3k5750rf7i0j3zld0xirb41zx07q2"; + sha256 = "0f4vyqgjribwa60j3a1c2xv69zllc7rfhaafq0jj1mdy8hdzvxpd"; rev = version; repo = "icmake"; owner = "fbb-git"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 49d7287087f..e4d4994a781 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -10,11 +10,12 @@ let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamilies = { - aarch64 = "aarch64"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; + aarch64 = "aarch64"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index cd08ae973eb..0649cd7c595 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0rqfnclhzln6v4gm68fn4vn6ncf5qpi90295fwm4fx6dq4l94b3v"; + sha256 = "0hq2lx5w5lsiy9c69bcps4wyn2sa9s88hj0bq95p93sfiwq6mxlr"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7440b25c6e4..bd0c667fdad 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0bz6jj7jiwxd35xw9l1jbd846r0129pwgdi8m6dxwb8zybj73k2m"; + sha256 = "1c1ha4w3c36l7w2ncmwvry05hwcj8pv7dkpq23wdc25w1yj0l7sn"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 1655c154d4e..0afe2fbe928 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.1.1"; - sha256 = "19a3j6x7xkmr2srk2yzxx3wv003h9cxx08vr81ps76blvmzl3sjc"; + version = "3.1.2"; + sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; }; } diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 8c1a2bbb62d..23afc8b53f2 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,20 +2,20 @@ buildGoPackage rec { pname = "pack"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { - owner = "buildpack"; + owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0yh62h7lz2i07gixccmfyxk607djp1nrs57rzk7nkxnjcj4jj5sr"; + sha256 = "00v4kb9cv6nn7vrybjkv0kgcvfm5dsg0168dv253mrp9xmv8kd9l"; }; - goPackagePath = "github.com/buildpack/pack"; + goPackagePath = "github.com/buildpacks/pack"; subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpack/pack/cmd.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack/cmd.Version=${version}" ]; meta = with lib; { homepage = "https://buildpacks.io/"; diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 442035d0f5f..26b737f13a7 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, perf , Security }: @@ -15,11 +15,19 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0kmw2n4j5bisac0bv3npbwfz2z00ncd6w8ichwaz5hac5mi1a72f"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { + postFixup = lib.optionalString stdenv.isLinux '' + wrapProgram $out/bin/cargo-flamegraph \ + --suffix PATH ':' ${perf}/bin + wrapProgram $out/bin/flamegraph \ + --suffix PATH ':' ${perf}/bin + ''; + + meta = with lib; { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; homepage = https://github.com/ferrous-systems/flamegraph; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 223da64603b..8317473570d 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2019.11.07"; + version = "2019.12.14"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "145cdpcdzh2v77kvg8a0qqac9ra7vdcf9hj71vy5w7fck08yf192"; + sha256 = "1mprwqc5ydqn2wkssrj2g3wbpjss7flv584wss9j0jjfgy7jc4s1"; }; dontUnpack = true; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index 69fbfecc18f..837e1484583 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.3"; + version = "0.6.5"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "12fsgmqimc09qhkrqzi5n5qq3rigkagymn0cx6ayn2qglh8pwknw"; + sha256 = "0fzfczf66df81szp488zwdz6phx6lcq6wkb0dzpzq6ni39r7kvw8"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c264e528c8d..214e48b14b6 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.5.0"; + version = "12.6.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 = "1g4cgcn33zglk3az0pn81vsnq5b2csclxlx6hbp0l546lqjfw30d"; + sha256 = "14wp9dyacbldfvykc68pa0mj59anf0zfadxsr9bqwyl795zsxh7g"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0v13b4likwx1szbzbj3cf9yvkc9rbn8760agrf1bxik0immhhhq4"; + sha256 = "1iln85xy4qkz7ps2vr4qlbvn4p1b8137a75r4s24bc7g6apzyyvs"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0qlvm0ixwbkbqh73gbhvzhkaswwv1jcmqa79mazxwphxcki04m96"; + sha256 = "08vxgv6m83wqxksy0vj7nx6bb55sxn9c7l0sdpg0nblps0n8fzxm"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 0efe141d7bf..2e69c7df2a3 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.190.3"; + version = "2.204.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "146lg8xvg38glqn00kp20gx0bm5f9vv7fn3sy6fdqwdd60mh9hkr"; + sha256 = "112jimw5sf6n9nszmpsllz9sb06d3d8i45fin3m1vkdikszypf8j"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index 8feca8c62ca..ae511824569 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "2.5"; + version = "2.9"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "004fcll7248h73adkqawn9bhkqj9wsxyi3w99x64f7s37r2518wk"; + sha256 = "1ghp3kya4lxvfwz3c022cx9vqf55jbf9sjw60bxjcb5sszklyc89"; }; buildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 03f0ae3c444..4038ad7010f 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -19,6 +19,11 @@ buildPythonApplication rec { pygments sqlparse pgspecial setproctitle keyring ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" + ''; + checkInputs = [ pytest mock ]; # `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104 diff --git a/pkgs/development/tools/database/schemaspy/default.nix b/pkgs/development/tools/database/schemaspy/default.nix index d4e57adc140..00309c343d2 100644 --- a/pkgs/development/tools/database/schemaspy/default.nix +++ b/pkgs/development/tools/database/schemaspy/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper, graphviz }: stdenv.mkDerivation rec { - version = "6.0.0-rc2"; + version = "6.1.0"; pname = "schemaspy"; src = fetchurl { url = "https://github.com/schemaspy/schemaspy/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "0ph1l62hy163m2hgybhkccqbcj6brna1vdbr7536zc37lzjxq9rn"; + sha256 = "0lgz6b17hx9857fb2l03ggz8y3n8a37vrcsylif0gmkwj1v4qgl7"; }; dontUnpack = true; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index aa29277281d..0ec4b1510e9 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -16,9 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttools ]; - NIX_LDFLAGS = [ - "-lQt5PrintSupport" - ]; + NIX_LDFLAGS = "-lQt5PrintSupport"; enableParallelBuilding = true; @@ -26,7 +24,7 @@ mkDerivation rec { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 0408c8ed01b..4c8d0276d1a 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -33,8 +33,11 @@ python3Packages.buildPythonApplication rec { ] ++ stdenv.lib.optionals isPy27 [ mock ]; # test_genconfig.py needs devpi-server on PATH + # root_passwd_hash tries to write to store checkPhase = '' - PATH=$PATH:$out/bin pytest ./test_devpi_server --slow -rfsxX + PATH=$PATH:$out/bin HOME=$TMPDIR pytest \ + ./test_devpi_server --slow -rfsxX \ + -k 'not root_passwd_hash_option' ''; meta = with stdenv.lib;{ diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index f6a67b05114..0fdd026d875 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -65,13 +65,13 @@ rustPlatform.buildRustPackage rec { # Fix the build with mariadb, which otherwise shows "error adding symbols: # DSO missing from command line" errors for libz and libssl. - NIX_LDFLAGS = lib.optional mysqlSupport "-lz -lssl -lcrypto"; + NIX_LDFLAGS = lib.optionalString mysqlSupport "-lz -lssl -lcrypto"; meta = with lib; { description = "Database tool for working with Rust projects that use Diesel"; homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli; license = with licenses; [ mit asl20 ]; platforms = platforms.all; - maintainers = with maintainers; [ ivan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index d7dcb425963..af73ce25d42 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, perl, python, flex, bison, qt4, CoreServices, libiconv }: +{ stdenv, cmake, fetchurl, python3, flex, bison, qt4, CoreServices, libiconv }: stdenv.mkDerivation rec { @@ -12,11 +12,15 @@ stdenv.mkDerivation rec { sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + python3 + flex + bison + ]; buildInputs = - [ perl python flex bison ] - ++ stdenv.lib.optional (qt4 != null) qt4 + stdenv.lib.optional (qt4 != null) qt4 ++ stdenv.lib.optional stdenv.isSunOS libiconv ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES"; NIX_CFLAGS_COMPILE = - stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9"; + stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; enableParallelBuilding = true; doCheck = false; # fails diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 35d718ecd67..3c0b0cff548 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -2,9 +2,8 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , python3 -, libxml2Python , docbook_xml_dtd_43 , docbook_xsl , libxslt @@ -13,10 +12,12 @@ , withDblatex ? false, dblatex }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; version = "1.32"; + format = "other"; + src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; @@ -32,37 +33,41 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; nativeBuildInputs = [ + pkg-config gettext meson ninja + libxslt # for xsltproc ]; buildInputs = [ docbook_xml_dtd_43 docbook_xsl libxslt - pkgconfig - python3 - python3.pkgs.pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 - libxml2Python - ] - ++ stdenv.lib.optional withDblatex dblatex - ; + ] ++ stdenv.lib.optionals withDblatex [ + dblatex + ]; + + pythonPath = with python3.pkgs; [ + pygments # Needed for https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_32/meson.build#L42 + (anytree.override { withGraphviz = false; }) + lxml + ]; mesonFlags = [ "-Dtests=false" "-Dyelp_manual=false" ]; - # Make pygments available for binaries, python.withPackages creates a wrapper - # but scripts are not allowed in shebangs so we link it into sys.path. - postInstall = '' - ln -s ${python3.pkgs.pygments}/${python3.sitePackages}/* $out/share/gtk-doc/python/ - ''; - doCheck = false; # requires a lot of stuff doInstallCheck = false; # fails + postFixup = '' + # Do not propagate Python + substituteInPlace $out/nix-support/propagated-build-inputs \ + --replace "${python3}" "" + ''; + passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index 736640eba8e..dccf4a55831 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper which ]; buildInputs = [ python python.pkgs.setuptools z3.python erlang ]; - buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + buildFlags = [ "PWD=$(out)/lib/erlang/lib/cuter-${version}" "cuter_target" ]; configurePhase = '' autoconf ./configure --prefix $out diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index a4e51008bf7..731eb80b261 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,14 +4,14 @@ , lib }: python.pkgs.buildPythonApplication rec { - version = "1.1.5"; + version = "1.1.6"; pname = "fdroidserver"; src = fetchFromGitLab { owner = "fdroid"; repo = "fdroidserver"; rev = version; - sha256 = "1wpwv5gbwrjs03fmr6d81268k6gzjgr86swzgb8nfj48955iw193"; + sha256 = "0bz3pb34bkdg3l6dvpzynnfhblv18x88a5bh2dm8v31g5f9agh7r"; }; patchPhase = '' diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 8ab0ad21170..2c86cffeaab 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.1.0"; + version = "6.1.2"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "14f8vviki89dqhd429zlj0frma52xhyxpdln5c81z1dgs7819rpg"; + sha256 = "sha256:1rh1p50mwwlmwwdlcx7pzlsrg1dcl7gdsjbi7kyz0m71fbnn0bnv"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -19,7 +19,8 @@ makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ - --add-flags "org.flywaydb.commandline.Main" + --add-flags "org.flywaydb.commandline.Main" \ + --add-flags "-jarDirs='$out/share/flyway/jars'" ''; meta = with stdenv.lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7e126b3d112..0a7c9e7ebe1 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -15,7 +15,7 @@ buildRustPackage rec { sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014"; }; - cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y"; + cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv"; cargoPatches = [ (fetchpatch { @@ -27,6 +27,11 @@ buildRustPackage rec { url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch"; sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s"; }) + # Cargo.lock: Update url, which fixes incompatibility with NLL + (fetchpatch { + url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch"; + sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10"; + }) ]; LIBGIT2_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 1ea73484886..8304d95d99f 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,19 +1,19 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "golangci-lint"; - version = "1.21.0"; - goPackagePath = "github.com/golangci/golangci-lint"; - - subPackages = [ "cmd/golangci-lint" ]; + version = "1.22.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0knvb59mg9jrzmfs5nzglz4nv047ayq1xz6dkis74wl1g9xi6yr5"; + sha256 = "1wwp6ppm5p2cf7jbcgmqm6alzaj34sa079d98afw21yr81qxvvid"; }; + modSha256 = "02j2cf5778ds0vwz0kkd9c1x5ap732vkq20bfg440spfajscvndm"; + subPackages = [ "cmd/golangci-lint" ]; + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = https://golangci.com/; diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 36e41bddf25..839c12c04af 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1d4sbvk9wqzl3g3da8inqdkvd43rkwvmq969jlgl1k1agv5xjxqv"; + sha256 = "0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0"; }; modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn"; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 4107be4b454..58e9c67dd44 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.33.1"; + version = "7.35.1"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0alkfc0vx2pghdv29w2p9i96q20xydrjfc3yjmvnsa5740y80ha7"; + sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 549a4d1b826..c4d290bf967 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { postPatch = "sed -e 's,/usr/bin/install,install,g' -i src/Makefile"; preBuild = "cd src"; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 907b095629f..210dc101a24 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -57,7 +57,7 @@ GEM httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.13.0) + jazzy (0.13.1) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -66,7 +66,7 @@ GEM sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) - json (2.2.0) + json (2.3.0) liferaft (0.0.6) minitest (5.13.0) molinillo (0.6.6) @@ -76,17 +76,17 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.13.0) + rouge (3.14.0) ruby-macho (1.4.0) sassc (2.2.1) ffi (~> 1.9) - sqlite3 (1.4.1) + sqlite3 (1.4.2) thread_safe (0.3.6) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.13.0) + xcodeproj (1.14.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 2073991e787..872b6296786 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -230,20 +230,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d903aii1y54xb348cyj7rps7xa3in41w2qjh6yvgkbxbabnc616"; + sha256 = "0917v3dk9ks0apr0srk9sm6agk47iyh5bzfxqpkhd4dfgb4vpvjx"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; liferaft = { source = { @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw"; + sha256 = "0k5jrp0qc9p61mfcwyn1a7dajmkw04z6y76wa8a0axh1v2wrw8ld"; type = "gem"; }; - version = "3.13.0"; + version = "3.14.0"; }; ruby-macho = { groups = ["default"]; @@ -363,10 +363,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; thread_safe = { source = { @@ -382,10 +382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.6"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -402,9 +402,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx"; + sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb"; type = "gem"; }; - version = "1.13.0"; + version = "1.14.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/jtc/default.nix b/pkgs/development/tools/jtc/default.nix index 4dcc15089fe..84dff0277ef 100644 --- a/pkgs/development/tools/jtc/default.nix +++ b/pkgs/development/tools/jtc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jtc"; - version = "1.74"; + version = "1.75c"; src = fetchFromGitHub { owner = "ldn-softdev"; repo = pname; rev = version; - sha256 = "04hzamgs4k0x58cf4dw0a46kyw79yvcd5vazbklbjl6ap3rmnrx3"; + sha256 = "0q72vak1sbhigqq1a0s873knnm666sz1k3sdxbbi3bzq1x8mnykd"; }; buildPhase = '' diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix new file mode 100644 index 00000000000..a3944ff4126 --- /dev/null +++ b/pkgs/development/tools/kcli/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kcli"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "cswank"; + repo = "kcli"; + rev = version; + sha256 = "1m9967f9wk1113ap2qmqinqg7gvpmg5y2g1ji0q818qbandzlh23"; + }; + + modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; + + subPackages = [ "." ]; + + meta = with stdenv.lib; { + description = "A kafka command line browser"; + homepage = "https://github.com/cswank/kcli"; + license = licenses.mit; + maintainers = with maintainers; [ cswank ]; + }; +} diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 76be5e60c53..0c55dc9fdb1 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.35.0"; + version = "0.36.0"; src = fetchurl { url = "https://github.com/shyiko/ktlint/releases/download/${version}/ktlint"; - sha256 = "0zj18wcapnqny7k4wvwkyjfds6l2f4y22w6a84k06rzih2ghv0gm"; + sha256 = "0pjxd4z0byqrr5qbk3k38vr1ln052m5vhlrky4agmhg5zhn38mm6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c98a0a79705..a825d84027e 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.11.3"; + version = "0.12.3"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,13 +12,13 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0v765f93hkq94bmzfwkkb9ndbfka415sxyi01679fg860746rl6l"; + sha256 = "1r20543dydp5m9ciw01y8wlw8kxwmjn6zabfalnb13y1pa0zm76q"; }; meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; license = licenses.mit; - maintainers = with maintainers; [ fpletz equirosa ]; + maintainers = with maintainers; [ fpletz equirosa filalex77 ]; }; } diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index a91ab763bea..b9c149af531 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.5.2"; + name = "libsigrokdecode-0.5.3"; src = fetchurl { url = "https://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "1w434nl1syjkvwl08lji3r9sr60lbxp1nqys8hqwzv2lgiwrx3g0"; + sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 43cb6e6c2c7..7a2252c6b27 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -39,7 +39,7 @@ let noweb = stdenv.mkDerivation rec { mkdir -p "$tex/tex/latex/noweb" ''; - installTargets = "install-code install-tex install-elisp"; + installTargets = [ "install-code" "install-tex" "install-elisp" ]; postInstall = '' substituteInPlace "$out/bin/cpif" --replace "PATH=/bin:/usr/bin" "" @@ -57,7 +57,7 @@ let noweb = stdenv.mkDerivation rec { # HACK: This is ugly, but functional. PATH=$out/bin:$PATH make -BC xdoc - make $installFlags install-man + make "''${installFlags[@]}" install-man ln -s "$tex" "$out/share/texmf" ''; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix new file mode 100644 index 00000000000..415479edc84 --- /dev/null +++ b/pkgs/development/tools/metals/default.nix @@ -0,0 +1,57 @@ +{ stdenv, lib, coursier, jdk, jre, makeWrapper }: + +let + baseName = "metals"; + version = "0.7.6"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch org.scalameta:metals_2.12:${version} \ + -r bintray:scalacenter/releases \ + -r sonatype:snapshots > deps + mkdir -p $out/share/java + cp -n $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "03vx8n77mndpqbvq14cy3k9r4jwgjacrv56v5n87da8rqiclx37j"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk deps ]; + + phases = [ "installPhase" ]; + + extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m"; + + installPhase = '' + mkdir -p $out/bin + + makeWrapper ${jre}/bin/java $out/bin/metals-emacs \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main" + + makeWrapper ${jre}/bin/java $out/bin/metals-vim \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main" + + makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main" + + makeWrapper ${jre}/bin/java $out/bin/metals-sublime \ + --prefix PATH : ${lib.makeBinPath [ jdk ]} \ + --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" + ''; + + meta = with stdenv.lib; { + homepage = https://scalameta.org/metals/; + license = licenses.asl20; + description = "Work-in-progress language server for Scala"; + maintainers = with maintainers; [ ceedubs tomahna ]; + }; +} diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index fd9fa5f02da..7b9223ddec0 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.2.6"; + version = "1.2.8"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0y7qshg6v8s5rwi0fz9xpyhd1yhv8jrw2jhp276a30dfkglx19qn"; + sha256 = "1znrgmwi11pnanvlaqlrffp5y3pz2ql6vrglbzqx8m9ydvdn1cp1"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix new file mode 100644 index 00000000000..bf1cae3edc7 --- /dev/null +++ b/pkgs/development/tools/misc/act/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "act"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "nektos"; + repo = pname; + rev = "v${version}"; + sha256 = "1y1bvk93dzsxwjakmgpb5qyy3lqng7cdabi64b555c1z6b42mf58"; + }; + + modSha256 = "00d0wjnr5y3bl95lma8sdwvqqs7fd0k43azawp1kb29kqnrlismg"; + + meta = with lib; { + description = "Run your GitHub Actions locally"; + homepage = "https://circleci.com/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index a3579b73408..6261ffc9b01 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, gtest, python, boost }: +{ + stdenv, + fetchFromGitHub, + cmake, + gtest, + python, + boost +}: stdenv.mkDerivation rec { pname = "cli11"; @@ -20,6 +27,7 @@ stdenv.mkDerivation rec { preConfigure = '' rm -rfv extern/googletest ln -sfv ${gtest.src} extern/googletest + sed -i '/TrueFalseTest/d' tests/CMakeLists.txt ''; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix new file mode 100644 index 00000000000..17d93679285 --- /dev/null +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, jre }: + +stdenv.mkDerivation rec { + pname = "clojure-lsp"; + version = "20200106T233511"; + + src = fetchurl { + url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; + sha256 = "0z550c15sywbaxbfi1nxx19whfysq4whl4na4fjihnin8ab5sh2x"; + }; + + dontUnpack = true; + + installPhase = '' + install -Dm755 $src $out/bin/clojure-lsp + ''; + + meta = with stdenv.lib; { + description = "Language Server Protocol (LSP) for Clojure"; + homepage = "https://github.com/snoe/clojure-lsp"; + license = licenses.mit; + maintainers = [ maintainers.ericdallo ]; + platforms = jre.meta.platforms; + }; + +} diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index c51a5f50474..1ff96918766 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./gcc44.patch ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + meta = { homepage = https://www.gnu.org/software/ddd; description = "Graphical front-end for command-line debuggers"; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index 378cc4683b4..b82429cdac5 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-libtool-opts=${stdenv.lib.optionalString enableShared "-shared"}" ]; - installTargets = "install${stdenv.lib.optionalString withLibrary "-full"}"; + installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; meta = { homepage = https://invisible-island.net/dialog/dialog.html; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index 9975f0f5465..fe86a22b7f4 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; buildInputs = [ python ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 2d756a655a4..edcca88c71d 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "global"; - version = "6.6.3"; + version = "6.6.4"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "0735pj47dnspf20n0j1px24p59nwjinlmlb2n32ln1hvdkprivnb"; + sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 4a65d088834..3e5c12e183a 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -15,7 +15,7 @@ else let perlDeps = buildEnv { name = "hydra-perl-deps"; - paths = with perlPackages; + paths = with perlPackages; lib.closePropagation [ ModulePluggable CatalystActionREST CatalystAuthenticationStoreDBIxClass @@ -27,7 +27,7 @@ let CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace - CatalystRuntime + CatalystPluginUnicodeEncoding CatalystTraitForRequestProxyBase CatalystViewDownload CatalystViewJSON @@ -51,6 +51,7 @@ let LWP LWPProtocolHttps NetAmazonS3 + NetPrometheus NetStatsd PadWalker Readonly @@ -58,6 +59,8 @@ let SetScalar Starman SysHostnameLong + TermSizeAny + TestMore TextDiff TextTable XMLSimple @@ -69,15 +72,15 @@ let }; in stdenv.mkDerivation rec { pname = "hydra"; - version = "2019-08-30"; + version = "2019-11-13"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = pname; - rev = "242b8b7a314759ed33f69205d26a1b7c337511e0"; - sha256 = "167ijcf9qdm10kjvqax3hcvs5mpa4mx2y2i9idwwc6xfvn8fhs84"; + rev = "20dd0bbe6a90d9066e635ee82e98efec23b17e51"; + sha256 = "06chiaa7p54zxngmy2q3ps7bbiqpdv9h2rfmprh83qz36xps9rs2"; }; buildInputs = @@ -99,7 +102,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - NIX_CFLAGS_COMPILE = [ "-pthread" ]; + NIX_CFLAGS_COMPILE = "-pthread"; shellHook = '' PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 12197c2de40..a56ab127235 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { libXext libXv libXrandr glib bison libunwind python3 procps gtk-doc openssl peg ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=array-bounds" ]; + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index 83651e6d17e..a0f2f8f546a 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - x86_64-linux = "0sc5709k3z7lb8qcjpj49s6vfv69ds2wc8319ag9x776nyz1pqxi"; - x86_64-darwin = "0zh4q46vfdwaihs838ck8fap92i3b4x10wbpmx8mcwyfk5v0fkch"; + x86_64-linux = "1wq4fc2fifkg1qz7nxdfb4yi2biay8cgdz7kl5k0p37sxn0sbkja"; + x86_64-darwin = "06346kj7bv49py49pmmnmh8m24322m88v1af19909pj9cxgd0p6v"; } else { - x86_64-linux = "1pq17fasryharvw4byybvmcf5172hcmy6cp0m8bxhkxagwilprba"; - x86_64-darwin = "11crpx2qs2nzkzv6fvs1gqn9v4zalxkzsc5br0fy1y02lzm26zbm"; + x86_64-linux = "0ygpmcm6wdcnvw8azwqc5257lyic7yw31rqvm2pw3afhpha62lpj"; + x86_64-darwin = "0xy81g0bhxp47p29kkkh5llfzqkzqzr5dk50ap2hy0hjw33ld6g1"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix new file mode 100644 index 00000000000..9fbafebb10c --- /dev/null +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -0,0 +1,38 @@ +{ + pkgs +, stdenv +, libusb +, fetchFromGitHub +, lib +}: +stdenv.mkDerivation rec { + pname = "micronucleus"; + version = "2.04"; + + sourceRoot = "source/commandline"; + + src = fetchFromGitHub { + owner = "micronucleus"; + repo = "micronucleus"; + rev = version; + sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; + }; + + buildInputs = [ libusb ]; + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/lib/udev + cp micronucleus $out/bin + cp 49-micronucleus.rules $out/lib/udev + ''; + + meta = with lib; { + description = "Upload tool for micronucleus"; + homepage = "https://github.com/micronucleus/micronucleus"; + license = licenses.gpl3; + maintainers = [ maintainers.cab404 ]; + }; + +} diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 80203dd0df9..7e141270904 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: stdenv.mkDerivation rec { pname = "openocd"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; }; + patches = [ + # Fix FTDI channel configuration for SheevaPlug + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 + (fetchpatch { + url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; + sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libftdi1 libusb1 hidapi ]; @@ -25,12 +34,13 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ "-Wno-implicit-fallthrough" "-Wno-format-truncation" "-Wno-format-overflow" "-Wno-error=tautological-compare" - ]; + "-Wno-error=array-bounds" + ]); postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 5b17f111b45..015fc534f6b 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.15"; + version = "1.16"; src = fetchgit { url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; rev = "v${version}"; - sha256 = "10af9mh3qxbx0hgjcmh0vjbg22bgxzhbpd9395ymasyw4npg6l9x"; + sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 2d5d94813ca..47a91482327 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "scc"; - version = "2.8.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "boyter"; @@ -17,9 +17,9 @@ buildGoPackage rec { subPackages = [ "./" ]; meta = with stdenv.lib; { - homepage = https://github.com/boyter/scc; + homepage = "https://github.com/boyter/scc"; description = "A very fast accurate code counter with complexity calculations and COCOMO estimates written in pure Go"; - maintainers = with maintainers; [ sigma ]; + maintainers = with maintainers; [ sigma filalex77 ]; license = with licenses; [ unlicense /* or */ mit ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 004975f10d8..eec1f32b4df 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,21 +1,17 @@ -{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }: +{stdenv, fetchurl, ncurses, libpcap }: stdenv.mkDerivation rec { - version = "3.5.1"; + version = "3.6.0"; pname = "sipp"; - src = fetchFromGitHub { - owner = "SIPp"; - repo = "sipp"; - rev = "v${version}"; - sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k"; + src = fetchurl { + url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; + sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; }; - patchPhase = '' + postPatch = '' sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp - sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac - echo "#define SIPP_VERSION \"v${version}\"" > include/version.h ''; configureFlags = [ @@ -29,8 +25,6 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; - nativeBuildInputs = [ autoreconfHook ]; - meta = with stdenv.lib; { homepage = http://sipp.sf.net; description = "The SIPp testing tool"; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 965f0ed096c..4d63e2c6a15 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlags = "PREFIX=$(out) CC=cc"; + makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index a077367622e..66d40ae3127 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,4 +1,4 @@ -{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: +{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule, shortenPerlShebang }: stdenv.mkDerivation { name = "${name}-${sqitchModule.version}"; @@ -8,6 +8,8 @@ stdenv.mkDerivation { src = sqitchModule; dontBuild = true; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do @@ -17,6 +19,8 @@ stdenv.mkDerivation { ln -s ${sqitchModule}/$d $out/$d fi done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index a76a180741e..fd810555296 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost libtool groff ghostscript libgcrypt ]; - configureFlags = [ - (stdenv.lib.optional (libgcrypt == null) "--without-gcrypt") - ]; + configureFlags = stdenv.lib.optional (libgcrypt == null) "--without-gcrypt"; meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 8feeb13db95..dbb8057292b 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; - version = "1.0.18"; + version = "1.0.19"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libmysqlclient libaio ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "akopytov"; repo = pname; rev = version; - sha256 = "1r6lkyfp65xqklj1rdfw551srqqyak144agi8x3wjz3wmsbqls19"; + sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index e18f32fb07c..26aa50f7f7a 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "terracognita"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "06qw3mycgqkj2f5n6lm9xb2c21xjim2qlwizxsdc5hjrwbasl2q0"; + sha256 = "1d5yi2jxmk04wcz8rjwa5kz9525j8s90d4rj2d4cbgd3lbbk45qq"; }; - modSha256 = "0sjs1dd8z8brxj5wwfrwimnlscy7i6flc4kq4576zwrcjg6pjvkr"; + modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91"; + + subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 7741f2d4ffb..56ae48b7133 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -6,6 +6,10 @@ , interactive ? false, ncurses, procps }: +let + crossBuildTools = interactive && stdenv.hostPlatform != stdenv.buildPlatform; +in + with stdenv.lib; stdenv.mkDerivation { @@ -17,7 +21,13 @@ stdenv.mkDerivation { inherit sha256; }; - patches = optional (version == "6.5") ./perl.patch; + patches = optional (version == "6.5") ./perl.patch + ++ optional crossBuildTools ./cross-tools-flags.patch; + + # ncurses is required to build `makedoc' + # this feature is introduced by the ./cross-tools-flags.patch + NATIVE_TOOLS_CFLAGS = if crossBuildTools then "-I${getDev buildPackages.ncurses}/include" else null; + NATIVE_TOOLS_LDFLAGS = if crossBuildTools then "-L${getLib buildPackages.ncurses}/lib" else null; # We need a native compiler to build perl XS extensions # when cross-compiling. @@ -30,10 +40,8 @@ stdenv.mkDerivation { configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ] ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk"; - preInstall = '' - installFlags="TEXMF=$out/texmf-dist"; - installTargets="install install-tex"; - ''; + installFlags = [ "TEXMF=$(out)/texmf-dist" ]; + installTargets = [ "install" "install-tex" ]; checkInputs = [ procps ]; diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch new file mode 100644 index 00000000000..f0e4230d7ec --- /dev/null +++ b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -0,0 +1,12 @@ +diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure +--- texinfo-6.5/configure 2017-09-13 03:50:18.000000000 +0900 ++++ texinfo-6.5-patched/configure 2019-12-28 17:39:06.692818866 +0900 +@@ -23281,7 +23281,7 @@ + # env -i gives this build host configure a clean environment; + # consequently, we have to re-initialize $PATH. + env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ +- PATH="$PATH" \ ++ PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ + tools_only=1 \ + ${confdir}/configure --build=${build} --host=${build} \ + --disable-rpath --disable-nls diff --git a/pkgs/development/tools/misc/texlab/citeproc/package.json b/pkgs/development/tools/misc/texlab/citeproc/package.json deleted file mode 100644 index 87e7ccc1c92..00000000000 --- a/pkgs/development/tools/misc/texlab/citeproc/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "citeproc", - "version": "0.1.0", - "description": "Render BibTeX citations", - "repository": "https://github.com/latex-lsp/citeproc.git", - "author": "Eric Förster <efoerster@users.noreply.github.com>", - "license": "MIT", - "scripts": { - "dist": "webpack", - "format": "prettier --write \"src/**/*.{js,json}\" \"*.{js,json,yml,md}\" \".vscode/**/*.{json}\"" - }, - "dependencies": { - "@babel/core": "^7.5.5", - "@babel/preset-env": "^7.5.5", - "@citation-js/core": "^0.4.8", - "@citation-js/plugin-bibtex": "^0.4.8", - "@citation-js/plugin-csl": "^0.4.8", - "@types/node": "^11.13.17", - "@types/webpack": "^4.4.35", - "babel-loader": "^8.0.6", - "babel-polyfill": "^6.26.0", - "null-loader": "^0.1.1", - "prettier": "^1.18.2", - "ts-loader": "^5.4.5", - "ts-node": "^8.3.0", - "tslint": "^5.18.0", - "tslint-config-prettier": "^1.15.0", - "webpack": "^4.35.3", - "webpack-cli": "^3.3.6" - } -} diff --git a/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh b/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh deleted file mode 100755 index b57e48e10bc..00000000000 --- a/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p jq - -set -eu -o pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Usage: $0 <git release tag>" - exit 1 -fi - -TEXLAB_WEB_SRC="https://raw.githubusercontent.com/latex-lsp/texlab/$1" - -curl --silent "$TEXLAB_WEB_SRC/src/citeproc/js/package.json" | \ - jq '. + {"dependencies": .devDependencies} | del(.devDependencies)' > package.json diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index e11c288c1e9..1e8b3b2cbab 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -3,32 +3,24 @@ , fetchFromGitHub , nodejs , Security -, texlab-citeproc-build-deps }: rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "0b9lw6cmh7gyzj0pb3ghvqc3q7lzl12bfg9pjhl31lib3mmga8yb"; + # 1.9.0 + patches for building citeproc-db, see https://github.com/latex-lsp/texlab/pull/137 + rev = "e38fe4bedc9d8094649a9d2753ca9855e0c18882"; + sha256 = "0j87gmzyqrpgxrgalvlfqj5cj8j0h23hbbv8vdz2dhc847xhhfq1"; }; - cargoSha256 = "0qnysl0ayc242dgvanqgmx8v4a2cjg0f1lhbyw16qjv61qcsx8y5"; - - nativeBuildInputs = [ nodejs ]; + cargoSha256 = "09d9r7aal1q00idv08zdw7dygyasyp5l6jrh96cdclf63h1p4fk9"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' - rm build.rs - ln -s ${texlab-citeproc-build-deps}/lib/node_modules/citeproc/node_modules src/citeproc/js - (cd src/citeproc/js && npm run dist) - ''; - meta = with stdenv.lib; { description = "An implementation of the Language Server Protocol for LaTeX"; homepage = https://texlab.netlify.com/; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index e3e8e2c046c..96eb98bbbef 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "10.1.0"; + version = "10.1.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0l7vqmdagfhi4hnp50ng253zy4g48qjhs5kmnk2xh5v3c59ys4zs"; + sha256 = "0wndjb4rvj8548wz0svwgnk94qlg5w2fv75fn2jgriq6fh6v43yg"; }; - cargoSha256 = "140nm0nswmgdp549gqp71dbn99rc5g7cagl9s5m5qirl9mbpys8x"; + cargoSha256 = "1lpa4xfh3bcm51amwxvkzpvmi4b2c4q5qwxxigcbzw76l7rqp2w9"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 44744413138..2e056306db4 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontStrip = true; - installFlags = "SEMVER=${version} PREFIX=$(out)"; + installFlags = [ "SEMVER=${version}" "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/afiniate/trv; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 90605771958..c104adc78cc 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { doCheck = true; - checkFlags = "units"; + checkFlags = [ "units" ]; meta = with stdenv.lib; { description = "A maintained ctags implementation"; diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index e1726efc40c..64e04455abe 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -1,20 +1,19 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript }: - stdenv.mkDerivation rec { pname = "watson-ruby"; version = (import ./gemset.nix).watson-ruby.version; - env = bundlerEnv { - name = "watson-ruby-gems-${version}"; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "watson-ruby-gems-${version}"; + inherit ruby; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; + }; + in '' mkdir -p $out/bin ln -s ${env}/bin/watson $out/bin/watson ''; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index 068028c7da9..d8dab6b0358 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation { }) ]; - NIX_LDFLAGS = [ - "-lpcre" - ]; + NIX_LDFLAGS = "-lpcre"; buildPhase = '' HOME=$TMPDIR diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 0539e8de92b..f8beae4d527 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; prefixKey = "PREFIX="; - installTargets = "install-compiler"; + installTargets = [ "install-compiler" ]; meta = with stdenv.lib; { description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 6b471560fa9..de5da5674a2 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { --replace +camlp4 $out/lib/ocaml/${ocaml.version}/site-lib/camlp4 ''; - makeFlags = "all"; + makeFlags = [ "all" ]; - installTargets = "install install-META"; + installTargets = [ "install" "install-META" ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 1531408e498..c3fbb586349 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { preConfigure = "configureFlagsArray=(--strict" + " --libdir $out/lib/ocaml/${ocaml.version}/site-lib)"; - buildFlags = "world.opt"; + buildFlags = [ "world.opt" ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 27c608fc719..d6327010e30 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -18,7 +18,7 @@ let param = sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; extra = { createFindlibDestdir = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' mkdir $out/bin ''; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix new file mode 100644 index 00000000000..adb6947b5c9 --- /dev/null +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, ocaml, findlib }: + +if stdenv.lib.versionOlder ocaml.version "4.07" +then throw "dune is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "dune"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; + sha256 = "0z5anyyfiydpk4l45p64k2ravypawnlllixq0h5ir450dw0ifi5i"; + }; + + buildInputs = [ ocaml findlib ]; + + buildFlags = "release"; + + dontAddPrefix = true; + + installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + + meta = { + homepage = "https://dune.build/"; + description = "A composable build system"; + maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; + license = stdenv.lib.licenses.mit; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index 075020eef5c..ef0f5c4fabd 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ]; - buildFlags = "release"; + buildFlags = [ "release" ]; dontAddPrefix = true; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 28efaf4cf3d..33b729f938d 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { patches = [ ./Makefile.patch ]; - buildFlags = "PREFIX=$(out)"; - installFlags = "PREFIX=$(out)"; + buildFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; preInstall = "mkdir $out/bin"; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 79be6a8170c..9ea01a8dca7 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,29 +1,24 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, ocp-build, ocp-indent, cmdliner, re }: - -stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, buildDunePackage, ocp-build, ocp-indent, cmdliner, re, }: +buildDunePackage rec { + pname = "ocp-index"; version = "1.1.9"; - name = "ocaml${ocaml.version}-ocp-index-${version}"; src = fetchFromGitHub { owner = "OCamlPro"; - repo = "ocp-index"; + repo = pname; rev = version; sha256 = "0dq1kap16xfajc6gg9hbiadax782winpvxnr3dkm2ncznnxds37p"; }; - buildInputs = [ ocaml findlib dune ocp-build cmdliner re ]; - propagatedBuildInputs = [ ocp-indent ]; - - buildPhase = "dune build -p ocp-index"; + buildInputs = [ ocp-build cmdliner re ]; - inherit (dune) installPhase; + propagatedBuildInputs = [ ocp-indent ]; meta = { homepage = http://typerex.ocamlpro.com/ocp-index.html; description = "A simple and light-weight documentation extractor for OCaml"; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 1ea1cd4ab38..6a3c0c20d85 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { url = "https://src.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz"; sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13"; }; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = [ ./warn.patch ]; buildInputs = [ ocaml makeWrapper ncurses ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation { # # configureFlags = if transitional then "--transitional" else "--strict"; # -# buildFlags = "world.opt"; +# buildFlags = [ "world.opt" ]; meta = { description = "Omake build system"; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index f154b94ae33..c0aa1d16374 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, dune -, lambdaTerm, cppo, makeWrapper +, lambdaTerm, cppo, makeWrapper, buildDunePackage }: if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "utop is not available for OCaml ${ocaml.version}" else -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "utop"; version = "2.4.2"; @@ -16,12 +16,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ocaml findlib cppo dune ]; + buildInputs = [ cppo ]; propagatedBuildInputs = [ lambdaTerm ]; - inherit (dune) installPhase; - postFixup = let path = "etc/utop/env"; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 0e4810f0ba4..725694063a3 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "out-of-tree"; - version = "1.1.1"; + version = "1.2.1"; buildInputs = [ makeWrapper ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "048jda3vng11mg62fd3d8vs9yjsp569zlfylnkqv8sb6wd1qn66d"; + sha256 = "0wh4yh865wgl3hs203ncdjh1gaxznmhxdg56mciibng0dghgyw7n"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 261ae318a62..bfc330276b0 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.4.4"; + version = "1.5.1"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "00il85qbj5yadm5l5bczv7awmaazn9k3v3i0wsd6dbwpjga6snw9"; + sha256 = "0cj5nr2wjpw676wwx97pk4vfal4n13hm95bjl6600fj6m3491sh0"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index fac5b8e5830..0d7c806d2f4 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -1,21 +1,29 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; - version = "0.3.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "eraserhd"; repo = "parinfer-rust"; rev = "v${version}"; - sha256 = "0w7fcg33k8k16q8wzax44ck8csa2dr7bmwcz1g57dz33vhxi8ajc"; + sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l"; }; - cargoSha256 = "17fkzpvfaxixllr9nxx7dnpqxkiighggryxf30j3lafghyrx987f"; + cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn"; + + buildInputs = [ llvmPackages.libclang llvmPackages.clang ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' mkdir -p $out/share/kak/autoload/plugins cp rc/parinfer.kak $out/share/kak/autoload/plugins/ + + rtpPath=$out/share/vim-plugins/parinfer-rust + mkdir -p $rtpPath/plugin + sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \ + plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 5382ec421b7..0253fa27dc0 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.4.2"; + version = "3.5"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1kzsb6fmmpq00l2s55hyb4dbsmz8f3a64ria6354wlbx6ypj4fgz"; + sha256 = "1l8k2fcklwy0y57yidxvk5lbf0kb96ci3zffg2djivk8k05j0dhb"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 8542d415196..79e171d5fd7 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20191119"; + version = "20191125"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "0ch8y9g7b3lnw1r76p65gvdnbpwd60d4pghgadid122fcq7566p2"; + sha256 = "1phw8410ly3msv03dmjfi8xkmrl1lrrk928fp1489amg6sz2w707"; }; configureFlags = [ diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 2f4db7982b7..12c9b9d57f8 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -21,7 +21,7 @@ let configureFlags = [ "--with-colm=${colm}" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isGNU "-std=gnu++98"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=gnu++98"; doCheck = true; diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix new file mode 100644 index 00000000000..6a4ca2a3057 --- /dev/null +++ b/pkgs/development/tools/poetry/default.nix @@ -0,0 +1,69 @@ +{ lib, poetry2nix, python, fetchFromGitHub, runtimeShell }: + +poetry2nix.mkPoetryApplication { + + inherit python; + + pyproject = ./pyproject.toml; + poetrylock = ./poetry.lock; + + src = fetchFromGitHub { + owner = "sdispater"; + repo = "poetry"; + rev = "1.0.0"; + sha256 = "05xlx9wnlrsjj3i4wawnvxadvqwsdh03401wpgingkbq0c50aimi"; + }; + + # "Vendor" dependencies (for build-system support) + postPatch = '' + for path in ''${PYTHONPATH//:/ }; do + echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py + done + ''; + + # Poetry is a bit special in that it can't use itself as the `build-system` property in pyproject.toml. + # That's why we need to hackily install outputs completely manually. + # + # For projects using poetry normally overriding the installPhase is not required. + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/${python.libPrefix}/site-packages + cp -r poetry $out/lib/${python.libPrefix}/site-packages + + mkdir -p $out/bin + cat > $out/bin/poetry <<EOF + #!${python.interpreter} + import sys + + if __name__ == '__main__': + sys.path.append("$out/lib/${python.libPrefix}/site-packages") + from poetry.console import main + main() + EOF + chmod +x $out/bin/poetry + + mkdir -p "$out/share/bash-completion/completions" + "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry" + mkdir -p "$out/share/zsh/vendor-completions" + "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" + mkdir -p "$out/share/fish/vendor_completions.d" + "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" + + runHook postInstall + ''; + + # Propagating dependencies leads to issues downstream + # We've already patched poetry to prefer "vendored" dependencies + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + + # Fails because of impurities (network, git etc etc) + doCheck = false; + + meta = with lib; { + platforms = platforms.all; + maintainers = with maintainers; [ adisbladis jakewaksbaum ]; + }; +} diff --git a/pkgs/development/tools/poetry/poetry.lock b/pkgs/development/tools/poetry/poetry.lock new file mode 100644 index 00000000000..51fe6c42c7a --- /dev/null +++ b/pkgs/development/tools/poetry/poetry.lock @@ -0,0 +1,1886 @@ +[[package]] +category = "dev" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "appdirs" +optional = false +python-versions = "*" +version = "1.4.3" + +[[package]] +category = "dev" +description = "A few extensions to pyyaml." +name = "aspy.yaml" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "1.3.0" + +[package.dependencies] +pyyaml = "*" + +[[package]] +category = "dev" +description = "Atomic file writes." +name = "atomicwrites" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "1.3.0" + +[[package]] +category = "main" +description = "Classes Without Boilerplate" +name = "attrs" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "19.3.0" + +[package.extras] +azure-pipelines = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "pytest-azurepipelines"] +dev = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface", "sphinx", "pre-commit"] +docs = ["sphinx", "zope.interface"] +tests = ["coverage", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "zope.interface"] + +[[package]] +category = "dev" +description = "The uncompromising code formatter." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "black" +optional = false +python-versions = ">=3.6" +version = "19.10b0" + +[package.dependencies] +appdirs = "*" +attrs = ">=18.1.0" +click = ">=6.5" +pathspec = ">=0.6,<1" +regex = "*" +toml = ">=0.9.4" +typed-ast = ">=1.4.0" + +[package.extras] +d = ["aiohttp (>=3.3.2)", "aiohttp-cors"] + +[[package]] +category = "main" +description = "httplib2 caching for requests" +name = "cachecontrol" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.12.5" + +[package.dependencies] +msgpack = "*" +requests = "*" + +[package.dependencies.lockfile] +optional = true +version = ">=0.9" + +[package.extras] +filecache = ["lockfile (>=0.9)"] +redis = ["redis (>=2.10.5)"] + +[[package]] +category = "main" +description = "Cachy provides a simple yet effective caching library." +name = "cachy" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.3.0" + +[package.extras] +memcached = ["python-memcached (>=1.59,<2.0)"] +msgpack = ["msgpack-python (>=0.5,<0.6)"] +redis = ["redis (>=3.3.6,<4.0.0)"] + +[[package]] +category = "main" +description = "Python package for providing Mozilla's CA Bundle." +name = "certifi" +optional = false +python-versions = "*" +version = "2019.11.28" + +[[package]] +category = "main" +description = "Foreign Function Interface for Python calling C code." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +name = "cffi" +optional = false +python-versions = "*" +version = "1.13.2" + +[package.dependencies] +pycparser = "*" + +[[package]] +category = "dev" +description = "Validate configuration and produce human readable error messages." +name = "cfgv" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.0.1" + +[package.dependencies] +six = "*" + +[[package]] +category = "main" +description = "Universal encoding detector for Python 2 and 3" +name = "chardet" +optional = false +python-versions = "*" +version = "3.0.4" + +[[package]] +category = "main" +description = "Cleo allows you to create beautiful and testable command-line interfaces." +name = "cleo" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.7.6" + +[package.dependencies] +clikit = ">=0.4.0,<0.5.0" + +[[package]] +category = "dev" +description = "Composable command line interface toolkit" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\" or python_version >= \"3.6\" and python_version < \"4.0\"" +name = "click" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "7.0" + +[[package]] +category = "main" +description = "CliKit is a group of utilities to build beautiful and testable command line interfaces." +name = "clikit" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.4.1" + +[package.dependencies] +pastel = ">=0.1.0,<0.2.0" +pylev = ">=1.3,<2.0" + +[package.dependencies.enum34] +python = ">=2.7,<2.8" +version = ">=1.1,<2.0" + +[package.dependencies.typing] +python = ">=2.7,<2.8 || >=3.4,<3.5" +version = ">=3.6,<4.0" + +[[package]] +category = "dev" +description = "Cross-platform colored terminal text." +marker = "sys_platform == \"win32\"" +name = "colorama" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.4.1" + +[[package]] +category = "dev" +description = "Cross-platform colored terminal text." +marker = "sys_platform == \"win32\"" +name = "colorama" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "0.4.3" + +[[package]] +category = "main" +description = "Updated configparser from Python 3.7 for Python 2.6+." +marker = "python_version == \"2.7\" and python_version < \"2.8\" or python_version < \"3\"" +name = "configparser" +optional = false +python-versions = ">=2.6" +version = "4.0.2" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2)", "pytest-flake8", "pytest-black-multipy"] + +[[package]] +category = "main" +description = "Backports and enhancements for the contextlib module" +marker = "python_version < \"3\"" +name = "contextlib2" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.6.0.post1" + +[[package]] +category = "dev" +description = "Code coverage measurement for Python" +name = "coverage" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" +version = "4.5.4" + +[[package]] +category = "main" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +name = "cryptography" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +version = "2.8" + +[package.dependencies] +cffi = ">=1.8,<1.11.3 || >1.11.3" +six = ">=1.4.1" + +[package.dependencies.enum34] +python = "<3" +version = "*" + +[package.dependencies.ipaddress] +python = "<3" +version = "*" + +[package.extras] +docs = ["sphinx (>=1.6.5,<1.8.0 || >1.8.0)", "sphinx-rtd-theme"] +docstest = ["doc8", "pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +idna = ["idna (>=2.1)"] +pep8test = ["flake8", "flake8-import-order", "pep8-naming"] +test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"] + +[[package]] +category = "main" +description = "Discover and load entry points from installed packages." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +name = "entrypoints" +optional = false +python-versions = ">=2.7" +version = "0.3" + +[package.dependencies] +[package.dependencies.configparser] +python = ">=2.7,<2.8" +version = ">=3.5" + +[[package]] +category = "main" +description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" +name = "enum34" +optional = false +python-versions = "*" +version = "1.1.6" + +[[package]] +category = "dev" +description = "A platform independent file lock." +name = "filelock" +optional = false +python-versions = "*" +version = "3.0.12" + +[[package]] +category = "dev" +description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+" +marker = "python_version < \"3.0\"" +name = "funcsigs" +optional = false +python-versions = "*" +version = "1.0.2" + +[[package]] +category = "main" +description = "Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version < \"3\"" +name = "functools32" +optional = false +python-versions = "*" +version = "3.2.3-2" + +[[package]] +category = "dev" +description = "Backport of the concurrent.futures package from Python 3" +marker = "python_version < \"3.2\"" +name = "futures" +optional = false +python-versions = ">=2.6, <3" +version = "3.3.0" + +[[package]] +category = "main" +description = "Version of the glob module that can capture patterns and supports recursive wildcards" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +name = "glob2" +optional = false +python-versions = "*" +version = "0.6" + +[[package]] +category = "main" +description = "HTML parser based on the WHATWG HTML specification" +name = "html5lib" +optional = false +python-versions = "*" +version = "1.0.1" + +[package.dependencies] +six = ">=1.9" +webencodings = "*" + +[package.extras] +all = ["genshi", "chardet (>=2.2)", "datrie", "lxml"] +chardet = ["chardet (>=2.2)"] +datrie = ["datrie"] +genshi = ["genshi"] +lxml = ["lxml"] + +[[package]] +category = "dev" +description = "HTTP client mock for Python" +name = "httpretty" +optional = false +python-versions = "*" +version = "0.9.7" + +[package.dependencies] +six = "*" + +[[package]] +category = "dev" +description = "File identification library for Python" +name = "identify" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "1.4.8" + +[package.extras] +license = ["editdistance"] + +[[package]] +category = "main" +description = "Internationalized Domain Names in Applications (IDNA)" +name = "idna" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.8" + +[[package]] +category = "main" +description = "Read metadata from Python packages" +name = "importlib-metadata" +optional = false +python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" +version = "0.23" + +[package.dependencies] +zipp = ">=0.5" + +[package.dependencies.configparser] +python = "<3" +version = ">=3.5" + +[package.dependencies.contextlib2] +python = "<3" +version = "*" + +[package.extras] +docs = ["sphinx", "rst.linker"] +testing = ["packaging", "importlib-resources"] + +[[package]] +category = "dev" +description = "Read resources from Python packages" +marker = "python_version < \"3.7\"" +name = "importlib-resources" +optional = false +python-versions = ">=2.7,!=3.0,!=3.1,!=3.2,!=3.3" +version = "1.0.2" + +[package.dependencies] +[package.dependencies.pathlib2] +python = "<3" +version = "*" + +[package.dependencies.typing] +python = "<3.5" +version = "*" + +[[package]] +category = "main" +description = "IPv4/IPv6 manipulation library" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" +name = "ipaddress" +optional = false +python-versions = "*" +version = "1.0.23" + +[[package]] +category = "main" +description = "Low-level, pure Python DBus protocol wrapper." +marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +name = "jeepney" +optional = false +python-versions = ">=3.5" +version = "0.4.1" + +[package.extras] +dev = ["testpath"] + +[[package]] +category = "dev" +description = "A very fast and expressive template engine." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "jinja2" +optional = false +python-versions = "*" +version = "2.10.3" + +[package.dependencies] +MarkupSafe = ">=0.23" + +[package.extras] +i18n = ["Babel (>=0.8)"] + +[[package]] +category = "main" +description = "An implementation of JSON Schema validation for Python" +name = "jsonschema" +optional = false +python-versions = "*" +version = "3.2.0" + +[package.dependencies] +attrs = ">=17.4.0" +pyrsistent = ">=0.14.0" +setuptools = "*" +six = ">=1.11.0" + +[package.dependencies.functools32] +python = "<3" +version = "*" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + +[package.extras] +format = ["idna", "jsonpointer (>1.13)", "rfc3987", "strict-rfc3339", "webcolors"] +format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator (>0.1.0)", "rfc3339-validator"] + +[[package]] +category = "main" +description = "Store and access your passwords safely." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +name = "keyring" +optional = false +python-versions = ">=2.7" +version = "18.0.1" + +[package.dependencies] +entrypoints = "*" +pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" + +[package.dependencies.secretstorage] +python = "<3.5" +version = "<3" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs", "pytest-flake8"] + +[[package]] +category = "main" +description = "Store and access your passwords safely." +marker = "python_version >= \"3.5\" and python_version < \"4.0\"" +name = "keyring" +optional = false +python-versions = ">=3.5" +version = "19.3.0" + +[package.dependencies] +pywin32-ctypes = "<0.1.0 || >0.1.0,<0.1.1 || >0.1.1" +secretstorage = "*" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=3.5,<3.7.3 || >3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov"] + +[[package]] +category = "dev" +description = "Python LiveReload is an awesome tool for web developers" +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "livereload" +optional = false +python-versions = "*" +version = "2.6.1" + +[package.dependencies] +six = "*" +tornado = "*" + +[[package]] +category = "main" +description = "Platform-independent file locking module" +name = "lockfile" +optional = false +python-versions = "*" +version = "0.12.2" + +[[package]] +category = "dev" +description = "Python implementation of Markdown." +name = "markdown" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +version = "3.0.1" + +[[package]] +category = "dev" +description = "Python implementation of Markdown." +name = "markdown" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" +version = "3.1.1" + +[package.dependencies] +setuptools = ">=36" + +[package.extras] +testing = ["coverage", "pyyaml"] + +[[package]] +category = "dev" +description = "This is an extension to Python-Markdown which provides an \"include\" function, similar to that found in LaTeX (and also the C pre-processor and Fortran). I originally wrote it for my FORD Fortran auto-documentation generator." +name = "markdown-include" +optional = false +python-versions = "*" +version = "0.5.1" + +[package.dependencies] +markdown = "*" + +[[package]] +category = "dev" +description = "Safely add untrusted strings to HTML/XML markup." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "markupsafe" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +version = "1.1.1" + +[[package]] +category = "dev" +description = "Project documentation with Markdown." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "mkdocs" +optional = false +python-versions = ">=2.7.9,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*" +version = "1.0.4" + +[package.dependencies] +Jinja2 = ">=2.7.1" +Markdown = ">=2.3.1" +PyYAML = ">=3.10" +click = ">=3.3" +livereload = ">=2.5.1" +tornado = ">=5.0" + +[[package]] +category = "dev" +description = "Rolling backport of unittest.mock for all Pythons" +marker = "python_version < \"3.0\"" +name = "mock" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "3.0.5" + +[package.dependencies] +six = "*" + +[package.dependencies.funcsigs] +python = "<3.3" +version = ">=1" + +[package.extras] +build = ["twine", "wheel", "blurb"] +docs = ["sphinx"] +test = ["pytest", "pytest-cov"] + +[[package]] +category = "main" +description = "More routines for operating on iterables, beyond itertools" +marker = "python_version < \"3.8\"" +name = "more-itertools" +optional = false +python-versions = "*" +version = "5.0.0" + +[package.dependencies] +six = ">=1.0.0,<2.0.0" + +[[package]] +category = "main" +description = "More routines for operating on iterables, beyond itertools" +name = "more-itertools" +optional = false +python-versions = ">=3.4" +version = "7.2.0" + +[[package]] +category = "main" +description = "More routines for operating on iterables, beyond itertools" +marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\" or python_version > \"2.7\"" +name = "more-itertools" +optional = false +python-versions = ">=3.5" +version = "8.0.2" + +[[package]] +category = "main" +description = "MessagePack (de)serializer." +name = "msgpack" +optional = false +python-versions = "*" +version = "0.6.2" + +[[package]] +category = "dev" +description = "Node.js virtual environment builder" +name = "nodeenv" +optional = false +python-versions = "*" +version = "1.3.3" + +[[package]] +category = "dev" +description = "Core utilities for Python packages" +name = "packaging" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "19.2" + +[package.dependencies] +pyparsing = ">=2.0.2" +six = "*" + +[[package]] +category = "main" +description = "Bring colors to your terminal." +name = "pastel" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.1.1" + +[[package]] +category = "main" +description = "Object-oriented filesystem paths" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.6\"" +name = "pathlib2" +optional = false +python-versions = "*" +version = "2.3.5" + +[package.dependencies] +six = "*" + +[package.dependencies.scandir] +python = "<3.5" +version = "*" + +[[package]] +category = "dev" +description = "Utility library for gitignore style pattern matching of file paths." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "pathspec" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.6.0" + +[[package]] +category = "dev" +description = "Backport of PEP 562." +name = "pep562" +optional = false +python-versions = "*" +version = "1.0" + +[[package]] +category = "main" +description = "Pexpect allows easy control of interactive console applications." +name = "pexpect" +optional = false +python-versions = "*" +version = "4.7.0" + +[package.dependencies] +ptyprocess = ">=0.5" + +[[package]] +category = "main" +description = "Query metadatdata from sdists / bdists / installed packages." +name = "pkginfo" +optional = false +python-versions = "*" +version = "1.5.0.1" + +[package.extras] +testing = ["nose", "coverage"] + +[[package]] +category = "dev" +description = "plugin and hook calling mechanisms for python" +name = "pluggy" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.13.1" + +[package.dependencies] +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + +[package.extras] +dev = ["pre-commit", "tox"] + +[[package]] +category = "dev" +description = "A framework for managing and maintaining multi-language pre-commit hooks." +name = "pre-commit" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "1.18.3" + +[package.dependencies] +"aspy.yaml" = "*" +cfgv = ">=2.0.0" +identify = ">=1.0.0" +importlib-metadata = "*" +nodeenv = ">=0.11.1" +pyyaml = "*" +six = "*" +toml = "*" +virtualenv = ">=15.2" + +[package.dependencies.importlib-resources] +python = "<3.7" +version = "*" + +[[package]] +category = "dev" +description = "A framework for managing and maintaining multi-language pre-commit hooks." +name = "pre-commit" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "1.20.0" + +[package.dependencies] +"aspy.yaml" = "*" +cfgv = ">=2.0.0" +identify = ">=1.0.0" +nodeenv = ">=0.11.1" +pyyaml = "*" +six = "*" +toml = "*" +virtualenv = ">=15.2" + +[package.dependencies.futures] +python = "<3.2" +version = "*" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = "*" + +[package.dependencies.importlib-resources] +python = "<3.7" +version = "*" + +[[package]] +category = "main" +description = "Run a subprocess in a pseudo terminal" +name = "ptyprocess" +optional = false +python-versions = "*" +version = "0.6.0" + +[[package]] +category = "dev" +description = "library with cross-python path, ini-parsing, io, code, log facilities" +name = "py" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "1.8.0" + +[[package]] +category = "main" +description = "C parser in Python" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +name = "pycparser" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.19" + +[[package]] +category = "dev" +description = "Pygments is a syntax highlighting package written in Python." +name = "pygments" +optional = false +python-versions = "*" +version = "2.3.1" + +[[package]] +category = "dev" +description = "Pygments is a syntax highlighting package written in Python." +name = "pygments" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.5.2" + +[[package]] +category = "dev" +description = "Pygments Github custom lexers." +name = "pygments-github-lexers" +optional = false +python-versions = "*" +version = "0.0.5" + +[package.dependencies] +pygments = ">=2.0.2" + +[[package]] +category = "main" +description = "A pure Python Levenshtein implementation that's not freaking GPL'd." +name = "pylev" +optional = false +python-versions = "*" +version = "1.3.0" + +[[package]] +category = "dev" +description = "Extension pack for Python Markdown." +name = "pymdown-extensions" +optional = false +python-versions = "*" +version = "6.0" + +[package.dependencies] +Markdown = ">=3.0.1" + +[[package]] +category = "dev" +description = "Extension pack for Python Markdown." +name = "pymdown-extensions" +optional = false +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" +version = "6.2" + +[package.dependencies] +Markdown = ">=3.0.1" +pep562 = "*" + +[[package]] +category = "main" +description = "Python parsing module" +name = "pyparsing" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +version = "2.4.5" + +[[package]] +category = "main" +description = "Persistent/Functional/Immutable data structures" +name = "pyrsistent" +optional = false +python-versions = "*" +version = "0.14.11" + +[package.dependencies] +six = "*" + +[[package]] +category = "dev" +description = "pytest: simple powerful testing with Python" +name = "pytest" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "4.6.7" + +[package.dependencies] +atomicwrites = ">=1.0" +attrs = ">=17.4.0" +colorama = "*" +packaging = "*" +pluggy = ">=0.12,<1.0" +py = ">=1.5.0" +six = ">=1.10.0" +wcwidth = "*" + +[[package.dependencies.more-itertools]] +python = "<2.8" +version = ">=4.0.0,<6.0.0" + +[[package.dependencies.more-itertools]] +python = ">=2.8" +version = ">=4.0.0" + +[package.dependencies.funcsigs] +python = "<3.0" +version = ">=1.0" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12" + +[package.dependencies.pathlib2] +python = "<3.6" +version = ">=2.2.0" + +[package.extras] +testing = ["argcomplete", "hypothesis (>=3.56)", "nose", "requests", "mock"] + +[[package]] +category = "dev" +description = "Pytest plugin for measuring coverage." +name = "pytest-cov" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.8.1" + +[package.dependencies] +coverage = ">=4.4" +pytest = ">=3.6" + +[package.extras] +testing = ["fields", "hunter", "process-tests (2.0.2)", "six", "virtualenv"] + +[[package]] +category = "dev" +description = "Thin-wrapper around the mock package for easier use with py.test" +name = "pytest-mock" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "1.13.0" + +[package.dependencies] +pytest = ">=2.7" + +[package.dependencies.mock] +python = "<3.0" +version = "*" + +[package.extras] +dev = ["pre-commit", "tox"] + +[[package]] +category = "dev" +description = "pytest-sugar is a plugin for pytest that changes the default look and feel of pytest (e.g. progressbar, show tests that fail instantly)." +name = "pytest-sugar" +optional = false +python-versions = "*" +version = "0.9.2" + +[package.dependencies] +packaging = ">=14.1" +pytest = ">=2.9" +termcolor = ">=1.1.0" + +[[package]] +category = "main" +description = "" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and sys_platform == \"win32\" or python_version >= \"3.4\" and python_version < \"3.5\" and sys_platform == \"win32\" or python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"win32\"" +name = "pywin32-ctypes" +optional = false +python-versions = "*" +version = "0.2.0" + +[[package]] +category = "dev" +description = "YAML parser and emitter for Python" +name = "pyyaml" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "5.2" + +[[package]] +category = "dev" +description = "Alternative regular expression module, to replace re." +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "regex" +optional = false +python-versions = "*" +version = "2019.12.9" + +[[package]] +category = "main" +description = "Python HTTP for Humans." +name = "requests" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "2.21.0" + +[package.dependencies] +certifi = ">=2017.4.17" +chardet = ">=3.0.2,<3.1.0" +idna = ">=2.5,<2.9" +urllib3 = ">=1.21.1,<1.25" + +[package.extras] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] +socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] + +[[package]] +category = "main" +description = "Python HTTP for Humans." +name = "requests" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +version = "2.22.0" + +[package.dependencies] +certifi = ">=2017.4.17" +chardet = ">=3.0.2,<3.1.0" +idna = ">=2.5,<2.9" +urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26" + +[package.extras] +security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"] +socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"] + +[[package]] +category = "main" +description = "A utility belt for advanced users of python-requests" +name = "requests-toolbelt" +optional = false +python-versions = "*" +version = "0.8.0" + +[package.dependencies] +requests = ">=2.0.1,<3.0.0" + +[[package]] +category = "main" +description = "scandir, a better directory iterator and faster os.walk()" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" +name = "scandir" +optional = false +python-versions = "*" +version = "1.10.0" + +[[package]] +category = "main" +description = "Python bindings to FreeDesktop.org Secret Service API" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platform == \"linux2\" or sys_platform == \"linux\") or python_version >= \"3.4\" and python_version < \"3.5\" and (sys_platform == \"linux2\" or sys_platform == \"linux\")" +name = "secretstorage" +optional = false +python-versions = "*" +version = "2.3.1" + +[package.dependencies] +cryptography = "*" + +[package.extras] +dbus-python = ["dbus-python"] + +[[package]] +category = "main" +description = "Python bindings to FreeDesktop.org Secret Service API" +marker = "python_version >= \"3.5\" and python_version < \"4.0\" and sys_platform == \"linux\"" +name = "secretstorage" +optional = false +python-versions = ">=3.5" +version = "3.1.1" + +[package.dependencies] +cryptography = "*" +jeepney = "*" + +[[package]] +category = "main" +description = "Tool to Detect Surrounding Shell" +name = "shellingham" +optional = false +python-versions = ">=2.6,!=3.0,!=3.1,!=3.2,!=3.3" +version = "1.3.1" + +[[package]] +category = "main" +description = "Python 2 and 3 compatibility utilities" +name = "six" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*" +version = "1.13.0" + +[[package]] +category = "main" +description = "A backport of the subprocess module from Python 3 for use on 2.x." +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\"" +name = "subprocess32" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4" +version = "3.5.4" + +[[package]] +category = "dev" +description = "ANSII Color formatting for output in terminal." +name = "termcolor" +optional = false +python-versions = "*" +version = "1.1.0" + +[[package]] +category = "dev" +description = "Python Library for Tom's Obvious, Minimal Language" +name = "toml" +optional = false +python-versions = "*" +version = "0.10.0" + +[[package]] +category = "main" +description = "Style preserving TOML library" +name = "tomlkit" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "0.5.8" + +[package.dependencies] +[package.dependencies.enum34] +python = ">=2.7,<2.8" +version = ">=1.1,<2.0" + +[package.dependencies.functools32] +python = ">=2.7,<2.8" +version = ">=3.2.3,<4.0.0" + +[package.dependencies.typing] +python = ">=2.7,<2.8 || >=3.4,<3.5" +version = ">=3.6,<4.0" + +[[package]] +category = "dev" +description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "tornado" +optional = false +python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*" +version = "5.1.1" + +[[package]] +category = "dev" +description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." +marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\"" +name = "tornado" +optional = false +python-versions = ">= 3.5" +version = "6.0.3" + +[[package]] +category = "dev" +description = "tox is a generic virtualenv management and test command line tool" +name = "tox" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +version = "3.14.0" + +[package.dependencies] +filelock = ">=3.0.0,<4" +packaging = ">=14" +pluggy = ">=0.12.0,<1" +py = ">=1.4.17,<2" +six = ">=1.0.0,<2" +toml = ">=0.9.4" +virtualenv = ">=14.0.0" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12,<1" + +[package.extras] +docs = ["sphinx (>=2.0.0,<3)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] +testing = ["freezegun (>=0.3.11,<1)", "pathlib2 (>=2.3.3,<3)", "pytest (>=4.0.0,<6)", "pytest-cov (>=2.5.1,<3)", "pytest-mock (>=1.10.0,<2)", "pytest-xdist (>=1.22.2,<2)", "pytest-randomly (>=1.2.3,<2)", "flaky (>=3.4.0,<4)", "psutil (>=5.6.1,<6)"] + +[[package]] +category = "dev" +description = "tox is a generic virtualenv management and test command line tool" +name = "tox" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +version = "3.14.1" + +[package.dependencies] +filelock = ">=3.0.0,<4" +packaging = ">=14" +pluggy = ">=0.12.0,<1" +py = ">=1.4.17,<2" +six = ">=1.0.0,<2" +toml = ">=0.9.4" +virtualenv = ">=16.0.0" + +[package.dependencies.importlib-metadata] +python = "<3.8" +version = ">=0.12,<1" + +[package.extras] +docs = ["sphinx (>=2.0.0,<3)", "towncrier (>=18.5.0)", "pygments-github-lexers (>=0.0.5)", "sphinxcontrib-autoprogram (>=0.1.5)"] +testing = ["freezegun (>=0.3.11,<1)", "pathlib2 (>=2.3.3,<3)", "pytest (>=4.0.0,<6)", "pytest-cov (>=2.5.1,<3)", "pytest-mock (>=1.10.0,<2)", "pytest-xdist (>=1.22.2,<2)", "pytest-randomly (>=1.0.0,<4)", "flaky (>=3.4.0,<4)", "psutil (>=5.6.1,<6)"] + +[[package]] +category = "dev" +description = "a fork of Python 2 and 3 ast modules with type comment support" +marker = "python_version >= \"3.6\" and python_version < \"4.0\"" +name = "typed-ast" +optional = false +python-versions = "*" +version = "1.4.0" + +[[package]] +category = "main" +description = "Type Hints for Python" +marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\"" +name = "typing" +optional = false +python-versions = "*" +version = "3.7.4.1" + +[[package]] +category = "main" +description = "HTTP library with thread-safe connection pooling, file post, and more." +name = "urllib3" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" +version = "1.24.3" + +[package.extras] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] + +[[package]] +category = "main" +description = "HTTP library with thread-safe connection pooling, file post, and more." +name = "urllib3" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4" +version = "1.25.7" + +[package.extras] +brotli = ["brotlipy (>=0.6.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7,<2.0)"] + +[[package]] +category = "main" +description = "Virtual Python Environment builder" +name = "virtualenv" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +version = "16.7.8" + +[package.extras] +docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"] +testing = ["pytest (>=4.0.0,<5)", "coverage (>=4.5.0,<5)", "pytest-timeout (>=1.3.0,<2)", "six (>=1.10.0,<2)", "pytest-xdist", "pytest-localserver", "pypiserver", "mock", "xonsh"] + +[[package]] +category = "dev" +description = "Measures number of Terminal column cells of wide-character codes" +name = "wcwidth" +optional = false +python-versions = "*" +version = "0.1.7" + +[[package]] +category = "main" +description = "Character encoding aliases for legacy web content" +name = "webencodings" +optional = false +python-versions = "*" +version = "0.5.1" + +[[package]] +category = "main" +description = "Backport of pathlib-compatible object wrapper for zip files" +name = "zipp" +optional = false +python-versions = ">=2.7" +version = "0.6.0" + +[package.dependencies] +more-itertools = "*" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] +testing = ["pathlib2", "contextlib2", "unittest2"] + +[metadata] +content-hash = "35feeab2d2e9415a82f714a41962c442ea8b302f0e8365c10ee188f31603684a" +python-versions = "~2.7 || ^3.4" + +[metadata.files] +appdirs = [ + {file = "appdirs-1.4.3-py2.py3-none-any.whl", hash = "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e"}, + {file = "appdirs-1.4.3.tar.gz", hash = "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92"}, +] +"aspy.yaml" = [ + {file = "aspy.yaml-1.3.0-py2.py3-none-any.whl", hash = "sha256:463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc"}, + {file = "aspy.yaml-1.3.0.tar.gz", hash = "sha256:e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45"}, +] +atomicwrites = [ + {file = "atomicwrites-1.3.0-py2.py3-none-any.whl", hash = "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4"}, + {file = "atomicwrites-1.3.0.tar.gz", hash = "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"}, +] +attrs = [ + {file = "attrs-19.3.0-py2.py3-none-any.whl", hash = "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c"}, + {file = "attrs-19.3.0.tar.gz", hash = "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"}, +] +black = [ + {file = "black-19.10b0-py36-none-any.whl", hash = "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b"}, + {file = "black-19.10b0.tar.gz", hash = "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539"}, +] +cachecontrol = [ + {file = "CacheControl-0.12.5.tar.gz", hash = "sha256:cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"}, +] +cachy = [ + {file = "cachy-0.3.0-py2.py3-none-any.whl", hash = "sha256:338ca09c8860e76b275aff52374330efedc4d5a5e45dc1c5b539c1ead0786fe7"}, + {file = "cachy-0.3.0.tar.gz", hash = "sha256:186581f4ceb42a0bbe040c407da73c14092379b1e4c0e327fdb72ae4a9b269b1"}, +] +certifi = [ + {file = "certifi-2019.11.28-py2.py3-none-any.whl", hash = "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3"}, + {file = "certifi-2019.11.28.tar.gz", hash = "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"}, +] +cffi = [ + {file = "cffi-1.13.2-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:3c9fff570f13480b201e9ab69453108f6d98244a7f495e91b6c654a47486ba43"}, + {file = "cffi-1.13.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c5e309ec482556397cb21ede0350c5e82f0eb2621de04b2633588d118da4396"}, + {file = "cffi-1.13.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:19db0cdd6e516f13329cba4903368bff9bb5a9331d3410b1b448daaadc495e54"}, + {file = "cffi-1.13.2-cp27-cp27m-win32.whl", hash = "sha256:5c4fae4e9cdd18c82ba3a134be256e98dc0596af1e7285a3d2602c97dcfa5159"}, + {file = "cffi-1.13.2-cp27-cp27m-win_amd64.whl", hash = "sha256:32a262e2b90ffcfdd97c7a5e24a6012a43c61f1f5a57789ad80af1d26c6acd97"}, + {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:4a43c91840bda5f55249413037b7a9b79c90b1184ed504883b72c4df70778579"}, + {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8169cf44dd8f9071b2b9248c35fc35e8677451c52f795daa2bb4643f32a540bc"}, + {file = "cffi-1.13.2-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:71a608532ab3bd26223c8d841dde43f3516aa5d2bf37b50ac410bb5e99053e8f"}, + {file = "cffi-1.13.2-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:7f627141a26b551bdebbc4855c1157feeef18241b4b8366ed22a5c7d672ef858"}, + {file = "cffi-1.13.2-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:0b49274afc941c626b605fb59b59c3485c17dc776dc3cc7cc14aca74cc19cc42"}, + {file = "cffi-1.13.2-cp34-cp34m-win32.whl", hash = "sha256:4424e42199e86b21fc4db83bd76909a6fc2a2aefb352cb5414833c030f6ed71b"}, + {file = "cffi-1.13.2-cp34-cp34m-win_amd64.whl", hash = "sha256:7d4751da932caaec419d514eaa4215eaf14b612cff66398dd51129ac22680b20"}, + {file = "cffi-1.13.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:ccb032fda0873254380aa2bfad2582aedc2959186cce61e3a17abc1a55ff89c3"}, + {file = "cffi-1.13.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:dcd65317dd15bc0451f3e01c80da2216a31916bdcffd6221ca1202d96584aa25"}, + {file = "cffi-1.13.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:135f69aecbf4517d5b3d6429207b2dff49c876be724ac0c8bf8e1ea99df3d7e5"}, + {file = "cffi-1.13.2-cp35-cp35m-win32.whl", hash = "sha256:7b93a885bb13073afb0aa73ad82059a4c41f4b7d8eb8368980448b52d4c7dc2c"}, + {file = "cffi-1.13.2-cp35-cp35m-win_amd64.whl", hash = "sha256:e570d3ab32e2c2861c4ebe6ffcad6a8abf9347432a37608fe1fbd157b3f0036b"}, + {file = "cffi-1.13.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:0e3ea92942cb1168e38c05c1d56b0527ce31f1a370f6117f1d490b8dcd6b3a04"}, + {file = "cffi-1.13.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5ecfa867dea6fabe2a58f03ac9186ea64da1386af2159196da51c4904e11d652"}, + {file = "cffi-1.13.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:291f7c42e21d72144bb1c1b2e825ec60f46d0a7468f5346841860454c7aa8f57"}, + {file = "cffi-1.13.2-cp36-cp36m-win32.whl", hash = "sha256:62f2578358d3a92e4ab2d830cd1c2049c9c0d0e6d3c58322993cc341bdeac22e"}, + {file = "cffi-1.13.2-cp36-cp36m-win_amd64.whl", hash = "sha256:fd43a88e045cf992ed09fa724b5315b790525f2676883a6ea64e3263bae6549d"}, + {file = "cffi-1.13.2-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:d75c461e20e29afc0aee7172a0950157c704ff0dd51613506bd7d82b718e7410"}, + {file = "cffi-1.13.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:aa00d66c0fab27373ae44ae26a66a9e43ff2a678bf63a9c7c1a9a4d61172827a"}, + {file = "cffi-1.13.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2e9c80a8c3344a92cb04661115898a9129c074f7ab82011ef4b612f645939f12"}, + {file = "cffi-1.13.2-cp37-cp37m-win32.whl", hash = "sha256:d754f39e0d1603b5b24a7f8484b22d2904fa551fe865fd0d4c3332f078d20d4e"}, + {file = "cffi-1.13.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6471a82d5abea994e38d2c2abc77164b4f7fbaaf80261cb98394d5793f11b12a"}, + {file = "cffi-1.13.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:74a1d8c85fb6ff0b30fbfa8ad0ac23cd601a138f7509dc617ebc65ef305bb98d"}, + {file = "cffi-1.13.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:415bdc7ca8c1c634a6d7163d43fb0ea885a07e9618a64bda407e04b04333b7db"}, + {file = "cffi-1.13.2-cp38-cp38-win32.whl", hash = "sha256:6d4f18483d040e18546108eb13b1dfa1000a089bcf8529e30346116ea6240506"}, + {file = "cffi-1.13.2-cp38-cp38-win_amd64.whl", hash = "sha256:2781e9ad0e9d47173c0093321bb5435a9dfae0ed6a762aabafa13108f5f7b2ba"}, + {file = "cffi-1.13.2.tar.gz", hash = "sha256:599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346"}, +] +cfgv = [ + {file = "cfgv-2.0.1-py2.py3-none-any.whl", hash = "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"}, + {file = "cfgv-2.0.1.tar.gz", hash = "sha256:edb387943b665bf9c434f717bf630fa78aecd53d5900d2e05da6ad6048553144"}, +] +chardet = [ + {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"}, + {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"}, +] +cleo = [ + {file = "cleo-0.7.6-py2.py3-none-any.whl", hash = "sha256:9443d67e5b2da79b32d820ae41758dd6a25618345cb10b9a022a695e26b291b9"}, + {file = "cleo-0.7.6.tar.gz", hash = "sha256:99cf342406f3499cec43270fcfaf93c126c5164092eca201dfef0f623360b409"}, +] +click = [ + {file = "Click-7.0-py2.py3-none-any.whl", hash = "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13"}, + {file = "Click-7.0.tar.gz", hash = "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"}, +] +clikit = [ + {file = "clikit-0.4.1-py2.py3-none-any.whl", hash = "sha256:80b0bfee42310a715773dded69590c4c33fa9fc9a351fa7c262cb67f21d0758f"}, + {file = "clikit-0.4.1.tar.gz", hash = "sha256:8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"}, +] +colorama = [ + {file = "colorama-0.4.1-py2.py3-none-any.whl", hash = "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"}, + {file = "colorama-0.4.1.tar.gz", hash = "sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d"}, + {file = "colorama-0.4.3-py2.py3-none-any.whl", hash = "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff"}, + {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, +] +configparser = [ + {file = "configparser-4.0.2-py2.py3-none-any.whl", hash = "sha256:254c1d9c79f60c45dfde850850883d5aaa7f19a23f13561243a050d5a7c3fe4c"}, + {file = "configparser-4.0.2.tar.gz", hash = "sha256:c7d282687a5308319bf3d2e7706e575c635b0a470342641c93bea0ea3b5331df"}, +] +contextlib2 = [ + {file = "contextlib2-0.6.0.post1-py2.py3-none-any.whl", hash = "sha256:3355078a159fbb44ee60ea80abd0d87b80b78c248643b49aa6d94673b413609b"}, + {file = "contextlib2-0.6.0.post1.tar.gz", hash = "sha256:01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"}, +] +coverage = [ + {file = "coverage-4.5.4-cp26-cp26m-macosx_10_12_x86_64.whl", hash = "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28"}, + {file = "coverage-4.5.4-cp27-cp27m-macosx_10_12_x86_64.whl", hash = "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c"}, + {file = "coverage-4.5.4-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce"}, + {file = "coverage-4.5.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe"}, + {file = "coverage-4.5.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888"}, + {file = "coverage-4.5.4-cp27-cp27m-win32.whl", hash = "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc"}, + {file = "coverage-4.5.4-cp27-cp27m-win_amd64.whl", hash = "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24"}, + {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437"}, + {file = "coverage-4.5.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6"}, + {file = "coverage-4.5.4-cp33-cp33m-macosx_10_10_x86_64.whl", hash = "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5"}, + {file = "coverage-4.5.4-cp34-cp34m-macosx_10_12_x86_64.whl", hash = "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef"}, + {file = "coverage-4.5.4-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e"}, + {file = "coverage-4.5.4-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca"}, + {file = "coverage-4.5.4-cp34-cp34m-win32.whl", hash = "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0"}, + {file = "coverage-4.5.4-cp34-cp34m-win_amd64.whl", hash = "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1"}, + {file = "coverage-4.5.4-cp35-cp35m-macosx_10_12_x86_64.whl", hash = "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7"}, + {file = "coverage-4.5.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47"}, + {file = "coverage-4.5.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"}, + {file = "coverage-4.5.4-cp35-cp35m-win32.whl", hash = "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e"}, + {file = "coverage-4.5.4-cp35-cp35m-win_amd64.whl", hash = "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d"}, + {file = "coverage-4.5.4-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9"}, + {file = "coverage-4.5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755"}, + {file = "coverage-4.5.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9"}, + {file = "coverage-4.5.4-cp36-cp36m-win32.whl", hash = "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f"}, + {file = "coverage-4.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5"}, + {file = "coverage-4.5.4-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca"}, + {file = "coverage-4.5.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650"}, + {file = "coverage-4.5.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2"}, + {file = "coverage-4.5.4-cp37-cp37m-win32.whl", hash = "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5"}, + {file = "coverage-4.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351"}, + {file = "coverage-4.5.4-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5"}, + {file = "coverage-4.5.4.tar.gz", hash = "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c"}, +] +cryptography = [ + {file = "cryptography-2.8-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:fb81c17e0ebe3358486cd8cc3ad78adbae58af12fc2bf2bc0bb84e8090fa5ce8"}, + {file = "cryptography-2.8-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:44ff04138935882fef7c686878e1c8fd80a723161ad6a98da31e14b7553170c2"}, + {file = "cryptography-2.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:369d2346db5934345787451504853ad9d342d7f721ae82d098083e1f49a582ad"}, + {file = "cryptography-2.8-cp27-cp27m-win32.whl", hash = "sha256:df6b4dca2e11865e6cfbfb708e800efb18370f5a46fd601d3755bc7f85b3a8a2"}, + {file = "cryptography-2.8-cp27-cp27m-win_amd64.whl", hash = "sha256:7f09806ed4fbea8f51585231ba742b58cbcfbfe823ea197d8c89a5e433c7e912"}, + {file = "cryptography-2.8-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:58363dbd966afb4f89b3b11dfb8ff200058fbc3b947507675c19ceb46104b48d"}, + {file = "cryptography-2.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:6ec280fb24d27e3d97aa731e16207d58bd8ae94ef6eab97249a2afe4ba643d42"}, + {file = "cryptography-2.8-cp34-abi3-macosx_10_6_intel.whl", hash = "sha256:b43f53f29816ba1db8525f006fa6f49292e9b029554b3eb56a189a70f2a40879"}, + {file = "cryptography-2.8-cp34-abi3-manylinux1_x86_64.whl", hash = "sha256:7270a6c29199adc1297776937a05b59720e8a782531f1f122f2eb8467f9aab4d"}, + {file = "cryptography-2.8-cp34-abi3-manylinux2010_x86_64.whl", hash = "sha256:de96157ec73458a7f14e3d26f17f8128c959084931e8997b9e655a39c8fde9f9"}, + {file = "cryptography-2.8-cp34-cp34m-win32.whl", hash = "sha256:02079a6addc7b5140ba0825f542c0869ff4df9a69c360e339ecead5baefa843c"}, + {file = "cryptography-2.8-cp34-cp34m-win_amd64.whl", hash = "sha256:b0de590a8b0979649ebeef8bb9f54394d3a41f66c5584fff4220901739b6b2f0"}, + {file = "cryptography-2.8-cp35-cp35m-win32.whl", hash = "sha256:ecadccc7ba52193963c0475ac9f6fa28ac01e01349a2ca48509667ef41ffd2cf"}, + {file = "cryptography-2.8-cp35-cp35m-win_amd64.whl", hash = "sha256:90df0cc93e1f8d2fba8365fb59a858f51a11a394d64dbf3ef844f783844cc793"}, + {file = "cryptography-2.8-cp36-cp36m-win32.whl", hash = "sha256:1df22371fbf2004c6f64e927668734070a8953362cd8370ddd336774d6743595"}, + {file = "cryptography-2.8-cp36-cp36m-win_amd64.whl", hash = "sha256:a518c153a2b5ed6b8cc03f7ae79d5ffad7315ad4569b2d5333a13c38d64bd8d7"}, + {file = "cryptography-2.8-cp37-cp37m-win32.whl", hash = "sha256:4b1030728872c59687badcca1e225a9103440e467c17d6d1730ab3d2d64bfeff"}, + {file = "cryptography-2.8-cp37-cp37m-win_amd64.whl", hash = "sha256:d31402aad60ed889c7e57934a03477b572a03af7794fa8fb1780f21ea8f6551f"}, + {file = "cryptography-2.8-cp38-cp38-win32.whl", hash = "sha256:73fd30c57fa2d0a1d7a49c561c40c2f79c7d6c374cc7750e9ac7c99176f6428e"}, + {file = "cryptography-2.8-cp38-cp38-win_amd64.whl", hash = "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13"}, + {file = "cryptography-2.8.tar.gz", hash = "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"}, +] +entrypoints = [ + {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, + {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"}, +] +enum34 = [ + {file = "enum34-1.1.6-py2-none-any.whl", hash = "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79"}, + {file = "enum34-1.1.6-py3-none-any.whl", hash = "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a"}, + {file = "enum34-1.1.6.tar.gz", hash = "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"}, + {file = "enum34-1.1.6.zip", hash = "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850"}, +] +filelock = [ + {file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"}, + {file = "filelock-3.0.12.tar.gz", hash = "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59"}, +] +funcsigs = [ + {file = "funcsigs-1.0.2-py2.py3-none-any.whl", hash = "sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca"}, + {file = "funcsigs-1.0.2.tar.gz", hash = "sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"}, +] +functools32 = [ + {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"}, + {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"}, +] +futures = [ + {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"}, + {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"}, +] +glob2 = [ + {file = "glob2-0.6.tar.gz", hash = "sha256:f5b0a686ff21f820c4d3f0c4edd216704cea59d79d00fa337e244a2f2ff83ed6"}, +] +html5lib = [ + {file = "html5lib-1.0.1-py2.py3-none-any.whl", hash = "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3"}, + {file = "html5lib-1.0.1.tar.gz", hash = "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"}, +] +httpretty = [ + {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, +] +identify = [ + {file = "identify-1.4.8-py2.py3-none-any.whl", hash = "sha256:9e7521e9abeaede4d2d1092a106e418c65ddf6b3182b43930bcb3c8cfb974488"}, + {file = "identify-1.4.8.tar.gz", hash = "sha256:7782115794ec28b011702815d9f5e532244560cd2bf0789c4f09381d43befd90"}, +] +idna = [ + {file = "idna-2.8-py2.py3-none-any.whl", hash = "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"}, + {file = "idna-2.8.tar.gz", hash = "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"}, +] +importlib-metadata = [ + {file = "importlib_metadata-0.23-py2.py3-none-any.whl", hash = "sha256:d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af"}, + {file = "importlib_metadata-0.23.tar.gz", hash = "sha256:aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26"}, +] +importlib-resources = [ + {file = "importlib_resources-1.0.2-py2.py3-none-any.whl", hash = "sha256:6e2783b2538bd5a14678284a3962b0660c715e5a0f10243fd5e00a4b5974f50b"}, + {file = "importlib_resources-1.0.2.tar.gz", hash = "sha256:d3279fd0f6f847cced9f7acc19bd3e5df54d34f93a2e7bb5f238f81545787078"}, +] +ipaddress = [ + {file = "ipaddress-1.0.23-py2.py3-none-any.whl", hash = "sha256:6e0f4a39e66cb5bb9a137b00276a2eff74f93b71dcbdad6f10ff7df9d3557fcc"}, + {file = "ipaddress-1.0.23.tar.gz", hash = "sha256:b7f8e0369580bb4a24d5ba1d7cc29660a4a6987763faf1d8a8046830e020e7e2"}, +] +jeepney = [ + {file = "jeepney-0.4.1-py3-none-any.whl", hash = "sha256:f6a3f93464a0cf052f4e87da3c8b3ed1e27696758fb9739c63d3a74d9a1b6774"}, + {file = "jeepney-0.4.1.tar.gz", hash = "sha256:13806f91a96e9b2623fd2a81b950d763ee471454aafd9eb6d75dbe7afce428fb"}, +] +jinja2 = [ + {file = "Jinja2-2.10.3-py2.py3-none-any.whl", hash = "sha256:74320bb91f31270f9551d46522e33af46a80c3d619f4a4bf42b3164d30b5911f"}, + {file = "Jinja2-2.10.3.tar.gz", hash = "sha256:9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de"}, +] +jsonschema = [ + {file = "jsonschema-3.2.0-py2.py3-none-any.whl", hash = "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163"}, + {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, +] +keyring = [ + {file = "keyring-18.0.1-py2.py3-none-any.whl", hash = "sha256:7b29ebfcf8678c4da531b2478a912eea01e80007e5ddca9ee0c7038cb3489ec6"}, + {file = "keyring-18.0.1.tar.gz", hash = "sha256:67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838"}, + {file = "keyring-19.3.0-py2.py3-none-any.whl", hash = "sha256:9b80469783d3f6106bce1d389c6b8b20c8d4d739943b1b8cd0ddc2a45d065f9d"}, + {file = "keyring-19.3.0.tar.gz", hash = "sha256:ee3d35b7f1ac3cb69e9a1e4323534649d3ab2fea402738a77e4250c152970fed"}, +] +livereload = [ + {file = "livereload-2.6.1-py2.py3-none-any.whl", hash = "sha256:78d55f2c268a8823ba499305dcac64e28ddeb9a92571e12d543cd304faf5817b"}, + {file = "livereload-2.6.1.tar.gz", hash = "sha256:89254f78d7529d7ea0a3417d224c34287ebfe266b05e67e51facaf82c27f0f66"}, +] +lockfile = [ + {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, + {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, +] +markdown = [ + {file = "Markdown-3.0.1-py2.py3-none-any.whl", hash = "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa"}, + {file = "Markdown-3.0.1.tar.gz", hash = "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"}, + {file = "Markdown-3.1.1-py2.py3-none-any.whl", hash = "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"}, + {file = "Markdown-3.1.1.tar.gz", hash = "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"}, +] +markdown-include = [ + {file = "markdown-include-0.5.1.tar.gz", hash = "sha256:72a45461b589489a088753893bc95c5fa5909936186485f4ed55caa57d10250f"}, +] +markupsafe = [ + {file = "MarkupSafe-1.1.1-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win32.whl", hash = "sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b"}, + {file = "MarkupSafe-1.1.1-cp27-cp27m-win_amd64.whl", hash = "sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f"}, + {file = "MarkupSafe-1.1.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win32.whl", hash = "sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21"}, + {file = "MarkupSafe-1.1.1-cp34-cp34m-win_amd64.whl", hash = "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win32.whl", hash = "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1"}, + {file = "MarkupSafe-1.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win32.whl", hash = "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66"}, + {file = "MarkupSafe-1.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"}, + {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"}, + {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"}, +] +mkdocs = [ + {file = "mkdocs-1.0.4-py2.py3-none-any.whl", hash = "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"}, + {file = "mkdocs-1.0.4.tar.gz", hash = "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939"}, +] +mock = [ + {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"}, + {file = "mock-3.0.5.tar.gz", hash = "sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3"}, +] +more-itertools = [ + {file = "more-itertools-5.0.0.tar.gz", hash = "sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"}, + {file = "more_itertools-5.0.0-py2-none-any.whl", hash = "sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc"}, + {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, + {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"}, + {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"}, + {file = "more-itertools-8.0.2.tar.gz", hash = "sha256:b84b238cce0d9adad5ed87e745778d20a3f8487d0f0cb8b8a586816c7496458d"}, + {file = "more_itertools-8.0.2-py3-none-any.whl", hash = "sha256:c833ef592a0324bcc6a60e48440da07645063c453880c9477ceb22490aec1564"}, +] +msgpack = [ + {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170"}, + {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:a06efd0482a1942aad209a6c18321b5e22d64eb531ea20af138b28172d8f35ba"}, + {file = "msgpack-0.6.2-cp27-cp27m-win32.whl", hash = "sha256:8a3ada8401736df2bf497f65589293a86c56e197a80ae7634ec2c3150a2f5082"}, + {file = "msgpack-0.6.2-cp27-cp27m-win_amd64.whl", hash = "sha256:b8b4bd3dafc7b92608ae5462add1c8cc881851c2d4f5d8977fdea5b081d17f21"}, + {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:24149a75643aeaa81ece4259084d11b792308a6cf74e796cbb35def94c89a25a"}, + {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:757bd71a9b89e4f1db0622af4436d403e742506dbea978eba566815dc65ec895"}, + {file = "msgpack-0.6.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:32fea0ea3cd1ef820286863a6202dcfd62a539b8ec3edcbdff76068a8c2cc6ce"}, + {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:db7ff14abc73577b0bcbcf73ecff97d3580ecaa0fc8724babce21fdf3fe08ef6"}, + {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:187794cd1eb73acccd528247e3565f6760bd842d7dc299241f830024a7dd5610"}, + {file = "msgpack-0.6.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:b24afc52e18dccc8c175de07c1d680bdf315844566f4952b5bedb908894bec79"}, + {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:355f7fd0f90134229eaeefaee3cf42e0afc8518e8f3cd4b25f541a7104dcb8f9"}, + {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:76df51492bc6fa6cc8b65d09efdb67cbba3cbfe55004c3afc81352af92b4a43c"}, + {file = "msgpack-0.6.2-cp36-cp36m-win32.whl", hash = "sha256:f0f47bafe9c9b8ed03e19a100a743662dd8c6d0135e684feea720a0d0046d116"}, + {file = "msgpack-0.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c6e5024fc0cdf7f83b6624850309ddd7e06c48a75fa0d1c5173de4d93300eb19"}, + {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:30b88c47e0cdb6062daed88ca283b0d84fa0d2ad6c273aa0788152a1c643e408"}, + {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:229a0ccdc39e9b6c6d1033cd8aecd9c296823b6c87f0de3943c59b8bc7c64bee"}, + {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:4abdb88a9b67e64810fb54b0c24a1fd76b12297b4f7a1467d85a14dd8367191a"}, + {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:dedf54d72d9e7b6d043c244c8213fe2b8bbfe66874b9a65b39c4cc892dd99dd4"}, + {file = "msgpack-0.6.2-cp37-cp37m-win32.whl", hash = "sha256:0cc7ca04e575ba34fea7cfcd76039f55def570e6950e4155a4174368142c8e1b"}, + {file = "msgpack-0.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:1904b7cb65342d0998b75908304a03cb004c63ef31e16c8c43fee6b989d7f0d7"}, + {file = "msgpack-0.6.2.tar.gz", hash = "sha256:ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830"}, +] +nodeenv = [ + {file = "nodeenv-1.3.3.tar.gz", hash = "sha256:ad8259494cf1c9034539f6cced78a1da4840a4b157e23640bc4a0c0546b0cb7a"}, +] +packaging = [ + {file = "packaging-19.2-py2.py3-none-any.whl", hash = "sha256:d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108"}, + {file = "packaging-19.2.tar.gz", hash = "sha256:28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47"}, +] +pastel = [ + {file = "pastel-0.1.1-py2.py3-none-any.whl", hash = "sha256:a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef"}, + {file = "pastel-0.1.1.tar.gz", hash = "sha256:bf3b1901b2442ea0d8ab9a390594e5b0c9584709d543a3113506fe8b28cbace3"}, +] +pathlib2 = [ + {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"}, + {file = "pathlib2-2.3.5.tar.gz", hash = "sha256:6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"}, +] +pathspec = [ + {file = "pathspec-0.6.0.tar.gz", hash = "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c"}, +] +pep562 = [ + {file = "pep562-1.0-py2.py3-none-any.whl", hash = "sha256:d2a48b178ebf5f8dd31709cc26a19808ef794561fa2fe50ea01ea2bad4d667ef"}, + {file = "pep562-1.0.tar.gz", hash = "sha256:58cb1cc9ee63d93e62b4905a50357618d526d289919814bea1f0da8f53b79395"}, +] +pexpect = [ + {file = "pexpect-4.7.0-py2.py3-none-any.whl", hash = "sha256:2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1"}, + {file = "pexpect-4.7.0.tar.gz", hash = "sha256:9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"}, +] +pkginfo = [ + {file = "pkginfo-1.5.0.1-py2.py3-none-any.whl", hash = "sha256:a6d9e40ca61ad3ebd0b72fbadd4fba16e4c0e4df0428c041e01e06eb6ee71f32"}, + {file = "pkginfo-1.5.0.1.tar.gz", hash = "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb"}, +] +pluggy = [ + {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, + {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, +] +pre-commit = [ + {file = "pre_commit-1.18.3-py2.py3-none-any.whl", hash = "sha256:fa78ff96e8e9ac94c748388597693f18b041a181c94a4f039ad20f45287ba44a"}, + {file = "pre_commit-1.18.3.tar.gz", hash = "sha256:1d3c0587bda7c4e537a46c27f2c84aa006acc18facf9970bf947df596ce91f3f"}, + {file = "pre_commit-1.20.0-py2.py3-none-any.whl", hash = "sha256:c2e4810d2d3102d354947907514a78c5d30424d299dc0fe48f5aa049826e9b50"}, + {file = "pre_commit-1.20.0.tar.gz", hash = "sha256:9f152687127ec90642a2cc3e4d9e1e6240c4eb153615cb02aa1ad41d331cbb6e"}, +] +ptyprocess = [ + {file = "ptyprocess-0.6.0-py2.py3-none-any.whl", hash = "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"}, + {file = "ptyprocess-0.6.0.tar.gz", hash = "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"}, +] +py = [ + {file = "py-1.8.0-py2.py3-none-any.whl", hash = "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa"}, + {file = "py-1.8.0.tar.gz", hash = "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"}, +] +pycparser = [ + {file = "pycparser-2.19.tar.gz", hash = "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"}, +] +pygments = [ + {file = "Pygments-2.3.1-py2.py3-none-any.whl", hash = "sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d"}, + {file = "Pygments-2.3.1.tar.gz", hash = "sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a"}, + {file = "Pygments-2.5.2-py2.py3-none-any.whl", hash = "sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b"}, + {file = "Pygments-2.5.2.tar.gz", hash = "sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe"}, +] +pygments-github-lexers = [ + {file = "pygments-github-lexers-0.0.5.tar.gz", hash = "sha256:aaca57e77cd6fcfce8d6ee97a998962eebf7fbb810519a8ebde427c62823e133"}, + {file = "pygments_github_lexers-0.0.5-py3.4.egg", hash = "sha256:0f9e9fb607d351c127a1e55e82a6eb491ed1fc11b2d6a0444ba217dc6d1f82c1"}, +] +pylev = [ + {file = "pylev-1.3.0-py2.py3-none-any.whl", hash = "sha256:1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e"}, + {file = "pylev-1.3.0.tar.gz", hash = "sha256:063910098161199b81e453025653ec53556c1be7165a9b7c50be2f4d57eae1c3"}, +] +pymdown-extensions = [ + {file = "pymdown-extensions-6.0.tar.gz", hash = "sha256:6cf0cf36b5a03b291ace22dc2f320f4789ce56fbdb6635a3be5fadbf5d7694dd"}, + {file = "pymdown_extensions-6.0-py2.py3-none-any.whl", hash = "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df"}, + {file = "pymdown-extensions-6.2.tar.gz", hash = "sha256:27953f071d37b63d418738f75d847d824c0e4430e93f085cfdd9f8dc08a8c5c3"}, + {file = "pymdown_extensions-6.2-py2.py3-none-any.whl", hash = "sha256:328b9e114925729e0789558a94325be8e7ca9e0323ed2a2b705d9bc1de4d2716"}, +] +pyparsing = [ + {file = "pyparsing-2.4.5-py2.py3-none-any.whl", hash = "sha256:20f995ecd72f2a1f4bf6b072b63b22e2eb457836601e76d6e5dfcd75436acc1f"}, + {file = "pyparsing-2.4.5.tar.gz", hash = "sha256:4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"}, +] +pyrsistent = [ + {file = "pyrsistent-0.14.11.tar.gz", hash = "sha256:3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2"}, +] +pytest = [ + {file = "pytest-4.6.7-py2.py3-none-any.whl", hash = "sha256:65e92898fb5b61d0a1d7319c3e6dcf97e599e331cfdc2b27f20c0d87ece19239"}, + {file = "pytest-4.6.7.tar.gz", hash = "sha256:9ea149066f566c943d3122f4b1cf1b577cab73189d11f490b54703fa5fa9df50"}, +] +pytest-cov = [ + {file = "pytest-cov-2.8.1.tar.gz", hash = "sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b"}, + {file = "pytest_cov-2.8.1-py2.py3-none-any.whl", hash = "sha256:cdbdef4f870408ebdbfeb44e63e07eb18bb4619fae852f6e760645fa36172626"}, +] +pytest-mock = [ + {file = "pytest-mock-1.13.0.tar.gz", hash = "sha256:e24a911ec96773022ebcc7030059b57cd3480b56d4f5d19b7c370ec635e6aed5"}, + {file = "pytest_mock-1.13.0-py2.py3-none-any.whl", hash = "sha256:67e414b3caef7bff6fc6bd83b22b5bc39147e4493f483c2679bc9d4dc485a94d"}, +] +pytest-sugar = [ + {file = "pytest-sugar-0.9.2.tar.gz", hash = "sha256:fcd87a74b2bce5386d244b49ad60549bfbc4602527797fac167da147983f58ab"}, + {file = "pytest_sugar-0.9.2-py2.py3-none-any.whl", hash = "sha256:26cf8289fe10880cbbc130bd77398c4e6a8b936d8393b116a5c16121d95ab283"}, +] +pywin32-ctypes = [ + {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, + {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, +] +pyyaml = [ + {file = "PyYAML-5.2-cp27-cp27m-win32.whl", hash = "sha256:35ace9b4147848cafac3db142795ee42deebe9d0dad885ce643928e88daebdcc"}, + {file = "PyYAML-5.2-cp27-cp27m-win_amd64.whl", hash = "sha256:ebc4ed52dcc93eeebeae5cf5deb2ae4347b3a81c3fa12b0b8c976544829396a4"}, + {file = "PyYAML-5.2-cp35-cp35m-win32.whl", hash = "sha256:38a4f0d114101c58c0f3a88aeaa44d63efd588845c5a2df5290b73db8f246d15"}, + {file = "PyYAML-5.2-cp35-cp35m-win_amd64.whl", hash = "sha256:483eb6a33b671408c8529106df3707270bfacb2447bf8ad856a4b4f57f6e3075"}, + {file = "PyYAML-5.2-cp36-cp36m-win32.whl", hash = "sha256:7f38e35c00e160db592091751d385cd7b3046d6d51f578b29943225178257b31"}, + {file = "PyYAML-5.2-cp36-cp36m-win_amd64.whl", hash = "sha256:0e7f69397d53155e55d10ff68fdfb2cf630a35e6daf65cf0bdeaf04f127c09dc"}, + {file = "PyYAML-5.2-cp37-cp37m-win32.whl", hash = "sha256:e4c015484ff0ff197564917b4b4246ca03f411b9bd7f16e02a2f586eb48b6d04"}, + {file = "PyYAML-5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:4b6be5edb9f6bb73680f5bf4ee08ff25416d1400fbd4535fe0069b2994da07cd"}, + {file = "PyYAML-5.2-cp38-cp38-win32.whl", hash = "sha256:8100c896ecb361794d8bfdb9c11fce618c7cf83d624d73d5ab38aef3bc82d43f"}, + {file = "PyYAML-5.2-cp38-cp38-win_amd64.whl", hash = "sha256:2e9f0b7c5914367b0916c3c104a024bb68f269a486b9d04a2e8ac6f6597b7803"}, + {file = "PyYAML-5.2.tar.gz", hash = "sha256:c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c"}, +] +regex = [ + {file = "regex-2019.12.9-cp27-none-win32.whl", hash = "sha256:40b7d1291a56897927e08bb973f8c186c2feb14c7f708bfe7aaee09483e85a20"}, + {file = "regex-2019.12.9-cp27-none-win_amd64.whl", hash = "sha256:c203c9ee755e9656d0af8fab82754d5a664ebaf707b3f883c7eff6a3dd5151cf"}, + {file = "regex-2019.12.9-cp35-none-win32.whl", hash = "sha256:719978a9145d59fc78509ea1d1bb74243f93583ef2a34dcc5623cf8118ae9726"}, + {file = "regex-2019.12.9-cp35-none-win_amd64.whl", hash = "sha256:75cf3796f89f75f83207a5c6a6e14eaf57e0369ef0ffff8e22bf36bbcfa0f1de"}, + {file = "regex-2019.12.9-cp36-none-win32.whl", hash = "sha256:3dbd8333fd2ebd50977ac8747385a73aa1f546eb6b16fcd83d274470fe11f243"}, + {file = "regex-2019.12.9-cp36-none-win_amd64.whl", hash = "sha256:ad9e3c7260809c0d1ded100269f78ea0217c0704f1eaaf40a382008461848b45"}, + {file = "regex-2019.12.9-cp37-none-win32.whl", hash = "sha256:91235c98283d2bddf1a588f0fbc2da8afa37959294bbd18b76297bdf316ba4d6"}, + {file = "regex-2019.12.9-cp37-none-win_amd64.whl", hash = "sha256:aaffd68c4c1ed891366d5c390081f4bf6337595e76a157baf453603d8e53fbcb"}, + {file = "regex-2019.12.9-cp38-none-win32.whl", hash = "sha256:e865bc508e316a3a09d36c8621596e6599a203bc54f1cd41020a127ccdac468a"}, + {file = "regex-2019.12.9-cp38-none-win_amd64.whl", hash = "sha256:77396cf80be8b2a35db863cca4c1a902d88ceeb183adab328b81184e71a5eafe"}, + {file = "regex-2019.12.9.tar.gz", hash = "sha256:77a3799152951d6d14ae5720ca162c97c64f85d4755da585418eac216b736cad"}, +] +requests = [ + {file = "requests-2.21.0-py2.py3-none-any.whl", hash = "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"}, + {file = "requests-2.21.0.tar.gz", hash = "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"}, + {file = "requests-2.22.0-py2.py3-none-any.whl", hash = "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"}, + {file = "requests-2.22.0.tar.gz", hash = "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"}, +] +requests-toolbelt = [ + {file = "requests-toolbelt-0.8.0.tar.gz", hash = "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"}, + {file = "requests_toolbelt-0.8.0-py2.py3-none-any.whl", hash = "sha256:42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237"}, +] +scandir = [ + {file = "scandir-1.10.0-cp27-cp27m-win32.whl", hash = "sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188"}, + {file = "scandir-1.10.0-cp27-cp27m-win_amd64.whl", hash = "sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"}, + {file = "scandir-1.10.0-cp34-cp34m-win32.whl", hash = "sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f"}, + {file = "scandir-1.10.0-cp34-cp34m-win_amd64.whl", hash = "sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e"}, + {file = "scandir-1.10.0-cp35-cp35m-win32.whl", hash = "sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f"}, + {file = "scandir-1.10.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32"}, + {file = "scandir-1.10.0-cp36-cp36m-win32.whl", hash = "sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022"}, + {file = "scandir-1.10.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4"}, + {file = "scandir-1.10.0-cp37-cp37m-win32.whl", hash = "sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173"}, + {file = "scandir-1.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d"}, + {file = "scandir-1.10.0.tar.gz", hash = "sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae"}, +] +secretstorage = [ + {file = "SecretStorage-2.3.1.tar.gz", hash = "sha256:3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6"}, + {file = "SecretStorage-3.1.1-py3-none-any.whl", hash = "sha256:7a119fb52a88e398dbb22a4b3eb39b779bfbace7e4153b7bc6e5954d86282a8a"}, + {file = "SecretStorage-3.1.1.tar.gz", hash = "sha256:20c797ae48a4419f66f8d28fc221623f11fc45b6828f96bdb1ad9990acb59f92"}, +] +shellingham = [ + {file = "shellingham-1.3.1-py2.py3-none-any.whl", hash = "sha256:77d37a4fd287c1e663006f7ecf1b9deca9ad492d0082587bd813c44eb49e4e62"}, + {file = "shellingham-1.3.1.tar.gz", hash = "sha256:985b23bbd1feae47ca6a6365eacd314d93d95a8a16f8f346945074c28fe6f3e0"}, +] +six = [ + {file = "six-1.13.0-py2.py3-none-any.whl", hash = "sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd"}, + {file = "six-1.13.0.tar.gz", hash = "sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66"}, +] +subprocess32 = [ + {file = "subprocess32-3.5.4-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:88e37c1aac5388df41cc8a8456bb49ebffd321a3ad4d70358e3518176de3a56b"}, + {file = "subprocess32-3.5.4.tar.gz", hash = "sha256:eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d"}, +] +termcolor = [ + {file = "termcolor-1.1.0.tar.gz", hash = "sha256:1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"}, +] +toml = [ + {file = "toml-0.10.0-py2.7.egg", hash = "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"}, + {file = "toml-0.10.0-py2.py3-none-any.whl", hash = "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"}, + {file = "toml-0.10.0.tar.gz", hash = "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c"}, +] +tomlkit = [ + {file = "tomlkit-0.5.8-py2.py3-none-any.whl", hash = "sha256:96e6369288571799a3052c1ef93b9de440e1ab751aa045f435b55e9d3bcd0690"}, + {file = "tomlkit-0.5.8.tar.gz", hash = "sha256:32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269"}, +] +tornado = [ + {file = "tornado-5.1.1-cp35-cp35m-win32.whl", hash = "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f"}, + {file = "tornado-5.1.1-cp35-cp35m-win_amd64.whl", hash = "sha256:0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d"}, + {file = "tornado-5.1.1-cp36-cp36m-win32.whl", hash = "sha256:8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f"}, + {file = "tornado-5.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb"}, + {file = "tornado-5.1.1-cp37-cp37m-win32.whl", hash = "sha256:e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"}, + {file = "tornado-5.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5"}, + {file = "tornado-5.1.1.tar.gz", hash = "sha256:4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"}, + {file = "tornado-6.0.3-cp35-cp35m-win32.whl", hash = "sha256:c9399267c926a4e7c418baa5cbe91c7d1cf362d505a1ef898fde44a07c9dd8a5"}, + {file = "tornado-6.0.3-cp35-cp35m-win_amd64.whl", hash = "sha256:398e0d35e086ba38a0427c3b37f4337327231942e731edaa6e9fd1865bbd6f60"}, + {file = "tornado-6.0.3-cp36-cp36m-win32.whl", hash = "sha256:4e73ef678b1a859f0cb29e1d895526a20ea64b5ffd510a2307b5998c7df24281"}, + {file = "tornado-6.0.3-cp36-cp36m-win_amd64.whl", hash = "sha256:349884248c36801afa19e342a77cc4458caca694b0eda633f5878e458a44cb2c"}, + {file = "tornado-6.0.3-cp37-cp37m-win32.whl", hash = "sha256:559bce3d31484b665259f50cd94c5c28b961b09315ccd838f284687245f416e5"}, + {file = "tornado-6.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:abbe53a39734ef4aba061fca54e30c6b4639d3e1f59653f0da37a0003de148c7"}, + {file = "tornado-6.0.3.tar.gz", hash = "sha256:c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9"}, +] +tox = [ + {file = "tox-3.14.0-py2.py3-none-any.whl", hash = "sha256:0bc216b6a2e6afe764476b4a07edf2c1dab99ed82bb146a1130b2e828f5bff5e"}, + {file = "tox-3.14.0.tar.gz", hash = "sha256:c4f6b319c20ba4913dbfe71ebfd14ff95d1853c4231493608182f66e566ecfe1"}, + {file = "tox-3.14.1-py2.py3-none-any.whl", hash = "sha256:1d1368ac86e8332f79e2bcef9fefe2b077469f08449eadf0183759b34f3b2070"}, + {file = "tox-3.14.1.tar.gz", hash = "sha256:bcfa3e40abc1e9b70607b56adfd976fe7dc8286ad56aab44e3151daca7d2d0d0"}, +] +typed-ast = [ + {file = "typed_ast-1.4.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:262c247a82d005e43b5b7f69aff746370538e176131c32dda9cb0f324d27141e"}, + {file = "typed_ast-1.4.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:71211d26ffd12d63a83e079ff258ac9d56a1376a25bc80b1cdcdf601b855b90b"}, + {file = "typed_ast-1.4.0-cp35-cp35m-win32.whl", hash = "sha256:630968c5cdee51a11c05a30453f8cd65e0cc1d2ad0d9192819df9978984529f4"}, + {file = "typed_ast-1.4.0-cp35-cp35m-win_amd64.whl", hash = "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12"}, + {file = "typed_ast-1.4.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4e0b70c6fc4d010f8107726af5fd37921b666f5b31d9331f0bd24ad9a088e631"}, + {file = "typed_ast-1.4.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:bc6c7d3fa1325a0c6613512a093bc2a2a15aeec350451cbdf9e1d4bffe3e3233"}, + {file = "typed_ast-1.4.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:cc34a6f5b426748a507dd5d1de4c1978f2eb5626d51326e43280941206c209e1"}, + {file = "typed_ast-1.4.0-cp36-cp36m-win32.whl", hash = "sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a"}, + {file = "typed_ast-1.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:354c16e5babd09f5cb0ee000d54cfa38401d8b8891eefa878ac772f827181a3c"}, + {file = "typed_ast-1.4.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95bd11af7eafc16e829af2d3df510cecfd4387f6453355188342c3e79a2ec87a"}, + {file = "typed_ast-1.4.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:18511a0b3e7922276346bcb47e2ef9f38fb90fd31cb9223eed42c85d1312344e"}, + {file = "typed_ast-1.4.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d"}, + {file = "typed_ast-1.4.0-cp37-cp37m-win32.whl", hash = "sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36"}, + {file = "typed_ast-1.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2b907eb046d049bcd9892e3076c7a6456c93a25bebfe554e931620c90e6a25b0"}, + {file = "typed_ast-1.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fdc1c9bbf79510b76408840e009ed65958feba92a88833cdceecff93ae8fff66"}, + {file = "typed_ast-1.4.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7954560051331d003b4e2b3eb822d9dd2e376fa4f6d98fee32f452f52dd6ebb2"}, + {file = "typed_ast-1.4.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:48e5b1e71f25cfdef98b013263a88d7145879fbb2d5185f2a0c79fa7ebbeae47"}, + {file = "typed_ast-1.4.0-cp38-cp38-win32.whl", hash = "sha256:1170afa46a3799e18b4c977777ce137bb53c7485379d9706af8a59f2ea1aa161"}, + {file = "typed_ast-1.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:838997f4310012cf2e1ad3803bce2f3402e9ffb71ded61b5ee22617b3a7f6b6e"}, + {file = "typed_ast-1.4.0.tar.gz", hash = "sha256:66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34"}, +] +typing = [ + {file = "typing-3.7.4.1-py2-none-any.whl", hash = "sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36"}, + {file = "typing-3.7.4.1-py3-none-any.whl", hash = "sha256:f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"}, + {file = "typing-3.7.4.1.tar.gz", hash = "sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"}, +] +urllib3 = [ + {file = "urllib3-1.24.3-py2.py3-none-any.whl", hash = "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"}, + {file = "urllib3-1.24.3.tar.gz", hash = "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"}, + {file = "urllib3-1.25.7-py2.py3-none-any.whl", hash = "sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293"}, + {file = "urllib3-1.25.7.tar.gz", hash = "sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"}, +] +virtualenv = [ + {file = "virtualenv-16.7.8-py2.py3-none-any.whl", hash = "sha256:b57776b44f91511866594e477dd10e76a6eb44439cdd7f06dcd30ba4c5bd854f"}, + {file = "virtualenv-16.7.8.tar.gz", hash = "sha256:116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0"}, +] +wcwidth = [ + {file = "wcwidth-0.1.7-py2.py3-none-any.whl", hash = "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"}, + {file = "wcwidth-0.1.7.tar.gz", hash = "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e"}, +] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] +zipp = [ + {file = "zipp-0.6.0-py2.py3-none-any.whl", hash = "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335"}, + {file = "zipp-0.6.0.tar.gz", hash = "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e"}, +] diff --git a/pkgs/development/tools/poetry/pyproject.toml b/pkgs/development/tools/poetry/pyproject.toml new file mode 100644 index 00000000000..2aea5026835 --- /dev/null +++ b/pkgs/development/tools/poetry/pyproject.toml @@ -0,0 +1,118 @@ +[tool.poetry] +name = "poetry" +version = "1.0.0" +description = "Python dependency management and packaging made easy." +authors = [ + "Sébastien Eustace <sebastien@eustace.io>" +] +license = "MIT" + +readme = "README.md" + +homepage = "https://python-poetry.org/" +repository = "https://github.com/python-poetry/poetry" +documentation = "https://python-poetry.org/docs" + +keywords = ["packaging", "dependency", "poetry"] + +classifiers = [ + "Topic :: Software Development :: Build Tools", + "Topic :: Software Development :: Libraries :: Python Modules" +] + +# Requirements +[tool.poetry.dependencies] +python = "~2.7 || ^3.4" +cleo = "^0.7.6" +clikit = "^0.4.1" +requests = "^2.18" +cachy = "^0.3.0" +requests-toolbelt = "^0.8.0" +jsonschema = "^3.1" +pyrsistent = "^0.14.2" +pyparsing = "^2.2" +cachecontrol = { version = "^0.12.4", extras = ["filecache"] } +pkginfo = "^1.4" +html5lib = "^1.0" +shellingham = "^1.1" +tomlkit = "^0.5.8" +pexpect = "^4.7.0" + +# The typing module is not in the stdlib in Python 2.7 and 3.4 +typing = { version = "^3.6", python = "~2.7 || ~3.4" } + +# Use pathlib2 for Python 2.7 and 3.4 +pathlib2 = { version = "^2.3", python = "~2.7 || ~3.4" } +# Use glob2 for Python 2.7 and 3.4 +glob2 = { version = "^0.6", python = "~2.7 || ~3.4" } +# Use virtualenv for Python 2.7 since venv does not exist +virtualenv = { version = "^16.0", python = "~2.7" } +# functools32 is needed for Python 2.7 +functools32 = { version = "^3.2.3", python = "~2.7" } +keyring = [ + { version = "^18.0", python = "~2.7 || ~3.4" }, + { version = "^19.0", python = "^3.5" } +] +# Use subprocess32 for Python 2.7 and 3.4 +subprocess32 = { version = "^3.5", python = "~2.7 || ~3.4" } +importlib-metadata = {version = "^0.23", python = "<3.8"} + +[tool.poetry.dev-dependencies] +pytest = "^4.1" +pytest-cov = "^2.5" +mkdocs = { version = "^1.0", python = "~2.7.9 || ^3.4" } +pymdown-extensions = "^6.0" +pygments = "^2.2" +pytest-mock = "^1.9" +pygments-github-lexers = "^0.0.5" +black = { version = "^19.10b0", python = "^3.6" } +pre-commit = "^1.10" +tox = "^3.0" +pytest-sugar = "^0.9.2" +httpretty = "^0.9.6" +markdown-include = "^0.5.1" + +[tool.poetry.scripts] +poetry = "poetry.console:main" + + +[build-system] +requires = ["intreehooks"] +build-backend = "intreehooks:loader" + +[tool.intreehooks] +build-backend = "poetry.masonry.api" + + +[tool.isort] +line_length = 88 +force_single_line = true +atomic = true +include_trailing_comma = true +lines_after_imports = 2 +lines_between_types = 1 +multi_line_output = 3 +use_parentheses = true +not_skip = "__init__.py" +skip_glob = ["*/setup.py"] +filter_files = true + +known_first_party = "poetry" +known_third_party = [ + "cachecontrol", + "cachy", + "cleo", + "clikit", + "html5lib", + "httpretty", + "jsonschema", + "keyring", + "pexpect", + "pkginfo", + "pyparsing", + "pytest", + "requests", + "requests_toolbelt", + "shellingham", + "tomlkit", +] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/README.md b/pkgs/development/tools/poetry2nix/poetry2nix/README.md new file mode 100644 index 00000000000..ac4861534f5 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/README.md @@ -0,0 +1,6 @@ +Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix + +The update procedure is as-follows: +1. Send your change to the upstream poetry2nix repository +2. Get it approved with tests passing +3. Run the update script in pkgs/development/tools/poetry2nix diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix new file mode 100755 index 00000000000..95576b987f5 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -0,0 +1,98 @@ +#!/usr/bin/env python +from concurrent.futures import ThreadPoolExecutor +import subprocess +import textwrap +import argparse +import toml +import json +import sys + + +argparser = argparse.ArgumentParser(description="Generate overrides for git hashes",) +argparser.add_argument( + "--lock", default="poetry.lock", help="Path to input poetry.lock", +) +argparser.add_argument( + "--out", default="poetry-git-overlay.nix", help="Output file", +) + + +def fetch_git(pkg): + return ( + pkg["name"], + subprocess.run( + [ + "nix-prefetch-git", + "--fetch-submodules", + "--url", + pkg["source"]["url"], + "--rev", + pkg["source"]["reference"], + ], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + ), + ) + + +def indent(expr, spaces=2): + i = " " * spaces + return "\n".join([(i if l != "" else "") + l for l in expr.split("\n")]) + + +if __name__ == "__main__": + args = argparser.parse_args() + + with open(args.lock) as lockf: + lock = toml.load(lockf) + + pkgs = [] + for pkg in lock["package"]: + if "source" in pkg: + pkgs.append(pkg) + + with ThreadPoolExecutor() as e: + futures = [] + + for pkg in pkgs: + futures.append(e.submit(fetch_git, pkg)) + + lines = [ + "{ pkgs }:", + "self: super: {", + ] + + for f in futures: + drv_name, p = f.result() + if p.returncode != 0: + sys.stderr.buffer.write(p.stderr) + sys.stderr.buffer.flush() + exit(p.returncode) + + meta = json.loads(p.stdout.decode()) + lines.append( + indent( + textwrap.dedent( + """ + %s = super.%s.overrideAttrs ( + _: { + src = pkgs.fetchgit { + url = "%s"; + rev = "%s"; + sha256 = "%s"; + }; + } + );""" + % (drv_name, drv_name, meta["url"], meta["rev"], meta["sha256"]) + ) + ) + ) + + lines.extend(["", "}", ""]) + + expr = "\n".join(lines) + + with open(args.out, "w") as f: + f.write(expr) + + print(f"Wrote {args.out}") diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix new file mode 100644 index 00000000000..82759ce7174 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -0,0 +1,52 @@ +{ pkgs ? import <nixpkgs> {} +, lib ? pkgs.lib +, version +}: + +let + inherit (pkgs) python3; + +in +pkgs.stdenv.mkDerivation { + pname = "poetry2nix"; + inherit version; + + buildInputs = [ + (python3.withPackages (ps: [ ps.toml ])) + ]; + + nativeBuildInputs = [ + pkgs.makeWrapper + ]; + + src = ./bin; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + ${python3.pkgs.black}/bin/black --quiet --check poetry2nix + patchShebangs poetry2nix + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv poetry2nix $out/bin + + wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ + pkgs.nix-prefetch-git + ]} + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/nix-community/poetry2nix"; + description = "CLI to supplement sha256 hashes for git dependencies"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.adisbladis ]; + }; + +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix new file mode 100644 index 00000000000..967f0d666cb --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -0,0 +1,252 @@ +{ pkgs ? import <nixpkgs> {} +, lib ? pkgs.lib +, poetry ? null +, poetryLib ? import ./lib.nix { inherit lib pkgs; } +}: + +let + inherit (poetryLib) isCompatible readTOML; + + # Poetry2nix version + version = "1.1.0"; + + /* The default list of poetry2nix override overlays */ + defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); + + mkEvalPep508 = import ./pep508.nix { + inherit lib; + stdenv = pkgs.stdenv; + }; + + getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; + + getAttrDefault = attribute: set: default: ( + if builtins.hasAttr attribute set + then builtins.getAttr attribute set + else default + ); + + # Map SPDX identifiers to license names + spdxLicenses = lib.listToAttrs (lib.filter (pair: pair.name != null) (builtins.map (v: { name = if lib.hasAttr "spdxId" v then v.spdxId else null; value = v; }) (lib.attrValues lib.licenses))); + # Get license by id falling back to input string + getLicenseBySpdxId = spdxId: getAttrDefault spdxId spdxLicenses spdxId; + + # + # Returns an attrset { python, poetryPackages } for the given lockfile + # + mkPoetryPython = + { poetrylock + , poetryPkg + , overrides ? [ defaultPoetryOverrides ] + , meta ? {} + , python ? pkgs.python3 + , pwd ? null + }@attrs: let + lockData = readTOML poetrylock; + lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData; + + specialAttrs = [ "poetrylock" "overrides" ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + evalPep508 = mkEvalPep508 python; + + # Filter packages by their PEP508 markers + partitions = let + supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + in + lib.partition supportsPythonVersion lockData.package; + + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: if builtins.hasAttr depName self then self."${depName}" else throw "foo"; + + lockPkgs = builtins.listToAttrs ( + builtins.map ( + pkgMeta: rec { + name = pkgMeta.name; + value = self.mkPoetryDep ( + pkgMeta // { + inherit pwd; + source = getAttrDefault "source" pkgMeta null; + files = lockFiles.${name}; + pythonPackages = self; + } + ); + } + ) compatible + ); + in + lockPkgs; + + overlays = builtins.map getFunctorFn ( + [ + ( + self: super: { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + } + ) + # Null out any filtered packages, we don't want python.pkgs from nixpkgs + (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + # Create poetry2nix layer + baseOverlay + ] ++ # User provided overrides + overrides + ); + + packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; + + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; + }; + + /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. + + Example: + poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; } + */ + mkPoetryEnv = + { poetrylock + , overrides ? [ defaultPoetryOverrides ] + , meta ? {} + , pwd ? null + , python ? pkgs.python3 + }: + let + poetryPkg = poetry.override { inherit python; }; + py = mkPoetryPython ( + { + inherit poetryPkg poetrylock overrides meta python pwd; + } + ); + in + py.python.withPackages (_: py.poetryPackages); + + /* Creates a Python application from pyproject.toml and poetry.lock */ + mkPoetryApplication = + { src + , pyproject + , poetrylock + , overrides ? [ defaultPoetryOverrides ] + , meta ? {} + , python ? pkgs.python3 + , pwd ? null + , ... + }@attrs: let + poetryPkg = poetry.override { inherit python; }; + + py = ( + mkPoetryPython { + inherit poetryPkg poetrylock overrides meta python pwd; + } + ).python; + + pyProject = readTOML pyproject; + + specialAttrs = [ "pyproject" "poetrylock" "overrides" ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + getDeps = depAttr: let + deps = getAttrDefault depAttr pyProject.tool.poetry {}; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); + in + builtins.map (dep: py.pkgs."${dep}") depAttrs; + + getInputs = attr: getAttrDefault attr attrs []; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + + in + py.pkgs.buildPythonApplication ( + passedAttrs // { + pname = pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; + + format = "pyproject"; + + nativeBuildInputs = [ pkgs.yj ]; + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + + passthru = { + python = py; + }; + + postPatch = (getAttrDefault "postPatch" passedAttrs "") + '' + # Tell poetry not to resolve the path dependencies. Any version is + # fine ! + yj -tj < pyproject.toml | python ${./pyproject-without-path.py} > pyproject.json + yj -jt < pyproject.json > pyproject.toml + rm pyproject.json + ''; + + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + license = getLicenseBySpdxId (getAttrDefault "license" pyProject.tool.poetry "unknown"); + }; + + } + ); + + /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ + cli = import ./cli.nix { inherit pkgs lib version; }; + + /* Poetry2nix documentation */ + doc = pkgs.stdenv.mkDerivation { + pname = "poetry2nix-docs"; + inherit version; + + src = pkgs.runCommandNoCC "poetry2nix-docs-src" {} '' + mkdir -p $out + cp ${./default.nix} $out/default.nix + ''; + + buildInputs = [ + pkgs.nixdoc + ]; + + buildPhase = '' + nixdoc --category poetry2nix --description "Poetry2nix functions" --file ./default.nix > poetry2nix.xml + ''; + + installPhase = '' + mkdir -p $out + cp poetry2nix.xml $out/ + ''; + + }; + +in +{ + inherit mkPoetryEnv mkPoetryApplication cli doc; + + /* + The default list of poetry2nix override overlays + + Can be overriden by calling defaultPoetryOverrides.overrideOverlay which takes an overlay function + */ + defaultPoetryOverrides = { + __functor = defaultPoetryOverrides; + overrideOverlay = fn: self: super: let + defaultSet = defaultPoetryOverrides self super; + customSet = fn self super; + in defaultSet // customSet; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json b/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json new file mode 100644 index 00000000000..2cce8e2ea08 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/extensions.json @@ -0,0 +1,14 @@ +[ + "tar", + "tar.bz2", + "tar.gz", + "tar.lz", + "tar.lzma", + "tar.xz", + "tbz", + "tgz", + "tlz", + "txz", + "whl", + "zip" +] \ No newline at end of file diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix new file mode 100644 index 00000000000..9ec76defb7d --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -0,0 +1,79 @@ +{ lib, pkgs }: +let + inherit (import ./semver.nix { inherit lib; }) satisfiesSemver; + + # Returns true if pythonVersion matches with the expression in pythonVersions + isCompatible = pythonVersion: pythonVersions: + let + operators = { + "||" = cond1: cond2: cond1 || cond2; + "," = cond1: cond2: cond1 && cond2; # , means && + }; + # split string at "," and "||" + tokens = builtins.filter (x: x != "") (builtins.split "(,|\\|\\|)" pythonVersions); + combine = acc: v: + let + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; + in + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v); + }; + initial = { operator = ","; state = true; }; + in + (builtins.foldl' combine initial tokens).state; + + readTOML = path: builtins.fromTOML (builtins.readFile path); + + # + # Returns the appropriate manylinux dependencies and string representation for the file specified + # + getManyLinuxDeps = f: + let + ml = pkgs.pythonManylinuxPackages; + in + if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } + else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } + else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } + else { pkg = []; str = null; }; + + # Fetch the artifacts from the PyPI index. Since we get all + # info we need from the lock file we don't use nixpkgs' fetchPyPi + # as it modifies casing while not providing anything we don't already + # have. + # + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention + fetchFromPypi = lib.makeOverridable ( + { pname, file, hash, kind }: + pkgs.fetchurl { + url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"; + inherit hash; + } + ); + + getBuildSystemPkgs = + { pythonPackages + , pyProject + }: let + buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; + drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; + in + if buildSystem == "" then [] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); + +in +{ + inherit + fetchFromPypi + getManyLinuxDeps + isCompatible + readTOML + getBuildSystemPkgs + ; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix new file mode 100644 index 00000000000..3631cbd228e --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -0,0 +1,100 @@ +{ autoPatchelfHook +, pkgs +, lib +, python +, buildPythonPackage +, pythonPackages +, poetryLib +}: +{ name +, version +, files +, source +, dependencies ? {} +, pythonPackages +, python-versions +, pwd +, supportedExtensions ? lib.importJSON ./extensions.json +, ... +}: let + + inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; + + inherit (import ./pep425.nix { + inherit lib python; + inherit (pkgs) stdenv; + }) selectWheel + ; + + fileCandidates = let + supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); + matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; + hasSupportedExtension = fname: builtins.match supportedRegex fname != null; + in + builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file) files; + + toPath = s: pwd + "/${s}"; + + isSource = source != null; + isGit = isSource && source.type == "git"; + isLocal = isSource && source.type == "directory"; + + localDepPath = toPath source.url; + pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); + + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pythonPackages pyProject; + }; + + fileInfo = let + isBdist = f: lib.strings.hasSuffix "whl" f.file; + isSdist = f: ! isBdist f; + binaryDist = selectWheel fileCandidates; + sourceDist = builtins.filter isSdist fileCandidates; + lockFileEntry = if (builtins.length sourceDist) > 0 then builtins.head sourceDist else builtins.head binaryDist; + in + rec { + inherit (lockFileEntry) file hash; + name = file; + format = if lib.strings.hasSuffix ".whl" name then "wheel" else "setuptools"; + kind = if format == "setuptools" then "source" else (builtins.elemAt (lib.strings.splitString "-" name) 2); + }; + +in +buildPythonPackage { + pname = name; + version = version; + + doCheck = false; # We never get development deps + dontStrip = true; + format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; + + nativeBuildInputs = if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else []; + buildInputs = if !isSource then (getManyLinuxDeps fileInfo.name).pkg else []; + + propagatedBuildInputs = + let + # Some dependencies like django gets the attribute name django + # but dependencies try to access Django + deps = builtins.map (d: lib.toLower d) (builtins.attrNames dependencies); + in + (builtins.map (n: pythonPackages.${n}) deps) ++ (if isLocal then buildSystemPkgs else []); + + meta = { + broken = ! isCompatible python.version python-versions; + license = []; + }; + + # We need to retrieve kind from the interpreter and the filename of the package + # Interpreters should declare what wheel types they're compatible with (python type + ABI) + # Here we can then choose a file based on that info. + src = if isGit then ( + builtins.fetchGit { + inherit (source) url; + rev = source.reference; + } + ) else if isLocal then (localDepPath) else fetchFromPypi { + pname = name; + inherit (fileInfo) file hash kind; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix new file mode 100644 index 00000000000..84d77cef3b5 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -0,0 +1,405 @@ +{ pkgs ? import <nixpkgs> {} +, lib ? pkgs.lib +, stdenv ? pkgs.stdenv +}: + +self: super: + +let + + addSetupTools = drv: if drv == null then null else drv.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.setuptools_scm + ]; + } + ); + + getAttrDefault = attribute: set: default: + if builtins.hasAttr attribute set + then builtins.getAttr attribute set + else default; + +in +{ + + asciimatics = super.asciimatics.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.setuptools_scm + ]; + } + ); + + av = super.av.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + } + ); + + bcrypt = super.bcrypt.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); + + cffi = super.cffi.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); + + cftime = super.cftime.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } + ); + + configparser = addSetupTools super.configparser; + + cbor2 = addSetupTools super.cbor2; + + cryptography = super.cryptography.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); + + django = ( + super.django.overrideAttrs ( + old: { + propagatedNativeBuildInputs = (getAttrDefault "propagatedNativeBuildInputs" old []) + ++ [ pkgs.gettext ]; + } + ) + ); + + django-bakery = super.django-bakery.overrideAttrs ( + old: { + configurePhase = '' + if ! test -e LICENSE; then + touch LICENSE + fi + '' + (getAttrDefault "configurePhase" old ""); + } + ); + + # Environment markers are not always included (depending on how a dep was defined) + enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; + + grandalf = super.grandalf.overrideAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "setup_requires=['pytest-runner',]," "setup_requires=[]," || true + ''; + } + ); + + horovod = super.horovod.overrideAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + } + ); + + hypothesis = addSetupTools super.hypothesis; + + importlib-metadata = addSetupTools super.importlib-metadata; + + inflect = super.inflect.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.setuptools_scm + ]; + } + ); + + jsonschema = addSetupTools super.jsonschema; + + keyring = addSetupTools super.keyring; + + lap = super.lap.overrideAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.numpy + ]; + } + ); + + llvmlite = super.llvmlite.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + postPatch = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; + + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + ''; + + __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + + passthru = old.passthru // { llvm = pkgs.llvm; }; + } + ); + + lockfile = super.lockfile.overrideAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + } + ); + + lxml = super.lxml.overrideAttrs ( + old: { + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + } + ); + + markupsafe = super.markupsafe.overrideAttrs ( + old: { + src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; + } + ); + + matplotlib = super.matplotlib.overrideAttrs ( + old: { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + + XDG_RUNTIME_DIR = "/tmp"; + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ]; + + inherit (super.matplotlib) patches; + } + ); + + mccabe = super.mccabe.overrideAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "setup_requires=[]," || true + ''; + } + ); + + netcdf4 = super.netcdf4.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.zlib + pkgs.netcdf + pkgs.hdf5 + pkgs.curl + pkgs.libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev pkgs.hdf5; + NETCDF4_DIR = pkgs.netcdf; + CURL_DIR = pkgs.curl.dev; + JPEG_DIR = pkgs.libjpeg.dev; + } + ); + + numpy = super.numpy.overrideAttrs ( + old: let + blas = pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = pkgs.writeTextFile { + name = "site.cfg"; + text = ( + lib.generators.toINI {} { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); + }; + in + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } + ); + + pillow = super.pillow.overrideAttrs ( + old: { + nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + } + ); + + pluggy = addSetupTools super.pluggy; + + psycopg2 = super.psycopg2.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); + + psycopg2-binary = super.psycopg2-binary.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); + + py = addSetupTools super.py; + + pyarrow = super.pyarrow.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } + ); + + pycairo = ( + drv: ( + drv.overridePythonAttrs ( + _: { + format = "other"; + } + ) + ).overrideAttrs ( + old: { + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.meson + pkgs.ninja + pkgs.pkgconfig + ]; + + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.cairo + pkgs.xlibsWrapper + ]; + + mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; + } + ) + ) super.pycairo; + + pycocotools = super.pycocotools.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + self.numpy + ]; + } + ); + + pygobject = super.pygobject.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + } + ); + + pyopenssl = super.pyopenssl.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); + + pytest = addSetupTools super.pytest; + + pytest-mock = addSetupTools super.pytest-mock; + + python-dateutil = addSetupTools super.python-dateutil; + + python-prctl = super.python-prctl.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ + self.setuptools_scm + pkgs.libcap + ]; + } + ); + + scaleapi = super.scaleapi.overrideAttrs ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true + ''; + } + ); + + scipy = super.scipy.overrideAttrs ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + enableParallelBuilding = true; + buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + preBuild = '' + ln -s ${self.numpy.cfg} site.cfg + ''; + } + ); + + shapely = super.shapely.overrideAttrs ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + inherit (super.shapely) patches GEOS_LIBRARY_PATH; + } + ); + + six = addSetupTools super.six; + + urwidtrees = super.urwidtrees.overrideAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.urwid + ]; + } + ); + + # TODO: Figure out getting rid of this hack + wheel = ( + pkgs.python3.pkgs.override { + python = self.python; + } + ).wheel.overridePythonAttrs ( + _: { + inherit (super.wheel) pname name version src; + } + ); + + zipp = addSetupTools super.zipp; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix new file mode 100644 index 00000000000..b2e11205c36 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -0,0 +1,106 @@ +{ lib, stdenv, python, isLinux ? stdenv.isLinux }: + +let + inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix; + + # The 'cpxy" as determined by `python.version` + # + # e.g "2.7.17" -> "cp27" + # "3.5.9" -> "cp35" + pythonTag = + let + ver = builtins.splitVersion python.version; + major = builtins.elemAt ver 0; + minor = builtins.elemAt ver 1; + in + "cp${major}${minor}"; + + abiTag = "${pythonTag}m"; + + # + # Parses wheel file returning an attribute set + # + toWheelAttrs = str: + let + entries = splitString "-" str; + p = removeSuffix ".whl" (builtins.elemAt entries 4); + in + { + pkgName = builtins.elemAt entries 0; + pkgVer = builtins.elemAt entries 1; + pyVer = builtins.elemAt entries 2; + abi = builtins.elemAt entries 3; + platform = p; + }; + + # + # Builds list of acceptable osx wheel files + # + # <versions> accepted versions in descending order of preference + # <candidates> list of wheel files to select from + findBestMatches = versions: candidates: + let + v = lib.lists.head versions; + vs = lib.lists.tail versions; + in + if (builtins.length versions == 0) + then [] + else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); + + # pyver = "cpXX" + # x = "cpXX" | "py2" | "py3" | "py2.py3" + isPyVersionCompatible = pyver: x: + let + normalize = y: ''cp${lib.strings.removePrefix "cp" (lib.strings.removePrefix "py" y)}''; + isCompat = p: x: lib.strings.hasPrefix (normalize x) p; + in + lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); + + # + # Selects the best matching wheel file from a list of files + # + selectWheel = files: + let + filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); + + isPyAbiCompatible = pyabi: x: x == "none" || pyabi == x; + + withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); + + withPlatform = if isLinux + then ( + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + || x.platform == "any" + ) + else (x: hasInfix "macosx" x.platform || x.platform == "any"); + + filterWheel = x: + let + f = toWheelAttrs x.file; + in + (withPython pythonTag abiTag f) && (withPlatform f); + + filtered = builtins.filter filterWheel filesWithoutSources; + + choose = files: + let + osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; + linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; + chooseLinux = x: lib.singleton (builtins.head (findBestMatches linuxMatches x)); + chooseOSX = x: lib.singleton (builtins.head (findBestMatches osxMatches x)); + in + if isLinux + then chooseLinux files + else chooseOSX files; + + in + if (builtins.length filtered == 0) + then [] + else choose (filtered); + +in +{ + inherit selectWheel toWheelAttrs isPyVersionCompatible; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix new file mode 100644 index 00000000000..bf1893931cd --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -0,0 +1,218 @@ +{ lib, stdenv }: python: + +let + + # Like builtins.substring but with stop being offset instead of length + substr = start: stop: s: builtins.substring start (stop - start) s; + + # Strip leading/trailing whitespace from string + stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; + + findSubExpressionsFun = acc: c: ( + if c == "(" then ( + let + posNew = acc.pos + 1; + isOpen = acc.openP == 0; + startPos = if isOpen then posNew else acc.startPos; + in + acc // { + inherit startPos; + exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; + pos = posNew; + openP = acc.openP + 1; + } + ) else if c == ")" then ( + let + openP = acc.openP - 1; + exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); + in + acc // { + inherit openP; + pos = acc.pos + 1; + exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; + exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; + } + ) else acc // { pos = acc.pos + 1; } + ); + + # Make a tree out of expression groups (parens) + findSubExpressions = expr: let + acc = builtins.foldl' findSubExpressionsFun { + exprs = []; + expr = expr; + pos = 0; + openP = 0; + exprPos = 0; + startPos = 0; + } (lib.stringToCharacters expr); + tailExpr = (substr acc.exprPos acc.pos expr); + tailExprs = if tailExpr != "" then [ tailExpr ] else []; + in + acc.exprs ++ tailExprs; + + parseExpressions = exprs: let + splitCond = ( + s: builtins.map + (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (builtins.split " (and|or) " (s + " ")) + ); + + mapfn = expr: ( + if (builtins.match "^ ?$" expr != null) then null # Filter empty + else if (builtins.elem expr [ "and" "or" ]) then { + type = "bool"; + value = expr; + } + else { + type = "expr"; + value = expr; + } + ); + + parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); + + in + builtins.foldl' ( + acc: v: acc ++ ( + if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] + ) + ) [] exprs; + + # Transform individual expressions to structured expressions + # This function also performs variable substitution, replacing environment markers with their explicit values + transformExpressions = exprs: let + variables = { + os_name = "posix"; # TODO: Check other platforms + sys_platform = ( + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "darwin" + else throw "Unsupported platform" + ); + platform_machine = stdenv.platform.kernelArch; + platform_python_implementation = "CPython"; # Only CPython supported for now + platform_release = ""; # Field not reproducible + platform_system = ( + if stdenv.isLinux then "Linux" + else if stdenv.isDarwin then "Darwin" + else throw "Unsupported platform" + ); + platform_version = ""; # Field not reproducible + python_version = python.passthru.pythonVersion; + python_full_version = python.version; + implementation_name = "cpython"; # Only cpython supported for now + implementation_version = python.version; + extra = ""; + }; + + substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; + + processVar = value: builtins.foldl' (acc: v: v acc) value [ + stripStr + substituteVar + ]; + + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; + + # Recursively eval all expressions + evalExpressions = exprs: let + unmarshal = v: ( + # TODO: Handle single quoted values + if v == "True" then true + else if v == "False" then false + else builtins.fromJSON v + ); + hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); + # TODO: Implement all operators + op = { + "<=" = x: y: (unmarshal x) <= (unmarshal y); + "<" = x: y: (unmarshal x) < (unmarshal y); + "!=" = x: y: x != y; + "==" = x: y: x == y; + ">=" = x: y: (unmarshal x) >= (unmarshal y); + ">" = x: y: (unmarshal x) > (unmarshal y); + "~=" = null; + "===" = null; + "in" = x: y: let + values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); + in + builtins.elem (unmarshal x) values; + }; + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; + + # Now that we have performed an eval all that's left to do is to concat the graph into a single bool + reduceExpressions = exprs: let + cond = { + "and" = x: y: x && y; + "or" = x: y: x || y; + }; + reduceExpressionsFun = acc: v: ( + if builtins.typeOf v == "set" then ( + if v.type == "value" then ( + acc // { + value = cond."${acc.cond}" acc.value v.value; + } + ) else if v.type == "bool" then ( + acc // { + cond = v.value; + } + ) else throw "Unsupported type" + ) else if builtins.typeOf v == "list" then ( + let + ret = builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } v; + in + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } + ) else throw "Unsupported type" + ); + in + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; + +in +e: builtins.foldl' (acc: v: v acc) e [ + findSubExpressions + parseExpressions + transformExpressions + evalExpressions + reduceExpressions +] diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py new file mode 100644 index 00000000000..bb61e4a5cb4 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python +# Patch out path dependencies from a pyproject.json file + +import json +import sys + +data = json.load(sys.stdin) + +for dep in data['tool']['poetry']['dependencies'].values(): + if isinstance(dep, dict): + try: + del dep['path']; + except KeyError: + pass + else: + dep['version'] = '*' + +json.dump(data, sys.stdout, indent=4) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix new file mode 100644 index 00000000000..620bb25ad97 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -0,0 +1,80 @@ +{ lib }: + +let + inherit (builtins) elemAt match; + + # Replace a list entry at defined index with set value + ireplace = idx: value: list: let + inherit (builtins) genList length; + in + genList (i: if i == idx then value else (elemAt list i)) (length list); + + operators = let + matchWildCard = s: match "([^\*])(\.[\*])" s; + mkComparison = ret: version: v: builtins.compareVersions version v == ret; + mkIdxComparison = idx: version: v: let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in + operators.">=" version v && operators."<" version upper; + dropWildcardPrecision = f: version: constraint: let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in + f v c; + in + { + # Prefix operators + "==" = dropWildcardPrecision (mkComparison 0); + ">" = dropWildcardPrecision (mkComparison 1); + "<" = dropWildcardPrecision (mkComparison (-1)); + "!=" = v: c: ! operators."==" v c; + ">=" = v: c: operators."==" v c || operators.">" v c; + "<=" = v: c: operators."==" v c || operators."<" v c; + # Semver specific operators + "~" = mkIdxComparison 1; # + "^" = mkIdxComparison 0; + # Infix operators + "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; + }; + + re = { + operators = "([=><!~\^]+)"; + version = "([0-9\.\*x]+)"; + }; + + parseConstraint = constraint: let + constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; + # The common prefix operators + mPre = match "${re.operators} *${re.version}" constraintStr; + # There is also an infix operator to match ranges + mIn = match "${re.version} *(-) *${re.version}" constraintStr; + in + ( + if mPre != null then { + op = elemAt mPre 0; + v = elemAt mPre 1; + } + # Infix operators are range matches + else if mIn != null then { + op = elemAt mIn 1; + v = { + vl = (elemAt mIn 0); + vu = (elemAt mIn 2); + }; + } + else throw "Constraint \"${constraintStr}\" could not be parsed" + ); + + satisfiesSemver = version: constraint: let + inherit (parseConstraint constraint) op v; + in + if constraint == "*" then true else operators."${op}" version v; + +in +{ inherit satisfiesSemver; } diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update new file mode 100755 index 00000000000..a5d367590be --- /dev/null +++ b/pkgs/development/tools/poetry2nix/update @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +pwd=$(pwd) +workdir=$(mktemp -d) + +function cleanup { + cd "$pwd" + rm -rf $workdir +} +trap cleanup EXIT + +cd "$workdir" + +curl -L -s https://github.com/nix-community/poetry2nix/archive/master.tar.gz | tar -xz +mv poetry2nix-master/* . + +mkdir build +cp *.nix *.json *.py build/ +cp -r bin build/ +rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix + +cat > build/README.md << EOF +Dont change these files here, they are maintained at https://github.com/nix-community/poetry2nix + +The update procedure is as-follows: +1. Send your change to the upstream poetry2nix repository +2. Get it approved with tests passing +3. Run the update script in pkgs/development/tools/poetry2nix +EOF + +rm -rf "$pwd/poetry2nix" +mv build "$pwd/poetry2nix" diff --git a/pkgs/development/tools/pry/Gemfile b/pkgs/development/tools/pry/Gemfile new file mode 100644 index 00000000000..ec63e2251d5 --- /dev/null +++ b/pkgs/development/tools/pry/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pry' diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock new file mode 100644 index 00000000000..e6025f50ca1 --- /dev/null +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + coderay (1.1.2) + method_source (0.9.2) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + +PLATFORMS + ruby + +DEPENDENCIES + pry + +BUNDLED WITH + 1.17.2 diff --git a/pkgs/development/tools/pry/default.nix b/pkgs/development/tools/pry/default.nix new file mode 100644 index 00000000000..974b61617fb --- /dev/null +++ b/pkgs/development/tools/pry/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "pry"; + gemdir = ./.; + exes = [ "pry" ]; + + passthru.updateScript = bundlerUpdateScript "pry"; + + meta = with lib; { + description = "A Ruby runtime developer console and IRB alternative"; + homepage = https://pryrepl.org; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/pry/gemset.nix b/pkgs/development/tools/pry/gemset.nix new file mode 100644 index 00000000000..e779c48aebf --- /dev/null +++ b/pkgs/development/tools/pry/gemset.nix @@ -0,0 +1,33 @@ +{ + coderay = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 6879d6875cc..2fc5efedb20 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,47 +1,14 @@ -{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool -, base, bower-json, bytestring, Cabal, containers, dhall, directory -, either, exceptions, extra, fetchgit, file-embed, filepath, foldl -, fsnotify, github, Glob, hpack, hspec, hspec-discover -, hspec-megaparsec, http-client, http-conduit, lens-family-core -, megaparsec, mtl, network-uri, open-browser, optparse-applicative -, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe -, semver-range, stdenv, stm, tar, template-haskell, temporary, text -, time, transformers, turtle, unliftio, unordered-containers -, vector, versions, zlib +{ haskellPackages +, haskell +, lib }: -mkDerivation { - pname = "spago"; - version = "0.12.1.0"; - src = fetchgit { - url = "https://github.com/spacchetti/spago"; - sha256 = "17xgp75yxangmb65sv3raysad31kmc109c4q4aj9dgcdqz23fcn2"; - rev = "a4679880402ead320f8be2f091b25d30e27b62df"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async-pool base bower-json - bytestring Cabal containers dhall directory either exceptions - file-embed filepath foldl fsnotify github Glob http-client - http-conduit lens-family-core megaparsec mtl network-uri - open-browser prettyprinter process retry rio rio-orphans safe - semver-range stm tar template-haskell temporary text time - transformers turtle unliftio unordered-containers vector versions - zlib - ]; - libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ - aeson-pretty async-pool base bytestring containers dhall filepath - github lens-family-core megaparsec optparse-applicative process - retry stm temporary text time turtle vector + +haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ + lib.maintainers.cdepillabout ]; - testHaskellDepends = [ - base containers directory extra hspec hspec-megaparsec megaparsec - process QuickCheck temporary text turtle versions - ]; - testToolDepends = [ hspec-discover ]; - prePatch = "hpack"; - homepage = "https://github.com/spacchetti/spago#readme"; - license = stdenv.lib.licenses.bsd3; -} + + passthru = (oldAttrs.passthru or {}) // { + updateScript = ./update.sh; + }; +})) diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix new file mode 100644 index 00000000000..c85cff2f03a --- /dev/null +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -0,0 +1,47 @@ +{ mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool +, base, bower-json, bytestring, Cabal, containers, dhall, directory +, either, exceptions, extra, fetchgit, file-embed, filepath, foldl +, fsnotify, github, Glob, hpack, hspec, hspec-discover +, hspec-megaparsec, http-client, http-conduit, lens-family-core +, megaparsec, mtl, network-uri, open-browser, optparse-applicative +, prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe +, semver-range, stdenv, stm, tar, template-haskell, temporary, text +, time, transformers, turtle, unliftio, unordered-containers +, vector, versions, zlib +}: +mkDerivation { + pname = "spago"; + version = "0.13.0"; + src = fetchgit { + url = "https://github.com/spacchetti/spago.git"; + sha256 = "158xq5zn32iwswxmpma92763hl6kzq7kb01cyvphmmlilx55b6yk"; + rev = "426838670ba9de4593f4c533a6947efb2d8ad4ba"; + fetchSubmodules = true; + }; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async-pool base bower-json + bytestring Cabal containers dhall directory either exceptions + file-embed filepath foldl fsnotify github Glob http-client + http-conduit lens-family-core megaparsec mtl network-uri + open-browser prettyprinter process retry rio rio-orphans safe + semver-range stm tar template-haskell temporary text time + transformers turtle unliftio unordered-containers vector versions + zlib + ]; + libraryToolDepends = [ hpack ]; + executableHaskellDepends = [ + aeson-pretty async-pool base bytestring containers dhall filepath + github lens-family-core megaparsec optparse-applicative process + retry stm temporary text time turtle vector + ]; + testHaskellDepends = [ + base containers directory extra hspec hspec-megaparsec megaparsec + process QuickCheck temporary text turtle versions + ]; + testToolDepends = [ hspec-discover ]; + prePatch = "hpack"; + homepage = "https://github.com/spacchetti/spago#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh new file mode 100755 index 00000000000..00c9c6d85f1 --- /dev/null +++ b/pkgs/development/tools/purescript/spago/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq +# +# This script will update the spago derivation to the latest version using +# cabal2nix. +# +# Note that you should always try building spago after updating it here, since +# some of the overrides in pkgs/development/haskell/configuration-nix.nix may +# need to be updated/changed. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# Spago derivation created with cabal2nix. +spago_derivation_file="${script_dir}/spago.nix" + +# This is the current revision of spago in Nixpkgs. +old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")" + +# This is the latest release version of spago on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/spacchetti/spago/releases" | jq '.[0].tag_name' --raw-output) + +echo "Updating spago from old version $old_version to new version $new_version." +echo "Running cabal2nix and outputting to ${spago_derivation_file}..." + +cabal2nix --revision "$new_version" "https://github.com/spacchetti/spago.git" > "$spago_derivation_file" + +echo "Finished." diff --git a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch index 39c5c06a285..f0e8c3d2c5e 100644 --- a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch +++ b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch @@ -1,15 +1,15 @@ diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index e2d1e6a..1a1d839 100644 +index b656f8e1..a830d3c3 100644 --- a/src/plugins/cpptools/headerpathfilter.cpp +++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -96,8 +96,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs) +@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths) { // include/c++, include/g++, libc++\include and libc++abi\include - static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))" -- R"(|(.*libc\+\+\/include))" -- R"(|(.*libc\+\+abi\/include))"; + static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))" +- R"(|(.*libc\+\+/include))" +- R"(|(.*libc\+\+abi/include))" + R"(|(.*libc\+\+.*\/include))" + R"(|(.*libc\+\+abi.*\/include))"; + R"(|(/usr/local/include))"; static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z"); - // The same as includeRegExp but also matches /usr/local/include diff --git a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch b/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch index 5cd34991c39..b0427e94c7c 100644 --- a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch +++ b/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch @@ -1,13 +1,12 @@ diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp -index e2d1e6a..1a1d839 100644 +index a830d3c3..80e2f933 100644 --- a/src/plugins/cpptools/headerpathfilter.cpp +++ b/src/plugins/cpptools/headerpathfilter.cpp -@@ -134,8 +134,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths) +@@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths) void HeaderPathFilter::tweakHeaderPaths() { - removeClangSystemHeaderPaths(builtInHeaderPaths); -- - auto split = resourceIterator(builtInHeaderPaths, - projectPart.toolChainTargetTriple.contains("darwin")); + removeGccInternalIncludePaths(); + auto split = resourceIterator(builtInHeaderPaths); diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 55eb30ab370..9e9ec6f0d3d 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -20,12 +20,12 @@ in mkDerivation rec { pname = "qtcreator"; - version = "4.10.0"; + version = "4.11.0"; baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); src = fetchurl { url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "12hgxdghz05ms4zl8prz2w8l66vmgw1qw2gsmmwqi2rdaay3lpcg"; + sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix new file mode 100644 index 00000000000..5a81ae757ea --- /dev/null +++ b/pkgs/development/tools/rdbtools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, python }: + +with python.pkgs; + +buildPythonApplication rec { + pname = "rdbtools"; + version = "0.1.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "03vdwwkqz8py6c3wfgx402rn8pjjfn44w3gbxzr60lbkx27m63yj"; + }; + + propagatedBuildInputs = [ redis python-lzf ]; + + # No tests in published package + doCheck = false; + + meta = with stdenv.lib; { + description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON"; + homepage = https://github.com/sripathikrishnan/redis-rdb-tools; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index dfa31b30a7e..15c61da13c0 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -78,6 +78,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/jhen0409/react-native-debugger; license = licenses.mit; description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 95a9e78383f..a727eebe054 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.19.1-01"; + version = "3.20.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0kjzp5n6pkgx5s21jfmh6pbgnjlvs89kcjqikv4lgc5yia264bks"; + sha256 = "0l8fwcnpbc35lqadyrsljvr4rr5kp9gkx5dxs9i35mg2f0z9bagv"; }; preferLocalBuild = true; diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index b39425ad873..a87ef4d2228 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.51.1"; + version = "0.52.0"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "1agqfwac2av1b1c2bfzn0hw3178s4l94fadfx8a25dy1k87wmhfm"; + sha256 = "0rf5sg9136f4j7s07iz2gd481h8gzdd106jc1jw1p5pw4zaiz5l0"; }; - cargoSha256 = "09m0ki1ald1csfzfvlc63r6k8m9ndxy9js6mfwqyfm4lj8kpbr3f"; + cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7"; libclang = llvmPackages.libclang.lib; #for substituteAll diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 41fc993c62f..cec7a509dc1 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.16"; + version = "0.4.17"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0cf539y20hlwxbk0zfs1and99hkb0fqg7m3a6dfd80hwx0dm0xmx"; + sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id"; }; - cargoSha256 = "1bspciy7sfx887hwxmckrnjy7b6kpy6g51yraw25yl302mzzng21"; + cargoSha256 = "1dasyyy2nkr4i5nhlzlwij3b972h2a43j94kvlbc9kvnnb44aymn"; buildInputs = [ llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 00a2eb721df..843f2eeef3f 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -98,13 +98,15 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.24.2" +version = "0.25.1" dependencies = [ "ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "colored 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscript 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscriptsdk 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -112,11 +114,11 @@ dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "run_script 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "run_script 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rust_info 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -146,7 +148,7 @@ name = "ci_info" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -173,7 +175,7 @@ dependencies = [ [[package]] name = "colored" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -216,8 +218,23 @@ dependencies = [ ] [[package]] +name = "duckscript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "duckscriptsdk" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "duckscript 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "home 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "envmnt" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -292,7 +309,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -461,7 +478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "run_script" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -508,12 +525,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -586,7 +603,7 @@ name = "toml" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -656,12 +673,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum ci_info 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4e9091c3d285e7046afdb70fc7413d1ac670288705e151443f868f71e66ed2a" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum colored 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "433e7ac7d511768127ed85b0c4947f47a254131e37864b2dc13f52aa32cd37e5" +"checksum colored 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f930f8b286023ed451756fe2527d73484d667adf9e905e9932e81d52996a343a" "checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum envmnt 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "24c6fdfb01bf7386076c5f655278306bbbed4ecc8abe30981217a11079fe3f2b" +"checksum duckscript 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f34baed35ba3d92eaf95fd023b63f3206e429d408bb54bcd55c71e1e43c4cae8" +"checksum duckscriptsdk 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db947cb1b8ef6fc232027e03ab36487fa8bd210de7ec9b4e0e70637dc5b8acf0" +"checksum envmnt 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "39cdd9fdbf10b8cfa59dd70ef823cbaa83e33b86f4ad291ae67b16f4bd37bc69" "checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" "checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" "checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" @@ -692,15 +711,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" -"checksum run_script 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "61b3a5ed82e15afc3e238178e2d22113af69ac88bd64a04499f025478853937f" +"checksum run_script 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc7ecc900fbff3d58006c8a41a84e987f13c3d590bc7268d747245f4b19878dc" "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" "checksum rust_info 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e4e04a5022c08c95c2285b0beb4cdd24c9b20bc018a263d6fdb0372f7a597db" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" -"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" +"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" "checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" "checksum syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index e4cb070464c..909a711b3c3 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.24.2"; + version = "0.25.1"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "02fc3vf802dzqvyh61cmkjf3vqf5xsl8dhjggns7p5zr2aqh8pfi"; + sha256 = "176qidyp9vmqs3i252r6wrhd6ayxbykwjfh7010nil3hgwjvrmb2"; }; in runCommand "cargo-make-src" {} '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1x2pkis82hsikjqgma7f6wmkcmviiqwc7pvdpmww61iq2aqfg7ds"; + cargoSha256 = "1jzw24kc2i1p7775hi39db0ylbi5b4m40wnmldqvi8skcayh38ky"; # Some tests fail because they need network access. # However, Travis ensures a proper build. @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { description = "A Rust task runner and build tool"; homepage = "https://github.com/sagiegurari/cargo-make"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ma27 ]; + maintainers = with maintainers; [ xrelkd ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 8e08e5e50eb..fb71c2fbdff 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1g0vrkwkc8wsyiz04qchw07chg0mg451if02sr17s65chwmbrc19"; + sha256 = "0g82ikn5yricihl064q57dhrd4m475aykclrjf145hgl4qy2bjly"; }; cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75"; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 65d3006a3b8..de31057af14 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "racer"; - version = "2.1.27"; + version = "2.1.28"; src = fetchFromGitHub { owner = "racer-rust"; repo = "racer"; rev = "v${version}"; - sha256 = "1ajj515ck5n0mzig77xnq1qgb2s4gf6ahgd5mab91406jvij9qf3"; + sha256 = "1zifbcqy9hmcdbz7sl046l2631f5a3j65kyin38l7wm7vrqx9s3h"; }; - cargoSha256 = "0ki5j5gh59c92a0w43kzljpiamv2jvyk4m2w8qldfyl5kaa40dxb"; + cargoSha256 = "1ys1yb939y144lhjr451cpqrayqn66r0zp71xm90fkqxsbv7wkqv"; buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin Security; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/racer-rust/racer; license = licenses.mit; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d36306a0756..ffae05f1c74 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.20.2"; + version = "1.21.1"; src = fetchFromGitHub { owner = "rust-lang"; - repo = "rustup.rs"; + repo = "rustup"; rev = version; - sha256 = "0vfrfjfg5x1g44w03rdci2ky7s3s7rljdcmmp5h6pdvhzrd234aj"; + sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg"; }; - cargoSha256 = "1lsv1d99dn6mngaqhd3lw90cr3zg4gq08wi0adxkkhaikc9jjdwh"; + cargoSha256 = "0kn3sq99sgsh8msignyb4vjllv0wf1crqaw7sqp3ggmlkrdq35sd"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 9a87f5f9369..7bd3fa38332 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,51 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards, llvm, which }: +{ lib, fetchFromGitHub, crystal }: -stdenv.mkDerivation { +crystal.buildCrystalPackage rec { pname = "scry"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { - owner = "crystal-lang-tools"; - repo = "scry"; - rev = "543c1c3f764298f9fff192ca884d10f72338607d"; - sha256 = "1yq7jap3y5pr2yqc6fn6bxshzwv7dz3w97incq7wpcvi7ibb4lcn"; + owner = "crystal-lang-tools"; + repo = pname; + rev = "v${version}"; + sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; }; - patches = lib.optional (lib.versionAtLeast crystal.version "0.28") ./fix_for_crystal_0_28_and_above.patch; + shardsFile = ./shards.nix; + crystalBinaries.scry.src = "src/scry.cr"; - nativeBuildInputs = [ crystal shards llvm which ]; - - buildPhase = '' - runHook preBuild - - shards build --release - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin bin/scry - - runHook postInstall - ''; - - # https://github.com/crystal-lang-tools/scry/issues/138 - doCheck = false; - - checkPhase = '' - runHook preCheck - - crystal spec - - runHook postCheck - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "Code analysis server for the Crystal programming language"; - homepage = https://github.com/crystal-lang-tools/scry; + homepage = "https://github.com/crystal-lang-tools/scry"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg filalex77 ]; }; } diff --git a/pkgs/development/tools/scry/shards.nix b/pkgs/development/tools/scry/shards.nix new file mode 100644 index 00000000000..31660ef7cd2 --- /dev/null +++ b/pkgs/development/tools/scry/shards.nix @@ -0,0 +1,8 @@ +{ + lsp = { + owner = "crystal-lang-tools"; + repo = "lsp"; + rev = "v0.1.0"; + sha256 = "1sgsdgm2dmkp92a2lbaf2pgf80gljdlqzp9xkqvwz0rr92la6810"; + }; +} diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index c7bc96871f8..a455f9e5fc7 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { "AVR=avr-" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + nativeBuildInputs = [ which pkgconfig avrgcc ]; buildInputs = [ libelf freeglut libGLU libGL ] ++ stdenv.lib.optional stdenv.isDarwin GLUT; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 9958cb197ca..f6702229374 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -1,9 +1,12 @@ { stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: +let + # Update spirv-headers rev in lockstep according to DEPs file + version = "2019.4"; +in stdenv.mkDerivation rec { pname = "spirv-tools"; - # Update spirv-headers rev in lockstep according to DEPs file - version = "2019.4"; + inherit version; src = fetchFromGitHub { owner = "KhronosGroup"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - buildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DSPIRV-Headers_SOURCE_DIR=${spirv-headers.src}" ]; diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index 8683c75a696..9fbdc2e2e87 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0vhppvy5vphipbycfilzxdly7nw12brscz4biawf3bl376yp7ljm"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perlPackages.perl makeWrapper ]; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index f1a1ceb9bb1..8f4ee7ce6e5 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ libgit2 ]; diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix index 931c00ecce5..213c926521f 100644 --- a/pkgs/development/tools/tora/default.nix +++ b/pkgs/development/tools/tora/default.nix @@ -40,14 +40,9 @@ mkDerivation { ]; # these libraries are only searched for at runtime so we need to force-link them - NIX_LDFLAGS = [ - "-lgvc" - "-lmysqlclient" - "-lecpg" - "-lssl" - ]; + NIX_LDFLAGS = "-lgvc -lmysqlclient -lecpg -lssl"; - NIX_CFLAGS_COMPILE = [ "-L${libmysqlclient}/lib/mysql" "-I${libmysqlclient}/include/mysql" ]; + NIX_CFLAGS_COMPILE = "-L${libmysqlclient}/lib/mysql -I${libmysqlclient}/include/mysql"; qtWrapperArgs = [ ''--prefix PATH : ${lib.getBin graphviz}/bin'' diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 01531d23c78..5908ceb0f80 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation ]; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; meta = { description = "Command line utility to live-reload your application."; diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix new file mode 100644 index 00000000000..f52d790c106 --- /dev/null +++ b/pkgs/development/tools/unityhub/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: + +appimageTools.wrapType2 rec { + name = "unityhub"; + + extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr + alsaLib cups gnome2.GConf libcap fontconfig freetype pango + cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb + libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 + + libX11 libXcursor libXdamage libXfixes libXrender libXi + libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]); + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + src = fetchurl { + url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; + sha256 = "1rx7ih94ig3pd1yx1d3fpx7zpixq3j5birkpnzkh778qqsdrg0nf"; + }; + + meta = with stdenv.lib; { + homepage = https://unity3d.com/; + description = "Game development tool"; + longDescription = '' + Popular development platform for creating 2D and 3D multiplatform games + and interactive experiences. + ''; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ tesq0 ]; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index a7d9057d9f0..4ef723c9a1f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -25,6 +25,17 @@ let inherit version; }; } // lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix)); + + # This replaces the gem symlinks with directories, resolving this + # error when running vagrant (I have no idea why): + # /nix/store/p4hrycs0zaa9x0gsqylbk577ppnryixr-vagrant-2.2.6/lib/ruby/gems/2.6.0/gems/i18n-1.1.1/lib/i18n/config.rb:6:in `<module:I18n>': uninitialized constant I18n::Config (NameError) + postBuild = '' + for gem in "$out"/lib/ruby/gems/*/gems/*; do + cp -a "$gem/" "$gem.new" + rm "$gem" + mv "$gem.new" "$gem" + done + ''; }; in buildRubyGem rec { @@ -79,12 +90,7 @@ in buildRubyGem rec { ''; installCheckPhase = '' - if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then - echo 'Vagrant smoke check passed' - else - echo 'Vagrant smoke check failed' - return 1 - fi + HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null ''; # `patchShebangsAuto` patches this one script which is intended to run diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 3866483f9ed..cd06dc30fbe 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock-for-0.2.55.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,26 +1,26 @@ -From 26c538a9da9047597f9fd437d8b83502aca3f932 Mon Sep 17 00:00:00 2001 +From db555b49901f6f9175abaa8e4a6c4ea0253c0acb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Tue, 26 Nov 2019 22:40:30 +0100 -Subject: [PATCH] Add cargo.lock for 0.2.55 +Date: Tue, 7 Jan 2020 21:24:10 +0100 +Subject: [PATCH] Add cargo.lock --- - Cargo.lock | 2237 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 2237 insertions(+) + Cargo.lock | 2365 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 2365 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..f256688d +index 00000000..852644b8 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,2237 @@ +@@ -0,0 +1,2365 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "add" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -38,7 +38,7 @@ index 00000000..f256688d + +[[package]] +name = "anyhow" -+version = "1.0.23" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -83,8 +83,8 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -101,10 +101,11 @@ index 00000000..f256688d + +[[package]] +name = "atty" -+version = "0.2.13" ++version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -120,7 +121,7 @@ index 00000000..f256688d +dependencies = [ + "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -129,8 +130,8 @@ index 00000000..f256688d +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -162,7 +163,7 @@ index 00000000..f256688d + +[[package]] +name = "blake2b_simd" -+version = "0.5.9" ++version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -181,7 +182,7 @@ index 00000000..f256688d + +[[package]] +name = "bumpalo" -+version = "2.6.0" ++version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -201,14 +202,14 @@ index 00000000..f256688d +name = "canvas" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] +name = "cc" -+version = "1.0.47" ++version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -220,7 +221,7 @@ index 00000000..f256688d +name = "char" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -242,9 +243,9 @@ index 00000000..f256688d +name = "closures" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -266,15 +267,15 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] +name = "console_log" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -306,9 +307,10 @@ index 00000000..f256688d + +[[package]] +name = "crossbeam-queue" -+version = "0.2.0" ++version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ ++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -337,7 +339,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -350,12 +352,12 @@ index 00000000..f256688d +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -369,6 +371,11 @@ index 00000000..f256688d +] + +[[package]] ++name = "diff" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -378,7 +385,7 @@ index 00000000..f256688d +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -390,16 +397,16 @@ index 00000000..f256688d +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dom" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -420,7 +427,7 @@ index 00000000..f256688d +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -434,8 +441,8 @@ index 00000000..f256688d +dependencies = [ + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -452,9 +459,9 @@ index 00000000..f256688d +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -462,12 +469,12 @@ index 00000000..f256688d +name = "fetch" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "web-sys 0.3.35", +] + +[[package]] @@ -476,7 +483,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -522,12 +529,12 @@ index 00000000..f256688d + +[[package]] +name = "getrandom" -+version = "0.1.13" ++version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -548,7 +555,7 @@ index 00000000..f256688d +name = "guide-supported-types-examples" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -563,15 +570,15 @@ index 00000000..f256688d +name = "hello_world" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.3" ++version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -584,7 +591,7 @@ index 00000000..f256688d +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -592,7 +599,7 @@ index 00000000..f256688d +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -613,7 +620,7 @@ index 00000000..f256688d + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", @@ -625,7 +632,7 @@ index 00000000..f256688d +name = "import_js" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -640,28 +647,28 @@ index 00000000..f256688d + +[[package]] +name = "jpeg-decoder" -+version = "0.1.16" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "js-sys" -+version = "0.3.32" ++version = "0.3.35" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-test 0.3.5", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-test 0.3.8", +] + +[[package]] +name = "julia_set" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -676,7 +683,7 @@ index 00000000..f256688d + +[[package]] +name = "libc" -+version = "0.2.65" ++version = "0.2.66" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -684,10 +691,10 @@ index 00000000..f256688d +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -758,7 +765,7 @@ index 00000000..f256688d + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -769,7 +776,7 @@ index 00000000..f256688d +name = "no-std" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -835,8 +842,8 @@ index 00000000..f256688d +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -848,7 +855,7 @@ index 00000000..f256688d + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -859,10 +866,10 @@ index 00000000..f256688d + +[[package]] +name = "openssl-src" -+version = "111.6.0+1.1.1d" ++version = "111.6.1+1.1.1d" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -871,11 +878,11 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -888,8 +895,8 @@ index 00000000..f256688d +version = "0.1.0" +dependencies = [ + "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -984,7 +991,7 @@ index 00000000..f256688d + +[[package]] +name = "proc-macro2" -+version = "1.0.6" ++version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -992,7 +999,7 @@ index 00000000..f256688d + +[[package]] +name = "quick-error" -+version = "1.2.2" ++version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1008,7 +1015,7 @@ index 00000000..f256688d +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1017,7 +1024,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1030,7 +1037,7 @@ index 00000000..f256688d +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1041,7 +1048,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1058,8 +1065,8 @@ index 00000000..f256688d +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1101,7 +1108,7 @@ index 00000000..f256688d +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1133,7 +1140,7 @@ index 00000000..f256688d +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1145,7 +1152,7 @@ index 00000000..f256688d +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1170,21 +1177,21 @@ index 00000000..f256688d + +[[package]] +name = "rayon" -+version = "1.2.1" ++version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rayon-core" -+version = "1.6.1" ++version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1196,13 +1203,13 @@ index 00000000..f256688d +dependencies = [ + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", -+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "js-sys 0.3.35", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "web-sys 0.3.35", +] + +[[package]] @@ -1211,8 +1218,8 @@ index 00000000..f256688d +source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786" +dependencies = [ + "image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1267,8 +1274,8 @@ index 00000000..f256688d +name = "request-animation-frame" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -1282,9 +1289,9 @@ index 00000000..f256688d + "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1299,7 +1306,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1307,7 +1314,7 @@ index 00000000..f256688d +name = "rust-duck-typed-interfaces" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -1337,10 +1344,10 @@ index 00000000..f256688d +name = "sample" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-test 0.3.5", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-test 0.3.8", +] + +[[package]] @@ -1382,30 +1389,30 @@ index 00000000..f256688d + +[[package]] +name = "serde" -+version = "1.0.103" ++version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_derive" -+version = "1.0.103" ++version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_json" -+version = "1.0.42" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1420,7 +1427,7 @@ index 00000000..f256688d + +[[package]] +name = "smallvec" -+version = "1.0.0" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1429,7 +1436,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1441,7 +1448,7 @@ index 00000000..f256688d + +[[package]] +name = "strsim" -+version = "0.9.2" ++version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1456,10 +1463,10 @@ index 00000000..f256688d + +[[package]] +name = "syn" -+version = "1.0.8" ++version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1469,9 +1476,9 @@ index 00000000..f256688d +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1490,7 +1497,7 @@ index 00000000..f256688d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1536,7 +1543,7 @@ index 00000000..f256688d +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1559,9 +1566,9 @@ index 00000000..f256688d +dependencies = [ + "askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -1569,7 +1576,7 @@ index 00000000..f256688d +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1577,7 +1584,7 @@ index 00000000..f256688d +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1587,13 +1594,13 @@ index 00000000..f256688d + +[[package]] +name = "trybuild" -+version = "1.0.18" ++version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -1610,7 +1617,7 @@ index 00000000..f256688d +name = "typescript-tests" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] @@ -1634,7 +1641,7 @@ index 00000000..f256688d +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1664,7 +1671,7 @@ index 00000000..f256688d + +[[package]] +name = "vcpkg" -+version = "0.2.7" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1674,247 +1681,265 @@ index 00000000..f256688d + +[[package]] +name = "walrus" -+version = "0.13.0" ++version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "walrus-macro" -+version = "0.13.0" ++version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasi" -+version = "0.7.0" ++version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "wasm-bindgen" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-macro 0.2.55", -+ "wasm-bindgen-test 0.3.5", ++ "js-sys 0.3.35", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-macro 0.2.58", ++ "wasm-bindgen-test 0.3.8", + "wasm-bindgen-test-crate-a 0.1.0", + "wasm-bindgen-test-crate-b 0.1.0", +] + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-shared 0.2.55", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-shared 0.2.58", +] + +[[package]] +name = "wasm-bindgen-benchmark" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", ++ "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", + "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-cli-support 0.2.55", -+ "wasm-bindgen-shared 0.2.55", ++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-cli-support 0.2.58", ++ "wasm-bindgen-shared 0.2.58", ++ "wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-anyref-xform 0.2.55", -+ "wasm-bindgen-multi-value-xform 0.2.55", -+ "wasm-bindgen-shared 0.2.55", -+ "wasm-bindgen-threads-xform 0.2.55", -+ "wasm-bindgen-wasm-conventions 0.2.55", -+ "wasm-bindgen-wasm-interpreter 0.2.55", -+ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-anyref-xform 0.2.58", ++ "wasm-bindgen-multi-value-xform 0.2.58", ++ "wasm-bindgen-shared 0.2.58", ++ "wasm-bindgen-threads-xform 0.2.58", ++ "wasm-bindgen-wasm-conventions 0.2.58", ++ "wasm-bindgen-wasm-interpreter 0.2.58", ++ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.5" ++version = "0.4.8" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-test 0.3.5", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-test 0.3.8", ++ "web-sys 0.3.35", +] + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-macro-support 0.2.55", ++ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-macro-support 0.2.58", +] + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.55", -+ "wasm-bindgen-shared 0.2.55", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.58", ++ "wasm-bindgen-shared 0.2.58", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-paint" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.55" ++version = "0.2.58" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.5" ++version = "0.3.8" +dependencies = [ + "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", ++ "js-sys 0.3.35", + "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-test-macro 0.3.5", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-test-macro 0.3.8", +] + +[[package]] +name = "wasm-bindgen-test-crate-a" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] +name = "wasm-bindgen-test-crate-b" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "wasm-bindgen 0.2.58", +] + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.5" ++version = "0.3.8" +dependencies = [ -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-wasm-conventions 0.2.55", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-wasm-conventions 0.2.58", +] + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.55" ++version = "0.2.58" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen-backend 0.2.55", ++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasm-bindgen-backend 0.2.58", + "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1922,62 +1947,85 @@ index 00000000..f256688d +name = "wasm-in-wasm" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", +] + +[[package]] -+name = "wasm-webidl-bindings" -+version = "0.6.0" ++name = "wasm2js" ++version = "0.1.0" ++dependencies = [ ++ "wasm-bindgen 0.2.58", ++] ++ ++[[package]] ++name = "wasmparser" ++version = "0.42.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wasmprinter" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wast" ++version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", -+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "wasm2js" -+version = "0.1.0" ++name = "wast" ++version = "5.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "wasm-bindgen 0.2.55", ++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "wasmparser" -+version = "0.39.3" ++name = "wat" ++version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "web-sys" -+version = "0.3.32" ++version = "0.3.35" +dependencies = [ -+ "anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", ++ "js-sys 0.3.35", + "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-futures 0.4.5", -+ "wasm-bindgen-test 0.3.5", -+ "wasm-bindgen-webidl 0.2.55", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-futures 0.4.8", ++ "wasm-bindgen-test 0.3.8", ++ "wasm-bindgen-webidl 0.2.58", +] + +[[package]] +name = "webaudio" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] +name = "webgl" +version = "0.1.0" +dependencies = [ -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -1985,18 +2033,18 @@ index 00000000..f256688d +version = "0.1.0" +dependencies = [ + "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "js-sys 0.3.32", -+ "wasm-bindgen 0.2.55", -+ "wasm-bindgen-test 0.3.5", -+ "wasm-bindgen-webidl 0.2.55", ++ "js-sys 0.3.35", ++ "wasm-bindgen 0.2.58", ++ "wasm-bindgen-test 0.3.8", ++ "wasm-bindgen-webidl 0.2.58", +] + +[[package]] +name = "websockets" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] @@ -2044,25 +2092,94 @@ index 00000000..f256688d +] + +[[package]] ++name = "wit-parser" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wit-printer" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wit-schema-version" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "wit-text" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wit-validator" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wit-walrus" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wit-writer" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "without-a-bundler" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[[package]] +name = "without-a-bundler-no-modules" +version = "0.1.0" +dependencies = [ -+ "wasm-bindgen 0.2.55", -+ "web-sys 0.3.32", ++ "wasm-bindgen 0.2.58", ++ "web-sys 0.3.35", +] + +[metadata] +"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" +"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum anyhow 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1072d8f55592084072d2d3cb23a4b680a8543c00f10d446118e85ad3718142" ++"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c" +"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" @@ -2070,7 +2187,7 @@ index 00000000..f256688d +"checksum askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083" +"checksum askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71" +"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" -+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" @@ -2078,12 +2195,12 @@ index 00000000..f256688d +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" ++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708" ++"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4" +"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" ++"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" +"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" @@ -2093,12 +2210,13 @@ index 00000000..f256688d +"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" +"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" -+"checksum crossbeam-queue 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfd6515864a82d2f877b42813d4553292c6659498c9a2aa31bab5a15243c2700" ++"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" +"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" +"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" +"checksum curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340" +"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" ++"checksum diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" +"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" +"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" @@ -2115,11 +2233,11 @@ index 00000000..f256688d +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a" +"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" -+"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" ++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +"checksum gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f" +"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" -+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" ++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" +"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" @@ -2127,10 +2245,10 @@ index 00000000..f256688d +"checksum image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158" +"checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" +"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -+"checksum jpeg-decoder 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c1aae18ffeeae409c6622c3b6a7ee49792a7e5a062eea1b135fbb74e301792ba" ++"checksum jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" -+"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" ++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" +"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" @@ -2151,7 +2269,7 @@ index 00000000..f256688d +"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" +"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" +"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-src 111.6.0+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "b9c2da1de8a7a3f860919c01540b03a6db16de042405a8a07a5e9d0b4b825d9c" ++"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" +"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" @@ -2165,8 +2283,8 @@ index 00000000..f256688d +"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -+"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" -+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" ++"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc" ++"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" @@ -2185,8 +2303,8 @@ index 00000000..f256688d +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+"checksum rayon 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "43739f8831493b276363637423d3622d4bd6394ab6f0a9c4a552e208aeb7fddd" -+"checksum rayon-core 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8bf17de6f23b05473c437eb958b9c850bfc8af0961fe17b4cc92d5a627b4791" ++"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098" ++"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" +"checksum raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)" = "<none>" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" @@ -2206,17 +2324,17 @@ index 00000000..f256688d +"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -+"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" -+"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" -+"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043" ++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" ++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" ++"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7" +"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86" ++"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" +"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" +"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" -+"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" ++"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -+"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" ++"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8" +"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" +"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" @@ -2229,7 +2347,7 @@ index 00000000..f256688d +"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" -+"checksum trybuild 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "b75e31d624df08744532e935f1d4bfedd319a277d5a162c5b15f6ced59307575" ++"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f" +"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" @@ -2238,19 +2356,29 @@ index 00000000..f256688d +"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" ++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485" -+"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76" -+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" -+"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1" -+"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470" ++"checksum walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410" ++"checksum walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" ++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++"checksum wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d" ++"checksum wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89101d1890503f4d87cc0512ff2568c00d6c13ed9de3880569e5c9c21556c06c" ++"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1" ++"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372" ++"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192" +"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164" +"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9" ++"checksum wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6bb31e17473db76d44713485a85dec22d7786958a9a9b9693cfe0d7162c1b4f5" ++"checksum wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f" ++"checksum wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a" ++"checksum wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5" ++"checksum wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "676e5641088526a9bdcab24dc2f675f464f4ca1a4714aa90307464aa6658b5ba" ++"checksum wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a" ++"checksum wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8" -- -2.23.0 +2.23.1 diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 26f37c5dc74..e949da2cf7e 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.55"; + version = "0.2.58"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "13pcfrdf3nk4mrc7lqpz9qjdh7gfpqf849iywcyjk3f9y8sm46ii"; + sha256 = "18n30i1pzrhm2wasa1737j9gihx1d6pwx77z552dcj1rdp7ar6ir"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "0mpq40llddqj7syi07pfhr48kndx35f1hyf5pvx5zdnfz29a924v"; - cargoPatches = [ ./0001-Add-cargo.lock-for-0.2.55.patch ]; + cargoSha256 = "1kkvgqvn08pv0654b7s40vs92myzfiv965561mwfzhj8fx8f1y18"; + cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 3384dac5410..154b228e0e1 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.19.2"; + version = "1.21.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "05sjf7pgdj3hh92j2xxl683frrkiw1rqxs72z3an4gb83nllvi0n"; + sha256 = "1yw3v62a6309f9hr189870i9jw2a15pkians1nnfjqczzh7r5pih"; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 22887a44aff..a3b975e3718 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.17.0"; - sha256 = "13n5cvb340ba7vwm8il7bjrmpz89h6cibhk9rc3kq9ymdgbnf9j1"; + version = "10.18.0"; + sha256 = "1ppycqffsy7ix6whdp6id7ld1qizwvjlzxyk12kxw4wphjmn49hb"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index fbec83c387a..8f84d24f70b 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "12.13.1"; - sha256 = "14mia71sr8p0ibz9g4j5xb5qwmik36qi5nhabjbv0sy2kirkm7il"; + version = "12.14.1"; + sha256 = "1nvsivl496fgaypbk2pqqh7py29g7wsggyjlqydy1c0q4f24nyw7"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index f5e9952233b..1c32310a82d 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -1,12 +1,10 @@ -{ stdenv, callPackage, openssl, icu, enableNpm ? true }: +{ callPackage, openssl, icu, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; - version = "13.3.0"; - sha256 = "0j36jf0ybq470w91kzg28bcmxlml7ccl4swwklb6x1ibkz697np7"; - - patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ]; + version = "13.6.0"; + sha256 = "0jf9nn5i1bijmrcgjvkp37fyz63lwwmxjh7nxipn2vw2qdx6ngsm"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 7c56cd827ca..3a0a8f34356 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.12.0"; + version = "7.14.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0sz7cidajrsj43vq5g8jrkxlrp97r7n8dfr9gp8l0wxnidiqm401"; + sha256 = "0565qvn5bnx1mc1ibxrqszzvls0gkg10js55439lwygfhkal0lvy"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 841a6ebecb0..6208bff15bc 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -53,7 +53,7 @@ perlPackages.buildPerlPackage { enableParallelBuilding = false; - installTargets = "install"; + installTargets = [ "install" ]; meta = with stdenv.lib; { homepage = "https://www.shlomifish.org/open-source/projects/website-meta-language/"; diff --git a/pkgs/development/web/woff2/brotli-static.patch b/pkgs/development/web/woff2/brotli-static.patch new file mode 100644 index 00000000000..4ed6d7e741a --- /dev/null +++ b/pkgs/development/web/woff2/brotli-static.patch @@ -0,0 +1,36 @@ +diff a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake +--- a/cmake/FindBrotliDec.cmake ++++ b/cmake/FindBrotliDec.cmake +@@ -18,10 +18,10 @@ find_path(BROTLIDEC_INCLUDE_DIRS + HINTS ${PC_BROTLIDEC_INCLUDEDIR} + ) + +-find_library(BROTLIDEC_LIBRARIES +- NAMES brotlidec +- HINTS ${PC_BROTLIDEC_LIBDIR} +-) ++if(NOT BUILD_SHARED_LIBS) ++ set(_S "STATIC_") ++endif() ++set(BROTLIDEC_LIBRARIES ${PC_BROTLIDEC_${_S}LIBRARIES}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BrotliDec +diff a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake +--- a/cmake/FindBrotliEnc.cmake ++++ b/cmake/FindBrotliEnc.cmake +@@ -18,10 +18,10 @@ find_path(BROTLIENC_INCLUDE_DIRS + HINTS ${PC_BROTLIENC_INCLUDEDIR} + ) + +-find_library(BROTLIENC_LIBRARIES +- NAMES brotlienc +- HINTS ${PC_BROTLIENC_LIBDIR} +-) ++if(NOT BUILD_SHARED_LIBS) ++ set(_S "STATIC_") ++endif() ++set(BROTLIENC_LIBRARIES ${PC_BROTLIENC_${_S}LIBRARIES}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BrotliEnc diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix index b77184e5652..ff0484547fc 100644 --- a/pkgs/development/web/woff2/default.nix +++ b/pkgs/development/web/woff2/default.nix @@ -1,4 +1,4 @@ -{ brotli, cmake, fetchFromGitHub, stdenv }: +{ brotli, cmake, pkgconfig, fetchFromGitHub, stdenv, static ? false }: stdenv.mkDerivation rec { pname = "woff2"; @@ -13,18 +13,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - nativeBuildInputs = [ cmake ]; + # Need to explicitly link to brotlicommon + patches = stdenv.lib.optional static ./brotli-static.patch; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] + ++ stdenv.lib.optional static "-DCMAKE_SKIP_RPATH:BOOL=TRUE"; propagatedBuildInputs = [ brotli ]; - # without this binaries only get built if shared libs are disable - patchPhase = '' + postPatch = '' + # without this binaries only get built if shared libs are disable sed 's@^if (NOT BUILD_SHARED_LIBS)$@if (TRUE)@g' -i CMakeLists.txt ''; meta = with stdenv.lib; { description = "Webfont compression reference code"; - homepage = https://github.com/google/woff2; + homepage = "https://github.com/google/woff2"; license = licenses.mit; maintainers = [ maintainers.hrdinka ]; platforms = platforms.unix; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 8102235d88e..42464f71ae3 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${xorgproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 19d2a01b472..408f2817854 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper SDL SDL_image ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; installPhase = '' ls -l diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 46eb054bc8e..309ea244d71 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ncurses5 ]; - installFlags = "bindir=$(out)/bin"; + installFlags = [ "bindir=$(out)/bin" ]; meta = with stdenv.lib; { homepage = http://rephial.org/; diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index edb739125c0..57373d39b54 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; }; - NIX_LDFLAGS = [ "-lSDL_image" ]; + NIX_LDFLAGS = "-lSDL_image"; enableParallelBuilding = true; diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index b1d8a27b5a2..ced19bffb31 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (common // rec { substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy"; + makeFlags = common.makeFlags ++ [ "LUA=1" ]; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 3241e6dd387..ac7d61b31c7 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "1.0.0"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b"; + sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4"; }; - NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2"; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_ttf}/include/SDL2" + ''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"'' + ]; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; @@ -22,8 +25,10 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications mv devilutionx.app $out/Applications '' else '' - mkdir -p $out/bin - cp devilutionx $out/bin + install -Dm755 -t $out/bin devilutionx + install -Dt $out/share/fonts/truetype ../Packaging/resources/CharisSILB.ttf + + # TODO: icons and .desktop (see Packages/{debian,fedora}/*) '') + '' runHook postInstall diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 206ed02e69c..af6bc4be393 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -19,11 +19,8 @@ stdenv.mkDerivation { patchShebangs ./configure ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; - - NIX_LDFLAGS = [ - "-ldl" - ]; + NIX_CFLAGS_COMPILE = "-fpermissive"; + NIX_LDFLAGS = "-ldl"; meta = { homepage = http://www.bergo.eng.br/eboard/; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index e305505d62c..242e0930db3 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -41,10 +41,7 @@ in stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2.dev}/include/SDL2" - "-I${SDL2_mixer}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 3cd2dc5827b..c8a5f380900 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { ''; */ - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = { description = "3D dungeon crawling adventure"; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index cee9be00a3a..17d503de1f7 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -3,8 +3,8 @@ let major = "2019"; - minor = "05"; - patch = "21"; + minor = "11"; + patch = "01"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "0q6in9rfs3b3qrfj2j6aj64z110k1yall4iqpp68rpp9r1dsh26p"; + sha256 = "1sc1z9n99jspa8jnk0pwdzynnadvcmb3pxl5cndw3z90xjwpzivw"; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "0v2xz1wlji6m6311r3vpkdil3a7l1w5nsz5yqd1l8bimy11rdr55"; + sha256 = "09jizc6h7jbsp8bzv05pvb5z24zadjzjx1slj5317axsb170v81p"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 58fdaeb8f74..07f84d7a151 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; postInstall = '' diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 3dbd7bd928b..788280fd820 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp"; }; - makeFlags = ''CC=cc PREFIX=$(out) CURSES=-lncurses''; + makeFlags = [ "CC=cc" "PREFIX=$(out)" "CURSES=-lncurses" ]; buildInputs = [ ncurses ]; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index b953aad606d..45c5013705f 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -41,9 +41,7 @@ stdenv.mkDerivation rec { sconsFlags+=" DATADIR=$out/share/globulation2/glob2" ''; - NIX_LDFLAGS = [ - "-lboost_system" - ]; + NIX_LDFLAGS = "-lboost_system"; meta = with stdenv.lib; { description = "RTS without micromanagement"; diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index 78936ec1949..e51c326da19 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { else if stdenv.isDarwin then "gmad_osx" else "gmad"; - premakeFlags = "--bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include"; + premakeFlags = [ "--bootil_lib=${bootil}/lib" "--bootil_inc=${bootil}/include" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 4bf460836d9..af2e924960a 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ SDL SDL_image SDL_mixer ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { homepage = https://jump.gnu.sinusoid.es/index.php?title=Main_Page; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix new file mode 100644 index 00000000000..d5d4f5c4015 --- /dev/null +++ b/pkgs/games/gweled/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchbzr, intltool +, gtk2, wrapGAppsHook, autoreconfHook, pkgconfig +, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "gweled"; + version = "unstable-2018-02-15"; + + src = fetchbzr { + url = "lp:gweled"; + rev = "94"; + sha256 = "01c38y4df5a06wqbsmsn8ysxx7hav9yvw6zdwbc9m5m55z7vmdb8"; + }; + + doCheck = false; + + nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkgconfig ]; + + buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; + + configureFlags = [ "--disable-setgid" ]; + + meta = with stdenv.lib; { + description = "Bejeweled clone game"; + homepage = "https://gweled.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.genesis ]; + }; +} diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 34819f90f52..c0aea8927b9 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gzdoom"; - version = "4.2.4"; + version = "4.3.1"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "1mkfpa3mx1rpd6lywdcqcf0y9ydzr1jxpk330kl9lxw59xihk0pc"; + sha256 = "1fpdwgm6qx66q1kqg1x32lcm61hk3a033lhagk819kicdsib90b7"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" "-lfluidsynth" ]; + NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; preConfigure = '' sed -i \ @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { for i in *.pk3; do install -Dm644 "$i" "$out/lib/gzdoom/$i" done + for i in fm_banks/*; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done + for i in soundfonts/*; do + install -Dm644 "$i" "$out/lib/gzdoom/$i" + done mkdir $out/bin makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom ''; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index b4f5e4f7f63..09ecd4279e4 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "10.5e"; + version = "11.2d"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; - rev = "v${version}"; - sha256 = "1sjr26if3xv8xv52app1hkxs0bbgbviagydm4mdwbxjpd6v3d1aa"; + rev = stdenv.lib.strings.stringAsChars (x: if x == "." then "" else x) "v${version}"; + sha256 = "0aj4xy5xjdj32l5mk8796ldh9d7h8rx35kgc1vr7acb4fhpppb0f"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 0a7474e0f51..8acab2eed0e 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng, pcre }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng +, pcre, graphicsmagick, makeDesktopItem }: stdenv.mkDerivation rec { @@ -12,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0mavmwikfsyr5sp65sl8dqknl1yz7c7ds53y1qkma24vsikz3k64"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig graphicsmagick ]; buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ]; @@ -24,6 +25,26 @@ stdenv.mkDerivation rec { # Help CMake find SDL_mixer.h NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2"; + # Create "ivan.desktop" file + ivanDesktop = makeDesktopItem { + name = pname; + exec = pname; + icon = "ivan.png"; + desktopName = "IVAN"; + genericName = pname; + categories = "Game;AdventureGame;RolePlaying;"; + comment = meta.description; + }; + + # Create appropriate directories. Convert "Icon.bmp" to "ivan.png", then copy + # it and "ivan.desktop" to these directories. + postInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/32x32/apps + gm convert $src/Graphics/Icon.bmp $out/share/icons/hicolor/32x32/apps/ivan.png + cp ${ivanDesktop}/share/applications/* $out/share/applications + ''; + meta = with stdenv.lib; { description = "Graphical roguelike game"; longDescription = '' diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 505d98c92db..dc6ebd396ed 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, boost, liboauth, jsoncpp -, htmlcxx, rhash, tinyxml-2, help2man }: +, htmlcxx, rhash, tinyxml-2, help2man, fetchpatch }: stdenv.mkDerivation rec { pname = "lgogdownloader"; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml-2 ]; + patches = [ + # Fix find_path for newer jsoncpp. Remove with the next release + (fetchpatch { + url = "https://github.com/Sude-/lgogdownloader/commit/ff353126ecda61824cf866d3807c9ebada96282e.patch"; + sha256 = "1xr1lwxlrncrj662s9l1is1x1mhs1jbwlj8qafixz5hw2kx22w19"; + }) + ]; + meta = { homepage = https://github.com/Sude-/lgogdownloader; description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 2639765c5d1..7879b68c857 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { description = "Mascot Constructive Pilot for X"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 4654456bd6c..f286c359e6f 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -40,7 +40,7 @@ let "-DOpenGL_GL_PREFERENCE=GLVND" ]; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 nativeBuildInputs = [ cmake doxygen graphviz ]; @@ -48,7 +48,7 @@ let irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm - ] ++ optional buildServer [ + ] ++ optionals buildServer [ leveldb postgresql hiredis ]; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 779d9a98522..5c65203c93a 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "mnemosyne"; - version = "2.6.1"; + version = "2.7"; src = fetchurl { url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; - sha256 = "0xcwikq51abrlqfn5bv7kcw1ccd3ip0w6cjd5vnnzwnaqwdj8cb3"; + sha256 = "0lx70vl3pa3c42lr59s459b2bqi7fm0c80lsm06l34ggfwdadq24"; }; nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ]; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 618e78553a5..2ad23a72368 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { configureFlags = [ "--no-werror" ]; # Without this libvorbisfile.so is not getting linked properly for some reason. - NIX_CFLAGS_LINK = [ "-lvorbisfile" ]; + NIX_CFLAGS_LINK = "-lvorbisfile"; preBuild = '' sed -i 's/.dll//g' Makefile diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index d59afc330a7..f6841abb1d0 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ogre cegui boost sfml openal ois ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; diff --git a/pkgs/games/openra/common.nix b/pkgs/games/openra/common.nix index b0d1f2a5455..51f94177177 100644 --- a/pkgs/games/openra/common.nix +++ b/pkgs/games/openra/common.nix @@ -69,7 +69,7 @@ in { python ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; doCheck = true; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index de05e1944f3..b00524461a4 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_LINK = [ "-lopenal" ]; + NIX_CFLAGS_LINK = "-lopenal"; meta = with stdenv.lib; { description = "A compatible client of Ace of Spades 0.75"; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index d0828b8811b..704ef3c327e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - makeFlags = "INSTALL_PERSONAL_DIR="; + makeFlags = [ "INSTALL_PERSONAL_DIR=" ]; postInstall = '' mv $out/games/ $out/bin diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 640a4d761f4..628493a34b1 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; }) ]; - makeFlags = "PREFIX=${placeholder "out"}"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; dontUseSconsInstall = true; meta = { inherit (s) version; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index e32bc06b8f5..2e4ce270b82 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "pokerth.pro" ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; enableParallelBuilding = true; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 85424ebea9b..48c06c0eab6 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -1,39 +1,48 @@ -{ fetchurl, python2, stdenv }: - -with python2.pkgs; +{ stdenv, fetchzip, buildPythonApplication, python3Packages + , desktop-file-utils, freecell-solver }: buildPythonApplication rec { pname = "PySolFC"; - version = "2.0"; + version = "2.6.4"; - src = fetchurl { - url = "mirror://sourceforge/pysolfc/${pname}-${version}.tar.bz2"; - sha256 = "0v0v8iflw55f5mghglkw80j8b7lv1hffjassfhqc4y84dmz8xjyv"; + src = fetchzip { + url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz"; + sha256 = "1bd84law5b1yga3pryggdvlfvm0l62gci2q8y3q79cysdk3z4w3z"; }; - patches = [ - ./pysolfc-datadir.patch + cardsets = fetchzip { + url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2"; + sha256 = "0h0fibjv47j8lkc1bwnlbbvrx2nr3l2hzv717kcgagwhc7v2mrqh"; + }; + + propagatedBuildInputs = with python3Packages; [ + tkinter six random2 + # optional : + pygame freecell-solver pillow ]; - propagatedBuildInputs = [ - tkinter + patches = [ + ./pysolfc-datadir.patch ]; - # No tests in archive - doCheck = false; + nativeBuildInputs = [ desktop-file-utils ]; + postPatch = '' + desktop-file-edit --set-key Icon --set-value ${placeholder "out"}/share/icons/pysol01.png data/pysol.desktop + desktop-file-edit --set-key Comment --set-value "${meta.description}" data/pysol.desktop + ''; postInstall = '' - # executables should not have an extension - pushd $out/bin - mv pysol.py pysol - rm pysol.pyc - popd + mkdir $out/share/PySolFC/cardsets + cp -r $cardsets/* $out/share/PySolFC/cardsets ''; + # No tests in archive + doCheck = false; + meta = with stdenv.lib; { description = "A collection of more than 1000 solitaire card games"; - homepage = http://pysolfc.sourceforge.net/; + homepage = https://pysolfc.sourceforge.io; license = licenses.gpl3; - maintainers = with maintainers; [ kierdavis ]; + maintainers = with maintainers; [ kierdavis genesis ]; }; } diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index c8af2331b08..1e27d67eb03 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; # Fix build for recent ncurses versions - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; meta = with stdenv.lib; { homepage = http://rogue.rogueforge.net/rogue-5-4/; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 77d1888b86e..9b6ca4f7c05 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: - stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "runelite"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - sha256 = "0q2xx0wrnlg5mrv8nnmnh300r8mqfm8k2p028m7mr09kn18xvkzx"; + sha256 = "0q0x8g43ggkvp5fgnymgygx59xfhnyyrhpi6ha333gqg97rr0rvw"; }; icon = fetchurl { - url = "https://github.com/runelite/runelite/raw/master/runelite-client/src/main/resources/runelite.png"; - sha256 = "0fxzkpsin09giqp7h8z0plxznk5d5j60sv34v1lw61p7d5y2izvr"; + url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; + sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1"; }; desktop = makeDesktopItem { @@ -43,11 +43,11 @@ --add-flags "-jar $out/share/runelite/RuneLite.jar" ''; - meta = { + meta = with lib; { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.kmeakin ]; - platforms = lib.platforms.all; + license = licenses.bsd2; + maintainers = with maintainers; [ kmeakin ]; + platforms = platforms.all; }; - } +} diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index a2859c11712..c86df396ff1 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fftw=${fftwSinglePrec.dev}" ]; - NIX_LDFLAGS = [ "-lopenal" ]; + NIX_LDFLAGS = "-lopenal"; meta = with stdenv.lib; { homepage = http://scorched3d.co.uk/; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 426be1f214a..9229f4fbc93 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -79,6 +79,7 @@ in buildFHSUserEnv rec { # Not formally in runtime but needed by some games at-spi2-atk + at-spi2-core # CrossCode gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index eea92b43b52..07ca9223bb0 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postUnpack = "sourceRoot+=/src"; makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; - buildFlags = "build "; + buildFlags = [ "build" ]; enableParallelBuilding = true; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index df6901585bb..3b33296892f 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "supertux"; - version = "0.6.0"; + version = "0.6.1.1"; src = fetchurl { url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; - sha256 = "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4"; + sha256 = "0n36qxwjlkdlksximz4s729az6pry2sdjavwgm7m65vfgdiz139f"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index fef3350a061..949f5a3e2ab 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -91,7 +91,7 @@ EOF enableParallelBuilding = true; sconsFlags = [ "BUILD=release" "TARGET_ARCH=x64" ]; - NIX_CFLAGS_COMPILE = ["-Wno-error=format-security"]; + NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; meta = with stdenv.lib; { description = "The Dark Mod - stealth FPS inspired by the Thief series"; homepage = "http://www.thedarkmod.com"; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index dc696d05558..9b58725a392 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, zlib, pcre }: +{ stdenv, fetchurl, lib, zlib, pcre +, tlsSupport ? true, gnutls ? null +# ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB +}: + +assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { name = "tintin-2.01.92"; @@ -8,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0id8rd2yhh6ccjnlwyixflsay1rq3sw6pwlhz1ic3nzj22cd91ik"; }; - buildInputs = [ zlib pcre ]; + nativeBuildInputs = lib.optional tlsSupport gnutls.dev; + buildInputs = [ zlib pcre ] ++ lib.optional tlsSupport gnutls; preConfigure = '' cd src diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index 9971aa0d166..b31b53922ff 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.6.1"; + version = "1.6.5"; src = fetchurl { url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; - sha256 = "0c5a2bdyfccwkqnb6yqvzggyi2nk032v01kfc00zlgpdfzljcb9i"; + sha256 = "0ifi057idid8xq7af8ybs99b6939hyfif1ml1ihjpx02vinmd419"; }; prePatch = '' @@ -41,11 +41,7 @@ in stdenv.mkDerivation rec { # disable parallel building as it caused sporadic build failures enableParallelBuilding = false; - NIX_CFLAGS_COMPILE = [ - "-I${SDL2.dev}/include/SDL2" - "-I${SDL2_image}/include/SDL2" - "-I${SDL2_ttf}/include/SDL2" - ]; + NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2"; makeFlags = [ "config=release" ]; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index fc9bc985c00..7ea83f80fef 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cd .. ''; patches = [ ./parse.patch ]; - patchFlags = "-p 0"; + patchFlags = [ "-p" "0" ]; NIX_LD_FLAGS = '' -rpath ${stdenv.cc}/lib -rpath ${stdenv.cc}/lib64 diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index 7f552bdd5d6..fdc28d3a539 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - makeFlags = "INSTALL=install"; + makeFlags = [ "INSTALL=install" ]; meta = { description = "Terminal-based Tetris clone by Victor Nilsson"; diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index 119cd8f0876..8a6d4cf14cd 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXpm libXt motif ]; - NIX_CFLAGS_LINK = [ "-lXpm" ]; + NIX_CFLAGS_LINK = "-lXpm"; configureFlags = [ "--with-x" diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 946bff79f97..54d6c320f18 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -9,10 +9,9 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXaw ]; - preBuild = '' - substituteInPlace Makefile \ - --replace /usr/local $out - ''; + makeFlags = [ + "INSTDIR=${placeholder ''out''}" + ]; meta = with stdenv.lib; { homepage = http://www.gedanken.org.uk/software/xbomb/; diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 257b0010245..4a1c25ee12e 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { libX11 SDL SDL_ttf SDL_image libGLU libGL expat zlib ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; meta = { description = ''A multiplayer space combat game (client part)''; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 383bdb88284..086aaded9aa 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* MANPATH .*| MANPATH = $out/man|" ''; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { inherit (s) version; description = ''Famous german card game''; diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 449d7ae6e2d..827fb351f1d 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -4,21 +4,15 @@ stdenv.mkDerivation rec { name = "zoom-1.1.5"; - + src = fetchurl { url = "https://www.logicalshift.co.uk/unix/zoom/${name}.tar.gz"; sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; }; - + buildInputs = [ perl expat xlibsWrapper freetype ]; - - NIX_CFLAGS_COMPILE = [ - # Zoom doesn't add the right directory in the include path. - "-I" (freetype + "/include/freetype2") - # for gcc5; c11 inline semantics breaks the build - "-fgnu89-inline" - ]; + NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; meta = with stdenv.lib; { description = "Player for Z-Code, TADS and HUGO stories or games"; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 5ff131dad9d..27bef4cae44 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pkgsCross, buildPackages }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, pkgsCross, buildPackages }: let buildArmTrustedFirmware = { filesToInstall , installDir ? "$out" - , platform + , platform ? null , extraMakeFlags ? [] , extraMeta ? {} , version ? "2.1" , ... } @ args: stdenv.mkDerivation ({ - name = "arm-trusted-firmware-${platform}-${version}"; + name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}"; inherit version; src = fetchFromGitHub { @@ -25,16 +25,18 @@ let # For Cortex-M0 firmware in RK3399 nativeBuildInputs = [ pkgsCross.arm-embedded.stdenv.cc ]; + buildInputs = [ openssl ]; + makeFlags = [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - "PLAT=${platform}" - ] ++ extraMakeFlags; + ] ++ (lib.optional (platform != null) "PLAT=${platform}") + ++ extraMakeFlags; installPhase = '' runHook preInstall mkdir -p ${installDir} - cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir} + cp ${lib.concatStringsSep " " filesToInstall} ${installDir} runHook postInstall ''; @@ -45,7 +47,7 @@ let # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory enableParallelBuilding = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/ARM-software/arm-trusted-firmware; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; @@ -56,6 +58,22 @@ let in { inherit buildArmTrustedFirmware; + armTrustedFirmwareTools = buildArmTrustedFirmware rec { + extraMakeFlags = [ + "HOSTCC=${stdenv.cc.targetPrefix}gcc" + "fiptool" "certtool" "sptool" + ]; + filesToInstall = [ + "tools/fiptool/fiptool" + "tools/cert_create/cert_create" + "tools/sptool/sptool" + ]; + postInstall = '' + mkdir -p "$out/bin" + find "$out" -type f -executable -exec mv -t "$out/bin" {} + + ''; + }; + armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; @@ -85,4 +103,11 @@ in { extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; }; + + armTrustedFirmwareS905 = buildArmTrustedFirmware rec { + extraMakeFlags = [ "bl31" ]; + platform = "gxbb"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = [ "build/${platform}/release/bl31.bin"]; + }; } diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index ce097bd5f23..b98560992e3 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; - makeFlags = "INSTALL_DIR=\${out}/bin/ MAN_DIR=\${out}/man/man1/"; + makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index f38ed7f0309..0c91b782117 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = ''configureFlags="--with-cupsbackenddir=$out/lib/cups/backend"''; buildInputs = [cups]; - NIX_CFLAGS_COMPILE = "-include stdio.h"; + NIX_CFLAGS_COMPILE = [ "-include stdio.h" "-Wno-error=stringop-truncation" ]; meta = { description = "CUPS back-end for Canon printers"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 29586f3fb55..13bb63ca709 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -245,7 +245,7 @@ stdenv.mkDerivation rec { }) ./firmware_location.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; configureFlags = [ "--enable-dependency-reduction" "--disable-frontend"]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index d4f15992e74..9bee05bfb25 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -24,13 +24,12 @@ stdenv.mkDerivation rec { substituteInPlace foomaticrip.c --replace /bin/bash ${stdenv.shell} ''; - installTargets = "install-cups"; + installTargets = [ "install-cups" ]; - installFlags = - '' - CUPS_FILTERS=$(out)/lib/cups/filter - CUPS_BACKENDS=$(out)/lib/cups/backend - ''; + installFlags = [ + "CUPS_FILTERS=$(out)/lib/cups/filter" + "CUPS_BACKENDS=$(out)/lib/cups/backend" + ]; meta = { description = "Foomatic printing filters"; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 993a5144a9d..3b03c300db3 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, substituteAll , pkgconfig , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils -, net_snmp, openssl, nettools +, net-snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true , withPlugin ? false @@ -55,7 +55,7 @@ python2Packages.buildPythonApplication { libusb1 sane-backends dbus - net_snmp + net-snmp openssl ]; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 3b78f015f7d..ab1794c1251 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -2,7 +2,7 @@ , pkgconfig , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false @@ -59,7 +59,7 @@ python2Packages.buildPythonApplication { dbus file ghostscript - net_snmp + net-snmp openssl perl zlib diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index fe890f3dce2..ecb74f39ab9 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends +, cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils -, net_snmp, openssl, perl, nettools +, net-snmp, openssl, perl, nettools , bash, coreutils, utillinux , withQt5 ? true , withPlugin ? false @@ -46,7 +46,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -python2Packages.buildPythonApplication { +python3Packages.buildPythonApplication { inherit name src; format = "other"; @@ -58,7 +58,7 @@ python2Packages.buildPythonApplication { dbus file ghostscript - net_snmp + net-snmp openssl perl zlib @@ -68,13 +68,14 @@ python2Packages.buildPythonApplication { pkgconfig ]; - pythonPath = with python2Packages; [ + pythonPath = with python3Packages; [ dbus pillow pygobject2 reportlab usbutils sip + dbus-python ] ++ stdenv.lib.optionals withQt5 [ pyqt5 enum-compat diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index 8a8556b63df..ad7659d060a 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -26,11 +26,7 @@ stdenv.mkDerivation rec { libusb.dev ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=deprecated-declarations" - "-Wno-error=parentheses" - "-Wno-error=unused-variable" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; postPatch = '' # remove vendored dependencies diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 8ca83c2c93d..e2f2bcc2f24 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 39a7e38e034..0d4c7ab7216 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -11,7 +11,7 @@ let rev = "244f8bbbdf64ae603f9f6c09a3067943837459ec"; sha256 = "0x4y5q7ygxfjfy2wxijkps9khsjjfb169sbda410vaw0m88wqj5p"; }; - makeFlags = "CPU=m68k SYNTAX=mot"; + makeFlags = [ "CPU=m68k" "SYNTAX=mot" ]; installPhase = '' mkdir -p $out/bin cp vasmm68k_mot $out/bin diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index d8717b46eef..ca6ad37b5aa 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation { pname = "citra"; - version = "2019-05-25"; + version = "2019-10-05"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "186ffc235f744dad315a603a98cce4597ef0f65f"; - sha256 = "0w24an80yjmkfcxjzdvsbpahx46bmd90liq5m6qva5pgnpmxx7pn"; + rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; + sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 67fb3b4d24b..d5d63cc2694 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , tinyxml , agg, alsaLib, soundtouch, openal , desktop-file-utils -, gtk2, gtkglext, libglade, pangox_compat +, gtk2, gtkglext, libglade , libGLU, libpcap, SDL, zziplib }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch - openal desktop-file-utils gtk2 gtkglext libglade pangox_compat + openal desktop-file-utils gtk2 gtkglext libglade libGLU libpcap SDL zziplib tinyxml ]; configureFlags = [ diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index 358cc59d3db..ad111a61514 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - makeFlags = "LINK=gcc CFLAGS=-O2"; + makeFlags = [ "LINK=gcc" "CFLAGS=-O2" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 668d1804544..722f6b25429 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU, libGL, SDL2, alsaLib, libarchive +, fetchpatch }: stdenv.mkDerivation { pname = "emulationstation"; @@ -12,14 +13,22 @@ stdenv.mkDerivation { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; + patches = [ + (fetchpatch { + url = "https://github.com/Aloshi/EmulationStation/commit/49ccd8fc7a7b1dfd974fc57eb13317c42842f22c.patch"; + sha256 = "1v5d81l7bav0k5z4vybrc3rjcysph6lkm5pcfr6m42wlz7jmjw0p"; + }) + ]; + + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ alsaLib boost curl eigen freeimage freetype libarchive libGLU libGL SDL2 ]; - buildPhase = "cmake . && make"; installPhase = '' install -D ../emulationstation $out/bin/emulationstation ''; + enableParallelBuilding = true; + meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; homepage = https://emulationstation.org; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 74e35379137..278d8d8dc5f 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; # For pthread_cancel - cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s"; + cmakeFlags = [ "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s" ]; buildInputs = [ zlib SDL cmake ]; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index d98232b1058..3c205a70375 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,9 +1,10 @@ { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper -, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama }: +, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, installShellFiles }: let majorVersion = "0"; - minorVersion = "216"; + minorVersion = "217"; desktopItem = makeDesktopItem { name = "MAME"; @@ -22,7 +23,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "0dmmw08pxxznvadrc51zg27jc9fjh688355w8kxkmi7k8qa367r0"; + sha256 = "0yzn29fp72k2g5xgv47ss6fr3sk9wdxw9f52nwld1baxr2adc0qx"; }; hardeningDisable = [ "fortify" ]; @@ -33,7 +34,7 @@ in mkDerivation { dontWrapQtApps = true; buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ]; - nativeBuildInputs = [ python pkgconfig which makeWrapper ]; + nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to @@ -54,9 +55,7 @@ in mkDerivation { find ${dest} -maxdepth 1 -executable -type f -exec mv -t $out/bin {} \; install -Dm755 src/osd/sdl/taputil.sh $out/bin/taputil.sh - mkdir -p $out/share/man/man{1,6} - mv ${dest}/docs/man/*.1 $out/share/man/man1 - mv ${dest}/docs/man/*.6 $out/share/man/man6 + installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6 mv artwork plugins samples ${dest} diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 98ea02cd897..b976c1e8c27 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,45 +1,69 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia -, glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }: - -assert withGamepads -> (SDL2 != null); -with stdenv.lib; +{ SDL2 +, cmake +, fetchFromGitHub +, ffmpeg +, glew +, lib +, libzip +, mkDerivation +, pkgconfig +, python3 +, qtbase +, qtmultimedia +, snappy +, zlib +}: mkDerivation rec { pname = "ppsspp"; - version = "1.4.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0m4qkhx7q496sm7ibg2n7rm3npxzfr93iraxgndk0vhfk8vy8w75"; + sha256 = "17sym0vk72lzbh9a1501mhw98c78x1gq7k1fpy69nvvb119j37wa"; }; - patchPhase = '' - echo 'const char *PPSSPP_GIT_VERSION = "${src.rev}";' >> git-version.cpp - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + postPatch = '' + substituteInPlace git-version.cmake \ + --replace unknown ${src.rev} + substituteInPlace UI/NativeApp.cpp \ + --replace /usr/share $out/share ''; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase qtmultimedia glew libzip snappy zlib ] - ++ optionals withGamepads [ SDL2 SDL2.dev ]; + nativeBuildInputs = [ cmake pkgconfig python3 ]; + + buildInputs = [ + SDL2 + ffmpeg + glew + libzip + qtbase + qtmultimedia + snappy + zlib + ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DUSING_QT_UI=ON" ]; + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSING_QT_UI=ON" + ]; installPhase = '' - mkdir -p $out/bin $out/share/ppsspp - mv PPSSPPQt $out/bin/ppsspp + mkdir -p $out/share/ppsspp + install -Dm555 PPSSPPQt $out/bin/ppsspp mv assets $out/share/ppsspp ''; - enableParallelBuilding = true; - - meta = { - homepage = https://www.ppsspp.org/; + meta = with lib; { description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; + homepage = "https://www.ppsspp.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index c8171f6c233..45ed31168f0 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -720,7 +720,7 @@ in with stdenv.lib.licenses; license = gpl2; extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ]; }).override { - cmakeFlags = "-DLIBRETRO=ON"; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; buildPhase = '' make \ diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 34e3961250c..3f14258b0c0 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ] - ++ optional withVulkan [ makeWrapper ]; + ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit - ++ optional withVulkan [ vulkan-loader ] + ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 libXdmcp libXext libXxf86vm mesa udev ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 057615a79a1..0b6eab70263 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -71,12 +71,12 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. - NIX_LDFLAGS = map (path: "-rpath " + path) ( + NIX_LDFLAGS = toString (map (path: "-rpath " + path) ( map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise ++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) - ); + )); # Don't shrink the ELF RPATHs in order to keep the extra RPATH # elements specified above. diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 2b38ed57c28..5487b6cdc2a 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,24 +1,32 @@ -{ lib, fetchFromGitHub, python3Packages, lilypond }: +{ lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { name = "frescobaldi-${version}"; - version = "3.0.0"; + version = "3.1"; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; rev = "v${version}"; - sha256 = "1yn18pwsjxpxz5j3yfysmaif8k0vqahj5c7ays9cxsylpg9hl7jd"; + sha256 = "0sv6dc1l34rrhfbn1wqkl9zs9hiacmmbviw87d0d03987s1iirb1"; }; propagatedBuildInputs = with python3Packages; [ lilypond pygame python-ly sip - pyqt5_with_qtwebkit (poppler-qt5.override { pyqt5 = pyqt5_with_qtwebkit; }) + pyqt5 poppler-qt5 + pyqtwebengine ]; + nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; + # no tests in shipped with upstream doCheck = false; + dontWrapQtApps = true; + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + meta = with lib; { homepage = http://frescobaldi.org/; description = ''Frescobaldi is a LilyPond sheet music text editor''; @@ -35,7 +43,7 @@ python3Packages.buildPythonApplication rec { fonts and keyboard shortcuts ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sepi ma27 ]; + maintainers = with maintainers; [ sepi ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 541fbea1dd4..37974e41080 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -76,15 +76,19 @@ stdenv.mkDerivation rec { sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib.dev}/include@" -i configure.ac autoconf - '' + lib.optionalString cupsSupport '' - configureFlags="$configureFlags --with-cups-serverbin=$out/lib/cups --with-cups-serverroot=$out/etc/cups --with-cups-datadir=$out/share/cups" ''; - configureFlags = - [ "--with-system-libtiff" - "--enable-dynamic" - ] ++ lib.optional x11Support "--with-x" - ++ lib.optional cupsSupport "--enable-cups"; + configureFlags = [ + "--with-system-libtiff" + "--enable-dynamic" + ] + ++ lib.optional x11Support "--with-x" + ++ lib.optionals cupsSupport [ + "--enable-cups" + "--with-cups-serverbin=$(out)/lib/cups" + "--with-cups-serverroot=$(out)/etc/cups" + "--with-cups-datadir=$(out)/share/cups" + ]; doCheck = true; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 7d0feef3868..adcbdddfc3a 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "0715fgqw6mqms4zld8wyf6appvvpfb1hglcmcn852c66a8zwr2r2"; + sha256 = "192ygz3ppfah8d2b811x67jfqhcr5ivz7qh4vwrd729rjfr0bbgb"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/meson-tools/default.nix b/pkgs/misc/meson-tools/default.nix new file mode 100644 index 00000000000..02b162c8809 --- /dev/null +++ b/pkgs/misc/meson-tools/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + pname = "meson-tools"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "afaerber"; + repo = pname; + rev = "v${version}"; + sha256 = "1bvshfa9pa012yzdwapi3nalpgcwmfq7d3n3w3mlr357a6kq64qk"; + }; + + buildInputs = [ openssl ]; + + installPhase = '' + mkdir -p "$out/bin" + mv amlbootsig unamlbootsig amlinfo "$out/bin" + ''; + + meta = with lib; { + homepage = "https://github.com/afaerber/meson-tools"; + description = "Tools for Amlogic Meson ARM platforms"; + license = licenses.gpl2; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index bfca574cd49..6e5822b5a6f 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.10"; + version = "1.12.1"; prebuilt_server = fetchurl { - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; - sha256 = "144k25x6ha89l9p5a1dm6r3fqvgqszzwrhvkvk0r44vg0i71msyb"; + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; + sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "0hhncqcs49n9g8sgvwbyvkaq4b1dhrpn7qgnaj6grjcb0i27vzaq"; + sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; }; # postPatch: @@ -40,12 +40,6 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg SDL2 ]; - # FIXME: remove on update to > 1.10 - patches = [(fetchpatch { - url = "https://github.com/Genymobile/scrcpy/commit/c05056343b56be65ae887f8b7ead61a8072622b9.diff"; - sha256 = "1xh24gr2g2i9rk0zyv19jx54hswrq12ssp227vxbhsbamin9ir5b"; - })]; - # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' echo -n > server/meson.build @@ -54,7 +48,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Doverride_server_path=${prebuilt_server}" ]; postInstall = '' mkdir -p "$out/share/scrcpy" - ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" + ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server" # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platform-tools}/bin" diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index e3d3b109d1a..9763949cf98 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { homepage = https://github.com/the-cavalry/light-locker; description = "A simple session-locker for LightDM"; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index f5e8b60cea0..9dadd085067 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libX11 libXext libXrandr ]; - installFlags = "DESTDIR=\${out} PREFIX="; + installFlags = [ "DESTDIR=\${out}" "PREFIX=" ]; postPatch = "sed -i '/chmod u+s/d' Makefile"; diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index 4d4e1c1fc41..cefcdbc75a3 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { description = "Launch a given program when your X session has been idle for a given time."; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 5e8fa725080..c43a8acf885 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.60"; + name = "xlockmore-5.61"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "16v7y9g42a4g2dlhj5qfcax9ydg814zfxb8c9yj69c6kl51xdh79"; + sha256 = "012wsfcphahwwylyfk9c848nwj1v08hpnja2yfs0j8pnq7milnva"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8a07461bb2f..5bd20c0765b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex -, openssl, swig, armTrustedFirmwareAllwinner, armTrustedFirmwareRK3328 -, armTrustedFirmwareRK3399 +, openssl, swig, meson-tools, armTrustedFirmwareAllwinner +, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399 +, armTrustedFirmwareS905 , buildPackages }: @@ -94,7 +95,7 @@ let homepage = http://www.denx.de/wiki/U-Boot/; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ dezgeg samueldr ]; + maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); @@ -129,6 +130,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootBananaPim3 = buildUBoot { + defconfig = "Sinovoip_BPI_M3_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootBananaPim64 = buildUBoot { defconfig = "bananapi_m64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; @@ -172,6 +179,52 @@ in { filesToInstall = ["u-boot.bin" "SPL"]; }; + # Flashing instructions: + # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442 + # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1 + # dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97 + ubootOdroidC2 = let + firmwareBlobs = fetchFromGitHub { + owner = "armbian"; + repo = "odroidc2-blobs"; + rev = "47c5aac4bcac6f067cebe76e41fb9924d45b429c"; + sha256 = "1ns0a130yxnxysia8c3q2fgyjp9k0nkr689dxk88qh2vnibgchnp"; + meta.license = lib.licenses.unfreeRedistributableFirmware; + }; + in buildUBoot { + defconfig = "odroid-c2_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + filesToInstall = ["u-boot.bin" "u-boot.gxbb" "${firmwareBlobs}/bl1.bin.hardkernel"]; + postBuild = '' + # BL301 image needs at least 64 bytes of padding after it to place + # signing headers (with amlbootsig) + truncate -s 64 bl301.padding.bin + cat '${firmwareBlobs}/gxb/bl301.bin' bl301.padding.bin > bl301.padded.bin + # The downstream fip_create tool adds a custom TOC entry with UUID + # AABBCCDD-ABCD-EFEF-ABCD-12345678ABCD for the BL301 image. It turns out + # that the firmware blob does not actually care about UUIDs, only the + # order the images appear in the file. Because fiptool does not know + # about the BL301 UUID, we would have to use the --blob option, which adds + # the image to the end of the file, causing the boot to fail. Instead, we + # take advantage of the fact that UUIDs are ignored and just put the + # images in the right order with the wrong UUIDs. In the command below, + # --tb-fw is really --scp-fw and --scp-fw is the BL301 image. + # + # See https://github.com/afaerber/meson-tools/issues/3 for more + # information. + '${buildPackages.armTrustedFirmwareTools}/bin/fiptool' create \ + --align 0x4000 \ + --tb-fw '${firmwareBlobs}/gxb/bl30.bin' \ + --scp-fw bl301.padded.bin \ + --soc-fw '${armTrustedFirmwareS905}/bl31.bin' \ + --nt-fw u-boot.bin \ + fip.bin + cat '${firmwareBlobs}/gxb/bl2.package' fip.bin > boot_new.bin + '${buildPackages.meson-tools}/bin/amlbootsig' boot_new.bin u-boot.img + dd if=u-boot.img of=u-boot.gxbb bs=512 skip=96 + ''; + }; + ubootOdroidXU3 = buildUBoot { defconfig = "odroid-xu3_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -300,7 +353,7 @@ in { ubootSheevaplug = buildUBoot { defconfig = "sheevaplug_defconfig"; extraMeta.platforms = ["armv5tel-linux"]; - filesToInstall = ["u-boot.bin"]; + filesToInstall = ["u-boot.kwb"]; }; ubootSopine = buildUBoot { @@ -314,7 +367,7 @@ in { defconfig = "cm_fx6_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot-with-nand-spl.imx"]; - buildFlags = "u-boot-with-nand-spl.imx"; + buildFlags = [ "u-boot-with-nand-spl.imx" ]; extraConfig = '' CONFIG_CMD_SETEXPR=y ''; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4b06bcb80d2..881cc2d62f3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -39,12 +39,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2019-12-08"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "fbb55d9ef8829630ea8f12c112bebc69c7a15337"; - sha256 = "0fg43ggaxpnybc9ism4b5q7l0n6rdgh4vkpch80x89mwld287lqv"; + rev = "e5bd3f1439f95a33cb8692f1d49f570eb626c70a"; + sha256 = "0i1h1syk008xwwph5kz0jg8rn0b6l1jmdx6hlxq6nr32r5kifhni"; }; }; @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-12-03"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "5f84325cd811ec179b7f3642652438c6a45b174d"; - sha256 = "0fdy4kvd7bg3xcls5g2xxml8hlwb80qvs9225dh2hqif0isbf4l2"; + rev = "4afbf2f25dc0ce86b118261b0cfb904c80ae6ba0"; + sha256 = "1p2g745gyhzs6qql6gnwsn2yxvzf2409andbd8xgrc9bi9cn25pj"; }; }; @@ -336,12 +336,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2019-12-16"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "2408fb2c163aef22857645b58537879562373fbb"; - sha256 = "1cffcrmz72cn9sd7yl5z4r9yqzavh9dd9pjhxyjy80g5f0ryxc93"; + rev = "f2a24f2e35350811845c6a14438a94341217992b"; + sha256 = "1ramsl7dpgh9l801jq9g8jpg2n757c7r6w8jgfx6gpqmm47iqgrs"; }; }; @@ -380,12 +380,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2019-10-31"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "77f7ecd8e6cc0af7a0cf293616b9f66a61a41f44"; - sha256 = "13qhw4gdl5p4imzmgickay6lc4hlnw5fsc46zw5qyqq7p88wgym9"; + rev = "4be4a57ad8f888ef92974ccb6e685358498863f1"; + sha256 = "15175bphaiih5j63bigj5sblcyqjj68g3k81wn7dwgwdpglf1mwf"; }; }; @@ -422,6 +422,17 @@ let }; }; + coc-metals = buildVimPluginFrom2Nix { + pname = "coc-metals"; + version = "2020-01-03"; + src = fetchFromGitHub { + owner = "ckipp01"; + repo = "coc-metals"; + rev = "a2c71dc75b35251549d1ba2cdb5f9ee286ab9f90"; + sha256 = "0hzd7m1rli2vgwvykrv9ld5q9na867l5d56fl02d7d3q9ykfn6j7"; + }; + }; + coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2019-09-23"; @@ -435,12 +446,12 @@ let coc-pairs = buildVimPluginFrom2Nix { pname = "coc-pairs"; - version = "2019-12-09"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-pairs"; - rev = "08ad1b1565960b41005bedbbd051f90c8edacc3c"; - sha256 = "0wfjs9hj11b0zfryfa2jnclgx4sfml9wvpjbwdqhhzz20ahc1jsh"; + rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd"; + sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5"; }; }; @@ -501,12 +512,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2019-12-10"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "3ffd09dad94f6f41dd03cf3cec2a6b92a7028702"; - sha256 = "1qrkgva9yjjbjyflwaqfk84ia2vd5956ikjkmjfhd3gd52kh7hlg"; + rev = "b57debd2faa71118258f29968f17b3cd06664b1e"; + sha256 = "1jk20qjr5az6hjxrmjm8vdq0ks40bq55cw0y7xsmivw6cb61m367"; }; }; @@ -733,12 +744,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2019-12-11"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "3128891191d7e363d39cbe70b96281ec8d897bcb"; - sha256 = "1qapfsk4z637rqi9mppac50gliyi957cvl2dfknq0dy856a11274"; + rev = "ece4fde5a377d52ba737b991b8a320ada5d1ac95"; + sha256 = "0aqxvhv70mbsr1gsybs8np82nhvixydivnbj2jp8cy43c1hvyxlh"; }; }; @@ -799,12 +810,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2019-11-28"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "4dc152ac826a825b69741cc79681a257e24497dc"; - sha256 = "1j9hgz76x554wzdz9ss14c94pwp2fk7yplznhyxamndn9wcy8yiv"; + rev = "aa1b5c762bbabaeeb5f3eca976e65bbb2f82a883"; + sha256 = "0pfsky4i4h769fjmrvy89d9ickkfifvmq0m54c6qhs24bycx0s7j"; }; }; @@ -843,12 +854,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-12-13"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "13c8542818f418d1207c368f0072072c793f58c1"; - sha256 = "1xrpmrr6wmy88s23j4cxcpsj9wlw7ak48sg3hjqpni9w231kp7a9"; + rev = "908cd3a3fe5b03783da7186441b2fe0c146f31b3"; + sha256 = "0qrz0mrrx79525rzab0l1qx3q49531306b05hgqrlkzx9zcppk8l"; }; }; @@ -888,35 +899,35 @@ let deoplete-fish = buildVimPluginFrom2Nix { pname = "deoplete-fish"; - version = "2018-09-15"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "ponko2"; repo = "deoplete-fish"; - rev = "9b9a686186e6484163b34eb6e620b83be355e82c"; - sha256 = "1v7ay0isrgcz0hgyggdqvmrldz0in26prj7p9l8ygkyrjq2w6b8a"; + rev = "4d27bfeff0269ae66e88645613a2b18ffae7a969"; + sha256 = "1l84dywfvgxclhicwdkdcqr0hicmish44c456g7vcdfqq97qvzp1"; }; }; deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2019-12-13"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "a3ac3f53f0af482095ebcf09af8ca1d1edce45bc"; - sha256 = "19xgsm5mbfcpdb0csckbwi83gl3b4wqdn8vchbv8j9faf10qnf2b"; + rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; + sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-12-13"; + version = "2019-12-22"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "7990447a308c6c5839ada856f31a7dd3e34f20a4"; - sha256 = "1570k79ihz6kif85ichdgdnbipbdkqb5ks8izhqppb68lajyjvd2"; + rev = "63beb118c8d215bad4f8759b84608fd463abebc5"; + sha256 = "1rilqprq6fq01qj1idgvy38p827gjq2bsx93xfbim6yc4hkj10d9"; fetchSubmodules = true; }; }; @@ -945,12 +956,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2019-12-13"; + version = "2019-12-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "ca4018c69aca115033f3e3b5408331e76ff64cd0"; - sha256 = "0k3vgikvjapqniz0cmnhjx4ds5dn4kscd443sf2x2nd6ppa6fd6j"; + rev = "0985ba9f5a5f35521087b9ca0858c96ab3785158"; + sha256 = "09bfsd217qi1ndfrfrjla1vlhnp8r9q9qirkwjjajbqhk4ws90pm"; }; }; @@ -978,34 +989,34 @@ let deoplete-ternjs = buildVimPluginFrom2Nix { pname = "deoplete-ternjs"; - version = "2019-12-06"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "carlitux"; repo = "deoplete-ternjs"; - rev = "b94b24677daa095f980f31017caabd4fe051635f"; - sha256 = "1vi9y5kkiq3cmainqkdqn4hibnws0bs0zzg1nsx7pary9jfcmmra"; + rev = "5405e84a44fc4ab5234c9a253ad4aa2b161e5897"; + sha256 = "0684f9ci0y4wihf04z9r8x55cir02al4wp911dz0zg678z8w0yha"; }; }; deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-12-10"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e9aad25f28b68581cea2d94400b9fa64b724773b"; - sha256 = "0wy5qapj6hfxj4ir38lb823zsgj6nqhi4r2sv0bm23g25sykg6ry"; + rev = "840c46aed8033efe19c7a5a809713c809b4a6bb5"; + sha256 = "09bivhh6iig9vskia9fz1cz2c6dbn3xf4cgm77z9ppaii00n9wh3"; }; }; dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; - version = "2019-12-09"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "5be708edaa89c93a585ed0ba04339c4f857dae3a"; - sha256 = "02s2wwd07qr2396hy3j3nw9f39ymahr9gpfsidrx4f1l4yb235in"; + rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; + sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; }; }; @@ -1044,12 +1055,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2019-12-10"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "53c56fcf358ca36b00b9cbf7dd70642c8922fdd0"; - sha256 = "1i0sk2s10ac5lagvn74m21lxsss1h4nfnn51lxnaflqbvlba4rln"; + rev = "7e5b4a91ad55b992247edb87543ed7855db1a199"; + sha256 = "0cbdk4bxk0alq69fjxk4ryfk1w6pvjkqp2sv7rj8qgrwgpqdv5wd"; fetchSubmodules = true; }; }; @@ -1101,12 +1112,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-12-14"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "55ef64a057025209c48905df06f725430e63542f"; - sha256 = "07qca1xmwaak45ccgv5vg69s3vwl1p5h9r2agh0aw30qw50jvkkw"; + rev = "419279ec95260efe3af42c8b03b823e59f09c3bc"; + sha256 = "1cydvb4jbh8h1n09rc8446fspvfvbgbqz5a21nbadbkg3106wn3c"; }; }; @@ -1212,12 +1223,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-11-24"; + version = "2019-12-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "65edb6ad99b51514aaf29afc25e35ce5f05281ba"; - sha256 = "1d40whzc21c4zbzssjwvhzddyb0a106ib8r4zzzdd61s1935z4xr"; + rev = "76669c3c1d675833f9d89f6496f16a7accc0f40e"; + sha256 = "0p5z9bljjfnp4kkpf9pb5zwv5l9xdk3aikpfxjj8scafl99k4m5r"; }; }; @@ -1487,24 +1498,24 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-12-08"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "c80a08d9835565bb8988d6314dfec616f70c53da"; - sha256 = "0s86i6s0qwghcfb7a3mxy2cbzh001hw860dsaaf2jprnwsvs2p1q"; + rev = "2572136fcb4c9941553dd05504007806613c8946"; + sha256 = "08fdaxaldbmg76bkj0xni4cpgqiss4cdxnv3jxskwvs6v9dxmbcs"; fetchSubmodules = true; }; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { pname = "Jenkinsfile-vim-syntax"; - version = "2019-06-17"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "martinda"; repo = "Jenkinsfile-vim-syntax"; - rev = "bf7ca0927c82edc495f7fa67bebc58e92567aa20"; - sha256 = "1ikpbg8whabfir6xpb6z4hs8ay3rg9q2qw45sn1ggfikp7dxfwbx"; + rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; + sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; }; }; @@ -1631,12 +1642,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2019-12-13"; + version = "2019-12-29"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "12388bb5ce5f5a16dc55dc22b80d7a410410b479"; - sha256 = "1k7l8sq6jcl0a6yk68ch72w20rhwi26fhrp0yvvvim0krs0yr068"; + rev = "6e60e3a6575449e08feb27fb3528b55e71fd56e3"; + sha256 = "054wxj8f23ddqs3mp8rvw2lsplqfyn352zcq6biywbybjm2xphf7"; }; }; @@ -1653,12 +1664,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-12-13"; + version = "2019-12-27"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "ef6df46efe5ac5289f084045e57c492205bd08b5"; - sha256 = "01nrkjh18qd65kbnrw9s2kdb2ml5a7648zvqzyjxw1mcqpw57838"; + rev = "f4fa096a67afbe593bd53cf618850c32512b5d47"; + sha256 = "0qrz4nwb4imnxiqk3p1r4sxib1gjicpsr3g6l8mdgw806l1jc9mg"; }; }; @@ -1862,12 +1873,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-12-01"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b4f7ad5ebb759f56c598527ab671aecace114ed5"; - sha256 = "0xq0vxq86am6xj4sxsnj131d54fds532pikabzsz2l8gnikb4b2r"; + rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9"; + sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4"; }; }; @@ -1884,12 +1895,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-11-29"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "fb9765ec9d8e14e01ed3f55364b56c608271fb45"; - sha256 = "02pqn7fjm4749qfbc13kz0bhf8azr7vhkzca8cq9imiwdpssvmjs"; + rev = "212c0d8b05ee65b9be77675db147d05abd323a46"; + sha256 = "0fjmrnmnqjb1r4cxbrlxwpwbm7jgs47wx6pql565946adv5bckh2"; }; }; @@ -1917,12 +1928,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2019-12-12"; + version = "2019-12-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "84057dd1dd28e1198d0b2777301ef6cafd8f2cef"; - sha256 = "164077vmqf4kcj0kn5c027faa4fjzfdbl1cz4j45dxpbak36hy6w"; + rev = "6cccbd41851f3d8f47c5e225d552a217cede4f3f"; + sha256 = "0jrdya11fzis746x1s802g2w20v47dhaxlmczb2fv4x3fxfwql5p"; }; }; @@ -1983,23 +1994,23 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2019-11-26"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdcommenter"; - rev = "023cc20324c41059b5ce79edaef0ffeef8bf5923"; - sha256 = "02459d88v2g8slrhajmaywwwanqifyrbrxg90vp7rrzx42f6p56r"; + rev = "24df32304e20677ab061115e7bc8a37f382c60e9"; + sha256 = "00w46597m8xsdksm2smqmslxk6ydnig4ycwn4fn0ybrlmyalclhi"; }; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2019-12-16"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "1ab85e33bef8763a618c505ee5a0611519f81e5a"; - sha256 = "1fxbl06pqm1zay0lbg9q6qq21rbcbpmbn53kfw86qyqj71rayd01"; + rev = "8a14891241e3468f9c13deaa6cf88aebe53b519f"; + sha256 = "033qnzna0awys5w5wf9sj2gydm433l1919zz9cm984l0nmgmkp29"; }; }; @@ -2027,12 +2038,12 @@ let nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2019-05-25"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "9f7ce848723f69e33792e5606091bbfd5739d253"; - sha256 = "1n6kdnll5jh92kfbwwm8544mpp7c2awqsaps91agqjd3nwa5x27x"; + rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; + sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; }; }; @@ -2069,6 +2080,17 @@ let }; }; + nvim-lsp = buildVimPluginFrom2Nix { + pname = "nvim-lsp"; + version = "2020-01-05"; + src = fetchFromGitHub { + owner = "neovim"; + repo = "nvim-lsp"; + rev = "7a15a52c0a7d735625ac73dc4d8efe70c5e99707"; + sha256 = "1wpp54gvb90qhgnxmp3fvfc3dbkdxk3q712c7wyd9alpbk4608fk"; + }; + }; + nvim-terminal-lua = buildVimPluginFrom2Nix { pname = "nvim-terminal-lua"; version = "2019-10-17"; @@ -2335,12 +2357,12 @@ let readline-vim = buildVimPluginFrom2Nix { pname = "readline-vim"; - version = "2019-12-12"; + version = "2019-12-28"; src = fetchFromGitHub { owner = "ryvnf"; repo = "readline.vim"; - rev = "9711f3c7c1d295e775750d7421060d74ee1b56e3"; - sha256 = "0zvavhc8033isdn7gdfla5kwif40rkn9p4zmkvwy423dpb3432h2"; + rev = "48f04c651728e8a7a8352eec697801aa32348564"; + sha256 = "1vs91lkm9gwvp0bahx80ag6lw03r5x6kyih70l4sq8q0kydp5f13"; }; }; @@ -2412,12 +2434,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-11-28"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "b7176e7a1607bb17f2f57cb8b365042f5676b21b"; - sha256 = "12i213ci5db4xiyqzwkd4i6mmxgq2j1ipjsn42mif3yp0cr1rvvv"; + rev = "05f98470e55722aaf9b1a1ef1eb272f2d95e349d"; + sha256 = "0hg8jmbybhfaiiwzm4rh7m706mwvzkyk1vzg8jxq8653cbbjfzib"; }; }; @@ -2511,12 +2533,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-10-09"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "ed1e2b20a6c2c4945b529799f2cdb0409f6a10d2"; - sha256 = "0yl82pp23nfg4ckrq33a3flisp7all6gs3aza7z9swv966y1qhwx"; + rev = "c09ffbbf54b4c25996f864b0f75ebc7a1fca6919"; + sha256 = "1sn952wil99jqc3r9hr017604s6gb99jwwmbldmkdh9qcr03kjvm"; }; }; @@ -2555,12 +2577,12 @@ let splice-vim = buildVimPluginFrom2Nix { pname = "splice-vim"; - version = "2017-09-03"; + version = "2019-12-23"; src = fetchFromGitHub { owner = "sjl"; repo = "splice.vim"; - rev = "b31cb25eea8a92a037e9da9a98b2e6147294c37d"; - sha256 = "0mqnrmkyms2z5lqy90cy076x3fr9xmd63962wd8n6n6mbin97ihx"; + rev = "fb0d7052e5569f59cb94f0e4303307affdd0e271"; + sha256 = "1vxxlh88dxmrsfr8w87395h84hgflcgaj6s35vjg34464xzsdn8s"; }; }; @@ -2665,12 +2687,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2019-10-25"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "a0f51bd5a6514632bf3d2df1b001df27361892bd"; - sha256 = "1drhdyyalg2sjgckgw8s026q2ydd07vfxr3i6vyvp3irlf86sbdy"; + rev = "3753b235a1163cfbc3b7c417825d1910b2f66100"; + sha256 = "16nw145n17d9fnwhcp42k85sf2mx2nyp7wy4gllhw48xnwgh6qpb"; }; }; @@ -2698,12 +2720,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2019-08-11"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "c9cecefc639b6019e0f12b7e9fb5a2375cd550c1"; - sha256 = "0xb61wchvj1iqzwxzscv3zwbsx1qjh8qhkmijsrjz92566g12xhy"; + rev = "239c0c08d3e691a2c447278b88de91b602fa50bd"; + sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa"; }; }; @@ -2820,23 +2842,23 @@ let typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2019-06-23"; + version = "2019-12-19"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "5a319ea5504e18215d155576c78d1b7fb8e22c8f"; - sha256 = "1hz42blc1sshkms9ramdhzwnphqs26p83q8smw5y14blp1zdb628"; + rev = "616186fd8a04afa32bae8dc0b70ab7f9cdb427fd"; + sha256 = "0mq6yxq5ais47ib0ifvdl3qi4c4wz0jwzqsz5djb616xfnmp8ysx"; }; }; ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-12-10"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "3a8b0548b3efd01bff0393f8f32228786149806c"; - sha256 = "10mnhlkxrzl008q7cfv3j78p1bd1dqmprpnmcz8nc6mmkldnflri"; + rev = "96026a4df27899b9e4029dd3b2977ad2ed819caf"; + sha256 = "1lp6rggsdq7hhis02yyzb79y30g3f7zcydwsi0hjpnnrwvani6s3"; }; }; @@ -2919,12 +2941,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-12-06"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "2a1f03757eff82d07f64d45dad4af1a805492a67"; - sha256 = "1ahlpwqf61rr6y23fk9pvnh8drkhv7v82a3r3w07p65mv0mfk958"; + rev = "5a633625615c79f87786d74ea925790ccdd82aba"; + sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5"; }; }; @@ -3150,34 +3172,34 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-12-15"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "929cf2e21f84e989da2abd9aa5102848db61565b"; - sha256 = "1rp2m5qpc763plybp1arzgrrmn8kg21sgnwac62k98w2s1c0x4jd"; + rev = "66f77d4a77e54946fedaac7d54d02271751eab40"; + sha256 = "008k8v0nx219lbn0vsc1cwr537lg0gdb9s4d7hjpdq2rhh79zsg3"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2019-12-13"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "67512f5e81b8ad088a8cbfe8b95f9e495bc81cf3"; - sha256 = "049lnixxcvvnkq5bfwpmclw1k73xyf5gqfpw78rkzsbg9milyr74"; + rev = "14c3a60ab0f42aa1001d8f32ffaab2c28935a1e7"; + sha256 = "0k25x599sfaw931p5b83cpqhz5dzjxp01v3qlsi78rhjyw1y83jf"; }; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2019-11-01"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "928a7ba76ee7b48a715b397543f21ee28a9959da"; - sha256 = "1cdjjyzmclzc32i1wcc5k67laz75yvi4jj2yc1fxa95bbq9zi0h5"; + rev = "0849bcb6523d17a753fcaff8d40cbeed2d09cf65"; + sha256 = "1z3x72aprp950chk754h0qpf5lxh2svzk39flks5fanxaggkpkng"; }; }; @@ -3337,12 +3359,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-11-20"; + version = "2020-01-01"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "dae6dd82a98eda68af83a1f725cc570ef3b1ae7d"; - sha256 = "0w2djjs29dgd5jcfglvgb4mb60vb1bj34mxzbx2sidp3lb15xn4y"; + rev = "7556c68b1d68b9a2b1b4a9df838cdc4bcf87ba0a"; + sha256 = "0bi6nbma0bwzvn7l6w88qgr4fbpfbipv936z346sh59dk17j4nv6"; }; }; @@ -3502,12 +3524,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2019-11-16"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "4d7b4d4e2db72e95ea03c6ef757b01cbc128179e"; - sha256 = "0ab7ivgkfaji0yl6mcx03nmr304vmdwxwiw0an94fa6wbhk0y9yl"; + rev = "9c12328df924ddb875ee1e5c9fc0f939b62d6a6c"; + sha256 = "1kpkwqrhix7whd00pcbanf3ij55x34cqc6qz3r2xshcmydk5vqxn"; }; }; @@ -3568,12 +3590,12 @@ let vim-easymotion = buildVimPluginFrom2Nix { pname = "vim-easymotion"; - version = "2019-03-23"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "easymotion"; repo = "vim-easymotion"; - rev = "85e90c9759e14633d878ed534ef313876ab96555"; - sha256 = "1n5rlqh685ba96mwi407x3r7vlxd34awlyb2wjmz6j8m0ld3skrq"; + rev = "83a09a19e7a9c51c6ca2e0f90f1dd27ef4c159c6"; + sha256 = "1xaliyiv80vcsl5gqj40avgdf4384d5xhnvhh0jaklk1hmrdzxgf"; }; }; @@ -3610,6 +3632,17 @@ let }; }; + vim-elm-syntax = buildVimPluginFrom2Nix { + pname = "vim-elm-syntax"; + version = "2019-11-28"; + src = fetchFromGitHub { + owner = "andys8"; + repo = "vim-elm-syntax"; + rev = "7ed55d9bc2c0cfd023d7cc6541634bcbf36430b5"; + sha256 = "1kq7qcw9l41q646a2ilwy94lj1qz9as14aqfmzkbi938yij18zpx"; + }; + }; + vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; version = "2019-11-13"; @@ -3755,12 +3788,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-12-11"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b68b6d4329d9bee58a521e0ff8c6adbbc53915b4"; - sha256 = "1lrx2vk6bj10sy297mby4fqjrn09s7ghq2xjbp8z2ajww4pcxp05"; + rev = "ddd64fc4c5c5365d56478f100f19898375244890"; + sha256 = "1b6mw8bb8dc46vjz5qb2v0n5kfvwz4hk7q0frflrsyc6z3pw7hab"; }; }; @@ -3777,12 +3810,12 @@ let vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2017-02-20"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c"; - sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s"; + rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; + sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; }; }; @@ -3832,12 +3865,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-12-16"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "0e33a2334d5cafc9754cc78c079ded7efbedc3fa"; - sha256 = "1phsnha6m7h5nd9smjij7xr7v5wqs2dza7bvdy18fjlv0rlfcgzc"; + rev = "ee2071d8e63f9aab98d750a91fcc3358e9987bc9"; + sha256 = "0a2ac5y8x3lhry5dzq2jbzvryfbvrdvn7bkd2wwm5bf2y9zpkbwk"; }; }; @@ -4107,12 +4140,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-12-07"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "f2c7ab94d29604128a38cb6626dac03e7cad5418"; - sha256 = "1bgg9jy61ygyrx16n20xvyp1wnqfgk857dc5jw2mwv9iq1hg0lvn"; + rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; + sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; }; }; @@ -4196,12 +4229,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-12-11"; + version = "2019-12-21"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "0d07dc85ba5a14b7e95f1f36539741d99c632bfb"; - sha256 = "1wxxln76mk5wd73pmaf67kv2q7gj6rb9zdfgx4hqx0jdcywhrjnw"; + rev = "838cfce82df8cf99df5e3a200ad23f6c0f027550"; + sha256 = "0305q9vf454h3hzkax5lpwzfwr9d573kqpsrlfsny69wgkrkvcax"; }; }; @@ -4317,12 +4350,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-12-16"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "64fa57aca10345031fab6db0065cf758f3dc1bdb"; - sha256 = "1cxif26wn7qjplikbfdbkrj94mcpf9fk02gik2qfwicib0p83bfi"; + rev = "6cb8410e10f1b6a23adf238c1f93ce19a3eef83a"; + sha256 = "1zqv58s35qvp53an15mvs7ywvarsqxc0has6yji99jwmjiq68pag"; }; }; @@ -4570,12 +4603,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-12-03"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "10d5ac88f4f6e98268b0fe999fd93bbf4cf6d778"; - sha256 = "13i2lhzsvwr7qbq53xjxg1khklsbbisizgvjllap1cmbxbmnxq49"; + rev = "b29871936f064be43ea9774cdf6980677830288c"; + sha256 = "0i20dlcnaf84fnsip9bfqz2clqgsq2vrzjxwq2mc1pj8pfvgr8r3"; }; }; @@ -4658,12 +4691,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-12-11"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "359ce90b9b37442974fd3ccd9279493d85efb3af"; - sha256 = "1dbdnyfzhfgn70jgcd0a079b76s4gdv9ykslmfiaiv7bvlmhs08s"; + rev = "2f5f74e5e67f657e9fdac54891a76721bcd3ead3"; + sha256 = "08772rc8wqpbxwqqkl8v9x79sijkdigypqlr12ph7jc45qfdqblp"; }; }; @@ -4680,12 +4713,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-12-12"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "cea0d08a062478503814e51aa21c6486a0dd1b21"; - sha256 = "05vhwgq2kj3safjhnv0rl4fhcfszba02mbwnyrlq4ayyiyv3n7cc"; + rev = "e8454d66ab8376cf9c7e42f09749d5bd17d98f89"; + sha256 = "19hajmja01hrzmq6f0lfnc03d7zpk0ixa9h9j5giskxp151f7vjr"; }; }; @@ -4746,12 +4779,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2019-11-28"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "1af106ef8fcbd096fdadf6f4f3a2b422594836f5"; - sha256 = "1703zqpaadjji34mmyfzmnwr9jvms63w12lwsrdnqv9h9ag03n7y"; + rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; + sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; }; }; @@ -4768,12 +4801,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2019-07-30"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "539e38c6ec0f747a9116452fe9ebd062222b89a3"; - sha256 = "19kfhm32mspwvnvfl96hzl67h9jcmzwwl92c37rw38pqpnm1sy1l"; + rev = "4ed62b09b84b8212382d5c3b03278b6eb9ddc08b"; + sha256 = "06kii2p5czan1m92s5p992c137n9ijvgbjj1miqy86am2p48a40k"; }; }; @@ -4878,12 +4911,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2019-11-13"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "76f62675a1814abcfbacb296f60dbb2d9d2b2f5f"; - sha256 = "05fmzd368d0mn141a1awhybl19bgls5j8czmyyvygx5pawjl3s6f"; + rev = "86f49aca266e4b17420bcadd29009997d15668d8"; + sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c"; }; }; @@ -4966,12 +4999,12 @@ let vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2019-12-13"; + version = "2019-12-20"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "53c781b9532da50ab9d6ab1bbe640902b2629a0e"; - sha256 = "1cyi4v3rqf8ln0lz1rgzh1qpxw5mq3ihixx83qnrxn81nd1ivk2i"; + rev = "cf896c1f4f37a9feb15d657dfd120aeeb6215ad8"; + sha256 = "19caali0yy1cy4hk9y9z21nzp0kj916551h0p0x7nmzxiiakp9nn"; }; }; @@ -4988,12 +5021,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2019-11-06"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "24e6c3f4cd6004e2b44e4022dee0260aba6132aa"; - sha256 = "000i2x36b8l5vc1li0f4jazs06nch9pca95yqr4w4m5hgjpzs5qs"; + rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521"; + sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx"; }; }; @@ -5010,12 +5043,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-12-12"; + version = "2020-01-03"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "3ba36bb710988349140138707731baeebd6337e4"; - sha256 = "19831g3b6cd5ws0zp6xp4aj110pzf6za3av9ac1s9dnpi97d37g9"; + rev = "f324a43a5f6a941a55ee992bb852f3c2c504a509"; + sha256 = "0dgxsn96vw4zgci58lzr4d4d4kwjbk9d52h51ibh3mhsikmpr7xk"; }; }; @@ -5142,12 +5175,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-12-10"; + version = "2019-12-17"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "5ac34a22dbf70e3c8afd7cc69726cec89655c4ad"; - sha256 = "1rs68islvz2rd3ahgfk06q9ydr3ph25zh4amg8vk1svqhk1vh0mp"; + rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b"; + sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv"; }; }; @@ -5175,12 +5208,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-12-16"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "bff65bf59401ef7d165637aedafe72f212ddf4c7"; - sha256 = "1jgzir5qn9v0ws6yb6d0hc3p859gy81x22wkqk58w55xxmfxd7am"; + rev = "1df8ac3e1bc33e1c70bd3a1713d8c9cd2eb491e1"; + sha256 = "0ivkm9vzzfn1iwzkkgk54kn846qnhvsaf8f4nzz3mllirjsl14am"; }; }; @@ -5252,12 +5285,12 @@ let vim-textobj-variable-segment = buildVimPluginFrom2Nix { pname = "vim-textobj-variable-segment"; - version = "2019-05-05"; + version = "2019-12-30"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "1af9cdef58a4072dddbe926e7c8c53903e97b70a"; - sha256 = "0spfbc30sli7ckpfbmjspfrbcg9dq5k0aimzbxx06rimbba8f846"; + rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; + sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; }; }; @@ -5395,12 +5428,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-11-29"; + version = "2019-12-18"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "7c1934f91b33f64836d0e0d27e08481849831266"; - sha256 = "1ga0skivc5p09d29k4gx2gdisalcl9514062ckddphynqn69ghi9"; + rev = "d332d08365bc735f60904a4207d650f191598378"; + sha256 = "0g5lawg641ma216v53ivhbkzpmdqhcmgybb5kh1rz6s991j51ziy"; }; }; @@ -5604,12 +5637,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-12-15"; + version = "2019-12-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "7c08bf73aa15bc794c79b1e8750df3c18066c6fb"; - sha256 = "130x4nwp2wci67nf7v73r4b7xgmfgs18ls1ckyrsq54k16016dbz"; + rev = "020206fbe1f6981855a3fe2f96ef893db782d4b8"; + sha256 = "113d1zdmx3vhjig4xrp1kqlzapdhygis2ky2paww42j22vakqywc"; }; }; @@ -5626,12 +5659,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-08-08"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "57d23fa763b498561aca7eb4efb05b52efd120c9"; - sha256 = "034857pz36rps7jmg79brcb25vfb4dgqpdhfy24vyhn3nil46jxs"; + rev = "b90e6f2e3343277faca65156d733f725f76f1e53"; + sha256 = "1z3mj73iqh4h3wx5cq4k7gp2nkbaj85v665v0phqw42c213064nb"; }; }; @@ -5747,24 +5780,24 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2019-11-30"; + version = "2020-01-06"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "e9d8813c02b8bdb81b63aeb576b9eaadf0dd4445"; - sha256 = "1x5950ca4nmsf1129sjd12kcncpv8jf4x80s0y3gwwgr3p7x1m22"; + rev = "48184a10ecdda3efce0131aa73495f1edc449a33"; + sha256 = "0nsdq17r2m2pmnz077rliqdlwk5sn1aj3bxl648bsli7rjacgaqq"; fetchSubmodules = true; }; }; youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-12-14"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "25b620de35f45c046b220923a45c55ee062f9201"; - sha256 = "1c01w86rdhyasn56llhlrzszmvfgq40r7s7m8njbpiy30712dab2"; + rev = "d9a9ce47de8b88100e4230805bf44d394197476d"; + sha256 = "1ggr6dhppmc34wah8d6dwjfb9kkaazlxajvnd972pyx9c56crl89"; fetchSubmodules = true; }; }; @@ -5804,12 +5837,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-12-10"; + version = "2020-01-02"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "65f71de21c31a0b7f7b09a62f865d1b61f9f71ed"; - sha256 = "0y0rfpsggl1a1h89zjzgpnx3vj244gmr3qwblsclh3hzf0sdav5r"; + rev = "7b644a313bf3e32a3b0c4616660d61f5ec8872d9"; + sha256 = "1icv1qa4wf1kaknfs045m8md2938qggzl6a5wf76lcn1iw5nr1cc"; }; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index a885dc163a1..6cde4d6695a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -17,12 +17,15 @@ # deoplete-khard dependency , khard -# vim-go denpencies +# vim-go dependencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion , gnused, reftools, gogetdoc, gometalinter , impl, iferr, gocode, gocode-gomod, go-tools +# direnv-vim dependencies +, direnv + # vCoolor dependency , gnome3 }: @@ -100,6 +103,14 @@ self: super: { ''; }); + direnv-vim = super.direnv-vim.overrideAttrs(oa: { + preFixup = oa.preFixup or "" + '' + substituteInPlace $out/share/vim-plugins/direnv-vim/autoload/direnv.vim \ + --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \ + "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')" + ''; + }); + clighter8 = super.clighter8.overrideAttrs(old: { preFixup = '' sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ @@ -118,12 +129,12 @@ self: super: { # NB: Make sure you pick a rev from the release branch! coc-nvim = buildVimPluginFrom2Nix rec { pname = "coc-nvim"; - version = "2019-11-30"; + version = "2020-01-05"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "42a45c639e2c43f9f1795c3804787c6a686781c0"; - sha256 = "0bny7s7scbls01jkvrwcd516py09lp0vkr65p1ik4282blyxyy6s"; + rev = "984779f2f825626aa9d441746d8b4ee079137c65"; + sha256 = "0w7qnhi7wikr789h3w5p59l8wd81czpvbzbdanf8klf9ap4ma3yg"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d4fd3e423f6..93e8f50e3d5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -12,6 +12,7 @@ amiorin/ctrlp-z andreshazard/vim-logreview andsild/peskcolor.vim andviro/flake8-vim +andys8/vim-elm-syntax ap/vim-css-color arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 @@ -46,6 +47,7 @@ chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator ckarnell/antonys-macro-repeater +ckipp01/coc-metals cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail cocopon/iceberg.vim @@ -315,6 +317,7 @@ neomake/neomake neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim neovim/nvimdev.nvim +neovim/nvim-lsp neutaaaaan/iosvkem nfnty/vim-nftables nicoe/deoplete-khard diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index d1b1bc846eb..16c14b32218 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,8 +188,7 @@ let vam ? null, pathogen ? null, plug ? null, - customRC ? "", - beforePlugins ? "", + customRC ? "" }: let @@ -209,6 +208,8 @@ let '' let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" execute pathogen#infect('${pluginsEnv}/{}') + + filetype indent plugin on | syn on ''); /* vim-plug is an extremely popular vim plugin manager. @@ -260,6 +261,8 @@ let in assert builtins.hasAttr "vim-addon-manager" knownPlugins; '' + filetype indent plugin on | syn on + let g:nix_plugin_locations = {} ${lib.concatMapStrings (plugin: '' let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" @@ -330,29 +333,19 @@ let set packpath-=~/.vim/after set packpath+=${packDir packages} set packpath+=~/.vim/after - ''); - - # somebody else could provide these implementations - vundleImpl = ""; - - neobundleImpl = ""; + filetype indent plugin on | syn on + ''); in writeText "vimrc" '' - " minimal setup, generated by NIX + " configuration generated by NIX set nocompatible - ${beforePlugins} - ${vamImpl} ${pathogenImpl} ${plugImpl} - ${vundleImpl} - ${neobundleImpl} ${nativeImpl} - filetype indent plugin on | syn on - ${customRC} ''; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 5d4fafacadd..b4ec1d2d696 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -122,6 +122,8 @@ in ms-vscode.cpptools = callPackage ./cpptools {}; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh {}; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; @@ -138,6 +140,29 @@ in }; }; + scala-lang.scala = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "scala"; + publisher = "scala-lang"; + version = "0.3.8"; + sha256 = "17dl10m3ayf57sqgil4mr9fjdm7i8gb5clrs227b768pp2d39ll9"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + + scalameta.metals = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "metals"; + publisher = "scalameta"; + version = "1.6.3"; + sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7"; + }; + meta = { + license = stdenv.lib.licenses.asl20; + }; + }; skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix new file mode 100644 index 00000000000..fe053dd7ea3 --- /dev/null +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, vscode-utils +, useLocalExtensions ? false}: +# Note that useLocalExtensions requires that vscode-server is not running +# on host. If it is, you'll need to remove ~/.vscode-server, +# and redo the install by running "Connect to host" on client + +let + inherit (vscode-utils) buildVscodeMarketplaceExtension; + + # patch runs on remote machine hence use of which + # links to local node if version is 12 + patch = '' + f="/home/''$USER/.vscode-server/bin/''$COMMIT_ID/node" + localNodePath=''$(which node) + if [ -x "''$localNodePath" ]; then + localNodeVersion=''$(node -v) + if [ "\''${localNodeVersion:1:2}" = "12" ]; then + echo PATCH: replacing ''$f with ''$localNodePath + rm ''$f + ln -s ''$localNodePath ''$f + fi + fi + ${stdenv.lib.optionalString useLocalExtensions '' + # Use local extensions + if [ -d ~/.vscode/extensions ]; then + if ! test -L "~/.vscode-server/extensions"; then + mkdir -p ~/.vscode-server + ln -s ~/.vscode/extensions ~/.vscode-server/ + fi + fi + ''} + ''; +in + buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-ssh"; + publisher = "ms-vscode-remote"; + version = "0.48.0"; + sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19"; + }; + + postPatch = '' + substituteInPlace "out/extension.js" \ + --replace "# install extensions" '${patch}' + ''; + + meta = with stdenv.lib; { + description ="Use any remote machine with a SSH server as your development environment."; + license = licenses.unfree; + maintainers = with maintainers; [ + tbenst + ]; + }; + } diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 8456d64a451..c3914777c6d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -18,7 +18,6 @@ let buildInputs = [ xar cpio python pbzx ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; outputs = [ "out" "dev" "man" ]; unpackPhase = '' @@ -52,7 +51,7 @@ let framework = name: deps: stdenv.mkDerivation { name = "apple-framework-${name}"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; # because we copy files from the system preferLocalBuild = true; @@ -137,7 +136,7 @@ in rec { libs = { xpc = stdenv.mkDerivation { name = "apple-lib-xpc"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include @@ -150,7 +149,7 @@ in rec { Xplugin = stdenv.mkDerivation { name = "apple-lib-Xplugin"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; # Not enough __propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ]; @@ -168,7 +167,7 @@ in rec { utmp = stdenv.mkDerivation { name = "apple-lib-utmp"; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index c803bf42187..b5a378cc6ae 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -70,6 +70,7 @@ with frameworks; with libs; { Kernel = [ IOKit ]; LDAP = []; LatentSemanticMapping = [ Carbon ]; + LocalAuthentication = []; MapKit = []; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ]; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix index 2d5520b9bf9..5685d09e54f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix @@ -3,7 +3,7 @@ appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ IOKit ]; - xcbuildFlags = "-target caffeinate"; + xcbuildFlags = [ "-target" "caffeinate" ]; installPhase = '' install -D Products/Deployment/caffeinate $out/bin/caffeinate ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix index f335a6c1154..f1b5e19feb2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Security/default.nix @@ -5,7 +5,7 @@ appleDerivation { # buildInputs = [ Foundation xpc darling ]; buildInputs = [ xpc xnu ]; - xcbuildFlags = "-target Security_frameworks_osx"; + xcbuildFlags = [ "-target" "Security_frameworks_osx" ]; # NIX_CFLAGS_COMPILE = "-Wno-error -I${xnu}/include/libkern -DPRIVATE -I${xnu}/Library/Frameworks/System.framework/Headers"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 8706d22be19..3e7e89642c2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -6,7 +6,7 @@ appleDerivation { buildInputs = [ CoreSymbolication darling xnu ]; NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration"; NIX_LDFLAGS = "-L./Products/Release"; - xcbuildFlags = "-target dtrace_frameworks -target dtrace"; + xcbuildFlags = [ "-target" "dtrace_frameworks" "-target" "dtrace" ]; doCheck = false; checkPhase = "xcodebuild -target dtrace_tests"; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix index 8bd45aa008b..2b196e46ef4 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -11,7 +11,7 @@ appleDerivation { --replace '#include <xpc/xpc.h>' "" ''; - xcbuildFlags = "-target util"; + xcbuildFlags = [ "-target" "util" ]; installPhase = '' mkdir -p $out/include diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index aaa3a1ebe32..afa5dc1c08c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -81,8 +81,8 @@ appleDerivation ({ export DSTROOT=$out ''; - buildFlags = lib.optionalString headersOnly "exporthdrs"; - installTargets = lib.optionalString headersOnly "installhdrs"; + buildFlags = lib.optional headersOnly "exporthdrs"; + installTargets = lib.optional headersOnly "installhdrs"; postInstall = lib.optionalString headersOnly '' mv $out/usr/include $out diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index cac2d97482a..2af1c5db2e3 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]; - buildFlags = "libtapi"; + buildFlags = [ "libtapi" ]; installTarget = "install-libtapi"; diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 9f5f8aa4422..768ca6cf9c9 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "reattach-to-user-namespace"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz"; - sha256 = "00mjyj8yicrpnlm46rlbkvxgl5381l8xawh7rmjk10p3zrm56jbv"; + sha256 = "0xxxdd26rcplhpvi2vy6crxadk3d1qkq4xry10lwq6dyya2jf6wb"; }; - buildFlags = "ARCHES=x86_64"; + buildFlags = [ "ARCHES=x86_64" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index d3e7dd5fa5d..77b351a1998 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 8b1faf788e5..7b356746861 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-xmlto" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; - installFlags = "ASOUND_STATE_DIR=$(TMPDIR)/dummy"; + installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { homepage = http://www.alsa-project.org/; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 658c8441276..7030bc0ca31 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -124,8 +124,8 @@ let prePatch = prePatchCommon; inherit patches; postPatch = "cd ./utils"; - makeFlags = ''LANGS=''; - installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin VIM_INSTALL_PATH=$(out)/share PYPREFIX=''; + makeFlags = [ "LANGS=" ]; + installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ]; postInstall = '' for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-status aa-unconfined ; do @@ -162,8 +162,8 @@ let prePatch = prePatchCommon; postPatch = "cd ./binutils"; - makeFlags = ''LANGS= USE_SYSTEM=1''; - installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin''; + makeFlags = [ "LANGS=" "USE_SYSTEM=1" ]; + installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" ]; inherit doCheck; @@ -187,8 +187,11 @@ let ''; inherit patches; postPatch = "cd ./parser"; - makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include AR=${stdenv.cc.bintools.targetPrefix}ar''; - installFlags = ''DESTDIR=$(out) DISTRO=unknown''; + makeFlags = [ + "LANGS=" "USE_SYSTEM=1" "INCLUDEDIR=${libapparmor}/include" + "AR=${stdenv.cc.bintools.targetPrefix}ar" + ]; + installFlags = [ "DESTDIR=$(out)" "DISTRO=unknown" ]; inherit doCheck; @@ -204,8 +207,8 @@ let buildInputs = [ libapparmor pam ]; postPatch = "cd ./changehat/pam_apparmor"; - makeFlags = ''USE_SYSTEM=1''; - installFlags = ''DESTDIR=$(out)''; + makeFlags = [ "USE_SYSTEM=1" ]; + installFlags = [ "DESTDIR=$(out)" ]; inherit doCheck; @@ -219,7 +222,7 @@ let nativeBuildInputs = [ which ]; postPatch = "cd ./profiles"; - installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles''; + installFlags = [ "DESTDIR=$(out)" "EXTRAS_DEST=$(out)/share/apparmor/extra-profiles" ]; inherit doCheck; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 1f24f4182de..fa2be46688c 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: -let - ver = "2019.3"; -in +let cfg = import ./version.nix; in + stdenv.mkDerivation rec { - name = "alfred-${ver}"; + pname = "alfred"; + inherit (cfg) version; src = fetchurl { - url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0rj7vyir4m63b69fgrz06mqlw7nivjfc8mdv19l02xs9vqh7khx4"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${version}/${pname}-${version}.tar.gz"; + sha256 = cfg.sha256.${pname}; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 537010dea53..57bafb398d1 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: -let - ver = "2019.3"; -in +let cfg = import ./version.nix; in + stdenv.mkDerivation rec { - name = "batctl-${ver}"; + pname = "batctl"; + inherit (cfg) version; src = fetchurl { - url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0307a01n72kg7vcm60mi8jna6bydiin2cr3ylrixra1596hkzn9b"; + url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${version}/${pname}-${version}.tar.gz"; + sha256 = cfg.sha256.${pname}; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 456872cdbd4..796be1e5d48 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2019.2"; in +let cfg = import ./version.nix; in -stdenv.mkDerivation { - name = "${base}-${kernel.version}"; +stdenv.mkDerivation rec { + pname = "batman-adv"; + version = "${cfg.version}-${kernel.version}"; src = fetchurl { - url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "1j5day3hia5nd21kb3msjblrybfr5sjnhrx7h5bb5ll8rykgdhvh"; + url = "http://downloads.open-mesh.org/batman/releases/${pname}-${cfg.version}/${pname}-${cfg.version}.tar.gz"; + sha256 = cfg.sha256.${pname}; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix new file mode 100644 index 00000000000..f9f3013e1f9 --- /dev/null +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -0,0 +1,9 @@ +{ + version = "2019.5"; + + sha256 = { + batman-adv = "1v18zvvg12jgywncbhxshgjc93r72ajpxgw22zp0zx22g2q13z99"; + alfred = "09npizg89ks1wm19l5xz0pq1ljpsbwy030xnprqnd0p53976wywa"; + batctl = "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz"; + }; +} diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 8024adeac64..cf9bcec554c 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -77,6 +77,8 @@ stdenv.mkDerivation rec { makeFlags = [ "rulesdir=${placeholder "out"}/lib/udev/rules.d" ]; + doCheck = stdenv.hostPlatform.isx86_64; + postInstall = '' mkdir -p $test/{bin,test} cp -a test $test diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index c54e3e38e9b..8b288fc046a 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -1,13 +1,13 @@ { stdenv , libopcodes, libbfd, libelf -, linuxPackages_latest +, linuxPackages_latest, zlib }: stdenv.mkDerivation { pname = "bpftool"; inherit (linuxPackages_latest.kernel) version src; - buildInputs = [ libopcodes libbfd libelf ]; + buildInputs = [ libopcodes libbfd libelf zlib ]; preConfigure = '' cd tools/bpf/bpftool diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 6d51907ea16..1262260664c 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "AADIR=$(out)/etc/apparmor.d" ]; - installTargets = "install-dist"; + installTargets = [ "install-dist" ]; meta = with stdenv.lib; { description = "Backlight and Keyboard LED control tool"; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 93ac3fe5b74..e24171dfefe 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ./gcc.patch ]; - makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; + makeFlags = [ "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}" ]; unpackPhase = '' sourceRoot=broadcom-sta diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index ea6a6e77572..1ee7ece0537 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ kerberos keyutils pam talloc ]; - makeFlags = "root_sbindir=$(out)/sbin"; + makeFlags = [ "root_sbindir=$(out)/sbin" ]; meta = with stdenv.lib; { homepage = http://www.samba.org/linux-cifs/cifs-utils/; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index 8ea3e3445cc..c46af5fba85 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)"]; - installFlags = ''PREFIX=""''; + installFlags = [ "PREFIX=\"\"" ]; meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/linuxconsole/; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix new file mode 100644 index 00000000000..a399ad7029f --- /dev/null +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitLab, kernel }: + +stdenv.mkDerivation rec { + pname = "ddcci-driver"; + version = "0.3.2"; + name = "${pname}-${kernel.version}-${version}"; + + src = fetchFromGitLab { + owner = "${pname}-linux"; + repo = "${pname}-linux"; + rev = "v${version}"; + sha256 = "0jl4l3vvxn85cbqr80p6bgyhf2vx9kbadrwx086wkj9ni8k6x5m6"; + }; + + hardeningDisable = [ "pic" ]; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + NIX_CFLAGS_COMPILE = [ "-Wno-error=incompatible-pointer-types" ]; + + prePatch = '' + substituteInPlace ./ddcci/Makefile \ + --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace depmod \# + substituteInPlace ./ddcci-backlight/Makefile \ + --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace depmod \# + ''; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "KVER=${kernel.modDirVersion}" + "KERNEL_MODLIB=$(out)/lib/modules/${kernel.modDirVersion}" + "INCLUDEDIR=$(out)/include" + ]; + + meta = with stdenv.lib; { + description = "Kernel module driver for DDC/CI monitors"; + homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; + license = licenses.gpl2; + maintainers = with maintainers; [ bricewge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 40f801881fc..94f32d2c432 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.5"; @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { sed 's/depmod /true /' -i Makefile ''; + patches = [ + # Fix build on Linux kernel >= 5.4 + # https://github.com/DIGImend/digimend-kernel-drivers/pull/331 + (fetchpatch { + url = "https://github.com/DIGImend/digimend-kernel-drivers/commit/fb8a2eb6a9198bb35aaccb81e22dd5ebe36124d1.patch"; + sha256 = "1j7l5hsk59gccydpf7n6xx1ki4rm6aka7k879a7ah5jn8p1ylgw9"; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; postInstall = '' diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index a4ec902f762..55dcba378ca 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { homepage = https://www.nongnu.org/dmidecode/; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 104fccd6955..414f276a210 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -7,16 +7,15 @@ , shared ? false }: let - kver = kernel.modDirVersion or null; mod = kernel != null; in stdenv.mkDerivation rec { name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "19.08.2"; + version = "19.11"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "141bqqy4w6nzs9z70x7yv94a4gmxjfal46pxry9bwdh3zi1jwnyd"; + sha256 = "1aqjn6bm9miv3v2rbqi1rh1c19wa8nip9fvnqaqpnrs3i2b36wa6"; }; nativeBuildInputs = [ @@ -44,13 +43,23 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Denable_docs=true" - "-Denable_kmods=${if kernel != null then "true" else "false"}" - ] - ++ lib.optionals (shared == false) [ - "-Ddefault_library=static" + "-Denable_kmods=${if mod then "true" else "false"}" ] + ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional (kernel != null) "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; + ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"; + + # dpdk meson script does not support separate kernel source and installion + # dirs (except via destdir), so we temporarily link the former into the latter. + preConfigure = lib.optionalString mod '' + mkdir -p $kmod/lib/modules/${kernel.modDirVersion} + ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ + $kmod/lib/modules/${kernel.modDirVersion} + ''; + + postBuild = lib.optionalString mod '' + rm -f $kmod/lib/modules/${kernel.modDirVersion}/build + ''; outputs = [ "out" ] ++ lib.optional mod "kmod"; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 0e35f45f042..74f3430c2d8 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -31,9 +31,13 @@ stdenv.mkDerivation rec { substituteInPlace scripts/drbd.rules --replace /usr/sbin/drbdadm $out/sbin/drbdadm ''; - makeFlags = "SHELL=${stdenv.shell}"; + makeFlags = [ "SHELL=${stdenv.shell}" ]; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; + installFlags = [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + "INITDIR=$(out)/etc/init.d" + ]; meta = with stdenv.lib; { homepage = http://www.drbd.org/; diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index 061dce04860..69acfa9682b 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -16,10 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libbfd libnl ncurses readline zlib ]; # To avoid running into https://sourceware.org/bugzilla/show_bug.cgi?id=14243 we need to define: - NIX_CFLAGS_COMPILE = [ - "-DPACKAGE=${pname}" - "-DPACKAGE_VERSION=${version}" - ]; + NIX_CFLAGS_COMPILE = "-DPACKAGE=${pname} -DPACKAGE_VERSION=${version}"; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index bd0ddb4ce1d..5cbddac82f0 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.26"; + version = "0.27"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1gnqd7dghwkcn48f6fr9qvkkm976b3x4bn3l7l2k9pamzpng084i"; + sha256 = "0pr9c4h535ggj54zfah9m3wziiwlig7r1hxpfx16s2s11ylrl9gd"; }; patches = [ diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 6aaaaec1b13..0d00eaa3ac8 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0acspj3djspfvgr3ng5b61qws6v2md6b0lc5qkby10mqnfpkvq85"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' install -dm755 "$out/share/licenses/extrace/" diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 8db9d4fb3b5..6e535cce898 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2019-10-22"; + version = "2019-12-15"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "03ycc55h7vgd4fmb7v7gl7lplf7pg7acs16aa2rramgldxqvyx7j"; + sha256 = "01zwmgva2263ksssqhhi46jh5kzb6z1a4xs8agsb2mbwifxf84cl"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "15nm0xh2xq8mnk7a66iljcklc15gvh6jcpz2d9llg1fkv6w8lqc6"; + outputHash = "1jp2bb87jbcml1q3r4yilf9l3pirr19zb70l6mlxlmbqml50zwzd"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 1f6a7145b77..aa2d9978178 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -211,6 +211,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" + "--libexecdir=${placeholder "out"}/libexec" ] ++ stdenv.lib.optionals (!haveDell) [ "-Dplugin_dell=false" "-Dplugin_synaptics=false" @@ -220,12 +221,6 @@ stdenv.mkDerivation rec { "-Dplugin_flashrom=true" ]; - # TODO: We need to be able to override the directory flags from meson setup hook - # better – declaring them multiple times might become an error. - preConfigure = '' - mesonFlagsArray+=("--libexecdir=$out/libexec") - ''; - postInstall = '' moveToOutput share/installed-tests "$installedTests" wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index 70a0bdbe240..c14e04dc344 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { ./do-not-create-sharedstatedir.patch ]; - NIX_CFLAGS_COMPILE = [ "-I${gnu-efi}/include/efi" ]; + NIX_CFLAGS_COMPILE = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member"; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix index db88ff05812..f68be3e8d2f 100644 --- a/pkgs/os-specific/linux/forkstat/default.nix +++ b/pkgs/os-specific/linux/forkstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.11"; + version = "0.02.12"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz"; - sha256 = "06lj8fl4083rp40i3sn8zggj165nvs3cq9dca66wcp9glb1d6yki"; + sha256 = "0na6didnqcjn0am65qyf32a01zilk736hqlnpfyqmv4jg31r02i5"; }; installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index 6402b5c69d8..66570bac942 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { mkdir -p "$out/bin" mkdir -p "$out/share/man/man8" ''; - makeFlags='' prefix="''${out}" manprefix="''${out}/share/" ''; + makeFlags = [ "prefix=$(out)" "manprefix=$(out)/share/" ]; meta = { inherit (s) version; description = ''Tool to detach from controlling TTY and attach to another''; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index a7aad276d37..6037f35ba86 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; - version = "1.07"; + version = "1.08"; src = fetchurl { url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "01841dfmf6aw39idlv8y52b1nw9wx4skklzqhw1f519m0671ajhh"; + sha256 = "1432sfgjv7xlas1saa0whnvqim2pb12g2522x3nf5a8v4qq7avbg"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/os-specific/linux/health-check/default.nix b/pkgs/os-specific/linux/health-check/default.nix index c6dc7bf66e2..d45f6c5f896 100644 --- a/pkgs/os-specific/linux/health-check/default.nix +++ b/pkgs/os-specific/linux/health-check/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.03"; + version = "0.03.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1bvgfzmvbqqhf1ailbwrsma6sbp5wcl6a35pb1n0y1n1p1hnqzph"; + sha256 = "0p85ai31n9hh6d4b79zzlczf9arsy7vmkjak1x3g9f5qj8fy4avp"; }; buildInputs = [ json_c libbsd ]; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index f5d80dc5258..98dab0e62d7 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipvsadm"; - version = "1.30"; + version = "1.31"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/ipvsadm/${pname}-${version}.tar.xz"; - sha256 = "033srm20n3114aci3b6cwxnkm7n68k09di2aziiryg27vxq3smwm"; + sha256 = "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 2d9554a4894..8e1bbd374cf 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.2"; + version = "1.4"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "10fwi31ym6hvn0vvh9fy0swzs3mfnpcwg95np4i5ksmw8k0kj0hf"; + sha256 = "13sig2lbiyi4x74ag37gvdqx5w18w6hmq9hc1ir4a1cqqf50v61v"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index fe5436625e8..58b1b53d52f 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libnl iptables ]; - makeFlags = "-C src/usr"; + makeFlags = [ "-C" "src/usr" ]; prePatch = '' sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ccc2f94814a..bcb2f0f8e7d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.159"; + version = "4.14.162"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1wi6m3w40z0v9krb12g9q09s9y471r51rhcv3qa81lc53cx2vm78"; + sha256 = "0jwbr7q17khv0174hl0kp78bsyhjv0mljfvrnbl9qdfl9hi70lgn"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a04156ebd84..0256476218a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.90"; + version = "4.19.93"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1zgpbim9019aymvgh0fr5g2r9j2xspw14amlnk09w5mgdl56rn19"; + sha256 = "0d2qgwnmvnwbsijc8k85sgmywyrv55wpah6qwjk6kgx8h8zx5x9a"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 199a85f7f4b..2ee7241396f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.206"; + version = "4.4.208"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14ylg9cm7z12mvkzg8z92gsw0libw9xz392ayzw0d9cgw1py39ax"; + sha256 = "03jj91z5dc0ybpjy9w6aanb3k53gcj7gsjc32h3ldf72hlmgz6aq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 885063c570a..e95a0d98139 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.206"; + version = "4.9.208"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mnabj0d5ra40hijwynnzxnh5w1qnvkvj2l3ydsdhkdwm6cpiwhx"; + sha256 = "0njjw1i8dilihn1hz62zra4b9y05fb3r2k2sqlkd0wfn86c1rbdp"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 11cfcae8673..89cbf776ac0 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.5"; + version = "5.4.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1h1ynb51gd4kiakqlkcc7vny45j2snbg4j985qf171mszckrz3jn"; + sha256 = "0llss8hbzkwqxx92y419vj2jvq0d8k52iivh3f59wgqr0b4i9i22"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index db9a23984c7..b6e4ea5d42a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17117"; + rev = "17174"; sha256 = "0hyd7wp73w4555d42xcvk4x4nxrfckbzah2ckb4d2aqzxab87789"; } , ... diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f89a7c93730..dcb274c9254 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5-rc2"; + version = "5.5-rc3"; extraMeta.branch = "5.5"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1fs432ld5k1j68hflqdxby9mxa6a7xnw1m6z5lfb9341gjw078xc"; + sha256 = "1rf394d1d6c0mvf6006gq1bscq3jjcvj9xxmdwallfwpp9igs8id"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d206910732c..0538511c528 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -164,6 +164,10 @@ let ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; + preInstall = '' + installFlagsArray+=("-j$NIX_BUILD_CORES") + ''; + # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ ( if platform ? kernelInstallTarget then platform.kernelInstallTarget diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index fa5b168389b..2af64c2ddc4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -6,6 +6,16 @@ patch = ./bridge-stp-helper.patch; }; + request_key_helper = + { name = "request-key-helper"; + patch = ./request-key-helper.patch; + }; + + request_key_helper_updated = + { name = "request-key-helper-updated"; + patch = ./request-key-helper-updated.patch; + }; + p9_fixes = { name = "p9-fixes"; patch = ./p9-fixes.patch; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 37b728bde88..9f32e3e37dd 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -46,22 +46,19 @@ stdenv.mkDerivation { # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. - NIX_CFLAGS_COMPILE = - [ "-Wno-error=cpp" - "-Wno-error=bool-compare" - "-Wno-error=deprecated-declarations" - "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" - ] - # gcc before 6 doesn't know these options - ++ stdenv.lib.optionals (hasPrefix "gcc-6" stdenv.cc.cc.name) [ - "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" - ]; + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=cpp" + "-Wno-error=bool-compare" + "-Wno-error=deprecated-declarations" + "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" + "-Wno-error=stringop-truncation" + ]; doCheck = false; # requires "sparse" doInstallCheck = false; # same separateDebugInfo = true; - installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)"; + installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' wrapProgram $out/bin/perf \ diff --git a/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch new file mode 100644 index 00000000000..aabb9e801be --- /dev/null +++ b/pkgs/os-specific/linux/kernel/request-key-helper-updated.patch @@ -0,0 +1,13 @@ +diff --git a/security/keys/request_key.c b/security/keys/request_key.c +index 88172c163953..4da74a1eebb2 100644 +--- a/security/keys/request_key.c ++++ b/security/keys/request_key.c +@@ -161,7 +161,7 @@ static int call_sbin_request_key(struct key_construction *cons, + + /* set up the argument list */ + i = 0; +- argv[i++] = "/sbin/request-key"; ++ argv[i++] = "/run/current-system/sw/bin/request-key"; + argv[i++] = (char *) op; + argv[i++] = key_str; + argv[i++] = uid_str; diff --git a/pkgs/os-specific/linux/kernel/request-key-helper.patch b/pkgs/os-specific/linux/kernel/request-key-helper.patch new file mode 100644 index 00000000000..8264e265aed --- /dev/null +++ b/pkgs/os-specific/linux/kernel/request-key-helper.patch @@ -0,0 +1,13 @@ +diff --git a/security/keys/request_key.c b/security/keys/request_key.c +index 957b9e3e1492..5436a0d8b81d 100644 +--- a/security/keys/request_key.c ++++ b/security/keys/request_key.c +@@ -114,7 +114,7 @@ static int call_usermodehelper_keys(const char *path, char **argv, char **envp, + */ + static int call_sbin_request_key(struct key *authkey, void *aux) + { +- static char const request_key[] = "/sbin/request-key"; ++ static char const request_key[] = "/run/current-system/sw/bin/request-key"; + struct request_key_auth *rka = get_request_key_auth(authkey); + const struct cred *cred = current_cred(); + key_serial_t prkey, sskey; diff --git a/pkgs/os-specific/linux/keyutils/conf-symlink.patch b/pkgs/os-specific/linux/keyutils/conf-symlink.patch new file mode 100644 index 00000000000..02762e857a8 --- /dev/null +++ b/pkgs/os-specific/linux/keyutils/conf-symlink.patch @@ -0,0 +1,13 @@ +diff --git a/request-key.c b/request-key.c +index bf47c0a..105fee8 100644 +--- a/request-key.c ++++ b/request-key.c +@@ -313,7 +313,7 @@ static void scan_conf_dir(struct parameters *params, const char *confdir) + while ((d = readdir(dir))) { + if (d->d_name[0] == '.') + continue; +- if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG) ++ if (d->d_type != DT_UNKNOWN && d->d_type != DT_REG && d->d_type != DT_LNK) + continue; + l = strlen(d->d_name); + if (l < 5) diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 792cd32d654..887aee45aa8 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch"; sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; }) + ./conf-symlink.patch ]; BUILDDATE = "1970-01-01"; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 96bb91175dc..ce76e31a920 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sed '16i#include <sys/stat.h>' -i ldm.c ''; - buildFlags = "ldm"; + buildFlags = [ "ldm" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 090bf6a566a..792568e8b57 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { --replace "-Werror" "" ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ + "prefix=${placeholder ''out''}" + ]; hardeningDisable = stdenv.lib.optional (stdenv.isi686) "stackprotector"; diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 9c730bb9659..174f1be99db 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { --replace 'man_prefix=$(prefix)' "man_prefix=$doc" ''; - installFlags = "RAISE_SETFCAP=no"; + installFlags = [ "RAISE_SETFCAP=no" ]; postInstall = '' rm "$lib"/lib/*.a diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index d8a2298f3d3..39e97f8473c 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "PREFIX=$(out)" diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 03bd0252c5c..b31554d6cee 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "SHLIBDIR=$(out)/lib" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = "-Wno-error"; passthru = { inherit se_release se_url; }; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index d4b3f374c5b..46c8dec8889 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9c48caaa243..7eac8fad64c 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { doCheck = false; # requires root # To prevent make install from failing. - preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + installFlags = [ "OWNER=" "GROUP=" "confdir=$(out)/etc" ]; # Install systemd stuff. #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index ec76cda9769..1f1c4b4d7c1 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = with maintainers; [ joachifm ]; + maintainers = with maintainers; [ joachifm ma27 ]; license = licenses.gpl2Plus; homepage = https://www.gnu.org/software/macchanger; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 13bdbcc19f6..a9947f92fc9 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "166"; + version = "167"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0q76lf5yrjq7b96ynj5dbf9ll94ymiab1b9106xpb4vbiwz0ia7w"; + sha256 = "0vkkqri3x11p7wz8z8rym4v637qpvw7lj6v40sx7sgh1g97ja9iy"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 297faa2a604..16c73377cb4 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; }; - makeFlags = "CC=${stdenv.cc.targetPrefix}cc"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' make install prefix=$out diff --git a/pkgs/os-specific/linux/mstpd/default.nix b/pkgs/os-specific/linux/mstpd/default.nix index 492a9321a21..4a7c6282d4c 100644 --- a/pkgs/os-specific/linux/mstpd/default.nix +++ b/pkgs/os-specific/linux/mstpd/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "mstpd"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "01majib6d1rixngf8c8vcrj1akf8nsqpxhdfdxxi2xwg23vx8f1a"; + sha256 = "1xkfydxljdnj49p5r3mirk4k146428b6imfc9bkfps9yjn64mkgb"; }; + patches = [ + (fetchpatch { + name = "fix-strncpy-gcc9.patch"; + url = "https://github.com/mstpd/mstpd/commit/d27d7e93485d881d8ff3a7f85309b545edbe1fc6.patch"; + sha256 = "19456daih8l3y6m9kphjr7pj7slrqzbj6yacnlgznpxyd8y4d86y"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 628b14b6a48..9a76e5873d4 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { makeFlags = [ "LIB=lib" "prefix=$(out)" - "mandir=$(out)/share/man/man8" + "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "unitdir=$(out)/lib/systemd/system" + "SYSTEMDPATH=lib" ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 3f53c0f5817..74363be47f4 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages +, python3, buildPackages, nixosTests }: let @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gss" + "--enable-svcgss" "--with-statedir=/var/lib/nfs" "--with-krb5=${lib.getLib kerberos}" "--with-systemd=${placeholder "out"}/etc/systemd/system" @@ -104,6 +105,12 @@ stdenv.mkDerivation rec { disallowedReferences = [ (lib.getDev kerberos) ]; + passthru.tests = { + nfs3-simple = nixosTests.nfs3.simple; + nfs4-simple = nixosTests.nfs4.simple; + nfs4-kerberos = nixosTests.nfs4.kerberos; + }; + meta = with stdenv.lib; { description = "Linux user-space NFS utilities"; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index ed84c41001b..0d5dd118798 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "install -m" "install -Dm" ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f1053cd994f..f5aad76b0b4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "440.36"; - sha256_64bit = "0nbdldwizb802w4x0rqnyb1p7iqz5nqiahqr534n5ihz21a6422h"; - settingsSha256 = "07hnl3bq76vsl655ipfx9v4zxjq0nc5hp43dk49nny4pi6ly06p1"; - persistencedSha256 = "08zm1i5sax16xfhkivkmady0yy5argmxv846x21q98ry1ic6cp6w"; + version = "440.44"; + sha256_64bit = "057wq9p2vl87gy61f079b6d7clw2vhw3kq7rj411brhrnvr7shmd"; + settingsSha256 = "1hr1n78c92zksnnryrcz4b8kxvi6kz4yp801ks85hq4a3rryj4vg"; + persistencedSha256 = "050znx2scm7x3r7czsz77ddjh4bs18hdd3k3shwpi3zflkmnhnvj"; } else legacy_390; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 76257f94fe7..cb7f3c9510c 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # To omit the hostnqn and hostid files that are impure and should be unique # for each target host: - installTargets = "install-spec"; + installTargets = [ "install-spec" ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 0bdc22da918..e1acda12025 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -5,7 +5,7 @@ version = "18.11.5"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0000000000000000000000000000000000000000000000000000"; + sha256 = "1n6nfaj7703l19jcw540lm8avni48hj9q1rq4mfp8b8gd4zjprj0"; }; }); @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { jansson ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + # for some reason, /build/odp-dpdk-1.22.0.0_DPDK_18.11/lib/.libs ends up in all binaries, # while it should be $out/lib instead. # prepend rpath with the proper location, the /build will get removed during rpath shrinking @@ -46,6 +48,8 @@ in stdenv.mkDerivation rec { # binaries will segfault otherwise dontStrip = true; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Open Data Plane optimized for DPDK"; homepage = https://www.opendataplane.org; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 7b34c1029ba..6a0273afbdd 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" ]; - installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns"; - installTargets = "install install_hdrs install_lib"; + installFlags = [ "etcdir=$(out)/etc" "vardir=$(out)/var/lib/isns" ]; + installTargets = [ "install" "install_hdrs" "install_lib" ]; meta = { description = "iSNS server and client for Linux"; diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 29ed9375c2e..4bda93baddc 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sh autogen.sh --prefix=$out ''; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index e01f84576ce..6bd59e1e7fd 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makefile = "Makefile.psm"; makeFlags = [ "PAXBIN=${paxctl}/bin/paxctl" "BINDIR=$(out)/bin" "RUNDIR=$(out)/lib/paxtest" ]; - installFlags = ''DESTDIR=""''; + installFlags = [ "DESTDIR=\"\"" ]; meta = with stdenv.lib; { description = "Test various memory protection measures"; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index aeb4d78d0ec..75c32577a00 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { ln -sf ${configOpts} ./config/config.opts'') ; - makeFlags = "LEX=flex"; - installFlags = ''INSTALL=install DESTDIR=''${out}''; + makeFlags = [ "LEX=flex" ]; + installFlags = [ "INSTALL=install" "DESTDIR=${placeholder "out"}" ]; postInstall = lib.concatMapStrings (path: '' for f in : $(find ${path} -type f); do diff --git a/pkgs/os-specific/linux/pktgen/configure.patch b/pkgs/os-specific/linux/pktgen/configure.patch new file mode 100644 index 00000000000..b4933313a51 --- /dev/null +++ b/pkgs/os-specific/linux/pktgen/configure.patch @@ -0,0 +1,17 @@ +1. librte_process_info does not exist. +2. lua5.3 library is liblua. +3. app/meson.build uses undeclared drivers_install_subdir. +--- a/lib/common/meson.build ++++ b/lib/common/meson.build +@@ -34,1 +34,1 @@ +-libs = ['eal', 'kvargs', 'cmdline', 'process_info'] ++libs = ['eal', 'kvargs', 'cmdline'] +--- a/lib/lua/meson.build ++++ b/lib/lua/meson.build +@@ -31 +31 @@ endforeach +-ext_deps += cc.find_library('lua5.3', required: true) ++ext_deps += cc.find_library('lua', required: true) +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -0,0 +1,1 @@ ++option('drivers_install_subdir', type: 'string', value: '') diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index fd57fa6e37c..3312f230247 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,41 +1,40 @@ -{ stdenv, lib, fetchurl, pkgconfig -, dpdk, libpcap, lua5_3, numactl, utillinux +{ stdenv, lib, fetchurl, meson, ninja, pkgconfig +, dpdk, libbsd, libpcap, lua5_3, numactl, utillinux , gtk2, which, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "3.7.2"; + version = "19.12.0"; src = fetchurl { url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/${pname}-${version}.tar.xz"; - sha256 = "03k7h4j2lsrh6b7477hgn87ljrjh2673ncffx9v261bx1ns54y7w"; + sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = - [ dpdk libpcap lua5_3 numactl which ] + [ dpdk libbsd libpcap lua5_3 numactl which ] ++ stdenv.lib.optionals withGtk [gtk2]; - RTE_SDK = "${dpdk}/share/dpdk"; - RTE_TARGET = "x86_64-native-linuxapp-gcc"; + RTE_SDK = dpdk; GUI = stdenv.lib.optionalString withGtk "true"; - NIX_CFLAGS_COMPILE = [ "-msse3" ]; + NIX_CFLAGS_COMPILE = "-msse3"; - postPatch = let dpdkMajor = lib.versions.major dpdk.version; in '' + patches = [ ./configure.patch ]; + + postPatch = '' substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu ''; - installPhase = '' - install -d $out/bin - install -m 0755 app/${RTE_TARGET}/pktgen $out/bin - install -m 0644 Pktgen.lua $out/bin + postInstall = '' + # meson installs unneeded files with conflicting generic names, such as + # include/cli.h and lib/liblua.so. + rm -rf $out/include $out/lib ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Traffic generator powered by DPDK"; homepage = http://dpdk.org/; diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/os-specific/linux/power-calibrate/default.nix index 75c6f1716fc..d62990ed4ff 100644 --- a/pkgs/os-specific/linux/power-calibrate/default.nix +++ b/pkgs/os-specific/linux/power-calibrate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "power-calibrate"; - version = "0.01.28"; + version = "0.01.29"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1miyjs0vngzfdlsxhn5gndcalzkh28grg4m6faivvp1c6mjp794m"; + sha256 = "1v8wvhjqglkvk9cl2b48lkcwhbc6nsdi3hjd7sap4hyvd6703pgs"; }; installFlags = [ diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b5e44a10947..09e4cbc438b 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -5,8 +5,6 @@ }: assert (!libsOnly) -> kernel != null; -# Disable for kernels 4.15 and above due to compatibility issues -assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15"; let xorgFullVer = lib.getVersion xorg.xorgserver; xorgVer = lib.versions.majorMinor xorgFullVer; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 1f39a99ea0b..62a6b645c2c 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "procps"; - version = "3.3.15"; + version = "3.3.16"; # The project's releases are on SF, but git repo on gitlab. src = fetchurl { url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz"; - sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h"; + sha256 = "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj"; }; buildInputs = [ ncurses ] diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 2162db25c86..b16b230ce27 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "26.1"; + version = "27.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1zb1y70ff8yy7rdl4gh2jx1gpja5hrbsh8gfi9fsxkz2rv1234r0"; + sha256 = "04mhcrcmbwxcjhswlkhnr6m5nl2389jgjv6aqhd4v0x555cwnfvw"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 6b6bef29cc3..80b5ce01243 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 78bcd925aea..4ad454437f5 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus libcap ]; - NIX_LDFLAGS = [ "-lrt" ]; + NIX_LDFLAGS = "-lrt"; meta = with stdenv.lib; { homepage = http://0pointer.de/blog/projects/rtkit; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index 57544659e86..f24921c7ce6 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index b1e01f705dc..f468196dc73 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ nukeReferences ]; - makeFlags = concatStringsSep " " [ + makeFlags = [ "ARCH=${stdenv.hostPlatform.platform.kernelArch}" # Normally not needed, but the Makefile sets ARCH in a broken way. "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" # Makefile uses $(uname -r); breaks us. ]; diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix index 94ba31d59e1..403f0a40010 100644 --- a/pkgs/os-specific/linux/rtlwifi_new/default.nix +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix index f2fa48b9efb..dbaf6f41325 100644 --- a/pkgs/os-specific/linux/smemstat/default.nix +++ b/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.05"; + version = "0.02.06"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "00586w6f1cq7rayv6galh9qxk7wrz62zbha9qhrb1cf85axchvbw"; + sha256 = "1069gwmc29vbw7zszqa5v5yxfvgaq7c41r0g456zdpm6msy5kb0w"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 399244e47ee..61a51afa3a7 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,32 +5,30 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.4"; + version = "0.26.5"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1v2j1ns17wyj7xl91p6wy1iwfx2fnn8af9nm939skc6229m87zzn"; + sha256 = "145mwg6izrpi4r1qrygi4yb7qd68g4k64i3qmamk0671wxhjqi3c"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc - ] ++ optional (kernel != null) kernel.moduleBuildDependencies; + ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" "-DSYSDIG_VERSION=${version}" + "-DCREATE_TEST_TARGETS=OFF" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; # needed since luajit-2.1.0-beta3 - NIX_CFLAGS_COMPILE = [ - "-DluaL_reg=luaL_Reg" - "-DluaL_getn(L,i)=((int)lua_objlen(L,i))" - ]; + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; preConfigure = '' cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 513503ff98e..213394e5ecc 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DSYSV"; - installFlags = "BINDIR=$(out)/sbin MANDIR=$(out)/share/man INSTALL=install"; + installFlags = [ "BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "INSTALL=install" ]; preConfigure = '' diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index ba6aff4e8bc..2ad7b21d451 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { export SYSTEMCTL=systemctl ''; - makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_FILE_ATTRIBUTES=y CHOWN=true"; - installTargets = "install_base install_nls install_man"; + makeFlags = [ "SYSCONFIG_DIR=$(out)/etc" "IGNORE_FILE_ATTRIBUTES=y" "CHOWN=true" ]; + installTargets = [ "install_base" "install_nls" "install_man" ]; patches = [ ./install.patch ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3cc976a909d..214c9b75cea 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -36,10 +36,10 @@ in stdenv.mkDerivation { # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { - owner = "NixOS"; + owner = "nixos"; repo = "systemd"; - rev = "491a247eff9b7ce1e5877f5f3431517c95f3222f"; - sha256 = "1xqiahapg480m165glrwqbfmc1fxw5sacdlm933cwyi1q8x4537g"; + rev = "d8853d39a28b9884e0acd3ae5732a1e7caaf08af"; + sha256 = "1wqm51i2czbbb3nara11mnxzqng4na1l8fvz7qnbxcrjsqm7hz18"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -180,18 +180,18 @@ in stdenv.mkDerivation { --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" ''; - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + NIX_CFLAGS_COMPILE = toString [ + # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; doCheck = false; # fails a bunch of tests @@ -263,6 +263,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ eelco andir mic92 ]; + maintainers = with maintainers; [ andir eelco flokli mic92 ]; }; } diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index 47b89f138c5..bfcf58a3530 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; buildInputs = [ libxml2 ncurses ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; meta = with stdenv.lib; { description = "Performance monitoring tool for Linux"; diff --git a/pkgs/os-specific/linux/untie/default.nix b/pkgs/os-specific/linux/untie/default.nix index d4f83eb8caf..9ca1c37e11b 100644 --- a/pkgs/os-specific/linux/untie/default.nix +++ b/pkgs/os-specific/linux/untie/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1334ngvbi4arcch462mzi5vxvxck4sy1nf0m58116d9xmx83ak0m"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A tool to run processes untied from some of the namespaces"; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 61f2c454046..f927eaefb4e 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,18 +1,22 @@ -{ stdenv, kernel, udev, autoconf, automake, libtool }: +{ lib, stdenv, kernel, udev, autoconf, automake, libtool }: stdenv.mkDerivation { name = "usbip-${kernel.name}"; src = kernel.src; - patches = [ + patches = lib.optionals (lib.versionAtLeast "5.4" kernel.version) [ # fixes build with gcc8 ./fix-snprintf-truncation.patch + # fixes build with gcc9 + ./fix-strncpy-truncation.patch ]; nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + preConfigure = '' cd tools/usb/usbip ./autogen.sh diff --git a/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch b/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch new file mode 100644 index 00000000000..a5c4c97bbc0 --- /dev/null +++ b/pkgs/os-specific/linux/usbip/fix-strncpy-truncation.patch @@ -0,0 +1,37 @@ +diff --git a/tools/usb/usbip/libsrc/usbip_common.c b/tools/usb/usbip/libsrc/usbip_common.c +index bb424638d75b..2fc5837e609a 100644 +--- a/tools/usb/usbip/libsrc/usbip_common.c ++++ b/tools/usb/usbip/libsrc/usbip_common.c +@@ -226,8 +226,8 @@ int read_usb_device(struct udev_device *sdev, struct usbip_usb_device *udev) + path = udev_device_get_syspath(sdev); + name = udev_device_get_sysname(sdev); + +- strncpy(udev->path, path, SYSFS_PATH_MAX); +- strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE); ++ strncpy(udev->path, path, SYSFS_PATH_MAX-1); ++ strncpy(udev->busid, name, SYSFS_BUS_ID_SIZE-1); + + sscanf(name, "%u-%u", &busnum, &devnum); + udev->busnum = busnum; +diff --git a/tools/usb/usbip/libsrc/usbip_device_driver.c b/tools/usb/usbip/libsrc/usbip_device_driver.c +index 5a3726eb44ab..95b416af8b99 100644 +--- a/tools/usb/usbip/libsrc/usbip_device_driver.c ++++ b/tools/usb/usbip/libsrc/usbip_device_driver.c +@@ -91,7 +91,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev) + copy_descr_attr16(dev, &descr, idProduct); + copy_descr_attr16(dev, &descr, bcdDevice); + +- strncpy(dev->path, path, SYSFS_PATH_MAX); ++ strncpy(dev->path, path, SYSFS_PATH_MAX-1); + + dev->speed = USB_SPEED_UNKNOWN; + speed = udev_device_get_sysattr_value(sdev, "current_speed"); +@@ -110,7 +110,7 @@ int read_usb_vudc_device(struct udev_device *sdev, struct usbip_usb_device *dev) + dev->busnum = 0; + + name = udev_device_get_sysname(plat); +- strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE); ++ strncpy(dev->busid, name, SYSFS_BUS_ID_SIZE-1); + return 0; + err: + fclose(fd); diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 5cb49485c5b..ec58d513b09 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ]; - NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ]; + NIX_CFLAGS_COMPILE = "-DENABLE_NOTIFICATIONS"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index b79a2cd342a..c66b4cbab83 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,18 +1,12 @@ { lib, stdenv, fetchurl, pkgconfig, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: -let - version = lib.concatStringsSep "." ([ majorVersion ] - ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.33"; - patchVersion = "2"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "util-linux"; - inherit version; + version = "2.33.2"; src = fetchurl { - url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${pname}-${version}.tar.xz"; + url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; }; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c2dca669616..56ab1751a91 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,11 +1,18 @@ -{ stdenv, kernel, wireguard-tools, perl }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; +# wireguard upstreamed since 5.6 https://lists.zx2c4.com/pipermail/wireguard/2019-December/004704.html +assert stdenv.lib.versionOlder kernel.version "5.6"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wireguard"; - inherit (wireguard-tools) src version; + version = "0.0.20200105"; + + src = fetchzip { + url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; + sha256 = "1b0amq4xjnl0bfxy6g0awbgnfymx3knd4ldai25z53j8f7d9xri7"; + }; preConfigure = '' cd src @@ -27,6 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; description = "Kernel module for the WireGuard secure network tunnel"; + downloadPage = "https://git.zx2c4.com/wireguard-linux-compat/refs/"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index ee8f0079075..0ddec9282e6 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { QTDIR = qt48; - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; + # cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ]; preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 6d2bf10cd91..02c2e03d90f 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -2,11 +2,11 @@ let name = "qpid-cpp-${version}"; - version = "1.38.0"; + version = "1.39.0"; src = fetchurl { url = "mirror://apache/qpid/cpp/${version}/${name}.tar.gz"; - sha256 = "1q7nsl9g8xv81ymhpkdp9mlw3gkzba62gggp3b72f0ywpc3kc3cz"; + sha256 = "088dx1l6myrksbhpr15bs09j6qm8vdliqwjp2ja5amym47md103r"; }; meta = with stdenv.lib; { @@ -16,7 +16,7 @@ let description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cpages ma27 ]; + maintainers = with maintainers; [ cpages ]; }; qpid-cpp = stdenv.mkDerivation { @@ -33,14 +33,16 @@ let sed -i '/management/d' CMakeLists.txt ''; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=deprecated-declarations" "-Wno-error=int-in-bool-context" "-Wno-error=maybe-uninitialized" "-Wno-error=unused-function" "-Wno-error=ignored-qualifiers" "-Wno-error=catch-value" - ]; + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + "-Wno-error=deprecated-copy" + ]); }; python-frontend = buildPythonPackage { diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index a25bf48f8dd..f1838f2a2cb 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - installFlags = "PREFIX=$(out) RMQ_ERLAPP_DIR=$(out)"; - installTargets = "install install-man"; + installFlags = [ "PREFIX=$(out)" "RMQ_ERLAPP_DIR=$(out)" ]; + installTargets = [ "install" "install-man" ]; runtimePath = stdenv.lib.makeBinPath [getconf erlang socat]; postInstall = '' diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 4d403e7d938..a5aead770b8 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.0.3"; + version = "7.2.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1anmhfdy4q74wchzha8fd2bd5hx0a2v3bgp9p5yvb8cal31zqcpd"; + sha256 = "1srwxk9c26hp1j3v6v1hr16l4dqaaiwrli5a9n9a44hkl7qy8yzl"; }; buildPhase = '' @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Team collaboration software written in Java and mainly used in corporate environments"; - homepage = https://www.atlassian.com/software/confluence; + homepage = "https://www.atlassian.com/software/confluence"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin willibutz ]; }; } diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 1d3e3e4f027..e5bc253f83d 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.5.0"; + version = "8.6.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "093706cpaw1a1vwvzpa85j7n338d748w372vsk8c9lvagaskiwh2"; + sha256 = "091vcr0hvrrm9zjqs67ai5mkx7b8ybpwqpdxy7jw5z3994rdx3xw"; }; buildPhase = '' diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index bf8623f0a89..2fb5b403508 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, avahi, cups }: +{ stdenv, buildGoPackage, fetchFromGitHub, avahi, cups, fetchpatch }: # TODO: Add a service for gcp-cups-connector and perhaps some other # kind of configuration for the same thing that gcp-connector-util @@ -19,6 +19,14 @@ buildGoPackage rec { "gcp-cups-connector" ]; + patches = [ + (fetchpatch { + # https://github.com/google/cloud-print-connector/pull/475 + url = "https://github.com/google/cloud-print-connector/commit/6a77c7c283b83cbcc9cbfab59710023cd09da3ed.patch"; + sha256 = "054pi9nz402va95z5k6wq3dalnv5rcya078wa99p1kdwb7cqmrcq"; + }) + ]; + src = fetchFromGitHub { owner = "google"; repo = "cloud-print-connector"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 8eb8437b0d5..637ac0607db 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "19.05.4.1"; + version = "19.05.5.1"; # 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 = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "07ydjda2dl9casz8hh91jlxdyc67mj4af1l2gq3gkzi4397azzz6"; + sha256 = "0f0gv3sirp6sxdrbwydsbcqicjbmrpm58yhgbsar8v6nx3g6y3hx"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 5e78fe742ac..8eb12a1b811 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = [ - "-Wno-error" "-fpermissive" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error -fpermissive"; postPatch = '' substituteInPlace Makefile.am \ diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index faa9976bed8..2d7acda90af 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nss, nspr, libqb -, dbus, rdma-core, libstatgrab, net_snmp +, dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ optional enableDbus dbus ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab - ++ optional enableSnmp net_snmp; + ++ optional enableSnmp net-snmp; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index e13967d7af1..5e4a07bdf25 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.8"; + version = "9.14.9"; src = fetchurl { url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "0xm0xrpgxq6gk6r6aa2w0lygnq02y1p614dmyjdmlsfnrrsslig5"; + sha256 = "0g2ph3hlw86yib8hv13qgkb4i84s9zv22r4k6yqlycm2izamwmr9"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index cb004a596d2..0c236fe9315 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -1,22 +1,26 @@ { stdenv, fetchurl, pkgconfig, systemd , boost, libsodium, libedit, re2 -, net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { +, net-snmp, lua, protobuf, openssl, zlib, h2o +}: + +stdenv.mkDerivation rec { pname = "dnsdist"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "1i3b1vpk9a8zbx9aby2s1ckkzhlvzgn11hcgj3b8x2j1b9771rqb"; + sha256 = "1h0x5xd13j8xxrrinb7d55851m6n9w0r15wx9m3c50dk7qngldm3"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ systemd boost libsodium libedit re2 net_snmp lua protobuf openssl ]; + nativeBuildInputs = [ pkgconfig protobuf ]; + buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ]; configureFlags = [ "--enable-libsodium" "--enable-re2" "--enable-dnscrypt" "--enable-dns-over-tls" + "--enable-dns-over-https" "--with-protobuf=yes" "--with-net-snmp" "--disable-dependency-tracking" @@ -26,6 +30,8 @@ doCheck = true; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "DNS Loadbalancer"; homepage = "https://dnsdist.org"; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index b6a405f6d2d..130a25511d7 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1664wpglrwqk627xma10f9qa652vzmf90gsjd8pribyj74xrczc1"; + sha256 = "0z7j3vwqqj0hh8n5irb2yqwzl45k4sn2wczbq1b1lqv5cxv6vgcy"; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 0a584ce1aca..e5fc3ac5bb9 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1hn2nw8v6gccwxwm36xczsac4bhxf8b8r7akri2wdp3gh70p4g7h"; + sha256 = "07w9av3v9zjnb1fhknmza168yxsq4zr2jqcla7yg10ajrhsk534d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 5bfb06cb15b..129fec2895b 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "powerdns"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0flhia156vir03np8va53rw31jsbg9wz3dyqqwddgai5bvr0f812"; + sha256 = "0a5al77rn4cd7v3g8c2q7627nf9b9g8dxg7yzz3b3jwgdfc1jl7n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 357237e1e29..42f280eed23 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig git ]; buildInputs = [ libmicrohttpd ]; - makeFlags = "BUILD=release"; + makeFlags = [ "BUILD=release" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index cce37fd8e6b..9782b289055 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gotify-server"; # Note that when this is updated, along with the hash, the `ui.nix` file # should include the same changes to the version and the sha256. - version = "2.0.11"; + version = "2.0.13"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6"; + sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; }; - modSha256 = "19mghbs1jasb7vxdw13mmwsbk5sfg3y2vvddr73c82lq0f8g2iha"; + modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index a47e5279585..2c1bddec68f 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.11"; + version = "2.0.13"; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0zrylyaxy1cks1wlzyf0di8in2braj4pfriyqa24vipwrlnhvgs6"; + sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d"; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index f205b600dd9..a05b37e9d2c 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p "$out/lib/udev/rules.d" ''; - installTargets = "install udev-install"; + installTargets = [ "install" "udev-install" ]; postFixup = '' wrapPythonProgramsIn $out/bin "$out $pythonPath" diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 7fc80ed7540..36b31947025 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "homeassistant-cli"; - version = "0.7.0"; + version = "0.8.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "a38d4669201ac2afa71b6578a220bf4d6d59131263b278d51ebd1479677f6baf"; + sha256 = "0qq42b2a0rlrzaxwf3zqks5gzgv0hf4pz4yjjl6ldnizw8fcj40n"; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 492d5a0b0dc..c9278cd16e6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -583,7 +583,7 @@ "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ ]; "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ ]; + "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; "qld_bushfire" = ps: with ps; [ ]; "qnap" = ps: with ps; [ ]; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 63861714145..d5da6df8d68 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -44,10 +44,6 @@ stdenv.mkDerivation rec { # Required for ‘pthread_cancel’. NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - preConfigure = '' - configureFlags="$configureFlags --includedir=$dev/include" - ''; - configureFlags = [ "--with-apr=${apr.dev}" "--with-apr-util=${aprutil.dev}" @@ -60,6 +56,7 @@ stdenv.mkDerivation rec { "--enable-cern-meta" "--enable-imagemap" "--enable-cgi" + "--includedir=${placeholder "dev"}/include" (stdenv.lib.enableFeature proxySupport "proxy") (stdenv.lib.enableFeature sslSupport "ssl") (stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix new file mode 100644 index 00000000000..37f2a397ae6 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap }: + +stdenv.mkDerivation rec { + pname = "mod_ca"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ apacheHttpd openssl openldap ]; + + # Note that configureFlags and installFlags are inherited by + # the various submodules. + # + configureFlags = [ + "--with-apxs=${apacheHttpd.dev}/bin/apxs" + ]; + + installFlags = [ + "INCLUDEDIR=${placeholder ''out''}/include" + "LIBEXECDIR=${placeholder ''out''}/modules" + ]; + + meta = with stdenv.lib; { + description = "RedWax CA service module"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix new file mode 100644 index 00000000000..54c0de1c701 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_crl"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + meta = with stdenv.lib; { + description = "RedWax module for Certificate Revocation Lists"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix new file mode 100644 index 00000000000..60f97d2f361 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_csr"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + # After openssl-1.0.2t, starting in openssl-1.1.0l + # parts of the OpenSSL struct API was replaced by + # getters - but some setters where forgotten. + # + # It is expected that these are back/retrofitted in version + # openssl-1.1.1d -- but while fixing this it was found + # that there were quite a few other setters missing and + # that some of the memory management needed was at odds + # with the principles used sofar. + # + # See https://github.com/openssl/openssl/pull/10563 + # + # So as a stopgap - use a minimalist compat. layer + # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h + # + preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h"; + + meta = with stdenv.lib; { + description = "RedWax CA service module to handle Certificate Signing Requests"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h new file mode 100644 index 00000000000..a2a9e0f7a18 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h @@ -0,0 +1,66 @@ +/* Licensed to Stichting The Commons Conservancy (TCC) under one or more + * contributor license agreements. See the AUTHORS file distributed with + * this work for additional information regarding copyright ownership. + * TCC licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c +// and the private header files for that. They are needed as +// starting with OpenSSL 1.1.0 the X509_req structure became +// private; and got some get0 functions to access its internals. +// But no getter's until post 1.1.1 (PR#10563). So this is a +// stopgap for these lacking releases. +// +// Testest against: +// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile) +// openssl-1.1.0l 0x0101000cfL (needs it) +// openssl-1.1.1d 0x01010104fL (last version that needs it) +// openssl-1.1.1-dev (should not need it - post PR#10563). +// +/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */ +#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#include "openssl/x509.h" + +#define HAS_OPENSSL_PR10563_WORK_AROUND + +struct X509_req_info_st { + ASN1_ENCODING enc; + ASN1_INTEGER *version; + X509_NAME *subject; + X509_PUBKEY *pubkey; + STACK_OF(X509_ATTRIBUTE) *attributes; +}; + +typedef _Atomic int CRYPTO_REF_COUNT; + +struct X509_req_st { + X509_REQ_INFO req_info; + X509_ALGOR sig_alg; + ASN1_BIT_STRING *signature; /* signature */ + CRYPTO_REF_COUNT references; + CRYPTO_RWLOCK *lock; +# ifndef OPENSSL_NO_SM2 + ASN1_OCTET_STRING *sm2_id; +# endif +}; + + +static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg) +{ + if (req->sig_alg.algorithm) + ASN1_OBJECT_free(req->sig_alg.algorithm); + if (req->sig_alg.parameter) + ASN1_TYPE_free(req->sig_alg.parameter); + req->sig_alg = *palg; +} +#endif diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix new file mode 100644 index 00000000000..6730ca16f10 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_ocsp"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + meta = with stdenv.lib; { + description = "RedWax CA service modules of OCSP Online Certificate Validation"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix new file mode 100644 index 00000000000..2bcf3b1d9c2 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_pkcs12"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + meta = with stdenv.lib; { + description = "RedWax CA service modules for PKCS#12 format files"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index f947bf535cc..6aed1481ddf 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { --replace '-$GIT' "" ''; + installFlags = [ "LIBEXECDIR=${placeholder "out"}/modules" ]; + preInstall = '' - installFlags="LIBEXECDIR=$out/modules $installFlags" mkdir -p $out/modules $out/bin ''; diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix new file mode 100644 index 00000000000..98703659c35 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_scep"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + # After openssl-1.0.2t, starting in openssl-1.1.0l + # parts of the OpenSSL struct API was replaced by + # getters - but some setters where forgotten. + # + # It is expected that these are back/retrofitted in version + # openssl-1.1.1d -- but while fixing this it was found + # that there were quite a few other setters missing and + # that some of the memory management needed was at odds + # with the principles used sofar. + # + # See https://github.com/openssl/openssl/pull/10563 + # + # So as a stopgap - use a minimalist compat. layer + # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h + # + preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h"; + + meta = with stdenv.lib; { + description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h new file mode 100644 index 00000000000..a2a9e0f7a18 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h @@ -0,0 +1,66 @@ +/* Licensed to Stichting The Commons Conservancy (TCC) under one or more + * contributor license agreements. See the AUTHORS file distributed with + * this work for additional information regarding copyright ownership. + * TCC licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c +// and the private header files for that. They are needed as +// starting with OpenSSL 1.1.0 the X509_req structure became +// private; and got some get0 functions to access its internals. +// But no getter's until post 1.1.1 (PR#10563). So this is a +// stopgap for these lacking releases. +// +// Testest against: +// openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile) +// openssl-1.1.0l 0x0101000cfL (needs it) +// openssl-1.1.1d 0x01010104fL (last version that needs it) +// openssl-1.1.1-dev (should not need it - post PR#10563). +// +/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L && OPENSSL_VERSION_NUMBER <= 0x01010104fL */ +#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#include "openssl/x509.h" + +#define HAS_OPENSSL_PR10563_WORK_AROUND + +struct X509_req_info_st { + ASN1_ENCODING enc; + ASN1_INTEGER *version; + X509_NAME *subject; + X509_PUBKEY *pubkey; + STACK_OF(X509_ATTRIBUTE) *attributes; +}; + +typedef _Atomic int CRYPTO_REF_COUNT; + +struct X509_req_st { + X509_REQ_INFO req_info; + X509_ALGOR sig_alg; + ASN1_BIT_STRING *signature; /* signature */ + CRYPTO_REF_COUNT references; + CRYPTO_RWLOCK *lock; +# ifndef OPENSSL_NO_SM2 + ASN1_OCTET_STRING *sm2_id; +# endif +}; + + +static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg) +{ + if (req->sig_alg.algorithm) + ASN1_OBJECT_free(req->sig_alg.algorithm); + if (req->sig_alg.parameter) + ASN1_TYPE_free(req->sig_alg.parameter); + req->sig_alg = *palg; +} +#endif diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix new file mode 100644 index 00000000000..72e0d521e3b --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_spkac"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + meta = with stdenv.lib; { + description = "RedWax CA service module for handling the Netscape keygen requests. "; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix new file mode 100644 index 00000000000..139da289078 --- /dev/null +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }: + +stdenv.mkDerivation rec { + pname = "mod_timestamp"; + version = "0.2.1"; + + src = fetchurl { + url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; + sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mod_ca apr aprutil ]; + inherit (mod_ca) configureFlags installFlags; + + meta = with stdenv.lib; { + description = "RedWax CA service module for issuing signed timestamps"; + + homepage = "https://redwax.eu"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ dirkx ]; + }; +} diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 461ab1e297e..c0e4cefa40a 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mod_wsgi"; - version = "4.6.8"; + version = "4.7.0"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "0xym7i3iaxqi23dayacv2llhi0klxcb4ldll5cjxv6lg9v5r88x2"; + sha256 = "079f4py20jd6n3d7djak5l9j8p6hfq96lf577iir6qpfsk2p0k3n"; }; buildInputs = [ apacheHttpd python ncurses ]; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index a8de0d7e084..d599956cfda 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake, ninja -, libressl, libuv, zlib +, openssl, libuv, zlib }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ninja ]; - buildInputs = [ libressl libuv zlib ]; + buildInputs = [ openssl libuv zlib ]; meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index a3bcb64e6c0..4e799774569 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "An advanced and secure webserver"; license = licenses.gpl2; platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" - maintainers = [ maintainers.ndowens ]; + maintainers = []; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 2c0dbc7d665..990d7c5cf13 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -53,15 +53,15 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_geoip_module" "--with-stream_realip_module" "--with-stream_ssl_module" "--with-stream_ssl_preread_module" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" ] ++ optional (perl != null) [ @@ -73,10 +73,10 @@ stdenv.mkDerivation { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString ([ "-I${libxml2.dev}/include/libxml2" "-Wno-error=implicit-fallthrough" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); configurePlatforms = []; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 5e21e8734bf..78ad5c5582d 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -258,6 +258,15 @@ in inputs = [ pkgs.pam ]; }; + pinba = { + src = fetchFromGitHub { + owner = "tony2001"; + repo = "ngx_http_pinba_module"; + rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6"; + sha256 = "00fii8bjvyipq6q47xhjhm3ylj4rhzmlk3qwxmfpdn37j7bc8p8c"; + }; + }; + push-stream ={ src = fetchFromGitHub { owner = "wandenberg"; diff --git a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch index 9dec715bf6c..c1473ccdb1b 100644 --- a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch +++ b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch @@ -1,14 +1,8 @@ -From f6a978f024d01202f954483423af1b2d5d5159a6 Mon Sep 17 00:00:00 2001 -From: Yegor Timoshenko <yegortimoshenko@riseup.net> -Date: Fri, 28 Sep 2018 03:27:04 +0000 -Subject: [PATCH] If root is in Nix store, set ETag to its path hash - ---- - src/http/ngx_http_core_module.c | 56 +++++++++++++++++++++++++++++---- - 1 file changed, 50 insertions(+), 6 deletions(-) +This patch makes it possible to serve static content from Nix store paths, by +using the hash of the store path for the ETag header. diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c -index c57ec00c..b7992de2 100644 +index cb49ef74..f88dc77c 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1583,6 +1583,7 @@ ngx_http_set_etag(ngx_http_request_t *r) @@ -19,7 +13,7 @@ index c57ec00c..b7992de2 100644 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); -@@ -1598,16 +1599,61 @@ ngx_http_set_etag(ngx_http_request_t *r) +@@ -1598,16 +1599,62 @@ ngx_http_set_etag(ngx_http_request_t *r) etag->hash = 1; ngx_str_set(&etag->key, "ETag"); @@ -68,6 +62,7 @@ index c57ec00c..b7992de2 100644 + } + + ngx_memcpy(etag->value.data, ptr1, etag->value.len); ++ ngx_http_clear_last_modified(r); + } else { + etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3); + @@ -87,6 +82,3 @@ index c57ec00c..b7992de2 100644 r->headers_out.etag = etag; --- -2.19.0 - diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 53773302963..328db9ec986 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; nativeBuildInputs = [ perl ]; - NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; preConfigure = '' patchShebangs . diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 379a5c242f7..1eeb5a8c4dd 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -53,23 +53,23 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" - ] ++ optional withDebug [ + ] ++ optionals withDebug [ "--with-debug" - ] ++ optional withMail [ + ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (!withMail) [ + ] ++ optionals (!withMail) [ "--without-mail_pop3_module" "--without-mail_imap_module" "--without-mail_smtp_module" - ] ++ optional withStream [ + ] ++ optionals withStream [ "--with-stream" "--with-stream_ssl_module" "--with-stream_realip_module" "--with-stream_geoip_module" "--with-stream_ssl_preread_module" "--with-stream_sni" - ] ++ optional (!withStream) [ + ] ++ optionals (!withStream) [ "--without-stream_limit_conn_module" "--without-stream_access_module" "--without-stream_geo_module" @@ -84,10 +84,8 @@ stdenv.mkDerivation rec { ++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; - NIX_CFLAGS_COMPILE = [ - "-I${libxml2.dev}/include/libxml2" - "-Wno-error=implicit-fallthrough" - ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough" + + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations"; preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules); diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 8711be4b5c0..d210fcefc85 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -9,6 +9,7 @@ , withRuby_2_4 ? false, ruby_2_4 , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 +, withRuby_2_7 ? true, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { ++ optional withRuby_2_4 ruby_2_4 ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 + ++ optional withRuby_2_7 ruby_2_7 ++ optional withSSL openssl; configureFlags = [ @@ -47,9 +49,9 @@ stdenv.mkDerivation rec { "--pid=/run/unit/unit.pid" "--user=unit" "--group=unit" - ] ++ optional withSSL [ "--openssl" ] - ++ optional (!withIPv6) [ "--no-ipv6" ] - ++ optional withDebug [ "--debug" ]; + ] ++ optional withSSL "--openssl" + ++ optional (!withIPv6) "--no-ipv6" + ++ optional withDebug "--debug"; postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} @@ -62,6 +64,7 @@ stdenv.mkDerivation rec { ${optionalString withRuby_2_4 "./configure ruby --module=ruby24 --ruby=${ruby_2_4}/bin/ruby"} ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} + ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; meta = { diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index e7bff373c3a..8de4c471e22 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap -, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python +, db, cyrus_sasl, svrcore, icu, net-snmp, kerberos, pcre, perlPackages, libevent, openssl, python }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; buildInputs = [ perl pam nspr nss openldap db cyrus_sasl svrcore icu - net_snmp kerberos pcre libevent openssl python + net-snmp kerberos pcre libevent openssl python ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]); patches = [ @@ -46,7 +46,9 @@ stdenv.mkDerivation rec { "--with-db-inc=${db.dev}/include" "--with-db-lib=${db.out}/lib" "--with-sasl=${cyrus_sasl.dev}" - "--with-netsnmp=${net_snmp}" + "--with-netsnmp=yes" + "--with-netsnmp-inc=${stdenv.lib.getDev net-snmp}/include" + "--with-netsnmp-lib=${stdenv.lib.getLib net-snmp}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 5a318c311af..55cc4c121f0 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation rec { sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings ''; - # fix build on gcc7 - NIX_CFLAGS_COMPILE = [ + # fix build on gcc7+ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=builtin-declaration-mismatch" "-Wno-error=implicit-fallthrough" + "-Wno-error=deprecated-copy" ]; buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index f7ed6382a7b..14d36ad6554 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -48,39 +48,38 @@ stdenv.mkDerivation rec { "--with-scheduler-ram" "--with-scheduler-stub" - ] ++ stdenv.lib.optional enablePython [ + ] ++ stdenv.lib.optionals enablePython [ "--with-python=${python2}" "--with-filter-python" "--with-queue-python" "--with-table-python" "--with-scheduler-python" - ] ++ stdenv.lib.optional enableLua [ + ] ++ stdenv.lib.optionals enableLua [ "--with-lua=${pkgconfig}" "--with-filter-lua" - ] ++ stdenv.lib.optional enablePerl [ + ] ++ stdenv.lib.optionals enablePerl [ "--with-perl=${perl}" "--with-filter-perl" - ] ++ stdenv.lib.optional enableMysql [ + ] ++ stdenv.lib.optionals enableMysql [ "--with-table-mysql" - ] ++ stdenv.lib.optional enablePostgres [ + ] ++ stdenv.lib.optionals enablePostgres [ "--with-table-postgres" - ] ++ stdenv.lib.optional enableSqlite [ + ] ++ stdenv.lib.optionals enableSqlite [ "--with-table-sqlite" - ] ++ stdenv.lib.optional enableRedis [ + ] ++ stdenv.lib.optionals enableRedis [ "--with-table-redis" ]; - NIX_CFLAGS_COMPILE = - stdenv.lib.optional enableRedis + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString enableRedis "-I${hiredis}/include/hiredis -lhiredis" - ++ stdenv.lib.optional enableMysql - "-L${libmysqlclient}/lib/mysql"; + + stdenv.lib.optionalString enableMysql + " -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index b3345f9420c..c0e6252a551 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; - NIX_LDFLAGS = lib.optional withLDAP "-llber"; + NIX_LDFLAGS = lib.optionalString withLDAP "-llber"; installTargets = [ "non-interactive-package" ]; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 8a92843e43e..9fb441a92de 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -42,12 +42,9 @@ stdenv.mkDerivation { --replace /bin/bash ${bash}/bin/bash; ''; - NIX_CFLAGS_COMPILE = [ - "-Wno-error=unused-result" "-Wno-error=nonnull-compare" - "-Wno-error=format-truncation" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=nonnull-compare -Wno-error=format-truncation"; - makeFlags = "DESTDIR=$(out) prefix="; + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; meta = { description = "A collection of postfix-related tools"; diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix new file mode 100644 index 00000000000..b4749558500 --- /dev/null +++ b/pkgs/servers/mail/public-inbox/default.nix @@ -0,0 +1,66 @@ +{ buildPerlPackage, lib, fetchurl, makeWrapper +, DBDSQLite, EmailMIME, IOSocketSSL, IPCRun, Plack, PlackMiddlewareReverseProxy +, SearchXapian, TimeDate, URI +, git, highlight, openssl, xapian +}: + +let + + # These tests would fail, and produce "Operation not permitted" + # errors from git, because they use git init --shared. This tries + # to set the setgid bit, which isn't permitted inside build + # sandboxes. + # + # These tests were indentified with + # grep -r shared t/ + skippedTests = [ "convert-compact" "search" "v2writable" "www_listing" ]; + + testConditions = with lib; + concatMapStringsSep " " (n: "! -name ${escapeShellArg n}.t") skippedTests; + +in + +buildPerlPackage rec { + pname = "public-inbox"; + version = "1.2.0"; + + src = fetchurl { + url = "https://public-inbox.org/releases/public-inbox-${version}.tar.gz"; + sha256 = "0sa2m4f2x7kfg3mi4im7maxqmqvawafma8f7g92nyfgybid77g6s"; + }; + + outputs = [ "out" "devdoc" "sa_config" ]; + + postConfigure = '' + substituteInPlace Makefile --replace 'TEST_FILES = t/*.t' \ + 'TEST_FILES = $(shell find t -name *.t ${testConditions})' + ''; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ + DBDSQLite EmailMIME IOSocketSSL IPCRun Plack PlackMiddlewareReverseProxy + SearchXapian TimeDate URI highlight + ]; + + checkInputs = [ git openssl xapian ]; + preCheck = '' + perl certs/create-certs.perl + ''; + + installTargets = [ "install" ]; + postInstall = '' + for prog in $out/bin/*; do + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ git ]} + done + + mv sa_config $sa_config + ''; + + meta = with lib; { + homepage = "https://public-inbox.org/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 95d39c999ee..274f45d5b2d 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -12,15 +12,17 @@ perlPackages.buildPerlPackage rec { # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434 patches = [ ./sa-update_add--siteconfigpath.patch ]; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM - LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF NetDNSResolverProgrammable - Socket6 ]); + buildInputs = [ makeWrapper ] ++ (with perlPackages; [ + HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP + IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF + NetDNSResolverProgrammable Socket6 + ]); # Enabling 'taint' mode is desirable, but that flag disables support # for the PERL5LIB environment variable. Needs further investigation. - makeFlags = "PERL_BIN=${perlPackages.perl}/bin/perl PERL_TAINT=no"; + makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ]; - makeMakerFlags = "CONFDIR=/homeless/shelter LOCALSTATEDIR=/var/lib/spamassassin"; + makeMakerFlags = [ "CONFDIR=/homeless/shelter" "LOCALSTATEDIR=/var/lib/spamassassin" ]; doCheck = false; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 72e3b5fc0e8..577915be134 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, python3, openssl -, enableSystemd ? stdenv.isLinux +, enableSystemd ? stdenv.isLinux, nixosTests }: with python3.pkgs; @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.7.0"; + version = "1.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1z7q34yazjb3glzhm0si0pzif32gnp03bmd490gckkl30rklyxsp"; + sha256 = "1vpwf6jqwb66mq31lk5f0wzfsqa2l65rd7b1zqjbhvmz0js8kz5f"; }; patches = [ @@ -78,6 +78,8 @@ in buildPythonApplication rec { doCheck = !stdenv.isDarwin; + passthru.tests = { inherit (nixosTests) matrix-synapse; }; + checkPhase = '' PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests ''; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 415609e77c2..5089acc2a0f 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,30 +4,32 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.6.1"; + version = "0.7.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lsi6x5yr8f9yjxsh1rmcd6wnxr6s6rpr720lg7sq629m42d9p1d"; + sha256 = "0xzivcn1s5j2nn9p7li9bzr0h225bnli4fr3yrh8v7npx2ymg1r3"; }; patches = [ + # fix tests (fetchpatch { - url = https://github.com/tulir/mautrix-telegram/commit/be6d395ed66d86ec7f13a262f9ae37731987019c.patch; - sha256 = "1q69ip17r45yhyrxr0pj8bvqj2grw2l39wak8pi5pm7qrxra93j2"; + url = "https://github.com/tulir/mautrix-telegram/commit/fe52f0ad106122f08af72e356c4c62bb8875b453.patch"; + sha256 = "0r7j7q78brqqx0rkchld328k00yq0ykdk7syvwpihqzj3gchacb7"; }) ]; - disabled = pythonOlder "3.6"; - postPatch = '' sed -i -e '/alembic>/d' setup.py + substituteInPlace setup.py \ + --replace "telethon>=1.9,<1.10" "telethon~=1.9" ''; propagatedBuildInputs = [ Mako aiohttp - mautrix-appservice + mautrix sqlalchemy CommonMark ruamel_yaml @@ -63,6 +65,7 @@ buildPythonPackage rec { homepage = https://github.com/tulir/mautrix-telegram; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; + platforms = platforms.linux; maintainers = with maintainers; [ nyanloutre ma27 ]; }; } diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 5c0fa2886dc..e266ea71ee0 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.33.6"; + version = "0.33.7.1"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1q5d323fzfvlc12v1g0mahlcz2sjii3k7cc6qg8q4q8yl0vg5c9k"; + sha256 = "1rx9v0vcrpsjsclap4x9ic9jwhyd24v1n1v8si18blzn3iyr8c36"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 96f09c2f82a..dd06c358358 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "miniflux"; - version = "2.0.18"; + version = "2.0.19"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0480f4481qf47l3l79f4gxhgfzzhfapjvl18kw9qjj3rzqn9xyj4"; + sha256 = "121qy1af1qbc09c3yfwhpk6r3hwmh3jg6gjx8ygfv3hfrss9yfll"; }; goPackagePath = "miniflux.app"; diff --git a/pkgs/servers/monitoring/alertmanager-bot/default.nix b/pkgs/servers/monitoring/alertmanager-bot/default.nix new file mode 100644 index 00000000000..8677a8d03f2 --- /dev/null +++ b/pkgs/servers/monitoring/alertmanager-bot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "alertmanager-bot"; + version = "0.4.0"; + + goPackagePath = "github.com/metalmatze/alertmanager-bot"; + + src = fetchFromGitHub { + owner = "metalmatze"; + repo = pname; + rev = version; + sha256 = "10v0fxxcs5s6zmqindr30plyw7p2yg0a64rdw1b2cj2mc1m3byx3"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Bot for Prometheus' Alertmanager"; + homepage = "https://github.com/metalmatze/alertmanager-bot"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/servers/monitoring/alertmanager-bot/deps.nix b/pkgs/servers/monitoring/alertmanager-bot/deps.nix new file mode 100644 index 00000000000..51e98ccbc93 --- /dev/null +++ b/pkgs/servers/monitoring/alertmanager-bot/deps.nix @@ -0,0 +1,948 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/DataDog/datadog-go"; + fetch = { + type = "git"; + url = "https://github.com/DataDog/datadog-go"; + rev = "0ddda6bee211"; + sha256 = "07ap1qhz8vwdypmlny5gxnc191c0qbm6acacs30m1d4p22x6wxip"; + }; + } + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.5"; + sha256 = "15ai4nzm8cv8nqs4xm5h6ghnms19c2sp8z0zpkc46rld6y7k0xky"; + }; + } + { + 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/armon/circbuf"; + fetch = { + type = "git"; + url = "https://github.com/armon/circbuf"; + rev = "bbbad097214e"; + sha256 = "1idpr0lzb2px2p3wgfq2276yl7jpaz43df6n91kf790404s4zmk3"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "f0300d1749da"; + sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "7fddfc383310"; + sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "v1.3.1"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.0.0"; + sha256 = "02aii7z46sasagw816zz3v0gzax1z5d1hkjslz7ng25386p0gzk1"; + }; + } + { + goPackagePath = "github.com/circonus-labs/circonus-gometrics"; + fetch = { + type = "git"; + url = "https://github.com/circonus-labs/circonus-gometrics"; + rev = "v2.0.0"; + sha256 = "0d6cnswq28mjak7092vf89f9l0ga2ziwyamq9kdgfc7aavpwr6l9"; + }; + } + { + goPackagePath = "github.com/circonus-labs/circonusllhist"; + fetch = { + type = "git"; + url = "https://github.com/circonus-labs/circonusllhist"; + rev = "6e85b9352cf0"; + sha256 = "182gry1clk12m34574qif7bx74qpxib2zv0mr5kv2j9hfq7f9m01"; + }; + } + { + goPackagePath = "github.com/creack/pty"; + fetch = { + type = "git"; + url = "https://github.com/creack/pty"; + rev = "v1.1.7"; + sha256 = "1plwwlk1i9b80zv8zdplvv81shfyc9gf0flydnydsh5sr3ib5vrc"; + }; + } + { + 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/docker/libkv"; + fetch = { + type = "git"; + url = "https://github.com/docker/libkv"; + rev = "v0.2.1"; + sha256 = "0blq7kxjy1bvm3j5q4i6csnc4i88c1wvj4gjvxbqfk3sny73gjkr"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "4030bb1f1f0c"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.1"; + sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/hako/durafmt"; + fetch = { + type = "git"; + url = "https://github.com/hako/durafmt"; + rev = "ea3ab126a649"; + sha256 = "1niq0v6av5vsn4rizfda4zq922jvavig5b0qg9g0gyz6cj62rjzs"; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "v1.4.5"; + sha256 = "0gpg3cbpsmzcaab3scqhpzz57892s95hwq5z0l9bq7qqm6iqfr9d"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "3573b8b52aa7"; + sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-immutable-radix"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-immutable-radix"; + rev = "v1.0.0"; + sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-msgpack"; + rev = "v0.5.5"; + sha256 = "0fqmfx3dxnvb0d23cpn2xpd067pibwlchdc58ln8w6lznzrbzaan"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.0.0"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-retryablehttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-retryablehttp"; + rev = "794af36148bf"; + sha256 = "1686d4qav0ayj3f5881w3kd9pz4fxsmknfqwccbj9yklxm3khvp4"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "v1.0.1"; + sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-sockaddr"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-sockaddr"; + rev = "v1.0.2"; + sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "v1.0.0"; + sha256 = "09vccqggz212cg0jir6vv708d6mx0f9w5bxrcdah3h6chgmal6v1"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "v1.0.1"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.3"; + sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb"; + }; + } + { + goPackagePath = "github.com/hashicorp/logutils"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/logutils"; + rev = "v1.0.0"; + sha256 = "076wf4sh5p3f953ndqk1cc0x7jhmlqrxak9953rz79rcdw77rjvv"; + }; + } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "v1.0.1"; + sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; + }; + } + { + goPackagePath = "github.com/hashicorp/memberlist"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/memberlist"; + rev = "v0.1.4"; + sha256 = "0l9qx8j7mm00ia6m41zbn39z7p77jjf95zph2nw8j2vihm56q9ql"; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "v0.8.3"; + sha256 = "0isaq2m08rpwvlzd72gvy3caapkrzgr9cwizl99ainsjgj2nkds9"; + }; + } + { + goPackagePath = "github.com/hashicorp/uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/uuid"; + rev = "ebb0a03e909c"; + sha256 = "0bzqr8y81h96cw299lhc5nxi9203a7xpd7csjsm6rh4k1bx4hdlf"; + }; + } + { + goPackagePath = "github.com/hashicorp/yamux"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/yamux"; + rev = "f5742cb6b856"; + sha256 = "1k9b399ljsp443s1v69c1m5jqdiw1998ryz4b4lh86nkz775ws5s"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.7"; + sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.8"; + sha256 = "1vcl6f90n0f8s8b4fyh0832ilybjqcypqyj233lqj1hx62fvgdbk"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/kylelemons/godebug"; + fetch = { + type = "git"; + url = "https://github.com/kylelemons/godebug"; + rev = "v1.1.0"; + sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.9"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "v1.0.15"; + sha256 = "051f51fyrsnj69j9ni9j72acqnrvvzqda4l831ijffy5h5jdl8f2"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "v1.0.0"; + sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-testing-interface"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-testing-interface"; + rev = "v1.0.0"; + sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "v1.0.0"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452"; + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "d0303fe80992"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.0.0"; + sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; + }; + } + { + 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/pascaldekloe/goe"; + fetch = { + type = "git"; + url = "https://github.com/pascaldekloe/goe"; + rev = "v0.1.0"; + sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/posener/complete"; + fetch = { + type = "git"; + url = "https://github.com/posener/complete"; + rev = "v1.1.2"; + sha256 = "02xrnfkk9r2jarna8jqfkksrn469jdap716037zq84waq3d5xk3l"; + }; + } + { + goPackagePath = "github.com/prometheus/alertmanager"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/alertmanager"; + rev = "v0.9.1"; + sha256 = "1lkfj63pp4jf58xmn015r7s42p1wyj6fryihpmdn0k76b0ccwqzj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.4"; + sha256 = "0s134fj4i7k6pxdmxwkdi7amb1882yq33spv15hg3pkpbd3h311p"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "v1.1.0"; + sha256 = "1nbydsmjr60904kz5d46nib0zid5kcv4gk9wayi44gn5wlzz80zp"; + }; + } + { + goPackagePath = "github.com/sean-/seed"; + fetch = { + type = "git"; + url = "https://github.com/sean-/seed"; + rev = "e2103e2c3529"; + sha256 = "0glir8jxi1w7aga2jwdb63pp1h8q4whknili7xixsqzwyy716125"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "v1.1.0"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + 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/tucnak/telebot"; + fetch = { + type = "git"; + url = "https://github.com/tucnak/telebot"; + rev = "00cebf376d79"; + sha256 = "0yay3h7gp6yag8jbapbq10vhmszad7svn68nnq5yp6pl1hmykzd6"; + }; + } + { + goPackagePath = "github.com/weaveworks/mesh"; + fetch = { + type = "git"; + url = "https://github.com/weaveworks/mesh"; + rev = "f74318fb713b"; + sha256 = "093j5i7wrkq1g92xaprd0rlfv9i74381wns4941bhbp6x6ahdcz7"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "45a5f77698d3"; + sha256 = "0636jjj89wkzqchajwwzgcn4aafc334p70nawh9jzavg2mkx0ch4"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "891ebc4b82d6"; + sha256 = "1rgw5gl2lc6bkmsx0fak84s6zdc1bhzfxgqg4mg4yh5hlnhpwrki"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fde4db37ae7a"; + sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/airbrake/gobrake.v2"; + rev = "v2.0.9"; + sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + rev = "v2.1.2"; + sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/vmihailenco/msgpack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/vmihailenco/msgpack.v2"; + rev = "v2.9.1"; + sha256 = "0ah9j7i97ifyqhiscq8d43gcrhksb3bx83s2p1nyfi1bxw78jwfi"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 029d8700956..aa4db2239f0 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,32 +1,21 @@ -{ stdenv, go, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "cadvisor"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "1hshmhsclja50ja2jqxx2f5lcvbs64n6aw6dw28wbnq3z9v0q8ad"; + sha256 = "1652yf2a4ng9z0jq8q6jnzh6svj5nwar9j8q7sssgy36bi03ixqa"; }; - nativeBuildInputs = [ go ]; + goPackagePath = "github.com/google/cadvisor"; - buildPhase = '' - export GOCACHE="$TMPDIR/go-cache" - mkdir -p Godeps/_workspace/src/github.com/google/ - ln -s $(pwd) Godeps/_workspace/src/github.com/google/cadvisor - GOPATH=$(pwd)/Godeps/_workspace go build -v -o cadvisor -ldflags="-s -w -X github.com/google/cadvisor/version.Version=${version}" github.com/google/cadvisor - ''; + subPackages = [ "." ]; - installPhase = '' - runHook preInstall - - install -Dm755 -t $out/bin cadvisor - - runHook postInstall - ''; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; meta = with stdenv.lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix deleted file mode 100644 index 5d6f0fc3bfe..00000000000 --- a/pkgs/servers/monitoring/facette/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub -, go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: - -stdenv.mkDerivation rec { - pname = "facette"; - version = "0.4.1"; - src = fetchFromGitHub { - owner = "facette"; - repo = "facette"; - rev = version; - sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi"; - }; - nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ]; - buildInputs = [ rrdtool ]; - preBuild = '' - export HOME="$NIX_BUILD_ROOT" # npm needs a writable home - ''; - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with stdenv.lib; { - description = "Time series data visualization software"; - longDescription = '' - Facette is a web application to display time series data from various - sources — such as collectd, Graphite, InfluxDB or KairosDB — on graphs. - ''; - homepage = https://facette.io/; - license = licenses.bsd3; - maintainers = with maintainers; [ fgaz ]; - broken = true; # not really broken, it just requires an internet connection to build. see #45382 - }; -} diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index d978cb003c7..46e1460d795 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -92,16 +92,16 @@ stdenv.mkDerivation rec { # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. - makeFlags = '' - PREFIX=$(out) - DESTDIR=$(out) - PERLLIB=$(out)/${perlPackages.perl.libPrefix} - PERL=${perlPackages.perl.outPath}/bin/perl - PYTHON=${python.outPath}/bin/python - RUBY=${ruby.outPath}/bin/ruby - JAVARUN=${jre.outPath}/bin/java - PLUGINUSER=munin - ''; + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" + "PERL=${perlPackages.perl.outPath}/bin/perl" + "PYTHON=${python.outPath}/bin/python" + "RUBY=${ruby.outPath}/bin/ruby" + "JAVARUN=${jre.outPath}/bin/java" + "PLUGINUSER=munin" + ]; postFixup = '' echo "Removing references to /usr/{bin,sbin}/ from munin plugins..." diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 693e67ee6dd..006d91ef74e 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: +{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "nagios"; @@ -13,13 +13,23 @@ stdenv.mkDerivation rec { buildInputs = [ php perl gd libpng zlib unzip ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ]; - buildFlags = "all"; + buildFlags = [ "all" ]; # Do not create /var directories preInstall = '' substituteInPlace Makefile --replace '$(MAKE) install-basic' "" ''; installTargets = "install install-config"; + postInstall = '' + # don't make default files use hardcoded paths to commands + sed -i 's@command_line *[^ ]*/\([^/]*\) @command_line \1 @' $out/etc/objects/commands.cfg + sed -i 's@/usr/bin/@@g' $out/etc/objects/commands.cfg + sed -i 's@/bin/@@g' $out/etc/objects/commands.cfg + ''; + + passthru.tests = { + inherit (nixosTests) nagios; + }; meta = { description = "A host, service and network monitoring program"; diff --git a/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix b/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix new file mode 100644 index 00000000000..62f6bc96a52 --- /dev/null +++ b/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, python3Packages, lib }: + +python3Packages.buildPythonApplication rec { + pname = "pynagsystemd"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "kbytesys"; + repo = pname; + rev = "v${version}"; + sha256 = "1xjhkhdpmqa7ngcpcfhrkmj4cid2wla3fzgr04wvw672ysffv2vz"; + }; + + propagatedBuildInputs = with python3Packages; [ nagiosplugin ]; + + meta = with lib; { + description = "Simple and easy nagios check for systemd status"; + homepage = "https://github.com/kbytesys/pynagsystemd"; + maintainers = with maintainers; [ symphorien ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 2bbab30d9ec..ed2abbc7fc8 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook, file, openssl, perl, perlPackages, unzip, nettools, ncurses }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, removeReferencesTo +, file, openssl, perl, perlPackages, unzip, nettools, ncurses }: stdenv.mkDerivation rec { name = "net-snmp-5.8"; @@ -19,6 +20,8 @@ stdenv.mkDerivation rec { ./0002-autoconf-version.patch ]; + outputs = [ "bin" "out" "dev" "lib" ]; + configureFlags = [ "--with-default-snmp-version=3" "--with-sys-location=Unknown" @@ -34,17 +37,21 @@ stdenv.mkDerivation rec { substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat" ''; - nativeBuildInputs = [ autoreconfHook nettools ]; - buildInputs = [ file perl unzip openssl ncurses ]; - propagatedBuildInputs = with perlPackages; [ perl JSON Tk TermReadKey ]; + nativeBuildInputs = [ autoreconfHook nettools removeReferencesTo ]; + buildInputs = with perlPackages; [ file perl unzip openssl ncurses JSON Tk TermReadKey ]; enableParallelBuilding = true; doCheck = false; # tries to use networking postInstall = '' - for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do + for f in "$lib/lib/"*.la $bin/bin/net-snmp-config $bin/bin/net-snmp-create-v3-user; do sed 's|-L${openssl.dev}|-L${openssl.out}|g' -i $f done + mkdir $dev/bin + mv $bin/bin/net-snmp-config $dev/bin + # libraries contain configure options + find $lib/lib -type f -exec remove-references-to -t $bin '{}' + + find $lib/lib -type f -exec remove-references-to -t $dev '{}' + ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 62f40b59d37..f72fa16cd12 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook -, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand +, coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl , dnsutils, libdbi, libmysqlclient, zlib, openldap, procps , runtimeShell }: @@ -9,7 +9,7 @@ let majorVersion = "2.2"; minorVersion = ".0"; - binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ]; + binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net-snmp procps ]; in stdenv.mkDerivation { name = "monitoring-plugins-${majorVersion}${minorVersion}"; @@ -44,11 +44,16 @@ in stdenv.mkDerivation { configureFlagsArray=( --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s' --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s' + --with-sudo-command='/run/wrappers/bin/sudo' + --with-mailq-command='${runCommand "mailq-wrapper" {preferLocalBuild=true;} '' + mkdir -p $out/bin + ln -s /run/wrappers/bin/sendmail $out/bin/mailq + ''}/bin/mailq' ) ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils libdbi libmysqlclient net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi libmysqlclient net-snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index dfa81d4da83..f3dfccee3bc 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: +{ stdenv, buildGoPackage, fetchFromGitHub, net-snmp }: buildGoPackage rec { pname = "snmp_exporter"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6"; }; - buildInputs = [ net_snmp ]; + buildInputs = [ net-snmp ]; doCheck = true; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 53932af6a18..697492d9627 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libevent, libiconv, openssl, pcre, zlib , odbcSupport ? true, unixODBC -, snmpSupport ? true, net_snmp +, snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 , sqliteSupport ? false, sqlite , mysqlSupport ? false, libmysqlclient @@ -34,7 +34,7 @@ in zlib ] ++ optional odbcSupport unixODBC - ++ optional snmpSupport net_snmp + ++ optional snmpSupport net-snmp ++ optional sqliteSupport sqlite ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index ac5dcca901d..4046cc7d8bb 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -2,7 +2,7 @@ , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC -, snmpSupport ? true, net_snmp +, snmpSupport ? true, net-snmp , sshSupport ? true, libssh2 , mysqlSupport ? false, libmysqlclient , postgresqlSupport ? false, postgresql @@ -38,7 +38,7 @@ in ++ optional odbcSupport unixODBC ++ optional jabberSupport iksemel ++ optional ldapSupport openldap - ++ optional snmpSupport net_snmp + ++ optional snmpSupport net-snmp ++ optional sshSupport libssh2 ++ optional mysqlSupport libmysqlclient ++ optional postgresqlSupport postgresql; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index affd73f9b41..0a61ba489eb 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,16 +1,16 @@ generic: { v44 = generic { - version = "4.4.3"; - sha256 = "1rpkgimi9kv9zrcis1zwbrny7yzralick206n71i8071hf95jvwx"; + version = "4.4.4"; + sha256 = "0pw66zd89w0i9365zkwn6vihx9bdzsmg7f91hd7zzm42s7kyvxvv"; }; v40 = generic { - version = "4.0.15"; - sha256 = "19q8h79h7lnsq6gbd0awrlw59scg92x0a1375kd2av6bjpx8r0y9"; + version = "4.0.16"; + sha256 = "0hjdvi0cwr9qczmkvnmmd22828hv5c587xcszp9pnap6621f3mx8"; }; v30 = generic { - version = "3.0.28"; - sha256 = "16966danf5ww4lhjg5gx5bnpid8abxh2ymdg6k5mymrman5bcdjj"; + version = "3.0.29"; + sha256 = "1d81w68hnkjdj1a00iasg6aidw25syi4lrbsiyc98pdihmxbpiky"; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d2578b185fc..f4081e5fa01 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.16"; + version = "0.21.18"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0yfzn1hcyww8z5pp70n7iinycz097vjc6q9fzmfrc6ikvz3db8f4"; + sha256 = "04kzdxigg6yhf5km66hxk6y8n7gl72bxnv2bc5zy274fzqf4cy9p"; }; buildInputs = [ glib boost ] diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 02c3759c58b..0d0aec4fb2c 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nextcloud"; - version = "17.0.1"; + version = "17.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - sha256 = "0jrbpzc4xf52zfncn6w2m0ch2fszqqz3ny0jq1cw7fy24vjhwgkp"; + sha256 = "1qrxalyyfjlv3myzkn5z33smfpv8r1ph2w9ax6jqivspq3zrc9gk"; }; installPhase = '' diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 5cc583c68b3..b0ed1c973c0 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx-sso"; - version = "0.22.0"; + version = "0.23.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "1kcyb7sbqna18yw3myi3c0imhh4hsa0h2k2y0bqfr2pqsnssz54a"; + sha256 = "1wfk56xnjbx7cwrryrl3jy8zw7sz8akq55nsxiq2i6h3vafy4yaz"; }; postInstall = '' diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index d3b80aa00fe..b7b43edc1cd 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ openssl zlib ]; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=format-truncation" + "-Wno-error=address-of-packed-member" + "-Wno-error=format-overflow" + "-Wno-error=stringop-truncation" + ]; preBuild = '' patchShebangs build/gen_version diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index ef75dad9151..e41930a2f48 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -17,7 +17,7 @@ let # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = lib.versionAtLeast version "3.5"; - NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + NIX_CFLAGS_COMPILE = lib.optionalString (lib.versionAtLeast version "3.5") "-Wno-error"; preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; postPatch = '' diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 4c4ac4c5cb6..c2ae83f3e8a 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unused-command-line-argument"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; sconsFlags = [ "--release" diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 2e06ff5d95e..98dd604c76d 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "neo4j"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0l320314pqy1mbcrkf7xkifwz86s5xa5saq81yqr8a67df0jknrg"; + sha256 = "1zjb6cgk2lpzx6pq1cs5fh65in6b5ccpl1cgfiglgpjc948mnhzv"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 4b1003db284..278ba8d13c5 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! - makeFlags = "PREFIX=$(out)" + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " AR=${stdenv.cc.targetPrefix}ar RANLIB=${stdenv.cc.targetPrefix}ranlib MALLOC=libc"; + makeFlags = [ "PREFIX=$(out)" ] + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index c0018529ea8..b744c58d4fb 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1m4hf26mgfvvx9z37qww8v8w4mhzyfl554ymdnzl99pr5ild093s"; }; + NIX_CFLAGS_COMPILE = [ "-Wno-error=pessimizing-move" "-Wno-error=redundant-move" ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ bzip2 libxml2 libzip boost lua luabind tbb expat ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 998d64e34f0..380e5bb4be5 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.2.2058-e67a4e892"; + version = "1.18.4.2171-ac2afe5f8"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "12riaabhc4pp3nbjqvbp81fsnjzw43yfgnkjm7s9il0n85awzg0s"; + sha256 = "10x4cf1c826vj9gqr7r6k70rrjifmi36sd7imfi7pdw5swizjzqv"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix new file mode 100644 index 00000000000..c581027530e --- /dev/null +++ b/pkgs/servers/pounce/default.nix @@ -0,0 +1,48 @@ +{ stdenv, libressl, fetchzip, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "pounce"; + version = "1.0p1"; + + src = fetchzip { + url = "https://code.causal.agency/june/pounce/archive/${version}.zip"; + sha256 = "1fh1cf15ybl962n7x70hlg7zfcmpwgq6q90s74d3jhawmjj01syw"; + }; + + patches = [ + # Don't always create ${ETCDIR}/rc.d + (fetchpatch { + url = https://code.causal.agency/june/pounce/commit/db65889605a2fa5352e90a573b7584a6b7a59dd5.patch; + sha256 = "0bxhig72g4q0hs8lb7g8lb7kf0w9jdy22qwm9yndlwrdw3vi36zq"; + }) + # Simplify Linux.mk + (fetchpatch { + url = https://code.causal.agency/june/pounce/commit/b7dc2e3439a37d23d4847e130b37ece39b8efdd7.patch; + sha256 = "0c2pa6w9abkmaaq4957arfmpsrn933vcrs4a2da785v57pgkj4lq"; + }) + # Reference openssl(1) by absolute path + (fetchpatch { + url = https://code.causal.agency/june/pounce/commit/973f19b4fe73ef956fbb4eeaf963bbb83c926203.patch; + sha256 = "1w4rhwqfcakzb9a6afq788rrsypay0rw75bjk2f3l66spjb7v3ps"; + }) + ]; + + buildInputs = [ libressl ]; + + configurePhase = "ln -s Linux.mk config.mk"; + + buildFlags = [ "all" ]; + + makeFlags = [ + "PREFIX=$(out)" + "LIBRESSL_BIN_PREFIX=${libressl}/bin" + ]; + + meta = with stdenv.lib; { + homepage = https://code.causal.agency/june/pounce; + description = "Simple multi-client TLS-only IRC bouncer"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ edef ]; + }; +} diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index fc130965cf1..bd679fd3ff8 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo, +{ stdenv, fetchurl, libcap, libnl, readline, net-snmp, less, perl, texinfo, pkgconfig, c-ares }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ readline net_snmp c-ares ] + [ readline net-snmp c-ares ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ]; nativeBuildInputs = [ pkgconfig perl texinfo ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 8278674faf1..27ff5b409f7 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "0jml16djrap0602agwm3hvq53c4lw5bg2qklxbfk79qs3v926134"; + sha256 = "0s8gkfnyid1r4xv07vjrbl6558xv6dyn4aapvx8snqdm79n78fn8"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Webmail Software"; - maintainers = with stdenv.lib.maintainers; [ vskilet globin ]; + maintainers = with stdenv.lib.maintainers; [ vskilet globin ma27 ]; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index 31891920369..73a947066bf 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - x86_64-linux = "0x1ws6iqflvzphg2srvdrn4xrr5wd5fnykkc9h006mj9rb5lp1k9"; - x86_64-darwin = "0yjzgsbsgwa6gbp270fqfm1klm6f8n4s2xmay62gdgvnsj543cxz"; + x86_64-linux = "1s27bzx5y8vcd95qrw6av3fhyxb45219x9ahwaxa2cygmbpighrp"; + x86_64-darwin = "1ia3byir3i5qaarmcaysrg3dhnxjmxnf0m0kzyf61g9aiy87gb7q"; } else { - x86_64-linux = "1nl6yic1j422l2c7mf8wv0ylfx6marrwm7d181z9nzdswq509kpg"; - x86_64-darwin = "1sy4an9d1faifr3n2y45kalrd22yb68dnpjhi9h8q73c21gp8pzf"; + x86_64-linux = "005i7d7ag10qkn7bkx7md50iihvcvc84hay2j94wvsm7yghhbmi3"; + x86_64-darwin = "01f81720rbzdqc0g1xymhz2lflldfbnb0rh7mpki99pss28vj9sh"; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index a40a142368a..cdab1fce7b0 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -30,9 +30,9 @@ in { pluginName = "analysis-lemmagen"; version = esVersion; src = fetchurl { - url = "https://github.com/vhyza/${pluginName}/releases/download/v${version}/${pluginName}-${version}-plugin.zip"; + url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; sha256 = - if version == "7.3.1" then "1nb82z6s94mzdx1srb1pwj7cpzs8w74njap0xiqn7sg5ylk6adm8" + if version == "7.5.1" then "0js8b9a9ma797448m3sy92qxbwziix8gkcka7hf17dqrb9k29v61" else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -49,7 +49,7 @@ in { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.3.1" then "1p30by7pqnvj8dcwws51kh9s962c42qwqq07gmj4jl83zxcl8kyl" + if version == "7.5.1" then "09wl2bpng4xx384xns960rymnm64b5zn2cb1sp25n85pd0isp4p2" else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -66,7 +66,7 @@ in { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.3.1" then "1b9l17zv6582sdcdiabwd293xx5ckc2d3h6smiv6znk5f4dxj7km" + if version == "7.5.1" then "0hhwxkjlkw1yv5sp6pdn5k1y8bdv4mnmb6nby1z4367mig6rm8v9" else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -83,7 +83,7 @@ in { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.3.1" then "1dqd3hd8qa1bsvd1p42k5zcrdmb66d2yspfc7g8nsz89w6b1invg" + if version == "7.5.1" then "1j1rgbha5lh0a02h55zqc5qn0mvvi16l2m5r8lmaswp97px056v9" else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -100,7 +100,7 @@ in { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.3.1" then "0kpb1hn2fb4lh6kn96vi7265ign9lwcd0zfc19l4n6fpp8js5lfh" + if version == "7.5.1" then "15g438zpxrcmsgddwmk3sccy92ha90cyq9c61kcw1q84wfi0a7jl" else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -117,13 +117,13 @@ in { pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.3.1" then "${esVersion}-37.0.0" + if esVersion == "7.5.1" then "${esVersion}-38.0.0" else if esVersion == "6.8.3" then "${esVersion}-25.5" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = fetchurl { url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; sha256 = - if version == "7.3.1-37.0.0" then "0rb631npr6vykrhln3x6q75xwb0wndvrspwnak0rld5d7pqn1r04" + if version == "7.5.1-38.0.0" then "1a1wp9wrmz6ji2rnpk0b9jqnp86w0w0z8sb48giyc1gzcy1ra9yh" else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" else throw "unsupported version ${version} for plugin ${pluginName}"; }; diff --git a/pkgs/servers/search/solr/8.x.nix b/pkgs/servers/search/solr/8.x.nix index 6a5dfb98aa7..db70aadf8d5 100644 --- a/pkgs/servers/search/solr/8.x.nix +++ b/pkgs/servers/search/solr/8.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.3.1"; + version = "8.4.0"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "0n80690vdsd0gf5gg77kg8pyf3nw0iv33zag9r7al88j5riy42ih"; + sha256 = "19l11w867y4bms9bmp9pj4ilkay7zb5015vlywdci2mswlafvrv6"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index f97182612fd..99402b3e1be 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.4"; + version = "3.3.5"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "07rxf1la93g5y7yq49fglhxji8vizzr268p1ccf8ws8j025vbl7n"; + sha256 = "1qaxx1g4dvdx54mc1kw07hm445zij37w6qmkdcwymy13krvsfd4b"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index a55d1cf14cd..aeedf8b30ae 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,5 +1,21 @@ +{ fetchFromGitHub, stdenv, lib, pkgconfig, autoreconfHook +, ncurses, gnutls, readline +, openssl, perl, sqlite, libjpeg, speex, pcre +, ldns, libedit, yasm, which, libsndfile, libtiff + +, curl, lua, libmysqlclient, postgresql, libopus, libctb, gsmlib + +, SystemConfiguration + +, modules ? null +}: + let +availableModules = import ./modules.nix { + inherit curl lua libmysqlclient postgresql libopus libctb gsmlib; +}; + # the default list from v1.8.7, except with applications/mod_signalwire also disabled defaultModules = mods: with mods; [ applications.commands @@ -27,6 +43,9 @@ defaultModules = mods: with mods; [ codecs.h26x codecs.opus + databases.mariadb + databases.pgsql + dialplans.asterisk dialplans.xml @@ -57,26 +76,9 @@ defaultModules = mods: with mods; [ xml_int.cdr xml_int.rpc xml_int.scgi -]; - -in +] ++ lib.optionals stdenv.isLinux [ endpoints.gsmopen ]; -{ fetchurl, stdenv, lib, ncurses, curl, pkgconfig, gnutls, readline -, openssl, perl, sqlite, libjpeg, speex, pcre -, ldns, libedit, yasm, which, lua, libopus, libsndfile, libtiff - -, modules ? defaultModules -, postgresql -, enablePostgres ? true - -, SystemConfiguration -}: - -let - -availableModules = import ./modules.nix { inherit curl lua libopus; }; - -enabledModules = modules availableModules; +enabledModules = (if modules != null then modules else defaultModules) availableModules; modulesConf = let lst = builtins.map (mod: mod.path) enabledModules; @@ -86,11 +88,13 @@ modulesConf = let in stdenv.mkDerivation rec { - name = "freeswitch-1.8.7"; - - src = fetchurl { - url = "https://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2"; - sha256 = "0k52mxdfc5w9fdnz8kvfjiwnnjjhnpkirnyrfkhq7bad84m731z4"; + pname = "freeswitch"; + version = "1.10.2"; + src = fetchFromGitHub { + owner = "signalwire"; + repo = pname; + rev = "v${version}"; + sha256 = "1fmrm51zgrasjbmhs0pzb1lyca3ddx0wd35shvxnkjnifi8qd1h7"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl @@ -98,23 +102,21 @@ stdenv.mkDerivation rec { --replace AS=\''${AS} AS=yasm ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl ncurses gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which libsndfile libtiff ] ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) - ++ lib.optionals enablePostgres [ postgresql ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; NIX_CFLAGS_COMPILE = "-Wno-error"; hardeningDisable = [ "format" ]; - configureFlags = lib.optionals enablePostgres [ "--enable-core-pgsql-support" ]; - preConfigure = '' + ./bootstrap.sh cp "${modulesConf}" modules.conf ''; @@ -127,7 +129,7 @@ stdenv.mkDerivation rec { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ misuzu ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/sip/freeswitch/modules.nix b/pkgs/servers/sip/freeswitch/modules.nix index aed30e467e8..be80fe56dda 100644 --- a/pkgs/servers/sip/freeswitch/modules.nix +++ b/pkgs/servers/sip/freeswitch/modules.nix @@ -1,6 +1,10 @@ { libopus +, libctb +, gsmlib , lua , curl +, libmysqlclient +, postgresql }: let @@ -101,6 +105,11 @@ in theora = mk "codecs/mod_theora" []; }; + databases = { + mariadb = mk "databases/mod_mariadb" [ libmysqlclient ]; + pgsql = mk "databases/mod_pgsql" [ postgresql ]; + }; + dialplans = { asterisk = mk "dialplans/mod_dialplan_asterisk" []; directory = mk "dialplans/mod_dialplan_directory" []; @@ -114,7 +123,7 @@ in endpoints = { alsa = mk "endpoints/mod_alsa" []; dingaling = mk "endpoints/mod_dingaling" []; - gsmopen = mk "endpoints/mod_gsmopen" []; + gsmopen = mk "endpoints/mod_gsmopen" [ gsmlib libctb ]; h323 = mk "endpoints/mod_h323" []; khomp = mk "endpoints/mod_khomp" []; loopback = mk "endpoints/mod_loopback" []; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index ba395c5e7f6..6637a75ea2f 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,15 +13,17 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "19.1.4"; + version = "19.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1bqzs844ildvyh4332vapsqhfkwcvjmgkkmn3i8ndd89q5yic6fq"; + sha256 = "1pnzzmxxb7qxiiy8qpl2sifk4qrijjbhmzy47bnjj5ssdsjjjcqy"; }; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; + inherit nativeBuildInputs buildInputs; buildPhase = '' diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 7f8f0786e03..860c1f8e94f 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; NIX_LDFLAGS = "-lgcc_s"; prePatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 440375db841..3f05b3e36c1 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -44,7 +44,7 @@ let buildFlags = [ "world" ]; - NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; # Otherwise it retains a reference to compiler and fails; see #44767. TODO: better. preConfigure = "CC=${stdenv.cc.targetPrefix}cc"; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 7fad204a018..9a01bf3eed6 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=stringop-truncation" ]; # disable dvbscan, as having it enabled causes a network download which # cannot happen during build. diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 6483973546c..11dd5449b4b 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = '' - -DSYSTEMD_SUPPORT=ON - ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"} - ''; + cmakeFlags = [ + "-DSYSTEMD_SUPPORT=ON" + (if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF") + ]; meta = with stdenv.lib; { description = "High performance peer-to-peer hub for the ADC network"; diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix new file mode 100644 index 00000000000..df6cfb70438 --- /dev/null +++ b/pkgs/servers/unpfs/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "unpfs"; + version = "0.0.2019-05-17"; + + src = fetchFromGitHub { + owner = "pfpacket"; + repo = "rust-9p"; + rev = "01cf9c60bff0f35567d876db7be7fb86032b44eb"; + sha256 = "0mhmr1912z5nyfpcvhnlgb3v67a5n7i2n9l5abi05sfqffqssi79"; + }; + + sourceRoot = "source/example/unpfs"; + + cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8"; + + RUSTC_BOOTSTRAP = 1; + + postInstall = '' + install -D -m 0444 ../../README* -t "$out/share/doc/${pname}" + install -D -m 0444 ../../LICEN* -t "$out/share/doc/${pname}" + ''; + + meta = with stdenv.lib; { + description = "9P2000.L server implementation in Rust"; + homepage = "https://github.com/pfpacket/rust-9p"; + license = licenses.bsd3; + maintainers = with maintainers; [ raskin ]; + + # macOS build fails: https://github.com/pfpacket/rust-9p/issues/7 + platforms = with platforms; linux; + }; +} diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 556c44b61a7..7669053d229 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; + NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); meta = with stdenv.lib; { homepage = https://uwsgi-docs.readthedocs.org/en/latest/; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8af11183c69..8d49846cbc0 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -19,7 +19,7 @@ let pcre libxslt groff ncurses readline libedit makeWrapper python3 ]; - buildFlags = "localstatedir=/var/spool"; + buildFlags = [ "localstatedir=/var/spool" ]; postInstall = '' wrapProgram "$out/sbin/varnishd" --prefix PATH : "${stdenv.lib.makeBinPath [ stdenv.cc ]}" diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix index 47184fe9c96..928d80b1297 100644 --- a/pkgs/servers/web-apps/fileshelter/default.nix +++ b/pkgs/servers/web-apps/fileshelter/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libzip boost wt4 libconfig ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postInstall = '' ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 490459f2e25..d16d59af6b9 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.33.1"; + version = "1.34.0"; src = with stdenv.lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "19x10vsgg2fhcpmfvdswwilqwa65byrsmzvhk2v8bsxzhp6s95vx"; + sha256 = "1lckjnharwxh9xb7gxdxrkb0r3xgd0dh4019cnbixn5mmzgc696y"; }; prePatch = '' diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 0cf16f17791..00ea34829aa 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.2.4"; + version = "5.3.2"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "1vf5220rw37sxvzy6yxn636ip2lx4bkc84z7q8rdwcs2wkv6md1p"; + sha256 = "0rq1j431x0fvcpry721hxglszql4c80qr26fglcdlm51h9z6i1p1"; }; installPhase = '' diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix index 352c5a80e1f..fc9876e10c2 100644 --- a/pkgs/servers/webmetro/default.nix +++ b/pkgs/servers/webmetro/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; }; - cargoSha256 = "07c8rrm70idmpvijvgkbgw5vswcyrghlrzv1km054xds5qxi2ldq"; + cargoSha256 = "03ncwj9bn21590phcnqyclclcird7rikbhxbwhg8i9i0nad81aaa"; meta = with stdenv.lib; { description = "Simple relay server for broadcasting a WebM stream"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c334365d8b5..84bf23a0fde 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -1,10 +1,10 @@ { abiCompat ? null, - stdenv, makeWrapper, fetchurl, fetchpatch, buildPackages, + stdenv, makeWrapper, fetchurl, fetchpatch, fetchFromGitLab, buildPackages, automake, autoconf, gettext, libiconv, libtool, intltool, freetype, tradcpp, fontconfig, meson, ninja, ed, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, + mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -63,16 +63,18 @@ self: super: x11BuildHook = ./imake.sh; patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch]; setupHook = ./imake-setup-hook.sh; - CFLAGS = [ ''-DIMAKE_COMPILETIME_CPP='"${if stdenv.isDarwin + CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${if stdenv.isDarwin then "${tradcpp}/bin/cpp" - else "gcc"}"' '' - ]; + else "gcc"}\"'"; + inherit tradcpp; }); mkfontdir = self.mkfontscale; - libxcb = super.libxcb.overrideAttrs (attrs: { + libxcb = (super.libxcb.override { + python = python3; + }).overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }); @@ -121,9 +123,7 @@ self: super: outputs = [ "out" "dev" ]; propagatedBuildInputs = [ freetype ]; # propagate link reqs. like bzip2 # prevents "misaligned_stack_error_entering_dyld_stub_binder" - configureFlags = lib.optionals isDarwin [ - "CFLAGS=-O0" - ]; + configureFlags = lib.optional isDarwin "CFLAGS=-O0"; }); libXxf86vm = super.libXxf86vm.overrideAttrs (attrs: { @@ -205,9 +205,8 @@ self: super: libXi = super.libXi.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ self.libXfixes ]; - configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "xorg_cv_malloc0_returns_null=no" - ]; + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "xorg_cv_malloc0_returns_null=no"; }); libXinerama = super.libXinerama.overrideAttrs (attrs: { @@ -218,7 +217,7 @@ self: super: libXmu = super.libXmu.overrideAttrs (attrs: { outputs = [ "out" "dev" "doc" ]; - buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"''; + buildFlags = [ "BITMAP_DEFINES='-DBITMAPDIR=\"/no-such-path\"'" ]; }); libXrandr = super.libXrandr.overrideAttrs (attrs: { @@ -308,6 +307,10 @@ self: super: buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; }); + xcbproto = super.xcbproto.override { + python = python3; + }; + xcbutil = super.xcbutil.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; }); @@ -336,32 +339,43 @@ self: super: xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { - installFlags = "sdkdir=\${out}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - installFlags = "sdkdir=\${dev}/include/xorg"; + installFlags = [ + "sdkdir=${placeholder ''dev''}/include/xorg" + ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; + installFlags = [ + "sdkdir=${placeholder ''out''}/include/xorg" + "configdir=${placeholder ''out''}/share/X11/xorg.conf.d" + ]; }); xf86inputvmmouse = super.xf86inputvmmouse.overrideAttrs (attrs: { configureFlags = [ - "--sysconfdir=$(out)/etc" - "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" - "--with-udev-rules-dir=$(out)/lib/udev/rules.d" + "--sysconfdir=${placeholder ''out''}/etc" + "--with-xorg-conf-dir=${placeholder ''out''}/share/X11/xorg.conf.d" + "--with-udev-rules-dir=${placeholder ''out''}/lib/udev/rules.d" ]; meta = attrs.meta // { @@ -382,6 +396,10 @@ self: super: xf86videovoodoo = super.xf86videovoodoo.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); xf86videowsfb = super.xf86videowsfb.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); + xf86videoomap = super.xf86videoomap.overrideAttrs (attrs: { + NIX_CFLAGS_COMPILE = [ "-Wno-error=format-overflow" ]; + }); + xf86videoamdgpu = super.xf86videoamdgpu.overrideAttrs (attrs: { configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; }); @@ -727,11 +745,14 @@ self: super: xf86videointel = super.xf86videointel.overrideAttrs (attrs: { # the update script only works with released tarballs :-/ - name = "xf86-video-intel-2018-12-03"; - src = fetchurl { - url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/" - + "e5ff8e1828f97891c819c919d7115c6e18b2eb1f.tar.gz"; - sha256 = "01136zljk6liaqbk8j9m43xxzqj6xy4v50yjgi7l7g6pp8pw0gx6"; + name = "xf86-video-intel-2019-12-09"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "driver"; + repo = "xf86-video-intel"; + rev = "f66d39544bb8339130c96d282a80f87ca1606caf"; + sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl"; }; buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix new file mode 100644 index 00000000000..27fb93a8803 --- /dev/null +++ b/pkgs/servers/xandikos/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonApplication rec { + pname = "xandikos"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jelmer"; + repo = "xandikos"; + rev = "v${version}"; + sha256 = "12r8fciid2qpqf054584ywwh49yddyhhpkpcm6jihzyr5y2r4kn1"; + }; + + propagatedBuildInputs = with python3Packages; [ + dulwich + defusedxml + icalendar + jinja2 + ]; + + meta = with stdenv.lib; { + description = "Lightweight CalDAV/CardDAV server"; + homepage = "https://github.com/jelmer/xandikos"; + license = licenses.gpl3Plus; + maintainers = [ maintainers."0x4A6F" ]; + }; +} + diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index e5e33c76d20..121368abf4c 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = upstreamPatches ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index b78282ab6e4..a06b08a5599 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; patches = upstreamPatches; diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix index 90bbc5e37dd..1f24a6dec12 100644 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ b/pkgs/shells/bash/bash-5.0-patches.nix @@ -10,4 +10,6 @@ patch: [ (patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") (patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") (patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") +(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") +(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") ] diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index 2bd37659387..2010f34ef7e 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -23,4 +23,8 @@ buildRustPackage rec { platforms = platforms.all; broken = stdenv.isDarwin; }; + + passthru = { + shellPath = "/bin/ion"; + }; } diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 80059e448c9..108d1a58758 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -1,16 +1,24 @@ -{ stdenv, meson, ninja, fetchFromGitHub, which, python, libiconv }: +{ stdenv, meson, ninja, fetchFromGitHub, which, python, fetchpatch +, libiconv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ksh"; - version = "93v"; + version = "2020.0.0"; src = fetchFromGitHub { owner = "att"; repo = "ast"; - rev = "b8d88244ae87857e7bbd6da230ffbbc51165df70"; - sha256 = "12kf14n8vz36hnsy3wp6lnyv1841p7hcq25y1d78w532dil69lx9"; + rev = version; + sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j"; }; + patches = [ + (fetchpatch { + url = "https://github.com/att/ast/commit/11983a71f5e29df578b7e2184400728b4e3f451d.patch"; + sha256 = "1n9558c4v2qpgpjb1vafs29n3qn3z0770wr1ayc0xjf5z5j4g3kv"; + }) + ]; + nativeBuildInputs = [ meson ninja which python ]; buildInputs = [ libiconv ]; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 981853bdaf8..de8502618c6 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -8,31 +8,31 @@ , libiconv , AppKit , Security -, withAllFeatures ? true +, withStableFeatures ? true }: rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.6.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0fdi5c9l8ij2vqcxwi9203mh1qj3lcqsl4kl2rkshqj45hn4ab2a"; + sha256 = "1hw9fazf5m80p39wgjqjcxafkfjxh0rkjmiznn2p66gccjnkddm6"; }; - cargoSha256 = "11cr88jmy34lzjka7agzfvm13hvg66ksa735rzcdx7lcxha538f3"; + cargoSha256 = "17hx02g9m3l2kgxba0n6wmixdbd9g8443h085v8shd70c6vln2v8"; nativeBuildInputs = [ pkg-config ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] - ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ stdenv.lib.optionals (withStableFeatures && stdenv.isDarwin) [ AppKit ]; - cargoBuildFlags = stdenv.lib.optional withAllFeatures "--all-features"; + cargoBuildFlags = stdenv.lib.optional withStableFeatures "--features=stable"; preCheck = '' export HOME=$TMPDIR @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.nushell.sh/"; license = licenses.mit; maintainers = with maintainers; [ filalex77 marsam ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; passthru = { diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 6ec2319a49d..faab933ae25 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -44,4 +44,8 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; }; + passthru = { + shellPath = "/bin/pwsh"; + }; + } diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index ed46a21325c..d13fd8aee00 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Gradle tab completion for bash and zsh"; homepage = https://github.com/gradle/gradle-completion; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 80f51dbb763..d23999abf3d 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zsh coreutils txt2tags procps ] - ++ optional stdenv.isLinux [ inetutils ]; + ++ optional stdenv.isLinux inetutils; buildPhase = '' cd doc diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 97377c9fff0..e53ee1394ed 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-12-18"; + version = "2020-01-04"; pname = "oh-my-zsh"; - rev = "7dddfe0a39b75acbe265c47b6d1dc575d6dedd9f"; + rev = "78b07e92fd4a3a5e1f92ee4e3d680c39b72c2245"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "14p723ax6l24kwi72dwl3zjd7907p0f38bdhwk527fpihm7vgrj0"; + sha256 = "1s5vr89dxgm1g3jcqybx4an80x0gmda4lh8y36r2dafxwmb09qmk"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix new file mode 100644 index 00000000000..d5081476efb --- /dev/null +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, substituteAll, pkgs }: + +# To make use of this derivation, use +# `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";` + +stdenv.mkDerivation { + pname = "powerlevel10k"; + version = "unstable-2019-12-19"; + src = fetchFromGitHub { + owner = "romkatv"; + repo = "powerlevel10k"; + rev = "8ef2b737d1f6099966a1eb16bdfc90d67b367f22"; + sha256 = "02b25klkyyhpdbf2vwzzbrd8hnfjpckbpjy6532ir6jqp2n2ivpj"; + }; + + patches = [ + (substituteAll { + src = ./gitstatusd.patch; + gitstatusdPath = "${pkgs.gitAndTools.gitstatus}/bin/gitstatusd"; + }) + ]; + + installPhase = '' + install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k + install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config + install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal + rm -r gitstatus/bin + install -D gitstatus/* --target-directory=$out/share/zsh-powerlevel10k/gitstatus + ''; + + meta = { + description = "A fast reimplementation of Powerlevel9k ZSH theme"; + homepage = "https://github.com/romkatv/powerlevel10k"; + license = stdenv.lib.licenses.mit; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.hexa ]; + }; +} diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch b/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch new file mode 100644 index 00000000000..a4440079e4b --- /dev/null +++ b/pkgs/shells/zsh/zsh-powerlevel10k/gitstatusd.patch @@ -0,0 +1,14 @@ +diff --git a/gitstatus/gitstatus.plugin.zsh b/gitstatus/gitstatus.plugin.zsh +index 46d0b3c..b082e24 100644 +--- a/gitstatus/gitstatus.plugin.zsh ++++ b/gitstatus/gitstatus.plugin.zsh +@@ -53,6 +53,8 @@ + + [[ -o 'interactive' ]] || 'return' + ++GITSTATUS_DAEMON=@gitstatusdPath@ ++ + # Temporarily change options. + 'builtin' 'local' '-a' '_gitstatus_opts' + [[ ! -o 'aliases' ]] || _gitstatus_opts+=('aliases') + diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix index 741587ef960..0dbfba52c0f 100644 --- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix +++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zsh ]; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Fish shell like syntax highlighting for Zsh"; diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 1df05099fbf..51d617354e8 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -121,9 +121,16 @@ stageFuns: let postStage = buildPackages: { __raw = true; stdenv.cc = - if buildPackages.stdenv.cc.isClang or false - then buildPackages.clang - else buildPackages.gcc; + if buildPackages.stdenv.hasCC + then + if buildPackages.stdenv.cc.isClang or false + then buildPackages.clang + else buildPackages.gcc + else + # This will blow up if anything uses it, but that's OK. The `if + # buildPackages.stdenv.cc.isClang then ... else ...` would blow up + # everything, so we make sure to avoid that. + buildPackages.stdenv.cc; }; in dfold folder postStage (_: {}) withAllowCustomOverrides diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 4e5c4cc2e83..cc49af7de3b 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -51,12 +51,18 @@ in lib.init bootStages ++ [ extraBuildInputs = [ ]; # Old ones run on wrong platform allowedRequisites = null; + hasCC = !targetPlatform.isGhcjs; + cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang else if crossSystem.useAndroidPrebuilt or false then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang else if targetPlatform.isGhcjs - then null + # Need to use `throw` so tryEval for splicing works, ugh. Using + # `null` or skipping the attribute would cause an eval failure + # `tryEval` wouldn't catch, wrecking accessing previous stages + # when there is a C compiler and everything should be fine. + then throw "no C compiler provided for this platform" else if crossSystem.useLLVM or false then buildPackages.llvmPackages_8.lldClang else buildPackages.gcc; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 2f43db9cfc2..befeb450997 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,15 @@ let lib = import ../../../lib; in lib.makeOverridable ( -{ name ? "stdenv", preHook ? "", initialPath, cc, shell +{ name ? "stdenv", preHook ? "", initialPath + +, # If we don't have a C compiler, we might either have `cc = null` or `cc = + # throw ...`, but if we do have a C compiler we should definiely have `cc != + # null`. + # + # TODO(@Ericson2314): Add assert without creating infinite recursion + hasCC ? cc != null, cc + +, shell , allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config , # The `fetchurl' to use for downloading curl and its dependencies @@ -57,7 +66,8 @@ let ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-lib64.sh ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh - cc + # TODO use lib.optional instead + (if hasCC then cc else null) ]; defaultBuildInputs = extraBuildInputs; @@ -145,7 +155,7 @@ let inherit overrides; - inherit cc; + inherit cc hasCC; } # Propagate any extra attributes. For instance, we use this to diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 239dfa0963b..6bae355812c 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ underlinkingPatch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index bb113c90849..a9b5f17af83 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ stdenv.lib.optional enableXinerama libXinerama; - buildFlags = "CC=cc " + (if enableXinerama then "xinerama=1" else "xinerama=0"); + buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; - installFlags = "DESTDIR=$(out) PREFIX="; + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix index af9394a84fa..6d5fa0f3d98 100644 --- a/pkgs/tools/X11/srandrd/default.nix +++ b/pkgs/tools/X11/srandrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr libXinerama ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/jceb/srandrd"; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index 2857ea6c7be..e196411ce41 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ]; makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "X11 brigthness and gamma software control"; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index 48cab6529cc..d50a7c006c8 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; installPhase = '' install -D xcwd "$out/bin/xcwd" diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index d20714befba..6fa185dfeab 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { homepage = https://www.semicomplete.com/projects/xdotool/; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index b5350ebecf7..f8f48ea4cdb 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # `cnee' is linked without `-lXi' and as a consequence has a RUNPATH that # lacks libXi. - makeFlags = "LDFLAGS=-lXi"; + makeFlags = [ "LDFLAGS=-lXi" ]; # XXX: Actually tests require an X server. doCheck = true; diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index dfac2cf88a5..4dbe31df03c 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ]; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; meta = { homepage = https://uninformativ.de/git/xpointerbarrier; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index ffede7d58b2..da7bfb445a9 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -60,10 +60,8 @@ in buildPythonApplication rec { ipaddress idna ]; - NIX_CFLAGS_COMPILE = [ # error: 'import_cairo' defined but not used - "-Wno-error=unused-function" - ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-function"; setupPyBuildFlags = [ "--with-Xdummy" diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 30d7f69aeb5..8349953f4ff 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xsecurelock"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "1if8byaby18ydkrk4k5yy8n0981x1dfqikq59gfpb7c2rv0vgi7i"; + sha256 = "0zdwszscdw0p7kwpqqv1dywn00bq1wak2x602lb6hdmkffspi8bg"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/xzoom/default.nix b/pkgs/tools/X11/xzoom/default.nix index 31f2c014557..ed7828f37e2 100644 --- a/pkgs/tools/X11/xzoom/default.nix +++ b/pkgs/tools/X11/xzoom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { inherit version; diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index 95f1df39576..b9169691808 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { pyyaml ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "prompt-toolkit>=1.0.0,<1.1.0" "prompt-toolkit" + ''; + #Checks are failing due to missing TTY, which won't exist. doCheck = false; preCheck = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 1f327e7ed55..f38d4cd1a1d 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -14,6 +14,23 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "5.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81"; + }; + }); + + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.4.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ba247bx5pc60hcpbf3rjsqk0whilg241i9qdfnlcwij5qgdgvh5"; + }; + }); + }; }; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index b28ef88ad99..69eae818c3b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.0.77"; + version = "2.0.78"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1qd6di8cqwhpcsqcx6g3scmwj90m15r695y5977q6a3qy13knisv"; + sha256 = "095dk5jbri3ydizs0fhfw1lhamvvxwx5smw8mj1bj78b2qsl5xh3"; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 529bc4d50d3..01355d48d5c 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -114,8 +114,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.4.0" "zip" "0zssvzdip23yzaxlac9rlzg9mlyjl97fwr0gj8y27z8j58pwj72i"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "4.0.0" "zip" - "0gy89bi89ikg5hps8rvnq28r33lixci3sk2m86jvziv9fh9rz41b"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip" + "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0"; azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip" "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg"; @@ -150,12 +150,18 @@ let azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip" "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij"; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" + "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; + azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.42.0" "zip" "0vp40i9aaw5ycz7s7qqir6jq7327f7zg9j9i8g31qkfl1h1c7pdn"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" + "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; + azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -177,6 +183,9 @@ let azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip" "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885"; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "3.1.0" "zip" + "1qvnksmvsg8cw1ac6vbdxjdqsm7s1sak27k8xy24hm7c9a8y1nqc"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc7" "zip" "1bzfpbz186dhnxn0blgr20xxnk67gkr8ysn2b3f1r41bq9hz97xp"; @@ -230,6 +239,24 @@ let }; }); + azure-keyvault = super.azure-keyvault.overrideAttrs(oldAttrs: rec { + version = "1.1.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + extension = "zip"; + sha256 = "0jfxm8lx8dzs3v2b04ljizk8gfckbm5l2v86rm7k0npbfvryba1p"; + }; + + propagatedBuildInputs = with self; [ + azure-common azure-nspkg msrest msrestazure cryptography + ]; + postInstall = '' + rm -f $out/${self.python.sitePackages}/azure/__init__.py + ''; + pythonImportsCheck = [ ]; + }); + # part of azure.mgmt.datalake namespace azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs(oldAttrs: rec { version = "0.2.1"; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index d75c317187b..aaca67baa16 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { name = "berglas-${version}"; - version = "0.2.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "berglas"; - rev = "v0.2.1"; - sha256 = "1m34rxiynmgsris1avjn7am50b8sds77515zlnna9qvsrywbzljc"; + rev = "v0.5.0"; + sha256 = "1y5w2czipwj069w4zxnyb9xqv5mx0yjjramykf3vm3q478bk3rm7"; }; - modSha256 = "0lfcrsb4r5hxxd652cxff23fnbrphp3lgwp5anpaddzcjcd2qyj8"; + modSha256 = "0y4ajii3pv25s4gjazf6fl0b9wax17cmwhbmiybqhp61annca7kr"; meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index e4b27d98dff..8e2ef7c87e1 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.3.3"; + version = "0.4.0"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1zsd6rxryg97dkkhibr0fvq16x3s75qj84rvhdv8p42ag58mz966"; + sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch index 81c1dd0e6a3..62351a70160 100644 --- a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch +++ b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch @@ -1,6 +1,6 @@ -From 411b8a413baf39e9b967949b17a992e81a11abfe Mon Sep 17 00:00:00 2001 +From 0de195de31dc311976af52a7c2b547bc23af2691 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk <fridh@fridh.nl> -Date: Tue, 29 Oct 2019 14:08:07 +0100 +Date: Sat, 14 Dec 2019 19:27:14 +0100 Subject: [PATCH] Don't use distutils.StrictVersion that cannot handle certain versions @@ -18,13 +18,13 @@ line 137, in parse ValueError: invalid version number '41.4.0.post20191022' ``` --- - setup.py | 15 +-------------- + certbot/setup.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -diff --git a/setup.py b/setup.py -index 1f4838c90..831528d77 100644 ---- a/setup.py -+++ b/setup.py +diff --git a/certbot/setup.py b/certbot/setup.py +index c1bf914..7456bf2 100644 +--- a/certbot/setup.py ++++ b/certbot/setup.py @@ -3,7 +3,6 @@ import os import re import sys @@ -40,7 +40,7 @@ index 1f4838c90..831528d77 100644 -# However environment markers are supported only with setuptools >= 36.2. -# So this dependency is not added for old Linux distributions with old setuptools, -# in order to allow these systems to build certbot from sources. - pywin32_req = 'pywin32>=224' + pywin32_req = 'pywin32>=227' # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py -if StrictVersion(setuptools_version) >= StrictVersion('36.2'): - install_requires.append(pywin32_req + " ; sys_platform == 'win32'") -elif 'bdist_wheel' in sys.argv[1:]: @@ -56,5 +56,5 @@ index 1f4838c90..831528d77 100644 dev_extras = [ 'astroid==1.6.5', -- -2.23.0 +2.24.1 diff --git a/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch b/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch deleted file mode 100644 index 33f0cd216c1..00000000000 --- a/pkgs/tools/admin/certbot/0001-pebble_artifacts-hardcode-pebble-location.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8ddf2697508eca514a0dde4646ad14ac3ba34b2a Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Fri, 18 Oct 2019 16:06:50 +0200 -Subject: [PATCH] pebble_artifacts: hardcode pebble location - ---- - certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -index 2b1557928..d2603c51a 100644 ---- a/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -+++ b/certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py -@@ -22,6 +22,7 @@ def fetch(workspace): - - - def _fetch_asset(asset, suffix): -+ return "@pebble@" - asset_path = os.path.join(ASSETS_PATH, '{0}_{1}_{2}'.format(asset, PEBBLE_VERSION, suffix)) - if not os.path.exists(asset_path): - asset_url = ('https://github.com/letsencrypt/pebble/releases/download/{0}/{1}_{2}' --- -2.23.0 - diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 7d3d019e81f..8fdbfd12778 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,19 +1,18 @@ -{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook, nginx, pebble }: +{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: python37Packages.buildPythonApplication rec { pname = "certbot"; - version = "0.39.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1s32xg2ljz7ci78wc8rqkjvgrz7vprb7fkznrlf9a4blm55pp54c"; + sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; }; patches = [ - ./0001-pebble_artifacts-hardcode-pebble-location.patch ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; @@ -43,9 +42,8 @@ python37Packages.buildPythonApplication rec { ]; postPatch = '' - substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" - substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers" - substituteInPlace certbot-ci/certbot_integration_tests/utils/pebble_artifacts.py --replace "@pebble@" "${pebble}/bin/pebble" + cd certbot + substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" ''; postInstall = '' @@ -55,15 +53,7 @@ python37Packages.buildPythonApplication rec { done ''; - # tests currently time out, because they're trying to do network access - # Upstream issue: https://github.com/certbot/certbot/issues/7450 - doCheck = false; - - checkPhase = '' - PATH="$out/bin:${nginx}/bin:$PATH" pytest certbot-ci/certbot_integration_tests - ''; - - dontUseSetuptoolsCheck = true; + doCheck = true; meta = with stdenv.lib; { homepage = src.meta.homepage; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 25c14712094..3f4d00736ad 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -1,28 +1,28 @@ -{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, rpm, xz }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: -buildGoPackage rec { +buildGoModule rec { pname = "clair"; - version = "2.0.9"; - - goPackagePath = "github.com/coreos/clair"; + version = "2.1.2"; src = fetchFromGitHub { - owner = "coreos"; + owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "1lcrqka4daqqjagx2mbfzg3z8wxg669mw1lb450nrlc33ji2iwdm"; + sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; }; + modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/clair \ + wrapProgram $out/bin/clair \ --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" ''; meta = with lib; { description = "Vulnerability Static Analysis for Containers"; - homepage = "https://github.com/coreos/clair"; + homepage = "https://github.com/quay/clair"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix new file mode 100644 index 00000000000..1f4315afc40 --- /dev/null +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -0,0 +1,49 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, pkg-config, libsecret }: + +buildGoPackage rec { + pname = "docker-credential-helpers"; + version = "0.6.3"; + + goPackagePath = "github.com/docker/docker-credential-helpers"; + + src = fetchFromGitHub { + owner = "docker"; + repo = pname; + rev = "v${version}"; + sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx"; + }; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ]; + + buildPhase = + if stdenv.isDarwin + then '' + cd go/src/${goPackagePath} + go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go + '' + else '' + cd go/src/${goPackagePath} + go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go + go build -o bin/docker-credential-pass pass/cmd/main_linux.go + ''; + + installPhase = + if stdenv.isDarwin + then '' + install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain + '' + else '' + install -Dm755 -t $bin/bin bin/docker-credential-pass + install -Dm755 -t $bin/bin bin/docker-credential-secretservice + ''; + + meta = with stdenv.lib; { + description = "Suite of programs to use native stores to keep Docker credentials safe"; + homepage = "https://github.com/docker/docker-credential-helpers"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index afb044ad583..1cdc969ea2e 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -6,15 +6,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - inherit pname ruby; - gemdir = ./.; - }; - phases = [ "installPhase" ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + inherit pname ruby; + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/fastlane $out/bin/fastlane \ --set FASTLANE_SKIP_UPDATE_CHECK 1 diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 13bba0860c4..c94686c93c1 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ + ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ futures ] ++ extraInputs; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 37f627a18f5..eaefba36545 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "simp_le-client"; - version = "0.16.0"; + version = "0.17.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "17azqlb1xsnh9p0m75apb19j7pramgj00cf5k6fwzz2zqz0x0hpp"; + sha256 = "0m1jynar4calaffp2zdxr5yy9vnhw2qf2hsfxwzfwf8fqb5h7bjb"; }; postPatch = '' diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix index ae8e5cac68c..788a64f928a 100644 --- a/pkgs/tools/admin/swiftclient/default.nix +++ b/pkgs/tools/admin/swiftclient/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchPypi, requests, six, pbr }: +{ lib, buildPythonApplication, fetchPypi, requests, six, pbr, setuptools }: buildPythonApplication rec { pname = "python-swiftclient"; @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv"; }; - propagatedBuildInputs = [ requests six pbr ]; + propagatedBuildInputs = [ requests six pbr setuptools ]; # For the tests the following requirements are needed: # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 78fa4359c91..1c2243d04f1 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -11,14 +11,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.10.0"; + version = "1.10.1"; pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - rev = "v1.10.0"; - sha256 = "0l0x7cq65wv9n93r952qsikwzcls1sq3r32mx0c4wg19dha0x1m4"; + rev = "v1.10.1"; + sha256 = "001n189d2f3psn7nxgl8188ml6f7jbk26cxn2835y3mnlk5lmhgr"; }; inherit fontDirectories; diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 13da95a28b5..8d1e28fed29 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { */ patches = [ ./0001-makefile-fix-installation.patch ]; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = { homepage = http://members.chello.nl/~k.holtman/afio.html; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index a03c9610e35..0dfd234bc75 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/sharutils/; license = licenses.gpl3Plus; - maintainers = [ maintainers.ndowens ]; + maintainers = []; platforms = platforms.all; }; } diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 9d072c9bb19..72be49d9792 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/matthewbauer/undmg; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 4b3a2f60c4f..0fe8f2f5866 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "15igz4xkzxlf81kl9p1n447rp2zrzpi6qdwn2iimzrppgqqb4z0b"; + sha256 = "0abvz6vv8kr416fphysfbwgxc6hyf1bpnd0aczfv7j3vc8x949d7"; }; postPatch = '' diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 7bbcc906292..b8f649fbdcb 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - patchFlags = "-p1 -F3"; + patchFlags = [ "-p1" "-F3" ]; patches = [ ./CVE-2014-8139.diff @@ -53,15 +53,21 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec"; - buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; + buildFlags = [ + "generic" + "D_USE_BZ2=-DUSE_BZIP2" + "L_BZ2=-lbz2" + ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile ''; - installFlags = "prefix=$(out)"; + installFlags = [ + "prefix=${placeholder ''out''}" + ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 20d85405bba..09ba6510707 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -19,8 +19,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; makefile = "unix/Makefile"; - buildFlags = if stdenv.isCygwin then "cygwin" else "generic"; - installFlags = "prefix=$(out) INSTALL=cp"; + buildFlags = if stdenv.isCygwin then [ "cygwin" ] else [ "generic" ]; + installFlags = [ + "prefix=${placeholder ''out''}" + "INSTALL=cp" + ]; patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else []; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index c66c6bc1f7e..9029eb38b06 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; - NIX_CFLAGS_COMPILE = [ "-D_POSIX_C_SOURCE" ]; + NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE"; meta = { description = "A simple and lightweight volume icon that sits in your system tray"; diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 5d31193ee8d..1d052adbba9 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }: +{ stdenv, fetchurl, alsaLib, libopus, ortp, bctoolbox }: -stdenv.mkDerivation { - pname = "trx-unstable"; - version = "2018-01-23"; +stdenv.mkDerivation rec { + pname = "trx"; + version = "0.4"; - src = fetchgit { - url = "http://www.pogo.org.uk/~mark/trx.git"; - rev = "66b4707a24172751a131e24d2a800496c699137f"; - sha256 = "0w0960p25944b30lkc8n4lj14xgsf0fjpmxqwlz2r8wl642bqnfm"; + src = fetchurl { + url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz"; + sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl"; }; buildInputs = [ alsaLib libopus ortp bctoolbox ]; diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix new file mode 100644 index 00000000000..7b4cdd6b531 --- /dev/null +++ b/pkgs/tools/audio/volctl/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pythonPackages, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + pname = "volctl"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "buzz"; + repo = pname; + rev = version; + sha256 = "1bqq5mrpi7qxzl37z6fj67pqappjmwhi8d8db95j3lmf16svm2xk"; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libpulseaudio + ]; + + pythonPath = with pythonPackages; [ + pygobject3 + ]; + + strictDeps = false; + + postPatch = '' + # The user can set a mixer application in the preferences. The + # default is pavucontrol. Do not hard code its path and hope it + # can be found in $PATH. + + substituteInPlace volctl/app.py --replace /usr/bin/pavucontrol pavucontrol + ''; + + preBuild = '' + export LD_LIBRARY_PATH=${libpulseaudio}/lib + ''; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib" + ) + ''; + + meta = with stdenv.lib; { + description = "PulseAudio enabled volume control featuring per-app sliders"; + homepage = https://buzz.github.io/volctl/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index be039fa47c0..bb24cb35d87 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "duplicati"; - version = "2.0.4.5"; + version = "2.0.4.23"; channel = "beta"; - build_date = "2018-11-28"; + build_date = "2019-07-14"; src = fetchzip { url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip"; - sha256 = "118rhzm8vk1092214vq7kxnmrnz4jl32lk8j90965a8pg05m53gn"; + sha256 = "1m2448vgl1fc2hkxkyasvdfgl728rqv16b41niznv5rsxv5643w2"; stripRoot = false; }; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 8c23d804d0b..a52c6bf1ba7 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -1,27 +1,22 @@ { stdenv, bundlerEnv, ruby, bundlerUpdateScript, makeWrapper }: -let - +stdenv.mkDerivation rec { pname = "lvmsync"; version = (import ./gemset.nix).${pname}.version; -in stdenv.mkDerivation rec { - - name = "${pname}-${version}"; - - env = bundlerEnv { - name = "${pname}-${version}-gems"; - ruby = ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; - }; - buildInputs = [ makeWrapper ]; phases = ["installPhase"]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + ruby = ruby; + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/lvmsync $out/bin/lvmsync ''; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index b78fc9b61f7..26f05d41954 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "restic"; - version = "0.9.5"; + version = "0.9.6"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "1bhn3xwlycpnjg2qbqblwxn3apj43lr5cakgkmrblk13yfwfv5xv"; + sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; }; buildPhase = '' diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index 6abd7002f8d..9f6204db2d8 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { - name = "rsnapshot-1.4.2"; + name = "rsnapshot-1.4.3"; src = fetchurl { url = "http://rsnapshot.org/downloads/${name}.tar.gz"; - sha256 = "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4"; + sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 12b021d5d3b..3e40c7d8ef6 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }: stdenv.mkDerivation rec { - name = "obexftp-0.24"; + name = "obexftp-0.24.2"; src = fetchurl { url = "mirror://sourceforge/openobex/${name}-Source.tar.gz"; - sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr"; + sha256 = "18w9r78z78ri5qc8fjym4nk1jfbrkyr789sq7rxrkshf1a7b83yl"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index a17b0302503..908808b79f3 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; - makeFlags = "RM=rm LN=ln MV=mv"; + makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libvorbis libmad libao ]; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 81bd4f60f43..7de086dba60 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/wodim $out/bin/cdrecord ''; - makeFlags = "PREFIX=\$(out)"; + makeFlags = [ "PREFIX=\$(out)" ]; meta = { description = "Portable command-line CD/DVD recorder software, mostly compatible with cdrtools"; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 90315540aba..3bc1f886ccd 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=${placeholder "out"}" ]; # we don't install python stuff as it borks up directories - installTargets = "install-bin install-devel"; + installTargets = [ "install-bin" "install-devel" ]; meta = with stdenv.lib; { homepage = https://github.com/rhinstaller/isomd5sum; diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index f181ab71edf..48a58c0c7d1 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [libdvdread libdvdcss]; - makeFlags = "DESTDIR=$(out) PREFIX=/"; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 94ca5eb58b1..3314544084f 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preBuild = "substituteInPlace Makefile --replace g++ c++"; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index a3aecf88c90..82a6a3a8a53 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, fetchpatch, gnugrep +{ stdenv, fetchFromGitHub, fetchpatch, cmake, gnugrep , fixDarwinDylibNames , file -, legacySupport ? false }: +, legacySupport ? false +, enableShared ? true }: stdenv.mkDerivation rec { pname = "zstd"; @@ -14,56 +15,46 @@ stdenv.mkDerivation rec { owner = "facebook"; }; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + patches = [ - # All 3 from https://github.com/facebook/zstd/pull/1883 + # From https://github.com/facebook/zstd/pull/1883 (fetchpatch { url = "https://github.com/facebook/zstd/commit/106278e7e5fafaea3b7deb4147bdc8071562d2f0.diff"; sha256 = "13z7id1qbc05cv1rmak7c8xrchp7jh1i623bq5pwcihg57wzcyr8"; }) - (fetchpatch { - url = "https://github.com/facebook/zstd/commit/0ede342acc2c26f87ae962fa88e158904d4198c4.diff"; - sha256 = "12l5xbvnzkvr76mvl1ls767paqfwbd9q1pzq44ckacfpz4f6iaap"; - excludes = [ - # I think line endings are causing problems, or something like that - "programs/windres/generate_res.bat" - ]; - }) - (fetchpatch { - url = "https://github.com/facebook/zstd/commit/10552eaffef84c011f67af0e04f0780b50a5ab26.diff"; - sha256 = "1s27ravar3rn7q8abybp9733jhpsfcaci51k04da94ahahvxwiqw"; - }) ] # This I didn't upstream because if you use posix threads with MinGW it will # work find, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - makeFlags = [ - "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}" - ] ++ stdenv.lib.optional stdenv.hostPlatform.isWindows "OS=Windows"; + cmakeFlags = [ + "-DZSTD_BUILD_SHARED:BOOL=${if enableShared then "ON" else "OFF"}" + "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" + "-DZSTD_BUILD_TESTS:BOOL=ON" + ]; + cmakeDir = "../build/cmake"; + dontUseCmakeBuildDir = true; + preConfigure = '' + mkdir -p build_ && cd $_ + ''; checkInputs = [ file ]; doCheck = true; preCheck = '' - substituteInPlace tests/playTests.sh \ + substituteInPlace ../tests/playTests.sh \ --replace 'MD5SUM="md5 -r"' 'MD5SUM="md5sum"' ''; - installFlags = [ - "PREFIX=$(out)" - ]; - - preInstall = '' - substituteInPlace programs/zstdgrep \ + preInstall = stdenv.lib.optionalString enableShared '' + substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$out/bin/zstdcat" - substituteInPlace programs/zstdless \ + substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$out/bin/zstdcat" ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 94573bcd201..c6bb07e7b87 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -2,8 +2,8 @@ let - version = "0.6.1"; - sha256 = "0h7idclmhyp14mq6786x7f2237vqpn70gyi88ik4g70xl84yfgyh"; + version = "0.6.2"; + sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib"; bees = stdenv.mkDerivation { pname = "bees"; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index a8849e6af22..d0f68fac7ca 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.1"; + version = "1.14.2"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "111i4ba4px3idmrr5qhgq01926fas1rs2yx2shnwgdk3ziqcszxl"; + sha256 = "0zn5fjrm9la5w1p66xhy87aasqsdky36dgc447jp2yp7nh18v339"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix index 6fc0e3a7f21..3c6f6228329 100644 --- a/pkgs/tools/filesystems/blobfuse/default.nix +++ b/pkgs/tools/filesystems/blobfuse/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; buildInputs = [ curl gnutls libgcrypt libuuid fuse ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 4a8c767e44a..533bb2322e7 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ fuse glib attr ]; - makeFlags = "DESTDIR=$(out) PREFIX="; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { homepage = http://www.brain-dump.org/projects/ciopfs/; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 512b5ce8567..a0d2cfd4ef7 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { - name = "davfs2-1.5.5"; + name = "davfs2-1.5.6"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "0bxd62268pix7w1lg7f9y94v34f4l45fdf6clyarj43qmljnlz2q"; + sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; }; buildInputs = [ neon zlib ]; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index a00104510bf..5a60f8c055e 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -25,9 +25,7 @@ stdenv.mkDerivation rec { # Filesystem resize functions were reintroduced in parted 3.1 due to no other available free alternatives # but in a sepparate library -> libparted-fs-resize --- that's why the added LDFLAG - makeFlags = '' - LDFLAGS=-lparted-fs-resize - ''; + makeFlags = [ "LDFLAGS=-lparted-fs-resize" ]; propagatedBuildInputs = [ parted utillinux ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 1afefc71465..b5fc12024b1 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.0"; + version = "7.1"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "0ynh7wrgpnmwah9r2ll32dmicdivz13ijjxg2vj1qcaxgy0b5ivm"; + sha256 = "11v5hwijbb08xq3dd4m6bkspa3v4vjzcnw6j1qyh0gjmc7yy4ml3"; }; buildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation ''--localstatedir=/var'' ]; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 56fc2e40ba2..b6099c099f3 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -30,11 +30,8 @@ in rec { # but we don't use /usr with nix, so remove only 2 items. patches = [ ./irods_root_path.patch ]; - NIX_CFLAGS_COMPILE = [ - # fix build with recent llvm versions - "-Wno-deprecated-register" - "-Wno-deprecated-declarations" - ]; + # fix build with recent llvm versions + NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations"; preConfigure = common.preConfigure + '' patchShebangs ./test diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index e9dc2c1f37c..5d3c2d15fb2 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.107"; + version = "3.0.109"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "18mw7a1by8l09fb2pan6zak29bcrgbf5zgfzrlw3c203yawqbx3k"; + sha256 = "1pwackc511fzx28w3an5qk738ykhpspvc1063w2hv901f213xjzw"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 0461c732e1a..3b355c92226 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -9,13 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; }; - nativeBuildInputs = [ autoreconfHook cmocka pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ] ++ stdenv.lib.optional doCheck cmocka; buildInputs = [ acl libuuid lzo zlib zstd ]; - configureFlags = [ "--enable-unit-tests" "--enable-tests" ]; + configureFlags = [ + (stdenv.lib.enableFeature doCheck "unit-tests") + (stdenv.lib.enableFeature doCheck "tests") + ]; enableParallelBuilding = true; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; meta = { description = "Tools for MTD filesystems"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 7c92dc95268..804b052b61a 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { #patches = [ ./purity.patch ]; # To prevent make install from failing. - preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + installFlags = [ "OWNER=" "GROUP=" "confdir=${placeholder "out"}/etc" ]; # Install systemd stuff. #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index c9af30f873b..dbc391d0082 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libaal}: -let version = "1.2.1"; in +let version = "2.0.0"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; + sha256 = "00kx9prz3d5plp1hn4xdkkd99cw42sanlsjnjhj0fsrlmi9yfs8n"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index c393c65a720..36ac3630e54 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cd squashfs-tools ''; - installFlags = "INSTALL_DIR=\${out}/bin"; + installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" ] ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 15a535eed3b..f02a913bc25 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { preBuild = "cd squashfs-tools"; - installFlags = "INSTALL_DIR=\${out}/bin"; + installFlags = [ "INSTALL_DIR=\${out}/bin" ]; makeFlags = [ "XZ_SUPPORT=1" "ZSTD_SUPPORT=1" ] ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 33fc5ce2ab6..018dfe7858e 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,30 +1,26 @@ -{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, ninja, docutils, makeWrapper +{ stdenv, fetchFromGitHub +, meson, pkgconfig, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages , openssh }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.7.0"; pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "0l4a6azsp920fhl4safxjam6821b77zxhw8mjgm33f60pksslww0"; + sha256 = "119qvjaai3nqs2psqk2kv4gxjchrnrcfnmlwk7yxnj3v59pgyxhv"; }; - patches = [ (fetchpatch { - url = "https://github.com/libfuse/sshfs/commit/a548abd1f33a8423bec72724a5f48eb96fa55dd2.patch"; - sha256 = "19p94aw7nvydd7p2bd1f5cqhlhhamjhda31k22sg06xaqyl893jm"; - }) ]; - nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ]; buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index d7603c42fca..cafe0bb7b11 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { osl seexpr makeWrapper ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${openexr.dev}/include/OpenEXR" "-I${ilmbase.dev}/include/OpenEXR" "-I${openimageio.dev}/include/OpenImageIO" @@ -33,6 +33,7 @@ in stdenv.mkDerivation rec { "-Wno-error=class-memaccess" "-Wno-error=maybe-uninitialized" "-Wno-error=catch-value" + "-Wno-error=stringop-truncation" ]; cmakeFlags = [ diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 160b77229b3..1326d045459 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -94,9 +94,11 @@ stdenv.mkDerivation rec { libXrender libXScrnSaver libXdmcp libXau openssl ]; - buildFlags = "PREFIX=$(out) all"; + buildFlags = [ "all" ]; - installFlags = "PREFIX=$(out)"; + makeFlags = [ + "PREFIX=${placeholder ''out''}" + ]; # Install udev rules, but remove lines that set up the udev-acl # stuff, since that is handled by udev's own rules (70-udev-acl.rules) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 9b7c4010791..31bdba26783 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.60"; + version = "2.61"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "1sr31r80jfswlx9a0p5bn85p6h7mq28fw8ihhnlbhphii6w8z2j9"; + sha256 = "0nblcxqzaxv1286zl2fjkivgp478l0nf3m0wnk78rd99lscjlw71"; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--with-context=$out/share/texmf/tex/context/third" ]; - NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ]; + NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' mv $out/share/info/asymptote/*.info $out/share/info/ diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index d28f73dd91c..62fa83800cb 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - makeFlags = "CC=${stdenv.cc.outPath}/bin/cc"; + makeFlags = [ "CC=${stdenv.cc.outPath}/bin/cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 296ba43a5ed..3fc82a9c72a 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ optional pngSupport libpng; - NIX_CFLAGS_COMPILE = stdenv.lib.optional x11Support "-lSDL"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString x11Support "-lSDL"; meta = with stdenv.lib; { description = "A lightweight, highly customizable and scriptable image viewer"; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 79b2708cb2b..9b3836b9dec 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; }; - buildInputs = optional gifview [ xorgproto libXt libX11 ]; + buildInputs = optionals gifview [ xorgproto libXt libX11 ]; - configureFlags = [] - ++ optional (!gifview) [ "--disable-gifview" ]; + configureFlags = optional (!gifview) "--disable-gifview"; - LDFLAGS = optional static "-static"; + LDFLAGS = optionalString static "-static"; doCheck = true; checkPhase = '' diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 9f6393b6372..0ac1c1a2155 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -19,11 +19,12 @@ let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in (if withQt then mkDerivation else stdenv.mkDerivation) rec { - name = "gnuplot-5.2.7"; + pname = "gnuplot"; + version = "5.2.8"; src = fetchurl { - url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "1vglp4la40f5dpj0zdj63zprrkyjgzy068p35bz5dqxjyczm1zlp"; + url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; + sha256 = "0dxc52d17mpyb2xm24da1nvhlacryv0irwa0q5l1cjj0rx67d9k0"; }; nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 700bed237bd..3b9d8a4cca5 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; + ] ++ stdenv.lib.optional (xorg == null) "--without-x"; inherit patches; diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 24d678e1142..480ae328cd3 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ qtbase gsl getdata netcdf muparser matio ]; - cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; + cmakeFlags = [ "-Dkst_qt5=1" "-Dkst_release=1" ]; postInstall = '' mkdir -p $out diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 90716d04a75..65ccfecedd6 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch"; sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj"; }) - ]; + ] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch); buildInputs = [ qtbase qttools libGLU.dev ]; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch b/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch new file mode 100644 index 00000000000..452fb1a76d5 --- /dev/null +++ b/pkgs/tools/graphics/nifskope/no-sse-on-arm.patch @@ -0,0 +1,19 @@ +diff --git a/NifSkope.pro b/NifSkope.pro +index cc29fc5..b17bb6e 100644 +--- a/NifSkope.pro ++++ b/NifSkope.pro +@@ -428,13 +428,10 @@ win32 { + # Optimization flags + QMAKE_CXXFLAGS_DEBUG -= -O0 -g + QMAKE_CXXFLAGS_DEBUG *= -Og -g3 +- QMAKE_CXXFLAGS_RELEASE *= -O3 -mfpmath=sse ++ QMAKE_CXXFLAGS_RELEASE *= -O3 + + # C++11 Support + QMAKE_CXXFLAGS_RELEASE *= -std=c++14 +- +- # Extension flags +- QMAKE_CXXFLAGS_RELEASE *= -msse2 -msse + } + + win32 { diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 6dafbfe2f9f..6a0385614e8 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man"]; - cmakeFlags = '' - -DWITH_MATLAB=false - ''; + cmakeFlags = [ "-DWITH_MATLAB=false" ]; preConfigure = '' rm cmake/FindNETPBM.cmake diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 6814a06e3b9..f7bd8d520c8 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib.static}/lib"; + makeFlags = [ "ZPATH=${zlib.static}/lib" ]; buildInputs = [ zlib ]; diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix index 9891ea5e52b..4b610ebbfef 100644 --- a/pkgs/tools/graphics/quirc/default.nix +++ b/pkgs/tools/graphics/quirc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p "$out"/{bin,lib,include} find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';' ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { inherit (s) version; description = ''A small QR code decoding library''; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9a071e6150f..7610b4e56fb 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Disable assertions which include -dev QtBase file paths. - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; configureFlags = [ "--without-python" diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 636cb518fd2..60de9e6910e 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -75,20 +75,20 @@ stdenv.mkDerivation rec { libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 libuuid ]; - cmakeFlags = '' - -DENABLE_QT_IM_MODULE=ON - -DENABLE_GTK2_IM_MODULE=ON - -DENABLE_GTK3_IM_MODULE=ON - -DENABLE_GIR=OFF - -DENABLE_OPENCC=OFF - -DENABLE_PRESAGE=OFF - -DENABLE_XDGAUTOSTART=OFF - -DENABLE_PINYIN=${if withPinyin then "ON" else "OFF"} - -DENABLE_TABLE=ON - -DENABLE_SPELL=ON - -DENABLE_QT_GUI=ON - -DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml' - ''; + cmakeFlags = [ + "-DENABLE_QT_IM_MODULE=ON" + "-DENABLE_GTK2_IM_MODULE=ON" + "-DENABLE_GTK3_IM_MODULE=ON" + "-DENABLE_GIR=OFF" + "-DENABLE_OPENCC=OFF" + "-DENABLE_PRESAGE=OFF" + "-DENABLE_XDGAUTOSTART=OFF" + "-DENABLE_PINYIN=${if withPinyin then "ON" else "OFF"}" + "-DENABLE_TABLE=ON" + "-DENABLE_SPELL=ON" + "-DENABLE_QT_GUI=ON" + "-DXKB_RULES_XML_FILE='${xkeyboard_config}/share/X11/xkb/rules/evdev.xml'" + ]; meta = with stdenv.lib; { homepage = https://github.com/fcitx/fcitx; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index e10d6ed607a..f1ca4226b47 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.7.2"; + version = "2.7.4"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "1v11hipdh8chkd81gcack42v8h8q4z2x2gv2gyymqk15yj0959i3"; + sha256 = "0wp9y6cgxsb2z1hk899q7wybl7v49vkgx6x5zl4l706jm3w9qmg8"; }; patches = [ ./hunspell-dirs.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://mike-fabian.github.io/ibus-typing-booster/; license = licenses.gpl3Plus; description = "A typing booster engine for the IBus platform"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; isIbusEngine = true; }; } diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix index 1f59d1f16a7..82a8d2aaad1 100644 --- a/pkgs/tools/misc/3llo/default.nix +++ b/pkgs/tools/misc/3llo/default.nix @@ -26,6 +26,6 @@ bundlerApp { description = "Trello interactive CLI on terminal"; license = licenses.mit; homepage = https://github.com/qcam/3llo; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 3bfb2d656d9..84778fb1c2d 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ronn ]; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/schlomo/automirror; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 25765589bee..adf73037af8 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.8.1"; + version = "1.9"; in stdenv.mkDerivation { pname = "autorandr"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "1bp1cqkrpg77rjyh4lq1agc719fmxn92jkiicf6nbhfl8kf3l3vy"; + sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix new file mode 100644 index 00000000000..f23ab45cfab --- /dev/null +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "bash_unit"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "pgrange"; + repo = pname; + rev = "v${version}"; + sha256 = "0jcjpcyf569b12vm4jrd53iqrrsjvr8sp9y29w2ls38fm8a16vr6"; + }; + + installPhase = '' + mkdir -p $out/bin + cp bash_unit $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Bash unit testing enterprise edition framework for professionals"; + maintainers = with maintainers; [ pamplemousse ]; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 6b62ca247cb..6f5dc209b96 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,5 +1,5 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig -, Security, libiconv, installShellFiles +{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less +, Security, libiconv, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2"; - nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles ]; + nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; @@ -27,6 +27,13 @@ rustPlatform.buildRustPackage rec { installShellCompletion assets/completions/bat.fish ''; + # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as + # expected with certain flag combinations. + postFixup = '' + wrapProgram "$out/bin/bat" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" + ''; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = https://github.com/sharkdp/bat; diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 7664b96563b..df7564a4b84 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Perl for running test suite. buildInputs = [ perl ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; doCheck = true; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a5e4a42ef3c..12b0ad2abf1 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -3,9 +3,8 @@ with python3Packages; buildPythonApplication rec { - version = "2017-01-19"; pname = "bonfire"; - name = "${pname}-unstable-${version}"; + version = "unstable-2017-01-19"; # use latest git version with --endpoint flag # https://github.com/blue-yonder/bonfire/pull/18 @@ -25,7 +24,7 @@ buildPythonApplication rec { # pip fails when encountering the git hash for the package version substituteInPlace setup.py \ --replace "version=version," "version='${version}'," - # remove extraneous files + # remove extraneous files substituteInPlace setup.cfg \ --replace "data_files = *.rst, *.txt" "" ''; @@ -45,6 +44,6 @@ buildPythonApplication rec { license = licenses.bsd3; maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; + broken = true; # no longer compatible with new arrow package }; - } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 897ecadd872..637f7a17695 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.7"; + version = "1.7.10"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "18v3sgi0aa8cd9sk3nhhyc4dmzpmq28wa21zyc9nvyw40ngmmxsb"; + sha256 = "1miki6p611s0m3s0q5qsc9cks0akm59ks3x1gzi9wvhzf6k9h0dn"; }; - modSha256 = "0c2jslcigq9ajchfr7inb7b6cpla7xjibcmjsvwspfzknrlrsbfn"; + modSha256 = "0rzwslpikadhqw8rcbg4hbasfcgjcc850ccfnprdxva4g1bb5rqc"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 575cb686f9d..738430f561b 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -2,14 +2,14 @@ , pkgconfig, qtbase, cmake, zlib, kmod }: mkDerivation rec { - version = "0.3.2"; + version = "0.4.2"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; rev = "v${version}"; - sha256 = "0ri5n7r1vhsgk6s64abvqcdrs5fmlwprw0rxiwfy0j8a9qcic1dr"; + sha256 = "1mkx1psw5xnpscdfik1kpzsnfhhkn3571i7acr9gxyjr27sckplc"; }; buildInputs = [ @@ -25,11 +25,12 @@ mkDerivation rec { cmakeFlags = [ "-DINSTALL_DIR_ANIMATIONS=libexec" + "-DUDEV_RULE_DIRECTORY=lib/udev/rules.d" + "-DFORCE_INIT_SYSTEM=systemd" ]; patches = [ ./install-dirs.patch - ./systemd-service.patch (substituteAll { name = "ckb-next-modprobe.patch"; src = ./modprobe.patch; diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/tools/misc/ckb-next/install-dirs.patch index 5545292a65e..0f113d71aa3 100644 --- a/pkgs/tools/misc/ckb-next/install-dirs.patch +++ b/pkgs/tools/misc/ckb-next/install-dirs.patch @@ -1,32 +1,13 @@ diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 09056a7..1bb4595 100644 +index 2fc10a8..22dbd14 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt -@@ -456,7 +456,7 @@ endif () - if (LINUX) - install( - FILES "${CMAKE_SOURCE_DIR}/linux/udev/99-ckb-daemon.rules" -- DESTINATION "/etc/udev/rules.d" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" - PERMISSIONS - OWNER_READ OWNER_WRITE - GROUP_READ -diff --git a/src/libs/ckb-next/CMakeLists.txt b/src/libs/ckb-next/CMakeLists.txt -index ecc591c..35de563 100644 ---- a/src/libs/ckb-next/CMakeLists.txt -+++ b/src/libs/ckb-next/CMakeLists.txt -@@ -75,12 +75,12 @@ if(NOT MACOS) - NAMESPACE - ${CMAKE_PROJECT_NAME}:: - DESTINATION -- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") -+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") - +@@ -421,7 +421,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") + elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") install( - FILES - "cmake/${PROJECT_NAME}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION -- "/usr/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") -+ "${CMAKE_INSTALL_PREFIX}/lib/cmake/${CMAKE_PROJECT_NAME}/${PROJECT_NAME}") - endif() + FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" +- DESTINATION "/usr/lib/systemd/system" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/tools/misc/ckb-next/modprobe.patch index f2156fc3b23..a2cbe262e89 100644 --- a/pkgs/tools/misc/ckb-next/modprobe.patch +++ b/pkgs/tools/misc/ckb-next/modprobe.patch @@ -1,26 +1,26 @@ diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c -index 1cedb07..8e0b24b 100644 +index 8489f5b..b851419 100644 --- a/src/daemon/input_linux.c +++ b/src/daemon/input_linux.c -@@ -58,7 +58,7 @@ int os_inputopen(usbdevice* kb){ - /// First check whether the uinput module is loaded by the kernel. - /// - // Load the uinput module (if it's not loaded already) -- if(system("modprobe uinput") != 0) { -+ if(system("@kmod@/bin/modprobe uinput") != 0) { - ckb_fatal("Failed to load uinput module\n"); - return 1; - } +@@ -63,7 +63,7 @@ int os_inputopen(usbdevice* kb){ + + // If not available, load the module + if(fd < 0){ +- if(system("modprobe uinput") != 0) { ++ if(system("@kmod@/bin/modprobe uinput") != 0) { + ckb_fatal("Failed to load uinput module\n"); + return 1; + } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp -index 3601146..3f2f78f 100644 +index 1eb95bd..f7d38ba 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp -@@ -251,7 +251,7 @@ void MainWindow::updateVersion(){ - daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices.")); +@@ -284,7 +284,7 @@ void MainWindow::updateVersion(){ #elif defined(Q_OS_LINUX) - QProcess modprobe; -- modprobe.start("modprobe", QStringList("uinput")); -+ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); + if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){ + QProcess modprobe; +- modprobe.start("modprobe", QStringList("uinput")); ++ modprobe.start("@kmod@/bin/modprobe", QStringList("uinput")); - if(!modprobe.waitForFinished()) - qDebug() << "Modprobe error"; + if(!modprobe.waitForFinished()) + qDebug() << "Modprobe error"; diff --git a/pkgs/tools/misc/ckb-next/systemd-service.patch b/pkgs/tools/misc/ckb-next/systemd-service.patch deleted file mode 100644 index 917bc09627f..00000000000 --- a/pkgs/tools/misc/ckb-next/systemd-service.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt -index 09056a7..72a7249 100644 ---- a/src/daemon/CMakeLists.txt -+++ b/src/daemon/CMakeLists.txt -@@ -249,12 +249,7 @@ elseif (LINUX) - # but it is not enabled by default and systemd is used instead. (Ubuntu 15.04+) - - # A way to check for upstart -- execute_process( -- COMMAND initctl --version -- OUTPUT_VARIABLE initctl_output -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- -- if ("${initctl_output}" MATCHES "upstart") -+ if (FALSE) - message(STATUS "upstart detected") - set(CKB_NEXT_INIT_SYSTEM "upstart" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -292,7 +287,7 @@ elseif (LINUX) - endif () - - # A way to check for systemd -- if (EXISTS "/run/systemd/system") -+ if (TRUE) - message(STATUS "systemd detected") - set(CKB_NEXT_INIT_SYSTEM "systemd" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -328,7 +323,7 @@ elseif (LINUX) - endif () - - # A way to check for OpenRC -- if (EXISTS "/run/openrc/softlevel") -+ if (FALSE) - message(STATUS "OpenRC detected") - set(CKB_NEXT_INIT_SYSTEM "OpenRC" CACHE INTERNAL "") - set(DISALLOW_SYSVINIT TRUE) -@@ -419,7 +414,7 @@ if ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "launchd") - elseif ("${CKB_NEXT_INIT_SYSTEM}" STREQUAL "systemd") - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/service/ckb-next-daemon.service" -- DESTINATION "/usr/lib/systemd/system" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" - PERMISSIONS - OWNER_READ OWNER_WRITE - GROUP_READ diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 547e2a1f059..1978476a12d 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0xf0r6zxaqan1drz61nqf95p2pkiiihpvrjhrr9dx9j3vswyx31g"; }; - buildFlags = with stdenv; + buildFlags = with stdenv; [ ( if isDarwin then "osx" else if isFreeBSD then "freebsd" - else "cpulimit"; + else "cpulimit" + ) ]; - installFlags = "PREFIX=$(out)"; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://limitcpu.sourceforge.net/; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index a91fdad8d82..e3ba0abb8bc 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1p99kxgg2893ppp56q5igpva39lzj4wvx37c993r4p6i4gq6bi3v"; + sha256 = "1r89cfw3ycqwvpfwwiqg8ykc1vyr1gf3ah30mvrmmalgmi6bnx5w"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index b924d5a74ea..74aec9bae6a 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.9"; + version = "4.9.1"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0gq7m2glwdhai93ms2qlnqjlynczzncxsddcq8l5yc6bp1f5r5r0"; + sha256 = "14a0fqdpwdw72790jjm01g5n7lwwaf9d6k78fflbysn5v62nd0mg"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 29d3e40eee4..b64c527a6b9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "131"; + version = "133"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1lqzm523pzxqj6xfm00z61d263w714d90sn6rfyh2npb8q95gfdn"; + sha256 = "15hi2fwcx3sf189rmxpyah0amq1a49wgp1ynhvwij5qj13wib2q8"; }; patches = [ diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index a502735c773..5ac8a661c9a 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6"; }; - cargoSha256 = "0ca9gaih0b9qg7bdgyhvb9gr1mq23r62pi0845vwc216jfaag079"; + cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv"; meta = with lib; { description = "A tool to conveniently learn about the disk usage of directories, fast!"; diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix index 6bb9924ddd0..c4209442de8 100644 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ b/pkgs/tools/misc/dylibbundler/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 1c0401e2ead..7e8d04b4209 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ]; - buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; + buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 735580eee5d..247572a379f 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.3"; + version = "4.4"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "0ni34sfrssa6njiqm22q2kxv437r6vbs0a6mys8kwwn7vbdw30dh"; + sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl"; }; postPatch = '' diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 8a270ed0fef..1ec99f12d82 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,16 +1,31 @@ -{ stdenv, fetchFromGitHub, opencl-headers, cmake, jsoncpp, boost, makeWrapper, - cudatoolkit, mesa, ethash, opencl-info, ocl-icd, openssl, pkg-config, cli11 }: +{ + stdenv, + fetchFromGitHub, + opencl-headers, + cmake, + jsoncpp, + boost, + makeWrapper, + cudatoolkit, + mesa, + ethash, + opencl-info, + ocl-icd, + openssl, + pkg-config, + cli11 +}: stdenv.mkDerivation rec { pname = "ethminer"; - version = "0.18.0-rc.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ethereum-mining"; repo = "ethminer"; rev = "v${version}"; - sha256 = "0gwnwxahjfwr4d2aci7y3w206nc5ifssl28ildva98ys0d24wy7z"; + sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707"; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 8c303dd1e0c..af9a7c9a133 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "19b6vqblddaw8ccw4sn0qsqzbswlhrz8ia6n4m3hymvcxn8skpz9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Identifies duplicate files residing within specified directories"; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index d0c389f31f9..bb10bfe2ec7 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.57"; + version = "0.2.58"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "04y3mnh77g8mvcikp3m0a20vz180fzv847z8xjnz97ynhrbp3q94"; + sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; }; - cargoSha256 = "19w1lwvp54fjl1ll5pay5grfgj4zs2idqiqppxhksf61az6knql9"; + cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index a06b38c0ec7..24a7143d8e1 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,33 +1,24 @@ -{ stdenv, fetchurl, fetchpatch, file, zlib, libgnurx }: +{ stdenv, fetchurl, file, zlib, libgnurx }: stdenv.mkDerivation rec { pname = "file"; - version = "5.37"; + version = "5.38"; src = fetchurl { urls = [ "ftp://ftp.astron.com/pub/file/${pname}-${version}.tar.gz" "https://distfiles.macports.org/file/${pname}-${version}.tar.gz" ]; - sha256 = "0zz0p9bqnswfx0c16j8k62ivjq1m16x10xqv4hy9lcyxyxkkkhg9"; + sha256 = "0d7s376b4xqymnrsjxi3nsv3f5v89pzfspzml2pcajdk5by2yg2r"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-18218.patch"; - url = "https://sources.debian.org/data/main/f/file/1:5.37-6/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch"; - sha256 = "1i22y91yndc3n2p2ngczp1lwil8l05sp8ciicil74xrc5f91y6mj"; - }) - ]; - nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ stdenv.lib.optional stdenv.hostPlatform.isWindows libgnurx; doCheck = true; - makeFlags = if stdenv.hostPlatform.isWindows then "FILE_COMPILE=file" - else null; + makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with stdenv.lib; { homepage = https://darwinsys.com/file; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index f3728361720..516badb7bc7 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "01iy8xgsyc1clhpik4nmkxw6xnblzswvn35qz4h4p5sw97c4iwq8"; + sha256 = "0xwh8fnvahcyygz0ydi4pdzgsyvjaphwl3f2ccdas52fbirwnicn"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fondu/default.nix b/pkgs/tools/misc/fondu/default.nix index 33efd2bd614..772ae236764 100644 --- a/pkgs/tools/misc/fondu/default.nix +++ b/pkgs/tools/misc/fondu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "152prqad9jszjmm4wwqrq83zk13ypsz09n02nrk1gg0fcxfm7fr2"; }; - makeFlags = "DESTDIR=$(out)"; + makeFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index e012d40271b..6239e839598 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-msse2" "-mfpmath=sse" ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ]; buildInputs = [ diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index b86e5ad997a..0685ecf2440 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "0pg3ahx8rmzr585qa4vphd1vxcm1r3sx5iyi8ghg5nn6sibqy0z4"; + sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c"; }; - cargoSha256 = "0yf3xkxxlb9252r869wbiv3b3kpz4p5gp556sic63bp0acig6a76"; + cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6"; meta = with stdenv.lib; { description = "Find files with SQL-like queries"; homepage = "https://github.com/jhspetersson/fselect"; license = with licenses; [ asl20 mit ]; - maintainers = [ maintainers.filalex77 ]; + maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 87702586a38..99dcc194d01 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "11jh6pqzgcvzg5i0zhhlc3v4yc2x9bnmd9g8sqzb666jwz3yn7x3"; + sha256 = "08gscwdq7fwfpk3mf7dfdf64n5ijm5kjb7f5wrzzvpnnqz24xnb0"; }; doCheck = true; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 7207d8dbfed..960373e7e5f 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "192ci09yi2hps02skcnbfwyjbf7pl0wb6q2zshb58cid5zgla8bx"; + sha256 = "02zy3c4k84rzqdkaf04idbj10v286hi0ix1xl2qsz1wrblh168w8"; }; modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143"; @@ -36,15 +36,13 @@ buildGoModule rec { ''; postInstall = '' - name="${pname}-${version}" - cp $src/bin/fzf-tmux $out/bin mkdir -p $man/share/man cp -r $src/man/man1 $man/share/man - mkdir -p $out/share/vim-plugins/$name - cp -r $src/plugin $out/share/vim-plugins/$name + mkdir -p $out/share/vim-plugins/${pname} + cp -r $src/plugin $out/share/vim-plugins/${pname} cp -R $src/shell $out/share/fzf cat <<SCRIPT > $out/bin/fzf-share @@ -60,7 +58,7 @@ buildGoModule rec { homepage = "https://github.com/junegunn/fzf"; description = "A command-line fuzzy finder written in Go"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ filalex77 ma27 ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 5b05ce534d7..24daa7fc81f 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A better fuzzy finder"; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 0315750c250..9a3ffe93510 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = https://github.com/artemanufrij/hashit; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index a8100e455f0..26396fee507 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -21,11 +21,14 @@ mkDerivation { cmakeFlags = [ "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" + "-DLIBUSB_LIBRARY=${libusb1}" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; installPhase = '' diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index d1d3996bd62..2ec68348495 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -3,15 +3,15 @@ , fetchpatch }: stdenv.mkDerivation rec { - pname = "ldmtool"; - version = "0.2.4"; + pname = "ldmtool"; + version = "0.2.4"; - src = fetchFromGitHub { - owner = "mdbooth"; - repo = "libldm"; - rev = "libldm-${version}"; - sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; - }; + src = fetchFromGitHub { + owner = "mdbooth"; + repo = "libldm"; + rev = "libldm-${version}"; + sha256 = "1fy5wbmk8kwl86lzswq0d1z2j5y023qzfm2ppm8knzv9c47kniqk"; + }; patches = [ # Remove useage of deprecrated G_PARAM_PRIVATE @@ -21,26 +21,26 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = '' - sed -i docs/reference/ldmtool/Makefile.am \ - -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' - ''; + preConfigure = '' + sed -i docs/reference/ldmtool/Makefile.am \ + -e 's|-nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl|--nonet ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl|g' + ''; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - configureScript = "sh autogen.sh"; + configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin - libtool readline gobject-introspection json-glib libuuid - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin + libtool readline gobject-introspection json-glib libuuid + ]; - meta = with stdenv.lib; { - description = "Tool and library for managing Microsoft Windows Dynamic Disks"; - homepage = https://github.com/mdbooth/libldm; - maintainers = with maintainers; [ jensbin ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Tool and library for managing Microsoft Windows Dynamic Disks"; + homepage = https://github.com/mdbooth/libldm; + maintainers = with maintainers; [ jensbin ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; } diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 61e115e71eb..c2f281ecb17 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { # TODO: Setting buildFlags probably isn't working properly. I've tried a few # variants, e.g.: - # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\""; - # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\""; + # - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ]; + # - buildFlags = [ "-ldflags" "\\\"-X" "${goPackagePath}/main.gVersion=${version}\\\"" ]; # Override the build phase (to set buildFlags): buildPhase = '' runHook preBuild diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index da7db422377..90560d32157 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; version = "0.8.5"; - maintainers = [ maintainers.dochang ]; + maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 9eff84e67dc..1bd30733765 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; sha256 = if enableUnfree - then "1mw053bx2zh5320p545ax8fnydzqj28r239l7a4m1d2shi89w6s8" - else "0d57ahak4chxmd0pmgkbmig2wacprv120pwmjlx63sxf5vw72yap"; + then "01l6alwgsq6yf0z9d08i0hi8g708nph1vm78nl4xbpg8h964bybj" + else "0nlwgaw6rmhp5b68zpp1pzsjs30b0bjzdg8f7xy6rarpk338s8yb"; }; dontBuild = true; diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index 914578c47ec..8be6cf5a8a3 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -10,7 +10,6 @@ # Apple dependencies , CoreServices , Security -, cf-private }: rustPlatform.buildRustPackage rec { @@ -40,7 +39,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = with pkgs; [ nix direnv which ]; buildInputs = - stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ]; + stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; passthru = { updater = with builtins; writeScript "copy-runtime-nix.sh" '' diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 49e4ab44836..918e8372dcb 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.8.7"; + name = "man-db-2.9.0"; src = fetchurl { url = "mirror://savannah/man-db/${name}.tar.xz"; - sha256 = "09mkpvwirv9kh2pqhfq90zl7pjdl63f4w4g1x6zhhp9hjswmpkdr"; + sha256 = "0qg2sdn8mayya0ril484iz1r7hi46l68d2d80cr6lvc7x3csqjjx"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 48f048b3abf..57cf5bb97e2 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { hardeningDisable = [ "all" ]; - buildFlags = "memtest.bin"; + buildFlags = [ "memtest.bin" ]; doCheck = false; # fails diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 412726e276d..09640b30be9 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -1,19 +1,22 @@ -{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }: +{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, openssl }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.2.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "1g8ggqs4fyscb1r98qj22f61jgkqnr4vdyps0drrvydl9lafdmpl"; + sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08"; }; - cargoSha256 = "055mbrzg7v8a65awn1051b4b9ngxq25wy31gjq8kc93qsb7k0f2k"; + cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn"; + + RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ cmake pkgconfig zlib ]; + buildInputs = [ openssl ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index b2f7fdf2a90..c88f12c74d1 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { sha256 = "17pdc5mandl739f8q26n5is8ga56s83aqcrwhlnnplbxwx2inidr"; }; - makeFlags = "USE_PTHREADS=1 USE_OPENSSL=1 USE_LONG_OPTIONS=1" - + stdenv.lib.optionalString stdenv.isi686 " USE_LARGE_FILES=1" - + stdenv.lib.optionalString stdenv.isLinux "CFLAGS=-lgcc_s"; + makeFlags = [ "USE_PTHREADS=1" "USE_OPENSSL=1" "USE_LONG_OPTIONS=1" ] + ++ stdenv.lib.optional stdenv.isi686 "USE_LARGE_FILES=1" + ++ stdenv.lib.optional stdenv.isLinux "CFLAGS=-lgcc_s"; - preInstall = '' - installFlags=PREFIX=$out - ''; + installFlags = [ "PREFIX=${placeholder "out"}" ]; buildInputs = [ openssl ]; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 336d673f7ec..44f791e5b8a 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = "CC=cc"; - installFlags = "PREFIX=$(out)"; + buildFlags = [ "CC=cc" ]; + installFlags = [ "PREFIX=$(out)" ]; postInstall = '' wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 92945004cb0..6ca0c6e8e08 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin "-f makefile.macosx"; + makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix new file mode 100644 index 00000000000..128d582e32e --- /dev/null +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "neo-cowsay"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Code-Hex"; + repo = "Neo-cowsay"; + rev = "v${version}"; + sha256 = "1in6kadczv05v62qhskqbdx7wppch0gwl0bshr5ihmi39k8l7v3z"; + }; + + modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; + + subPackages = [ "cmd/cowsay" "cmd/cowthink" ]; + + meta = with lib; { + description = "Cowsay reborn, written in Go"; + homepage = "https://github.com/Code-Hex/Neo-cowsay"; + license = with licenses; [artistic1 /* or */ gpl3]; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index be8c4fb9c06..e51a00dc7bd 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,15 +1,15 @@ -{ fetchFromGitHub, rustPlatform, stdenv +{ fetchFromGitHub, rustPlatform, stdenv, fetchpatch , CoreFoundation, libiconv, libresolv, Security }: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "02mdzpzfcxp9na86b4jcqqjd3id5jslgmnq1jc0vykg58xha51jg"; + sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs"; }; cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h"; @@ -17,6 +17,14 @@ rustPlatform.buildRustPackage rec { buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; + cargoPatches = [ + # fix wrong version in Cargo.lock + (fetchpatch { + url = "https://github.com/o2sh/onefetch/commit/b69fe660d72b65d7efac99ac5db3b03a82d8667f.patch"; + sha256 = "14przkdyd4yd11xpdgyscs70w9gpnh02j3xdzxf6h895w3mn84lx"; + }) + ]; + meta = with stdenv.lib; { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix index 007ae348bc2..8905f9eb36a 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/tools/misc/osm2pgsql/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "osm2pgsql"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = pname; rev = version; - sha256 = "1xbzkrjv5d34dahgp9xxhasr8xzygpjbsr675rq59xzy9v7nvs9b"; + sha256 = "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ expat proj bzip2 zlib boost postgresql lua ]; - NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ]; + NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; meta = with stdenv.lib; { description = "OpenStreetMap data to PostgreSQL converter"; diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index be96dd9d3d3..85bad70edc9 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c ''; - makeFlags = "prefix=$(out)"; + makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib gettext readline ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index e606b38775e..d1a786b3b91 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20191122"; + name = "parallel-20191222"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "01wmk3sf34d2lmhl37j4ga7aims2hcnzv1bydg1xs4pablar6ahq"; + sha256 = "0xvw578440s9cc382n7z2l8npj30nwr6wwmkyxn2pj1pcszfjagy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 8dcaed706c1..46606e3b43b 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; buildInputs = [ gtk2 hicolor-icon-theme ]; - NIX_LDFLAGS = [ "-lgio-2.0" ]; + NIX_LDFLAGS = "-lgio-2.0"; preFixup = '' # Need which and xdotool on path to fix auto-pasting. diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 1c094c291d8..ab3c4b5a6c4 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -27,6 +27,6 @@ in mkDerivation rec { description = "KDE Partition Manager"; license = licenses.gpl2; homepage = https://www.kde.org/applications/system/kdepartitionmanager/; - maintainers = with maintainers; [ peterhoeg ma27 ]; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 2436bbe4381..bdb86cbb802 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.2.0"; + version = "9.2.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "04r4zm550kp44pzl5xgj8abncrd1rxcfs7hqm38an1lz7shiisfi"; + sha256 = "00c5xgyn34psj538zrzql16z16532c9444vc5asg7qhrcylpqpk7"; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 20b45360f01..4c7e9d0892c 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { buildInputs = [ wine_custom libX11 libGLU libGL curl ]; - propagatedbuildInputs = [ curl cabextract ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; patches = [ ./pipelight.patch ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index c4868dd6183..ec56bb2b668 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2019.12"; + version = "1.2019.13"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1682lcfk63grzhzzxv34jxw3jacznvz1pd5cb266p9akk560a3z0"; + sha256 = "0r8ahcnim7is7np68ci6ppzr07iyx417wi81gkckfyy5p4pwk8kz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index d5f2fd4afd4..50952435dd7 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { name = "pws-${(import ./gemset.nix).pws.version}"; - env = bundlerEnv { - name = "${name}-gems"; - - inherit ruby; - - gemdir = ./.; - }; - buildInputs = [ makeWrapper ]; phases = ["installPhase"]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${name}-gems"; + + inherit ruby; + + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/pws $out/bin/pws \ --set PATH '"${xsel}/bin/:$PATH"' diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 4428bf1e625..3e7e3870959 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXtst qt4 ]; - NIX_LDFLAGS = [ "-lX11" ]; + NIX_LDFLAGS = "-lX11"; patchPhase = '' cd src substituteInPlace config --replace /bin/bash ${stdenv.shell} diff --git a/pkgs/tools/misc/reredirect/default.nix b/pkgs/tools/misc/reredirect/default.nix new file mode 100644 index 00000000000..15045d4bd8a --- /dev/null +++ b/pkgs/tools/misc/reredirect/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "reredirect"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "jerome-pouiller"; + repo = "reredirect"; + rev = "v${version}"; + sha256 = "0aqzs940kwvw80lhkszx8spcdh9ilsx5ncl9vnp611hwlryfw7kk"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postFixup = '' + substituteInPlace ${placeholder "out"}/bin/relink \ + --replace "reredirect" "${placeholder "out"}/bin/reredirect" + ''; + + meta = with stdenv.lib; { + description = "Tool to dynamicly redirect outputs of a running process"; + homepage = "https://github.com/jerome-pouiller/reredirect"; + license = licenses.mit; + maintainers = [ maintainers.tobim ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} + diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index ccd43270404..466a5f3faf1 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 -, lvm2, pam, python, utillinux, fetchpatch }: +, lvm2, pam, python, utillinux, fetchpatch, json_c }: stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1czx8brfhbfi614mqw46d38xwq6w7d5aca3pibwx8zz47rn99w6d"; + sha256 = "0605j4f3plb6q8lwf82y2jhply6dwj49jgxk8j16wsbf5k7lqzfq"; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2 - lvm2 pam python utillinux + lvm2 pam python utillinux json_c ]; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = '' # Hard-coded root paths, hard-coded root paths everywhere... - for file in {client,data,pam,scripts}/Makefile.am; do + for file in {client,data,pam,scripts,zypp-plugin}/Makefile.am; do substituteInPlace $file \ --replace '$(DESTDIR)/usr' "$out" \ --replace "DESTDIR" "out" \ @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ - "-I${libxml2.dev}/include/libxml2" - ]; + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; postInstall = '' rm -r $out/etc/cron.* diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 4fdc2bbda2a..fa59935f561 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -1,24 +1,25 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform +, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.30.1"; + version = "0.33.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "19h6ahbqfrq5jfdjqxd7phzh1lanqqvkb1phr4fx6qnn5icj9hlm"; + sha256 = "1wqxcfd7ams3k0swps9037dzc1qzxhpbqaz4qjw9jabgcl6jkb6v"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postPatch = '' substituteInPlace src/utils.rs \ --replace "/bin/echo" "echo" ''; - cargoSha256 = "0391l44rqshjz62658mfl58c2npv7k11l4lb4kk9gb3ywdhbjv26"; + cargoSha256 = "0gcca3vlwrfhw9k4r9zc1raflr1m4xws9dpdxjh1kz34f9g88ijg"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index b530193258c..66ed0a11fd9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { --replace 'PYTHONPATH=lib' 'PYTHONPATH=lib:$PYTHONPATH' ''; - makeFlags = "PREFIX=$(out) SYSCONFDIR=$(out)/etc PYTHON=${python.interpreter}"; + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python.interpreter}" ]; postInstall = '' wrapProgram "$out/bin/svtplay-dl" \ diff --git a/pkgs/tools/misc/teleconsole/default.nix b/pkgs/tools/misc/teleconsole/default.nix index 4cac9befe16..b8e984e90c4 100644 --- a/pkgs/tools/misc/teleconsole/default.nix +++ b/pkgs/tools/misc/teleconsole/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; CGO_ENABLED = 1; - buildFlags = "-ldflags"; + buildFlags = [ "-ldflags" ]; meta = with stdenv.lib; { homepage = "https://www.teleconsole.com/"; diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index f9ccec87adc..dd045f1cfac 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -1,18 +1,19 @@ { rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }: + rustPlatform.buildRustPackage rec { pname = "termplay"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitHub { owner = "jD91mZM2"; repo = "termplay"; - rev = version; + rev = "v${version}"; - sha256 = "0qgx9xmi8n3sq5n5m6gai777sllw9hyki2kwsj2k4h1ykibzq9r0"; + sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; }; cargoBuildFlags = ["--features" "bin"]; - cargoSha256 = "06vf2lhdsp7vsln8007zd1xcswn5akk9gnhh7582x1siiijksmn7"; + cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 318ad6e3a9d..c307c96199f 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; - NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"]; + NIX_LDFLAGS = "-ljack -L${libjack2}/lib"; instruments = fetchurl { url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 59aa3861510..006cef6f102 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; - configureFlags="--with-fuser=${psmisc}/bin/fuser"; + configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; diff --git a/pkgs/tools/misc/tmux-xpanes/default.nix b/pkgs/tools/misc/tmux-xpanes/default.nix new file mode 100644 index 00000000000..3ea5f758050 --- /dev/null +++ b/pkgs/tools/misc/tmux-xpanes/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, openssl, perl }: + +stdenv.mkDerivation rec { + pname = "tmux-xpanes"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "greymd"; + repo = pname; + rev = "v${version}"; + sha256 = "11yz6rh2ckd1z8q80n8giv2gcz2i22fgf3pnfxq96qrzflb0d96a"; + }; + + buildInputs = [ openssl perl ]; + + installPhase = '' + # Create directories. + install -m 755 -d $out/bin/ + install -m 755 -d $out/share/man/man1/ + + # Perform installation. + install -m 755 bin/* $out/bin/ + install -m 644 man/*.1 $out/share/man/man1/ + ''; + + meta = with stdenv.lib; { + description = "tmux-based terminal divider"; + homepage = "https://github.com/greymd/tmux-xpanes"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ monsieurp ]; + }; +} diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 3adf37c2218..060975f2002 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "3.5.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "15w1qi38dsx573nadqpvarxx63xla53w775fwkdds2iyspaljsg6"; + sha256 = "0vs0gnfs9swlmzsj7m3b88xfzcfy7n68bgm4i94csc3qsbip6m0j"; }; - cargoSha256 = "0xhrgs2rpkgjzgsipq5rb3fmqwvxrl2wi0fly1xaa6p304k1710m"; + cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd"; meta = with stdenv.lib; { description = "Upgrade all the things"; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index ccf8113e1a5..b863786145c 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)/bin" ] ++ lib.optional enableStatic "LDFLAGS=--static"; - installTargets = "install_flat"; + installTargets = [ "install_flat" ]; # tests currently (as of 0.8.0) get stuck in an infinite loop... # ...this is fixed in latest git, so doCheck can likely be enabled for next release diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index fd818ca6f9b..ac8feaef275 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -26,6 +26,12 @@ python3Packages.buildPythonApplication rec { url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch"; sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp"; }) + + # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95 + (fetchpatch { + url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch"; + sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4"; + }) ]; checkInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index bfb97c22b1d..f82917239e6 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.freetype.org/ttfautohint; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) - maintainers = with maintainers; [ goibhniu ndowens ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index edaa9b662e7..b261f0ef841 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/xorg62/tty-clock; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index c47fe77fb76..0f68ca82ece 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -2,16 +2,21 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "225"; + version = "230"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "07vh0rmvjr2sir15l3ppp2pnp2d849dg17rzykkzqyk3d5rwfxyj"; + sha256 = "03ab9drdqvkfq240pkrx6197jjvvjizjwfx9psjmm6lixksw0kjx"; }; nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; + # fix usage of off_t without include + postPatch = '' + sed -i '1i#include <sys/types.h>' sysif.h + ''; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index a32ce090ecd..5aa9f8c34a4 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" }: +{ stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" +, Security +}: rustPlatform.buildRustPackage { name = "uutils-coreutils-2019-05-03"; @@ -19,20 +21,20 @@ rustPlatform.buildRustPackage { ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ cargo sphinx ]; + buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; installPhase = ""; - meta = with stdenv.lib; { + meta = with lib; { description = "Cross-platform Rust rewrite of the GNU coreutils"; longDescription = '' uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; homepage = https://github.com/uutils/coreutils; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index a304873ca1e..18ae7b5e211 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchFromGitHub, rustPlatform , openssl, pkgconfig, protobuf -, Security, libiconv +, Security, libiconv, rdkafka , features ? (if stdenv.isAarch64 - then [ "shiplift/unix-socket" "jemallocator" ] - else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" ]) + then [ "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ] + else [ "leveldb" "leveldb/leveldb-sys-2" "shiplift/unix-socket" "jemallocator" "rdkafka" "rdkafka/dynamic_linking" ]) }: rustPlatform.buildRustPackage rec { @@ -20,14 +20,13 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1akyzrscc6pv7ggb1kna05vvxhfzrf1b4kji4bah1ry3yyqxdjsj"; - buildInputs = [ openssl pkgconfig protobuf ] + buildInputs = [ openssl pkgconfig protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library PROTOC="${protobuf}/bin/protoc"; PROTOC_INCLUDE="${protobuf}/include"; - # rdkafka fails to build, for some reason... cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; checkPhase = ":"; # skip tests, too -- they don't respect the rdkafka flag... diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index e5bb23016ae..fda442a6729 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [perl]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = { description = "Portable file system cache diagnostics and control"; diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index 0c46d4d6d17..c3b3cd11239 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -1,21 +1,20 @@ { stdenv, fetchFromGitHub -, meson, ninja, pkg-config, wayland # wayland-scanner +, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner , wayland-protocols }: stdenv.mkDerivation rec { pname = "wob"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - fetchSubmodules = true; - sha256 = "1z0vwss3ix5mf7mqpm4dzlv1bblddfi47ykblj0nmscxn1sinr7j"; + sha256 = "0cfglwh1inv6ng55vgznhll51m9g1lxfh37k4ridyxl64rc9jfq8"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; buildInputs = [ wayland-protocols ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index ec516555273..6a5ec867222 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; }; - NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ]; + NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; preConfigure = '' substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC" diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index f042b9e209f..77a2ef763a9 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h3jrygcjjbavdbkpx2hscsf0yf97gk487lzjdlvymd7dxdv9hy9"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ libxcb xcbutilwm xcbutil ]; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 3d2fb50371e..4c39babc317 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation { pname = "xsel-unstable"; - version = "2018-01-10"; + version = "2019-08-21"; src = fetchFromGitHub { owner = "kfish"; repo = "xsel"; - rev = "9bfc13d64b5acb92c6648c696a9d9260fcbecc65"; - sha256 = "05ms34by5hxznnpvmvhgp6llvlkz0zw4sq6c4bgwr82lj140lscm"; + rev = "ef01f3c72a195dbce682184c842b81b17d7d7ad1"; + sha256 = "191qa6022b7nww3bicfxpgp4d9x6c8s3sgixi780383ghkxds08c"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7ca9f18d30a..415ec83be2f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,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.11.28"; + version = "2019.12.25"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "19xiwdn3l0kizyj7cik9vyhgrlwg7ss4wl4hy2pbbbqwh5vwppwk"; + sha256 = "13f7wv9v77zilhif0ndgjv4wn9glhmm14yh7axdcx5wglrgz38hf"; }; nativeBuildInputs = [ makeWrapper ]; @@ -65,6 +65,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fpletz enzime ma27 ]; }; } diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index bf1c96b66b2..06c2898248d 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "graywolf"; repo = "acme-client-portable"; rev = "v${version}"; - sha256 = "1yq2lkrnjwjs0h9mijqysnjmr7kp4zcq1f4cxr9n1db7pw8446xb"; + sha256 = "1d9yk87nj5gizkq26m4wqfh4xhlrn5xlfj7mfgvrpsdiwibqxrrw"; }; nativeBuildInputs = [ autoreconfHook bison pkgconfig ]; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index c53cce49a38..a31bc57904d 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation { description = "A web-interface for hipache-proxy"; license = licenses.mit; homepage = https://github.com/emblica/airfield; - maintainers = with maintainers; [ offline ma27 ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index e9091086ed9..b1481b2208c 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "15zxg6spcmd35r6xbidq2fgcg2nzyv1sbbqds08lzll70mqx4pj7"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format" + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=format" "-Wno-error=format-truncation" "-Wno-error=pointer-compare" "-Wno-error=memset-elt-size" diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index 72c0a78a447..bb9abccc933 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libpcap, bison, flex, cyrus_sasl, tcp_wrappers, - pkgconfig, procps, which, wget, lsof, net_snmp, perl }: + pkgconfig, procps, which, wget, lsof, net-snmp, perl }: stdenv.mkDerivation rec { pname = "argus"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1zzf688dbbcb5z2r9v1p28rddns6znzx35nc05ygza6lp7aknkna"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap bison cyrus_sasl tcp_wrappers flex ]; - propagatedBuildInputs = [ procps which wget lsof net_snmp ]; + nativeBuildInputs = [ pkgconfig bison flex ]; + buildInputs = [ libpcap cyrus_sasl tcp_wrappers ]; + propagatedBuildInputs = [ procps which wget lsof net-snmp ]; patchPhase = '' substituteInPlace events/argus-extip.pl \ @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { substituteInPlace events/argus-vmstat.sh \ --replace vm_stat ${procps}/bin/vmstat substituteInPlace events/argus-snmp.sh \ - --replace /usr/bin/snmpget ${net_snmp}/bin/snmpget \ - --replace /usr/bin/snmpwalk ${net_snmp}/bin/snmpwalk + --replace /usr/bin/snmpget ${stdenv.lib.getBin net-snmp}/bin/snmpget \ + --replace /usr/bin/snmpwalk ${stdenv.lib.getBin net-snmp}/bin/snmpwalk ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 175ba3960ee..16b3ee668da 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "atinout-${version}"; version = "0.9.2-alpha"; - NIX_CFLAGS_COMPILE = [ "-Werror=implicit-fallthrough=0" ]; + NIX_CFLAGS_COMPILE = "-Werror=implicit-fallthrough=0"; LANG = "C.UTF-8"; nativeBuildInputs = [ ronn mount ]; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix new file mode 100644 index 00000000000..f1b9a87dd5a --- /dev/null +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "bandwhich"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "imsnif"; + repo = pname; + rev = version; + sha256 = "1qrxxy6vhac1g6jzg30lqwcpjffyk2297jkd9j4rmwwf5cgip58a"; + }; + + cargoSha256 = "1rixpljqddwhryddzni5l6m4sjyn1krrj0ig0rzc701am7srhg3a"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A CLI utility for displaying current network utilization"; + longDescription = '' + bandwhich sniffs a given network interface and records IP packet size, cross + referencing it with the /proc filesystem on linux or lsof on MacOS. It is + responsive to the terminal window size, displaying less info if there is + no room for it. It will also attempt to resolve ips to their host name in + the background using reverse DNS on a best effort basis. + ''; + homepage = "https://github.com/imsnif/bandwhich"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 4637a39e6e9..8e766cdeeb5 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { void sigint(int sig) FUNCATTR_NORETURN; -inline void init(void); +static inline void init(void); - + /* clear stuff and exit */ --- a/src/options.c +++ b/src/options.c @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # This code uses inline in the gnu89 sense: see http://clang.llvm.org/compatibility.html#inline - NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-std=gnu89" else null; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-std=gnu89"; meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index c0c3281431f..2ec16aa430a 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; configureFlags = [ "--chronyvardir=$(out)/var/lib/chrony" ] - ++ stdenv.lib.optional stdenv.isLinux [ "--enable-scfilter" ]; + ++ stdenv.lib.optional stdenv.isLinux "--enable-scfilter"; meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index f9dc3de7735..df94de882be 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # for flock stdenv.lib.optional stdenv.isLinux utillinux; - CFLAGS = "-O2"; + CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix new file mode 100644 index 00000000000..f3d0a584593 --- /dev/null +++ b/pkgs/tools/networking/clash/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "clash"; + version = "0.17.1"; + + src = fetchFromGitHub { + owner = "Dreamacro"; + repo = pname; + rev = "v${version}"; + sha256 = "0zhbaw9jzl9wqc7yx8yxqlb6fwkss4pqkv26069qg6nsk584ndnf"; + }; + + goPackagePath = "github.com/Dreamacro/clash"; + modSha256 = "0vyd61bin7hmpdqrmrikc776mgif9v25627n8hzi65kiycv40kgx"; + + buildFlagsArray = [ + "-ldflags=" + "-X ${goPackagePath}/constant.Version=${version}" + ]; + + meta = with stdenv.lib; { + description = "A rule-based tunnel in Go"; + homepage = "https://github.com/Dreamacro/clash"; + license = licenses.gpl3; + maintainers = with maintainers; [ contrun filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix new file mode 100644 index 00000000000..6f9ea09eea1 --- /dev/null +++ b/pkgs/tools/networking/corerad/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "corerad"; + version = "0.1.4"; + + goPackagePath = "github.com/mdlayher/corerad"; + + src = fetchFromGitHub { + owner = "mdlayher"; + repo = "corerad"; + rev = "v${version}"; + sha256 = "0qlmmgdz69gqqn6h5kb3gsjyj7lm6pcfcx9xlmrxhisj914ij76r"; + }; + + modSha256 = "0vim91yvw0cf9bd10hfanz8azq7q19lp2x61rs44ycx9zm3qdhcw"; + + meta = with stdenv.lib; { + homepage = "https://github.com/mdlayher/corerad"; + description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; + license = licenses.asl20; + maintainers = with maintainers; [ mdlayher ]; + }; +} diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 0a754140706..fee1e9ee3ac 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "croc"; - version = "6.4.7"; + version = "6.4.8"; goPackagePath = "github.com/schollz/croc"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "1i8g90sr5rk7flfxvmxca6z5vp9wh8zraf2lfz618s5axds3kb50"; + sha256 = "03wm7agjwky9ma321x6as76rg053cagmni9ygwls82jjs2pvv0bv"; }; - modSha256 = "1w84xqnn9fnkakak6j069app4ybbxpwq79g8qypwvmqg5bhvzywg"; + modSha256 = "011pcmfih8lg8l7hwdsq51p5brnhsddzv7mvsaw5sfv8nq9p8zc2"; subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index a83274188c0..2253daa2d11 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkgconfig, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency @@ -42,7 +42,7 @@ in buildGoPackage rec { "-r ${python}/lib" ]; in '' - buildFlagsArray=( "-tags" "ec2 systemd cpython process log" "-ldflags" "${ldFlags}") + buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}") ''; # DataDog use paths relative to the agent binary, so fix these. diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index bcf0743b7b9..c5d650f52bb 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -36,12 +36,14 @@ stdenv.mkDerivation rec { "--enable-early-chroot" "--sysconfdir=/etc" "--localstatedir=/var" - (lib.optional stdenv.isLinux "--with-randomdev=/dev/random") - ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + ] ++ lib.optional stdenv.isLinux "--with-randomdev=/dev/random" + ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = builtins.toString [ "-Wno-error=pointer-compare" "-Wno-error=format-truncation" + "-Wno-error=stringop-truncation" + "-Wno-error=format-overflow" ]; installFlags = [ "DESTDIR=\${out}" ]; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d63c63ab1d2..c45d017e3f5 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, udev, runtimeShellPackage, runtimeShell }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, udev, runtimeShellPackage, +runtimeShell }: stdenv.mkDerivation rec { # when updating this to >=7, check, see previous reverts: # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix pname = "dhcpcd"; - version = "8.1.2"; + version = "8.1.4"; src = fetchurl { url = "mirror://roy/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1b9mihp1mf2vng92fgks764a6pwf2gx7ccw6knja79c42nmyglyb"; + sha256 = "0gf1qif25wy5lffzw39pi4sshmpxz1f4a1m9sglj7am1gaix3817"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,6 +22,13 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; + patches = [ + (fetchpatch { + url = "https://roy.marples.name/cgit/dhcpcd.git/patch/?id=114870290a8d3d696bc4049c32eef3eed03d6070"; + sha256 = "0kzpwjh2gzvl5lvlnw6lis610p67nassk3apns68ga2pyxlky8qb"; + }) + ]; + preConfigure = "patchShebangs ./configure"; configureFlags = [ diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 3382616bfb6..8dd18df28c7 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; rev = "et-v${version}"; - sha256 = "05hbcbbxpvwm17ascnrwrz413kp3i94kp4px3vqx0f635rm41dqc"; + sha256 = "04jn0189vq5lc795izkxq1zdv9fnpxz2xchg2mm37armpz7n06id"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix new file mode 100644 index 00000000000..abc34abd77f --- /dev/null +++ b/pkgs/tools/networking/findomain/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, perl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "findomain"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "Edu4rdSHL"; + repo = pname; + rev = version; + sha256 = "1p7bj8q3zwn92nn6d71bk7cczclcsjvan6m8znlzr4lrwircp1y1"; + }; + + cargoSha256 = "1grb0frc1kp3z6vs2906h9v1yx9qxn6x0gf9jy1msqgnqjw0bgn9"; + + nativeBuildInputs = [ installShellFiles perl ]; + buildInputs = lib.optional stdenv.isDarwin Security; + + postInstall = '' + installManPage ${pname}.1 + ''; + + meta = with lib; { + description = "The fastest and cross-platform subdomain enumerator"; + homepage = "https://github.com/Edu4rdSHL/findomain"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 87932cd02bd..46ccfc0d24c 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "15q2lfwqyicgllhh5fn3a8g3iw9m42cd0izb99a24hn57pd9cr0n"; + sha256 = "1cf2f0nbcg76i4mv8l3d38c13lw0mma6d2xzwkb9iqn7jflj1j9y"; }; modSha256 = "1zbl0gfc99pbzdacxhfa1k3y6i7v13sb441wpbp9aygxhvwqrms9"; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 756e77f1157..72aaaa1e170 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, net_snmp }: +{ stdenv, fetchurl, autoreconfHook, net-snmp }: stdenv.mkDerivation rec { pname = "ifstat-legacy"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = [ net_snmp ]; + buildInputs = [ net-snmp ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 5aa0c01e848..44bf52c9933 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; - installFlags = "prefix=\${out}"; + installFlags = [ "prefix=\${out}" ]; meta = { homepage = http://code.kryo.se/iodine/; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index 5de4b8cecb7..35aeb23a9a8 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -30,13 +30,9 @@ stdenv.mkDerivation rec { "--disable-bundled-md5" "--disable-dynamic-load" "--enable-shared" - ] ++ stdenv.lib.optional (libmaxminddb != null ) [ - "--enable-mmdb" - ] ++ stdenv.lib.optional (geolite-legacy != null) [ - "--with-geoip-db=${geolite-legacy}/share/GeoIP" - ] ++ stdenv.lib.optional (ip2location-c != null ) [ - "--enable-ip2location" - ]; + ] ++ stdenv.lib.optional (libmaxminddb != null) "--enable-mmdb" + ++ stdenv.lib.optional (geolite-legacy != null) "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ++ stdenv.lib.optional (ip2location-c != null) "--enable-ip2location"; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 4e1894db98c..87748211425 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,32 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }: +{ stdenv, fetchFromGitHub, nixosTests +, libnfnetlink, libnl, net-snmp, openssl +, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { pname = "keepalived"; - version = "1.4.5"; + version = "2.0.19"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "12r80rcfxrys826flaqcdlfhcr7q4ccsd62ra1svy9545vf02qmx"; + sha256 = "05jgr0f04z69x3zf3b9z04wczl15fnh69bs6j0yw55fij1k9nj4d"; }; - patches = [ - (fetchpatch { - name = "CVE-2018-19115.patch"; - url = "https://github.com/acassen/keepalived/pull/961/commits/f28015671a4b04785859d1b4b1327b367b6a10e9.patch"; - sha256 = "1jnwk7x4qdgv7fb4jzw6sihv62n8wv04myhgwm2vxn8nfkcgd1mm"; - }) - ]; - buildInputs = [ libnfnetlink libnl - net_snmp + net-snmp openssl ]; - nativeBuildInputs = [ pkgconfig ]; + passthru.tests.keepalived = nixosTests.keepalived; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; configureFlags = [ "--enable-sha1" diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 13bdbe17ff8..9a982e53825 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lftp"; - version = "4.8.4"; + version = "4.9.0"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" ]; - sha256 = "0qks22357xv9y6ripmf5j2n5svh8j5z0yniphfk89sjwkqg2gg2f"; + sha256 = "0km267h57mlrd7gnn9gf40znvb3irwfc0qaql8kii8v936g6afqb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 9a0b8c9ebf5..4c8b926b582 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr, bash, iproute, iptables, procps, coreutils, gnused, gawk, nss, which, python, - docs ? false, xmlto + docs ? false, xmlto, libselinux, ldns }: let optional = stdenv.lib.optional; - version = "3.18"; + version = "3.29"; name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python @@ -14,6 +14,7 @@ let in assert docs -> xmlto != null; +assert stdenv.isLinux -> libselinux != null; stdenv.mkDerivation { inherit name; @@ -21,28 +22,35 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "0zginnakxw7m79zrdvfdvliaiyg78zgqfqkks9z5d1rjj5w13xig"; + sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn"; }; # These flags were added to compile v3.18. Try to lift them when updating. - NIX_CFLAGS_COMPILE = [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-decls" "-Wno-error=format-nonliteral" # these flags were added to build with gcc7 "-Wno-error=implicit-fallthrough" "-Wno-error=format-truncation" "-Wno-error=pointer-compare" + "-Wno-error=stringop-truncation" ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent - libcap_ng curl nspr nss python ] - ++ optional docs xmlto; + libcap_ng curl nspr nss python ldns ] + ++ optional docs xmlto + ++ optional stdenv.isLinux libselinux; prePatch = '' # Correct bash path sed -i -e 's|/bin/bash|/usr/bin/env bash|' mk/config.mk - # Fix systemd unit directory, and prevent the makefile from trying to reload the systemd daemon - sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|' -e 's|systemctl --system daemon-reload|true|' initsystems/systemd/Makefile + # Fix systemd unit directory, and prevent the makefile from trying to reload the + # systemd daemon or create tmpfiles + sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|g' \ + -e 's|TMPFILESDIR=.*$|TMPFILESDIR=$\{out}/tmpfiles.d/|g' \ + -e 's|systemctl|true|g' \ + -e 's|systemd-tmpfiles|true|g' \ + initsystems/systemd/Makefile # Fix the ipsec program from crushing the PATH sed -i -e 's|\(PATH=".*"\):.*$|\1:$PATH|' programs/ipsec/ipsec.in @@ -51,8 +59,6 @@ stdenv.mkDerivation { sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in ''; - patches = [ ./libreswan-3.18-glibc-2.26.patch ]; - # Set appropriate paths for build preBuild = "export INC_USRLOCAL=\${out}"; diff --git a/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch b/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch deleted file mode 100644 index 33c44f617a0..00000000000 --- a/pkgs/tools/networking/libreswan/libreswan-3.18-glibc-2.26.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/lib/libswan/id.c b/lib/libswan/id.c -index 8f06275..efb0394 100644 ---- a/lib/libswan/id.c -+++ b/lib/libswan/id.c -@@ -22,6 +22,7 @@ - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+#include <limits.h> - #include <unistd.h> - #ifndef HOST_NAME_MAX /* POSIX 1003.1-2001 says <unistd.h> defines this */ - #define HOST_NAME_MAX 255 /* upper bound, according to SUSv2 */ -diff --git a/linux/include/libreswan.h b/linux/include/libreswan.h -index c5efc6a..b0af4d7 100644 ---- a/linux/include/libreswan.h -+++ b/linux/include/libreswan.h -@@ -211,6 +211,7 @@ static inline deltatime_t monotimediff(monotime_t a, monotime_t b) { - #include <assert.h> - #define user_assert(foo) assert(foo) - #include <stdio.h> -+#include <stdint.h> - - # define uint8_t u_int8_t - # define uint16_t u_int16_t -diff --git a/programs/pluto/rcv_whack.c b/programs/pluto/rcv_whack.c -index 588c66c..4fc6289 100644 ---- a/programs/pluto/rcv_whack.c -+++ b/programs/pluto/rcv_whack.c -@@ -24,6 +24,7 @@ - #include <stddef.h> - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - #include <unistd.h> - #ifndef HOST_NAME_MAX /* POSIX 1003.1-2001 says <unistd.h> defines this */ - # define HOST_NAME_MAX 255 /* upper bound, according to SUSv2 */ diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index b8ba1357f5f..23dbb60767e 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, removeReferencesTo -, libevent, readline, net_snmp, openssl +, libevent, readline, net-snmp, openssl }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ]; - buildInputs = [ libevent readline net_snmp openssl ]; + buildInputs = [ libevent readline net-snmp openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 40eeed7f050..dcf377ca0c0 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, libmysqlclient, system-sendmail }: +, python3, gss, libmysqlclient, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; project = "mailutils"; - version = "3.2"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/${project}/${name}.tar.xz"; - sha256 = "0zh7xn8yvnw9zkc7gi5290i34viwxp1rn0g1q9nyvmckkvk59lwn"; + sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7"; }; postPatch = '' @@ -29,17 +29,11 @@ stdenv.mkDerivation rec { buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools - gss libmysqlclient python + gss libmysqlclient python3 ]; patches = [ - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff"; - excludes = [ "NEWS" ]; - sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db"; - }) ./fix-build-mb-len-max.patch - ./fix-test-ali-awk.patch ./path-to-cat.patch ]; diff --git a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch b/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch deleted file mode 100644 index 3d301d530de..00000000000 --- a/pkgs/tools/networking/mailutils/fix-test-ali-awk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/mh/tests/ali.at b/mh/tests/ali.at -index 28c0e5451..c76cf9363 100644 ---- a/mh/tests/ali.at -+++ b/mh/tests/ali.at -@@ -85,9 +85,9 @@ ali -a ./mh_aliases korzen | tr -d ' ' - [expout]) - - MH_CHECK([ali: group id],[ali05 ali-group-id ali-gid],[ --cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1 }' > expout -+cat /etc/passwd | awk -F : '/^#/ { next } $4==0 { print $1; exit }' > expout - test -s expout || AT_SKIP_TEST --name=`awk -F : '/^#/ { next } $3==0 { print $1 }' /etc/group < /dev/null` -+name=`awk -F : '/^#/ { next } $3==0 { print $1; exit }' /etc/group < /dev/null` - test -z "$name" && AT_SKIP_TEST - - echo "korzen: +$name" > mh_aliases diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index e54a2b21d9f..dd9886a65ee 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, bundlerEnv, ruby, bundlerUpdateScript }: -stdenv.mkDerivation rec { - name = "maphosts-${env.gems.maphosts.version}"; - +let env = bundlerEnv { name = "maphosts-gems"; inherit ruby; gemdir = ./.; }; +in stdenv.mkDerivation { + name = "maphosts-${env.gems.maphosts.version}"; phases = ["installPhase"]; diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index e902f24ca0e..469dd4cceb7 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcrcon"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Tiiffi"; repo = "mcrcon"; rev = "v${version}"; - sha256 = "0as60cgl8sflykmwihc6axy1hzx6gjgjav6c7mvlbsc43dv8fs51"; + sha256 = "004h1glagyw1mic1k461bky0w2fxdfhrhcqjzr9wp6gvyy9s8bix"; }; buildPhase = '' diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index dc0a4457dde..ebe6a60291a 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -11,14 +11,13 @@ let inherit sha256; }; - nativeBuildInputs = [] ++ - stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; doCheck = !stdenv.isFreeBSD; - makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = http://miniupnp.free.fr/; diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index 947ede5372a..69b454ea72e 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -2,7 +2,7 @@ , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43 , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3 -, libappindicator-gtk3, withGnome ? false, gcr, glib }: +, libappindicator-gtk3, withGnome ? true, gcr, glib }: let pname = "network-manager-applet"; diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index 53d6ab2fbcf..94a4c4b362a 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3, -networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch }: +networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: let pname = "NetworkManager-fortisslvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openfortivpn networkmanager ppp ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix index 966827a07da..29c0d550fe2 100644 --- a/pkgs/tools/networking/network-manager/iodine/default.nix +++ b/pkgs/tools/networking/network-manager/iodine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch }: +, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }: let pname = "NetworkManager-iodine"; @@ -25,12 +25,12 @@ in stdenv.mkDerivation { ]; buildInputs = [ iodine networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index bedc7875fb7..2762b12a364 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }: +, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }: let pname = "NetworkManager-openvpn"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ openvpn networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index 448fef4226a..843985bfa3e 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gtk3, gnome3, libsecret }: +, gtk3, gnome3, libsecret, networkmanagerapplet }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; }; - buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ]; + buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; configureFlags = [ "--without-libnm-glib" diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix index af5b19eb5db..66392325574 100644 --- a/pkgs/tools/networking/network-manager/vpnc/default.nix +++ b/pkgs/tools/networking/network-manager/vpnc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch }: +, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ vpnc networkmanager ] - ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ]; + ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig file ]; diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 50654da54e4..88510b9b887 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -18,13 +18,18 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-Wno-braced-scalar-init" "" + ''; + buildInputs = [ json_c libpcap ncurses ]; nativeBuildInputs = [ cmake ]; # To build with GCC 8+ it needs: - CXXFLAGS = [ "-Wno-class-memaccess" "-Wno-ignored-qualifiers" ]; + CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers"; # CMake can't find json_c without: - NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" ]; + NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" ]; doCheck = false; # requires network access diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index cc5620a1f4d..a0d6171efe2 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -5,8 +5,8 @@ with stdenv.lib; let versions = builtins.fromJSON (builtins.readFile ./versions.json); arch = if stdenv.isi686 then "386" else if stdenv.isx86_64 then "amd64" + else if stdenv.isAarch32 then "arm" else if stdenv.isAarch64 then "arm64" - else if stdenv.isArm then "arm" else throw "Unsupported architecture"; os = if stdenv.isLinux then "linux" else if stdenv.isDarwin then "darwin" diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 0c693ac6288..68f80106031 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ] - ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; + NIX_CFLAGS_COMPILE = "-fpermissive" + + stdenv.lib.optionalString stdenv.cc.isClang " -Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index e695c460422..8d4b340ea2b 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = "ocserv_${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0lybz93ah6n5b82ywshhmsmf65im8rk6gkxnzxfbxpqxra79j517"; + sha256 = "0k7sx9sg8akxwfdl51cvdqkdrx9qganqddgri2yhcgznc3f3pz5b"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = https://gitlab.com/openconnect/ocserv; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index a14f8187b7d..983ba018473 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,14 +2,14 @@ asciidoc, cacert, libxml2, libxslt, docbook_xsl }: python2Packages.buildPythonApplication rec { - version = "7.3.0"; + version = "7.3.2"; pname = "offlineimap"; src = fetchFromGitHub { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "0v32s09zgi3jg2grwh1xzzgzpw333b9qflai7zh2hv3fx9xnfbyj"; + sha256 = "0rmj1ws6hljqnfap3p3js5s46kx85yc02hjkiki5zg44wn3hswjg"; }; postPatch = '' @@ -23,7 +23,7 @@ python2Packages.buildPythonApplication rec { doCheck = false; nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ]; - propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 ]; + propagatedBuildInputs = with python2Packages; [ six kerberos rfc6555 pysocks ]; postInstall = '' make -C docs man @@ -35,6 +35,6 @@ python2Packages.buildPythonApplication rec { description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers"; homepage = http://offlineimap.org; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ endocrimes ma27 ]; + maintainers = with stdenv.lib.maintainers; [ endocrimes ]; }; } diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index 190c903d9c1..423282aa8c1 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { EOF ''; - installFlags = "SYSCONFDIR=$(out)/etc"; + installFlags = [ "SYSCONFDIR=$(out)/etc" ]; postInstall = '' wrapProgram "$out/sbin/resolvconf" --set PATH "${coreutils}/bin" diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2a1122029c1..90ecba0891d 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -12,10 +12,8 @@ let # **please** update this patch when you update to a new openssh release. gssapiPatch = fetchpatch { name = "openssh-gssapi.patch"; - url = "https://salsa.debian.org/ssh-team/openssh/raw/" - + "e50a98bda787a3b9f53ed67bdccbbac0bde1f9ae" - + "/debian/patches/gssapi.patch"; - sha256 = "14j9cabb3gkhkjc641zbiv29mbvsmgsvis3fbj8ywsd21zc7m2hv"; + url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch"; + sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj"; }; in @@ -61,11 +59,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook; buildInputs = [ zlib openssl libedit pam ] - ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook - ; + ++ optional withKerberos kerberos; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 2041d935c94..623645efc0c 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { setSourceRoot = '' export sourceRoot=$(realpath */gtests/net/packetdrill) ''; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=unused-result" + "-Wno-error=stringop-truncation" + "-Wno-error=address-of-packed-member" + ]; nativeBuildInputs = [ bison flex ]; patches = [ ./nix.patch ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index cf8c370c522..f5353db6803 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq"; }; - makeFlags = "-C src"; + makeFlags = [ "-C" "src" ]; installPhase = '' install -vD bin/* -t $out/bin diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 8a2dee19b95..f2ae143e1b9 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; meta = with stdenv.lib; { description = '' diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix new file mode 100644 index 00000000000..8e62aa735a4 --- /dev/null +++ b/pkgs/tools/networking/shorewall/default.nix @@ -0,0 +1,130 @@ +{ coreutils +, ebtables +, fetchurl +, gnugrep +, gnused +, iproute +, ipset +, iptables +, perl +, perlPackages +, stdenv +, tree +, utillinux +}: +let + PATH = stdenv.lib.concatStringsSep ":" + [ "${coreutils}/bin" + "${iproute}/bin" + "${iptables}/bin" + "${ipset}/bin" + "${ebtables}/bin" + "${utillinux}/bin" + "${gnugrep}/bin" + "${gnused}/bin" + ]; +in +stdenv.mkDerivation rec { + pname = "shorewall"; + version = "5.2.3.3"; + + srcs = [ + (fetchurl { + url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-core-${version}.tar.bz2"; + sha256 = "1gg2yfxzm3y9qqjrrg5nq2ggi1c6yfxx0s7fvwjw70b185mwa5p5"; + }) + (fetchurl { + url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall-${version}.tar.bz2"; + sha256 = "1ka70pa3s0cnvc83rlm57r05cdv9idnxnq0vmxi6nr7razak5f3b"; + }) + (fetchurl { + url = "http://www.shorewall.net/pub/shorewall/5.2/shorewall-5.2.3/shorewall6-${version}.tar.bz2"; + sha256 = "0mhs4m6agwk082h1n69gnyfsjpycdd8215r4r9rzb3czs5xi087n"; + }) + ]; + sourceRoot = "."; + + buildInputs = [ + coreutils + iproute + ipset + iptables + ebtables + utillinux + gnugrep + gnused + perl + ] ++ (with perlPackages; [ + DigestSHA1 + ]); + prePatch = '' + # Patch configure and install.sh files + patchShebangs . + + # Remove hardcoded PATH + sed -i shorewall-core-${version}/lib.cli \ + -e '/^ *PATH=.*/d' + ''; + configurePhase = '' + shorewall-core-${version}/configure \ + HOST=linux \ + PREFIX=$out \ + CONFDIR=\$PREFIX/etc-example \ + SBINDIR=\$PREFIX/sbin \ + SYSCONFDIR= \ + SHAREDIR=\$PREFIX/share \ + LIBEXECDIR=\$SHAREDIR \ + PERLLIBDIR=\$SHAREDIR/shorewall \ + MANDIR=$out/man \ + VARLIB=/var/lib \ + INITSOURCE= \ + INITDIR= \ + INITFILE= \ + DEFAULT_PAGER= + ''; + installPhase = '' + export DESTDIR=/ + shorewall-core-${version}/install.sh + + ln -s ../shorewall-core-${version}/shorewallrc shorewall-${version}/ + shorewall-${version}/install.sh + + ln -s ../shorewall-core-${version}/shorewallrc shorewall6-${version}/ + shorewall6-${version}/install.sh + + # Patch the example shorewall{,6}.conf in case it is included + # in services.shorewall{,6}.configs + sed -i $out/etc-example/shorewall/shorewall.conf \ + $out/etc-example/shorewall6/shorewall6.conf \ + -e 's|^LOGFILE=.*|LOGFILE=/var/log/shorewall.log|' \ + -e 's|^PATH=.*|PATH=${PATH}|' \ + -e 's|^PERL=.*|PERL=${perl}/bin/perl|' \ + -e 's|^SHOREWALL_SHELL=.*|SHOREWALL_SHELL=${stdenv.shell}|' + sed -i $out/etc-example/shorewall6/shorewall6.conf \ + -e 's|^CONFIG_PATH=.*|CONFIG_PATH=:''${CONFDIR}/shorewall6:''${SHAREDIR}/shorewall6:''${SHAREDIR}/shorewall|' + # FIXME: the default GEOIPDIR=/usr/share/xt_geoip/LE may require attention. + + # Redirect CONFDIR to /etc where services.shorewall{,6}.configs + # will generate the config files. + sed -i $out/share/shorewall/shorewallrc \ + -e 's~^CONFDIR=.*~CONFDIR=/etc~' + ''; + + meta = { + homepage = http://www.shorewall.net/; + description = "An IP gateway/firewall configuration tool for GNU/Linux"; + longDescription = '' + Shorewall is a high-level tool for configuring Netfilter. You describe your + firewall/gateway requirements using entries in a set of configuration + files. Shorewall reads those configuration files and with the help of the + iptables, iptables-restore, ip and tc utilities, Shorewall configures + Netfilter and the Linux networking subsystem to match your requirements. + Shorewall can be used on a dedicated firewall system, a multi-function + gateway/router/server or on a standalone GNU/Linux system. Shorewall does + not use Netfilter's ipchains compatibility mode and can thus take + advantage of Netfilter's connection state tracking capabilities. + ''; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 83f315706ef..f9add47dd3f 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "0i0rhb7n2i2nmbvdqdx83vi3kw4r17p7p099sr857cr3f3c221qx"; + sha256 = "0g7apfw33wkxxj7qwvlnnhv7qy13s1gkbmvns8612c0yfv9jrsvq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index ba05ee8e8b5..9471efa92d7 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + patchPhase = '' patchShebangs . diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index ebe31dc8b5a..81da427a52c 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation { --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)' ''; - installFlags = "etcdir=$(out)/etc"; + installFlags = [ "etcdir=$(out)/etc" ]; installTargets = [ "install" "install-sendmail" ]; buildInputs = stdenv.lib.optional tlsSupport openssl; - NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ]; + NIX_LDFLAGS = stdenv.lib.optionalString tlsSupport "-lcrypto"; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index 8dee8989c06..81d0935f0b0 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = "http://www.jetmore.org/john/code/swaks/"; description = "A featureful, flexible, scriptable, transaction-oriented SMTP test tool"; license = licenses.gpl2; - maintainers = with maintainers; [ ndowens ]; + maintainers = with maintainers; []; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 4062fc0fd58..1d3c4190e38 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-lua=yes" ]; - NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ]; + NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so"; preAutoreconf = '' substituteInPlace Makefile.am --replace "noinst" "" diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index af8f5cafb89..8591db4e016 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6"; }; - makeFlags = "prefix=$(out) LDFLAGS=-lm"; + makeFlags = [ "prefix=$(out)" "LDFLAGS=-lm" ]; preConfigure = '' sed -i 's@LIBS := \(.*\) -lm \(.*\)@LIBS := \1 \2@' Make.rules diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 08e2e07581b..18d9defdd94 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; + postInstall = '' + make unbound-event-install + ''; + preFixup = stdenv.lib.optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) # XXX: revisit # Build libunbound again, but only against nettle instead of openssl. # This avoids gnutls.out -> unbound.lib -> openssl.out. diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index bc500a01c11..b687f1db017 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation ({ sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak"; }; - makeFlags = if stdenv.isDarwin + makeFlags = [ (if stdenv.isDarwin then "osx" - else "lnp" # Linux with PAM modules; + else "lnp") ] # Linux with PAM modules; # -fPIC is required to compile php with imap on x86_64 systems - + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC" - + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " CC=${stdenv.hostPlatform.config}-gcc RANLIB=${stdenv.hostPlatform.config}-ranlib"; + ++ stdenv.lib.optional stdenv.isx86_64 "EXTRACFLAGS=-fPIC" + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "CC=${stdenv.hostPlatform.config}-gcc" "RANLIB=${stdenv.hostPlatform.config}-ranlib" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index 78f17934a78..ee3ca416aa4 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,20 +3,20 @@ , ... } @ args: callPackage ./generic.nix (rec { - version = "4.21.3"; + version = "4.22.0"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "0z45nrjnalrvpprq7g4zrjbrdkc3d3lhs4ci8hb8m69f92asiwbs"; + sha256 = "1gr4s96ii4dx5bcwpb82rn250pcnncxwzx147p9dbwbyiy0i9nz7"; }; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "20190516.1"; - geoipSha256 = "14h4rq7rlcl1397pwpylfgwpk3fiscpzqb04c4wd5lxkfvk5f02r"; + geoipRev = "202001010102"; + geoipSha256 = "16i73c3852f7zmya0q3856cc4gvhqhpln9s98qvr2dr1mpp72c1w"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -24,8 +24,8 @@ callPackage ./generic.nix (rec { # MIT licensed "geosite.dat" = let - geositeRev = "20191121.1"; - geositeSha256 = "0ijmvy43pvm69w38djf114j8swni7wfq5ry9wdpv9dj0rzb59m74"; + geositeRev = "20191226.1"; + geositeSha256 = "0b4ji5kj5jpkwri3libxm9yl49dcy91vkl7h1rkhrrhbl17s3qiy"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index 4ea09cd7f00..e43c174ab3f 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { } ); - configureFlags = stdenv.lib.optional (!withPython) [ "--disable-python" ]; + configureFlags = stdenv.lib.optional (!withPython) "--disable-python"; buildInputs = [ openssl libpcap ] ++ stdenv.lib.optional withPython python2; diff --git a/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch new file mode 100644 index 00000000000..d79d9e3531f --- /dev/null +++ b/pkgs/tools/networking/wireguard-go/0001-Fix-darwin-build.patch @@ -0,0 +1,26 @@ +From 63360467da4ae6d7fc8c0e05619bdf8813c7e417 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 5 Jan 2020 15:35:15 +0100 +Subject: [PATCH] Fix darwin build + +--- + rwcancel/select_default.go | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rwcancel/select_default.go b/rwcancel/select_default.go +index dd23cda..03f3452 100644 +--- a/rwcancel/select_default.go ++++ b/rwcancel/select_default.go +@@ -9,6 +9,7 @@ package rwcancel + + import "golang.org/x/sys/unix" + +-func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) error { +- return unix.Select(nfd, r, w, e, timeout) ++func unixSelect(nfd int, r *unix.FdSet, w *unix.FdSet, e *unix.FdSet, timeout *unix.Timeval) (err error) { ++ _, err = unix.Select(nfd, r, w, e, timeout) ++ return + } +-- +2.23.1 + diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 025573d7dd1..8832560b3b1 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,15 +2,17 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20190908"; + version = "0.0.20191012"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "1jsch0157nk86krdknij7dsvg6i7ar0ydhy07r40drhxqyp3q0hx"; + sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i"; }; + patches = [ ./0001-Fix-darwin-build.patch ]; + goDeps = ./deps.nix; passthru.updateScript = ./update.sh; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index 5501ebdc6c2..b1a92582b7c 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc2472"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; + rev = "34f69633bfdc"; + sha256 = "0169vcn9s4c851y9vm7xqnar3vdfjrp7qsvcxadpfhsmwlfhxzgg"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "ba9fcec4b297"; - sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; + rev = "d98b1b443823"; + sha256 = "1vzwpy56g056dsq304xga3d55jg2cxx89bijpfwjlhwyqyskybsz"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "19e00faab6ad"; - sha256 = "0znjx9xbyjdvk8cafdc1jl22gg29asxl5yl7mi3yz6zx3h39rm8y"; + rev = "c178f38b412c"; + sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7"; }; } { diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index b8297629ff7..a01b0ab2061 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "0.0.20191212"; + version = "1.0.20200102"; src = fetchzip { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "1vyin3i4nqc4syri49jhjc4qm0qshpvgw7k4d3g5vlyskhdfv5q0"; + url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; + sha256 = "0ry3vbckcbkx43bz0bqinrd1hkll67jbwb72ak0b41wkxjsc8fmv"; }; - sourceRoot = "source/src/tools"; + sourceRoot = "source/src"; nativeBuildInputs = [ makeWrapper ]; buildInputs = optional stdenv.isLinux libmnl; @@ -51,10 +51,10 @@ stdenv.mkDerivation rec { meta = { description = "Tools for the WireGuard secure network tunnel"; - downloadPage = "https://git.zx2c4.com/WireGuard/refs/"; + downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; homepage = "https://www.wireguard.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 ]; + maintainers = with maintainers; [ elseym ericsagnes mic92 zx2c4 globin ma27 xwvvvvwx ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 9c8f46bef07..98705430c2f 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { done ''; - NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 - + NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 + installPhase = '' mkdir -p $out/bin cp wrk $out/bin ''; - + meta = with stdenv.lib; { description = "HTTP benchmarking tool"; homepage = https://github.com/wg/wrk; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 58f2e816008..da5b8837523 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }: +{ stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ - --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ - --replace 'ronn -r' '${ronn}/bin/ronn -r' + --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ ''; - buildInputs = [ openssl lzo zlib iproute which ronn ]; + + nativeBuildInputs = [ ronn ]; + buildInputs = [ openssl lzo zlib iproute ]; + + enableParallelBuilding = true; installPhase = '' install -Dt "$out/bin/" zerotier-one @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.bsl11; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; - platforms = platforms.x86_64 ++ platforms.aarch64; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; + platforms = with platforms; x86_64 ++ aarch64 ++ arm; }; } diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index eb3977e84e6..3e3ba47be05 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -1,19 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, Security, openssl, pkg-config }: rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.12.4"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "02rx25dd3klprwr1qmn5vn4vz4244amk2ky4nqfmi4vq3ygrhd1c"; + sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q"; }; - cargoSha256 = "18nbmq8j58jlka1lsrx2y0bhb9l5f3wyvcr1zmmda3hvc3vm7kla"; + cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj"; - buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index eb8f5ef186f..75c47dda0c4 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ curl ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index c9223c9af15..2c5bc41e18d 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: stdenv.mkDerivation { - name = "disnix-0.9"; + name = "disnix-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9/disnix-0.9.tar.gz; - sha256 = "1kc4520zjc1z72mknylfvrsyda9rbmm5c9mw8w13zhdwg3zbna06"; + url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz; + sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; }; configureFlags = [ diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index f093f442e52..21b2fad1caa 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2019-11-17"; + version = "2020-01-04"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74"; - sha256 = "0p3ba287h9a7mpj8chdgvz5qryc15qxdis3fdmv9jvl0hwsr738d"; + rev = "1b7b1bc294e99ab1795fe7dad183c1d2ae58a099"; + sha256 = "02kwym8n41d5ba9lccnl5q3y10sw35p1da5b66mxldfr6d930pbj"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 0c53c1bbbc9..61435cee284 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags="-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"; + cmakeFlags = ["-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" ]; buildInputs = [ python libxml2 glib openssl curl check gpgme ]; diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 0dc707ccf86..a4acdf0a341 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.1.5"; + version = "1.1.8"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "0wgp4bana38r385qgcm83fhqd053y5i9swh5cmnmbqjibx85g5r2"; + sha256 = "0yy75iagyrr96y7497hbbizrm59c757mshwicl1b7ni2sn3p63fh"; }; - modSha256 = "1d532nv76gzckq2a0nyr9xixbm3rr8d8vlzgdz6i61xsjakfm6ap"; + modSha256 = "05hcn0k1zb4k4p3aaas7b276jw607cv290np9vmyqxb3khzv4vjg"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 1d025581b61..b3a16633c1d 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8"; }; - cargoSha256 = "0h8a5bnv32rkvywn8xdbny38m24bi6p9scwljgdk8k067pn3qk34"; + cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags"; nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl curl ] ++ stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5c55ac31588..28413971c00 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -57,7 +57,7 @@ common = propagatedBuildInputs = [ boehmgc ]; # Seems to be required when using std::atomic with 64-bit types - NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; + NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux" || stdenv.hostPlatform.system == "armv6l-linux") "-latomic"; preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. @@ -94,9 +94,9 @@ common = # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; - makeFlags = "profiledir=$(out)/etc/profile.d"; + makeFlags = [ "profiledir=$(out)/etc/profile.d" ]; - installFlags = "sysconfdir=$(out)/etc"; + installFlags = [ "sysconfdir=$(out)/etc" ]; doInstallCheck = true; # not cross @@ -174,10 +174,10 @@ in rec { }; nixStable = callPackage common (rec { - name = "nix-2.3.1"; + name = "nix-2.3.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b"; + sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 44a7eaff2bf..928c946de2b 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,14 +7,14 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "nix-review"; - version = "2.1.0"; + pname = "nixpkgs-review"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Mic92"; - repo = "nix-review"; + repo = "nixpkgs-review"; rev = version; - sha256 = "0bdar2d88qjkf76hi3ar1lyfxnbwzhx1fi8fv65bw95m2sp1p0b5"; + sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd"; }; makeWrapperArgs = [ @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; - homepage = https://github.com/Mic92/nix-review; + homepage = https://github.com/Mic92/nixpkgs-review; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 05f43cf29b1..1aae0290d5a 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.1"; + version = "0.4.2"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25"; + sha256 = "01p1a7hw9q9ixfk01djyy9axs71z1x9dkdnqz7zysmrlqi97i246"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 3353704cb36..cdd0c83574a 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl, libarchive, openssl, zlib, bzip2, +{ stdenv, lib, fetchurl, pkgconfig, m4, perl, libarchive, openssl, zlib, bzip2, lzma, curl, runtimeShell }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; postFixup = '' diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 4aadc4b7af0..13a3a85f082 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -4,13 +4,13 @@ with python3Packages; buildPythonApplication rec { pname = "reuse"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "fsfe"; repo = "reuse-tool"; rev = "v${version}"; - sha256 = "17bslyvjndhqryrisba9y7y0ijyzi3gmyl9rddkcvdqi3lg9668y"; + sha256 = "04i8zd66cs152h28k9085nqg937wp31pz2yqywaldx1gywijyd8h"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 2be1db764e1..7ff079c0116 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; postPatch = '' # fix unprefixed ranlib (needed on cross) diff --git a/pkgs/tools/security/afl/README.md b/pkgs/tools/security/afl/README.md index 0b0d4e80fbc..180cad6bc4c 100644 --- a/pkgs/tools/security/afl/README.md +++ b/pkgs/tools/security/afl/README.md @@ -4,12 +4,12 @@ Updating the QEMU patches When updating to the latest American Fuzzy Lop, make sure to check for any new patches to qemu for binary fuzzing support: -https://github.com/mirrorer/afl/tree/master/qemu_mode +https://github.com/google/AFL/tree/master/qemu_mode Be sure to check the build script and make sure it's also using the right QEMU version and options in `qemu.nix`: -https://github.com/mirrorer/afl/blob/master/qemu_mode/build_qemu_support.sh +https://github.com/google/AFL/blob/master/qemu_mode/build_qemu_support.sh `afl-config.h`, `afl-types.h`, and `afl-qemu-cpu-inl.h` are part of the afl source code, and copied from `config.h`, `types.h` and diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 05866792af6..df5e3728943 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, makeWrapper +{ stdenv, fetchFromGitHub, callPackage, makeWrapper , clang, llvm, which, libcgroup }: @@ -9,11 +9,13 @@ let else throw "afl: no support for ${stdenv.hostPlatform.system}!"; afl = stdenv.mkDerivation rec { pname = "afl"; - version = "2.52b"; + version = "2.56b"; - src = fetchurl { - url = "http://lcamtuf.coredump.cx/afl/releases/${pname}-${version}.tgz"; - sha256 = "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3"; + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1"; }; enableParallelBuilding = true; diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 415fa82f2ec..953c59e435c 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libdislocator"; src = afl.src; - sourceRoot = "${afl.name}/libdislocator"; + sourceRoot = "${afl.src.name}/libdislocator"; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch b/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch deleted file mode 100644 index 6cc663dc1fb..00000000000 --- a/pkgs/tools/security/afl/qemu-patches/qemu-2.10.0-glibc-2.27.patch +++ /dev/null @@ -1,28 +0,0 @@ -A modified version of qemu commit 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 -diff --git a/configure b/configure -index 9c8aa5a..99ccc17 100755 ---- a/configure -+++ b/configure -@@ -3855,7 +3855,7 @@ fi - # check if memfd is supported - memfd=no - cat > $TMPC << EOF --#include <sys/memfd.h> -+#include <sys/mman.h> - - int main(void) - { -diff --git a/util/memfd.c b/util/memfd.c -index 4571d1a..412e94a 100644 ---- a/util/memfd.c -+++ b/util/memfd.c -@@ -31,9 +31,7 @@ - - #include "qemu/memfd.h" - --#ifdef CONFIG_MEMFD --#include <sys/memfd.h> --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include <sys/syscall.h> - #include <asm/unistd.h> diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index d80d301351f..479de4b4185 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -6,7 +6,6 @@ with stdenv.lib; let qemuName = "qemu-2.10.0"; - aflName = afl.name; cpuTarget = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux-user" else if stdenv.hostPlatform.system == "i686-linux" then "i386-linux-user" else throw "afl: no support for ${stdenv.hostPlatform.system}!"; @@ -25,12 +24,12 @@ stdenv.mkDerivation { sourceRoot = qemuName; postUnpack = '' - cp ${aflName}/types.h $sourceRoot/afl-types.h - substitute ${aflName}/config.h $sourceRoot/afl-config.h \ + cp ${afl.src.name}/types.h $sourceRoot/afl-types.h + substitute ${afl.src.name}/config.h $sourceRoot/afl-config.h \ --replace "types.h" "afl-types.h" - substitute ${aflName}/qemu_mode/patches/afl-qemu-cpu-inl.h $sourceRoot/afl-qemu-cpu-inl.h \ + substitute ${afl.src.name}/qemu_mode/patches/afl-qemu-cpu-inl.h $sourceRoot/afl-qemu-cpu-inl.h \ --replace "../../config.h" "afl-config.h" - substituteInPlace ${aflName}/qemu_mode/patches/cpu-exec.diff \ + substituteInPlace ${afl.src.name}/qemu_mode/patches/cpu-exec.diff \ --replace "../patches/afl-qemu-cpu-inl.h" "afl-qemu-cpu-inl.h" ''; @@ -46,12 +45,13 @@ stdenv.mkDerivation { patches = [ # patches extracted from afl source - "../${aflName}/qemu_mode/patches/cpu-exec.diff" - "../${aflName}/qemu_mode/patches/elfload.diff" - "../${aflName}/qemu_mode/patches/syscall.diff" + "../${afl.src.name}/qemu_mode/patches/cpu-exec.diff" + "../${afl.src.name}/qemu_mode/patches/elfload.diff" + "../${afl.src.name}/qemu_mode/patches/syscall.diff" + "../${afl.src.name}/qemu_mode/patches/configure.diff" + "../${afl.src.name}/qemu_mode/patches/memfd.diff" # nix-specific patches to make installation more well-behaved ./qemu-patches/no-etc-install.patch - ./qemu-patches/qemu-2.10.0-glibc-2.27.patch ]; configureFlags = diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix new file mode 100644 index 00000000000..bde597ba9f3 --- /dev/null +++ b/pkgs/tools/security/age/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "age"; + version = "1.0.0-beta2"; + goPackagePath = "github.com/FiloSottile/age"; + modSha256 = "0kwdwhkxgqjd8h1p7pm4h4xidp2vk840h1j4qya4qz8bjf9vskl9"; + + subPackages = [ + "cmd/age" + "cmd/age-keygen" + ]; + + src = fetchFromGitHub { + owner = "FiloSottile"; + repo = "age"; + rev = "v${version}"; + sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; + }; + + meta = with lib; { + homepage = "https://age-encryption.org/"; + description = "Modern encryption tool with small explicit keys"; + license = licenses.bsd3; + maintainers = with maintainers; [ tazjin ]; + }; +} diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index f960245e2b3..71732f26934 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "0.20.1"; + version = "0.26.3"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,12 +10,12 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "084lb9rp04vbpzmvsb2l92a4gp7c8g28x4xsagzwkqqpwi3fd15d"; + sha256 = "0n6xm3yv0lxfapchzfrqi05hk918n4lh1hcp7gq7hybam93rld96"; }; goDeps = ./deps.nix; - buildFlags = "--tags release"; + buildFlags = [ "--tags" "release" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 libiconv ]; diff --git a/pkgs/tools/security/bitwarden-cli/default.nix b/pkgs/tools/security/bitwarden-cli/default.nix deleted file mode 100644 index 5c60eb9f4e2..00000000000 --- a/pkgs/tools/security/bitwarden-cli/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, pkgs }: - -let - # node-packages*.nix generated via: - # - # % node2nix --input node-packages.json \ - # --output node-packages-generated.nix \ - # --composition node-packages.nix \ - # --node-env ./../../../development/node-packages/node-env.nix - # - nodePackages = import ./node-packages.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; -in pkgs.lib.overrideDerivation nodePackages."@bitwarden/cli" (drv: { - # This defaults to "node-_at_bitwarden_slash_cli-1.7.0" - name = "bitwarden-cli-${drv.version}"; -}) diff --git a/pkgs/tools/security/bitwarden-cli/generate.sh b/pkgs/tools/security/bitwarden-cli/generate.sh deleted file mode 100755 index 5bcee4c0513..00000000000 --- a/pkgs/tools/security/bitwarden-cli/generate.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -exec node2nix -8 \ - --input node-packages.json \ - --output node-packages-generated.nix \ - --composition node-packages.nix \ - --node-env ./../../../development/node-packages/node-env.nix diff --git a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix b/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix deleted file mode 100644 index 2afff040354..00000000000 --- a/pkgs/tools/security/bitwarden-cli/node-packages-generated.nix +++ /dev/null @@ -1,1407 +0,0 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "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=="; - }; - }; - "acorn-6.2.1" = { - name = "acorn"; - packageName = "acorn"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz"; - sha512 = "JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q=="; - }; - }; - "acorn-globals-4.3.2" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz"; - sha512 = "BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ=="; - }; - }; - "acorn-walk-6.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; - }; - }; - "ajv-6.10.2" = { - name = "ajv"; - packageName = "ajv"; - version = "6.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; - sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; - }; - }; - "ansi-escapes-3.2.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "array-equal-1.0.0" = { - name = "array-equal"; - packageName = "array-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; - sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; - }; - }; - "asn1-0.2.4" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "async-limiter-1.0.0" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz"; - sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "aws-sign2-0.7.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - }; - "aws4-1.8.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz"; - sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="; - }; - }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - }; - "big-integer-1.6.36" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.36"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.36.tgz"; - sha512 = "t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg=="; - }; - }; - "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=="; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "chalk-2.4.1" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz"; - sha512 = "ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ=="; - }; - }; - "chardet-0.7.0" = { - name = "chardet"; - packageName = "chardet"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "cli-width-2.2.0" = { - name = "cli-width"; - packageName = "cli-width"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; - }; - }; - "combined-stream-1.0.6" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz"; - sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818"; - }; - }; - "commander-2.18.0" = { - name = "commander"; - packageName = "commander"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.18.0.tgz"; - sha512 = "6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ=="; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "cssom-0.3.8" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; - }; - }; - "cssstyle-1.4.0" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz"; - sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "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=="; - }; - }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "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=="; - }; - }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "escodegen-1.11.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.11.1.tgz"; - sha512 = "JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw=="; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; - }; - }; - "estraverse-4.2.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; - }; - }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "external-editor-3.1.0" = { - name = "external-editor"; - packageName = "external-editor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - }; - "extsprintf-1.3.0" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - }; - "fast-deep-equal-2.0.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; - }; - }; - "fast-json-stable-stringify-2.0.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.3.2" = { - name = "form-data"; - packageName = "form-data"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz"; - sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099"; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - }; - "graceful-fs-4.2.0" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"; - sha512 = "jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="; - }; - }; - "har-schema-2.0.0" = { - name = "har-schema"; - packageName = "har-schema"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-5.1.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; - }; - }; - "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=="; - }; - }; - "http-signature-1.2.0" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "inquirer-6.2.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz"; - sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "jsdom-13.2.0" = { - name = "jsdom"; - packageName = "jsdom"; - version = "13.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-13.2.0.tgz"; - sha512 = "cG1NtMWO9hWpqRNRR3dSvEQa8bFI6iLlqU2x4kwX51FQjp0qus8T9aBaAO6iGp3DeBrhdwuKxckknohkmfvsFw=="; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "jsprim-1.4.1" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; - }; - }; - "lowdb-1.0.0" = { - name = "lowdb"; - packageName = "lowdb"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; - sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; - }; - }; - "lunr-2.3.3" = { - name = "lunr"; - packageName = "lunr"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.3.tgz"; - sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; - }; - }; - "mime-db-1.40.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.40.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz"; - sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; - }; - }; - "mime-types-2.1.24" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.24"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz"; - sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; - "mute-stream-0.0.7" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; - }; - }; - "node-fetch-2.2.0" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz"; - sha512 = "OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA=="; - }; - }; - "node-forge-0.7.6" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"; - sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; - }; - }; - "nwsapi-2.1.4" = { - name = "nwsapi"; - packageName = "nwsapi"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz"; - sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw=="; - }; - }; - "oauth-sign-0.9.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "optionator-0.8.2" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "papaparse-4.6.0" = { - name = "papaparse"; - packageName = "papaparse"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/papaparse/-/papaparse-4.6.0.tgz"; - sha512 = "ylm8pmgyz9rkS3Ng/ru5tHUF3JxWwKYP0aZZWZ8eCGdSxoqgYiDUXLNQei73mUJOjHw8QNu5ZNCsLoDpkMA6sg=="; - }; - }; - "parse5-5.1.0" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; - sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; - }; - }; - "performance-now-2.1.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - }; - "pify-3.0.0" = { - name = "pify"; - packageName = "pify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; - }; - }; - "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=="; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - }; - "psl-1.3.0" = { - name = "psl"; - packageName = "psl"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz"; - sha512 = "avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag=="; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "punycode-2.1.1" = { - name = "punycode"; - packageName = "punycode"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - }; - "qs-6.5.2" = { - name = "qs"; - packageName = "qs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; - }; - }; - "request-2.88.0" = { - name = "request"; - packageName = "request"; - version = "2.88.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz"; - sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg=="; - }; - }; - "request-promise-core-1.1.2" = { - name = "request-promise-core"; - packageName = "request-promise-core"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag=="; - }; - }; - "request-promise-native-1.0.7" = { - name = "request-promise-native"; - packageName = "request-promise-native"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz"; - sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w=="; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - }; - "rxjs-6.5.2" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz"; - sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg=="; - }; - }; - "safe-buffer-5.2.0" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "saxes-3.1.11" = { - name = "saxes"; - packageName = "saxes"; - version = "3.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz"; - sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g=="; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "sshpk-1.16.1" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; - }; - }; - "stealthy-require-1.1.1" = { - name = "stealthy-require"; - packageName = "stealthy-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; - }; - }; - "steno-0.4.4" = { - name = "steno"; - packageName = "steno"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; - sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "symbol-tree-3.2.4" = { - name = "symbol-tree"; - packageName = "symbol-tree"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; - "tldjs-2.3.1" = { - name = "tldjs"; - packageName = "tldjs"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tldjs/-/tldjs-2.3.1.tgz"; - sha512 = "W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw=="; - }; - }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - }; - "tough-cookie-2.4.3" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ=="; - }; - }; - "tough-cookie-2.5.0" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; - }; - }; - "tslib-1.10.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz"; - sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - }; - "uri-js-4.2.2" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; - }; - }; - "uuid-3.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; - }; - }; - "verror-1.10.0" = { - name = "verror"; - packageName = "verror"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - }; - "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"; - }; - }; - "w3c-xmlserializer-1.1.2" = { - name = "w3c-xmlserializer"; - packageName = "w3c-xmlserializer"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; - sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; - }; - }; - "webidl-conversions-4.0.2" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - }; - "whatwg-encoding-1.0.5" = { - name = "whatwg-encoding"; - packageName = "whatwg-encoding"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; - }; - }; - "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-7.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ=="; - }; - }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - }; - "ws-6.2.1" = { - name = "ws"; - packageName = "ws"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; - }; - }; - "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=="; - }; - }; - "xmlchars-2.1.1" = { - name = "xmlchars"; - packageName = "xmlchars"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz"; - sha512 = "7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w=="; - }; - }; - "zxcvbn-4.4.2" = { - name = "zxcvbn"; - packageName = "zxcvbn"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.2.tgz"; - sha1 = "28ec17cf09743edcab056ddd8b1b06262cc73c30"; - }; - }; - }; -in -{ - "@bitwarden/cli" = nodeEnv.buildNodePackage { - name = "_at_bitwarden_slash_cli"; - packageName = "@bitwarden/cli"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.7.4.tgz"; - sha512 = "WCYARJaSpcItFvxPFdRXTO9s26HbYFazL3wSlZ7HuL4tiML/7AfPD4wO3J7fgBn1ghU5NGJ7YZIL+oPmiuw6+Q=="; - }; - dependencies = [ - sources."abab-2.0.0" - sources."acorn-6.2.1" - sources."acorn-globals-4.3.2" - sources."acorn-walk-6.2.0" - sources."ajv-6.10.2" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."array-equal-1.0.0" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-limiter-1.0.0" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" - sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.36" - sources."browser-process-hrtime-0.1.3" - sources."caseless-0.12.0" - sources."chalk-2.4.1" - sources."chardet-0.7.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.6" - sources."commander-2.18.0" - sources."core-util-is-1.0.2" - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."dashdash-1.14.1" - sources."data-urls-1.1.0" - sources."deep-is-0.1.3" - sources."delayed-stream-1.0.0" - sources."domexception-1.0.1" - sources."ecc-jsbn-0.1.2" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.11.1" - sources."esprima-3.1.3" - sources."estraverse-4.2.0" - sources."esutils-2.0.3" - sources."extend-3.0.2" - sources."external-editor-3.1.0" - 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."figures-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.2" - sources."getpass-0.1.7" - sources."graceful-fs-4.2.0" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."html-encoding-sniffer-1.0.2" - sources."http-signature-1.2.0" - sources."iconv-lite-0.4.24" - sources."inquirer-6.2.0" - sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jsdom-13.2.0" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" - sources."levn-0.3.0" - sources."lodash-4.17.15" - sources."lodash.sortby-4.7.0" - sources."lowdb-1.0.0" - sources."lunr-2.3.3" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" - sources."mimic-fn-1.2.0" - sources."mute-stream-0.0.7" - sources."node-fetch-2.2.0" - sources."node-forge-0.7.6" - sources."nwsapi-2.1.4" - sources."oauth-sign-0.9.0" - sources."onetime-2.0.1" - sources."optionator-0.8.2" - sources."os-tmpdir-1.0.2" - sources."papaparse-4.6.0" - sources."parse5-5.1.0" - sources."performance-now-2.1.0" - sources."pify-3.0.0" - sources."pn-1.1.0" - sources."prelude-ls-1.1.2" - sources."psl-1.3.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - (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."restore-cursor-2.0.0" - sources."run-async-2.3.0" - sources."rxjs-6.5.2" - sources."safe-buffer-5.2.0" - sources."safer-buffer-2.1.2" - sources."saxes-3.1.11" - sources."signal-exit-3.0.2" - sources."source-map-0.6.1" - sources."sshpk-1.16.1" - sources."stealthy-require-1.1.1" - sources."steno-0.4.4" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."supports-color-5.5.0" - sources."symbol-tree-3.2.4" - sources."through-2.3.8" - (sources."tldjs-2.3.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tmp-0.0.33" - sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" - sources."tslib-1.10.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."uri-js-4.2.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - sources."w3c-hr-time-1.0.1" - sources."w3c-xmlserializer-1.1.2" - sources."webidl-conversions-4.0.2" - sources."whatwg-encoding-1.0.5" - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-7.0.0" - sources."wordwrap-1.0.0" - sources."ws-6.2.1" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.1.1" - sources."zxcvbn-4.4.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; - license = "GPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/tools/security/bitwarden-cli/node-packages.json b/pkgs/tools/security/bitwarden-cli/node-packages.json deleted file mode 100644 index 624aa87bcbe..00000000000 --- a/pkgs/tools/security/bitwarden-cli/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "@bitwarden/cli" -] diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 57943a31406..259ee38c68f 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace 'sudo ' "" ''; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Wordlist generator"; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 324ac46b084..5ea91854282 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, gamin }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, gamin }: let version = "0.10.4"; in -pythonPackages.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "fail2ban"; inherit version; @@ -13,8 +13,19 @@ pythonPackages.buildPythonApplication { sha256 = "07ik6rm856q0ic2r7vbg6j3hsdcdgkv44hh5ck0c2y21fqwrck3l"; }; - propagatedBuildInputs = [ gamin ] - ++ (stdenv.lib.optional stdenv.isLinux pythonPackages.systemd); + patches = [ + # 0.10.3 supports Python 3 but somehow this got into the way + # https://github.com/fail2ban/fail2ban/issues/2255 + (fetchpatch { + url = "https://github.com/fail2ban/fail2ban/commit/657b147c0d7830f3600f3dc7feaa4815a7e19fde.patch"; + sha256 = "1hrk2x7ssrfhab1wrjk5xw1sxhiv2735glfcp6qcj8x4dss3q7f7"; + }) + ]; + + pythonPath = with python3.pkgs; + stdenv.lib.optionals stdenv.isLinux [ + systemd + ]; preConfigure = '' for i in config/action.d/sendmail*.conf; do @@ -33,11 +44,15 @@ pythonPackages.buildPythonApplication { substituteInPlace setup.py --replace /usr/share/doc/ share/doc/ # see https://github.com/NixOS/nixpkgs/issues/4968 - ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out + ${python3.interpreter} setup.py install_data --install-dir=$out --root=$out + ''; + + postPatch = '' + ${stdenv.shell} ./fail2ban-2to3 ''; postInstall = let - sitePackages = "$out/lib/${python.libPrefix}/site-packages"; + sitePackages = "$out/${python3.sitePackages}"; in '' # see https://github.com/NixOS/nixpkgs/issues/4968 rm -rf ${sitePackages}/etc ${sitePackages}/usr ${sitePackages}/var; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index 4579136add2..a9f69c8b96e 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpcap texinfo ] - ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ] - ++ stdenv.lib.optional wgetSupport [ wget ]; + ++ stdenv.lib.optionals gnupgSupport [ gnupg gpgme.dev ] + ++ stdenv.lib.optionals wgetSupport [ wget ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix new file mode 100644 index 00000000000..c3426bee965 --- /dev/null +++ b/pkgs/tools/security/gobuster/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "gobuster"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "OJ"; + repo = "gobuster"; + rev = "v${version}"; + sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym"; + }; + + modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; + + meta = with lib; { + description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; + homepage = "https://github.com/OJ/gobuster"; + license = licenses.asl20; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index 34e8c7bd679..c3a14f62c76 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit) - [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) + "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"; meta = with stdenv.lib; { description = "Calculates statistics on the keys in your gpg key-ring"; diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 40e9ee03952..8e70e0def41 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "5.2.2"; + version = "5.3.0"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0jschcjk9z9s3q2f7qcb4nmjmyipar3f0yqbrgmbg3jpgamahykn"; + sha256 = "1pqvxncpcnwxs89imma01ry30bz7cjifm8wz1s80yclkxxf80php"; }; buildInputs = [ curl openssl zlib ]; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index cec31cec377..e2e01fbb921 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1332"; + version = "1563"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "1zdhi8acd4jfp1v7ibd86hcv0g39yk8qrnhxjmmgzn8i7npr70cf"; + sha256 = "1sfi7drmbm08rgd2414s3sxd7h5g8d4kiwk40xklf7sw67w1ffpw"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index 19f51775ff2..d10c1659964 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; - buildFlags = "QMAKE=qmake"; + buildFlags = [ "QMAKE=qmake" ]; buildInputs = [ openssl pcre-cpp qt4 boost pkcs11helper ]; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 97d032045b3..1e585136d88 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -36,10 +36,10 @@ in stdenv.mkDerivation rec { ([ gnupg opensshUnsafe which socat cpio hexdump procps lockfileProgs ] ++ (with perlPackages; [ CryptOpenSSLRSA CryptOpenSSLBignum ])); - makeFlags = '' - PREFIX=/ - DESTDIR=$(out) - ''; + makeFlags = [ + "PREFIX=/" + "DESTDIR=$(out)" + ]; # The tests should be run (and succeed) when making changes to this package # but they aren't enabled by default because they "drain" entropy (GnuPG diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 33a873f73da..48df486ef0a 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pkgconfig wrapQtAppsHook ]; - cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index f1a61adabbb..d1e2ee58e48 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -59,7 +59,7 @@ buildGoPackage rec { ''; license = licenses.asl20; homepage = https://github.com/theupdateframework/notary; - maintainers = with maintainers; [ vdemeester ma27 ]; + maintainers = with maintainers; [ vdemeester ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 4f220ee7717..315cd1c8c28 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -7,33 +7,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "10575gb9l38cskq7swyjp0907wlziyxg4ppq33ndz319dsx69d87"; + sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-6502.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/0d7967549751b7032f22b437106b41444aff0ba9.patch"; - sha256 = "1y42lmz8i9w99hgpakdncnv8f94cqjfabz0v4xg6wfz9akl3ff7d"; - }) - (fetchpatch { - name = "CVE-2019-15945.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/412a6142c27a5973c61ba540e33cdc22d5608e68.patch"; - sha256 = "088i2i1fkvdxnywmb54bn4283vhbxx6i2632b34ss5dh7k080hp7"; - }) - (fetchpatch { - name = "CVE-2019-15946.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/a3fc7693f3a035a8a7921cffb98432944bb42740.patch"; - sha256 = "1qr9n8cbarrdn4kr5z0ys7flq50hfmcbm8584mhw7r39p08qwmvq"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index 187852e8b55..208012e2f88 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installTargets = "globalinstall"; + installTargets = [ "globalinstall" ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index ee1282e9a13..176ef7f7616 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir release cd release if [ $CC = gcc ]; then - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow" + NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member" fi NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${stdenv.lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable" ''; diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 24519654e9a..fa53b91a02f 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -5,11 +5,11 @@ let deps = lib.makeBinPath [ wget coreutils ]; in stdenv.mkDerivation rec { - name = "pcsc-tools-1.5.4"; + name = "pcsc-tools-1.5.5"; src = fetchurl { url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; - sha256 = "14vw6ya8gzyw3lzyrsvfcxx7qm7ry39fbxcdqqh552c1lyxnm7n3"; + sha256 = "01251m8hf7by8rw8fayhjxmcqvi6dp150680fpf89bqycha2vgqv"; }; buildInputs = [ udev dbus perlPackages.perl pcsclite ]; diff --git a/pkgs/tools/security/phrasendrescher/default.nix b/pkgs/tools/security/phrasendrescher/default.nix index 93dc75c1f32..71a9824bb62 100644 --- a/pkgs/tools/security/phrasendrescher/default.nix +++ b/pkgs/tools/security/phrasendrescher/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libssh2 gpgme ]; - configureFlags = "--with-plugins"; + configureFlags = [ "--with-plugins" ]; meta = with stdenv.lib; { description = "A modular and multi processing pass phrase cracking tool"; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index afaed796057..e717558a24d 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -1,37 +1,59 @@ -{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 +, gcc-arm-embedded }: -stdenv.mkDerivation rec { - pname = "proxmark3"; - version = "3.1.0"; +let + generic = { pname, version, rev, sha256 }: + stdenv.mkDerivation rec { + inherit pname version; - src = fetchFromGitHub { - owner = "Proxmark"; - repo = pname; - rev = "v${version}"; - sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf"; - }; + src = fetchFromGitHub { + owner = "Proxmark"; + repo = "proxmark3"; + inherit rev sha256; + }; + + nativeBuildInputs = [ pkgconfig gcc-arm-embedded ]; + buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses readline ]; + postPatch = '' + substituteInPlace client/Makefile --replace '-ltermcap' ' ' + substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' + substituteInPlace client/flasher.c \ + --replace 'armsrc/obj/fullimage.elf' \ + '${placeholder "out"}/firmware/fullimage.elf' + ''; - postPatch = '' - substituteInPlace client/Makefile --replace '-ltermcap' ' ' - substituteInPlace liblua/Makefile --replace '-ltermcap' ' ' - ''; + buildPhase = '' + make bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf client + ''; - preBuild = '' - cd client - ''; + installPhase = '' + install -Dt $out/bin client/proxmark3 + install -T client/flasher $out/bin/proxmark3-flasher + install -Dt $out/firmware bootrom/obj/bootrom.elf armsrc/obj/fullimage.elf + ''; - installPhase = '' - mkdir -p $out/bin - cp proxmark3 $out/bin - ''; + meta = with stdenv.lib; { + description = "Client for proxmark3, powerful general purpose RFID tool"; + homepage = http://www.proxmark.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + }; + }; +in + +{ + proxmark3 = generic rec { + pname = "proxmark3"; + version = "3.1.0"; + rev = "v${version}"; + sha256 = "1qw28n1bhhl91ix77lv50qcr919fq3hjc8zhhqphwxal2svgx2jf"; + }; - meta = with stdenv.lib; { - description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = http://www.proxmark.org; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz ]; + proxmark3-unstable = generic { + pname = "proxmark3-unstable"; + version = "2019-12-28"; + rev = "a4ff62be63ca2a81071e9aa2b882bd3ff57f13ad"; + sha256 = "067lp28xqx61n3i2a2fy489r5frwxqrcfj8cpv3xdzi3gb3vk5c3"; }; } diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 65158b3c5fe..68e5df80937 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = [ libxml2 file p7zip unrar unzip ]; - buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; - installFlags = "PREFIX=\${out}"; + buildFlags = stdenv.lib.optional stdenv.cc.isClang "CC=clang"; + installFlags = [ "PREFIX=\${out}" ]; patchPhase = '' substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i" diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index ad606af9562..863b03a117c 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.8"; + version = "1.3.9"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "0i00wl63hn80g0s9gdi772gchbghwgkvn4nbb5227y2wwy30yyi2"; + sha256 = "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq"; }; nativeBuildInputs = [ which ]; @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib-shared" "install-lib-so-link" "install-lib-headers" ]; meta = with stdenv.lib; { - homepage = http://rhash.anz.ru; + homepage = "http://rhash.sourceforge.net/"; description = "Console utility and library for computing and verifying hash sums of files"; + license = licenses.bsd0; platforms = platforms.all; maintainers = [ maintainers.andrewrk ]; }; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 4238fc5be33..bd289200fe8 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.8"; + version = "6.9"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "1clm9i9xg3j79q0d6vinn6dx0nwh1fvzcmkqpcbay7mwsgkknvw2"; + sha256 = "065jf26s8zkicb95zc9ilksjdq9gqrh5vcx3mhi6mypbnamn6w98"; }; postPatch = '' diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 3ece05926cc..656efbf390c 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spectre-meltdown-checker"; - version = "0.42"; + version = "0.43"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0pppf844i7b72hqnmfvq72w5y7b6dxd16y29l6j84maf22zxbjni"; + sha256 = "1ys5m1yvm26qjlsjpqqd33lwpb880p0ay289hmifxjjawkqddjgg"; }; prePatch = '' diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix new file mode 100644 index 00000000000..e5574be8ab9 --- /dev/null +++ b/pkgs/tools/security/step-ca/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "step-ca"; + version = "0.13.3"; + + goPackagePath = "github.com/smallstep/certificates"; + + src = fetchFromGitHub { + owner = "smallstep"; + repo = "certificates"; + rev = "v${version}"; + sha256 = "1i42j7v5a5qqqb9ng8irblfyzykhyws0394q3zac290ymjijxbnq"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; + homepage = "https://smallstep.com/certificates/"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/security/step-ca/deps.nix b/pkgs/tools/security/step-ca/deps.nix new file mode 100644 index 00000000000..07607b6f65d --- /dev/null +++ b/pkgs/tools/security/step-ca/deps.nix @@ -0,0 +1,291 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/AndreasBriese/bbloom"; + fetch = { + type = "git"; + url = "https://github.com/AndreasBriese/bbloom"; + rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815"; + sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/dgraph-io/badger"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/badger"; + rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9"; + sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx"; + }; + } + { + goPackagePath = "github.com/dgryski/go-farm"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-farm"; + rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3"; + sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; + }; + } + { + goPackagePath = "github.com/go-chi/chi"; + fetch = { + type = "git"; + url = "https://github.com/go-chi/chi"; + rev = "0ebf7795c516423a110473652e9ba3a59a504863"; + sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/juju/ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/juju/ansiterm"; + rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1"; + sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + { + goPackagePath = "github.com/manifoldco/promptui"; + fetch = { + type = "git"; + url = "https://github.com/manifoldco/promptui"; + rev = "157c96fb638a14d268b305cf2012582431fcc410"; + sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mmcloughlin/avo"; + fetch = { + type = "git"; + url = "https://github.com/mmcloughlin/avo"; + rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7"; + sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d"; + }; + } + { + goPackagePath = "github.com/newrelic/go-agent"; + fetch = { + type = "git"; + url = "https://github.com/newrelic/go-agent"; + rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba"; + sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + { + goPackagePath = "github.com/rs/xid"; + fetch = { + type = "git"; + url = "https://github.com/rs/xid"; + rev = "15d26544def341f036c5f8dca987a4cbe575032c"; + sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"; + }; + } + { + goPackagePath = "github.com/samfoo/ansi"; + fetch = { + type = "git"; + url = "https://github.com/samfoo/ansi"; + rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73"; + sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "ad15b42461921f1fb3529b058c6786c6a45d5162"; + sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606"; + }; + } + { + goPackagePath = "github.com/smallstep/assert"; + fetch = { + type = "git"; + url = "https://github.com/smallstep/assert"; + rev = "de77670473b5492f5d0bce155b5c01534c2d13f7"; + sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16"; + }; + } + { + goPackagePath = "github.com/smallstep/cli"; + fetch = { + type = "git"; + url = "https://github.com/smallstep/cli"; + rev = "eeecaac062cb548ee2ab7c7563bc3c2f2160f019"; + sha256 = "1khhd1vgwqb08vki1nh0k4i2yk6jjdqmnq4f8anqn125zsj7hvdk"; + }; + } + { + goPackagePath = "github.com/smallstep/nosql"; + fetch = { + type = "git"; + url = "https://github.com/smallstep/nosql"; + rev = "f80b3f432de0662f07ebd58fe52b0a119fe5dcd9"; + sha256 = "155blxdgaprl1py5g8p52gipp0ckz3k6v41hgsp83nay01yynafb"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; + sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; + }; + } + { + goPackagePath = "go.etcd.io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461"; + sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"; + sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; + sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; + sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; + sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610"; + sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://github.com/square/go-jose"; + rev = "730df5f748271903322feb182be83b43ebbbe27d"; + sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index a0922f4df73..71a71be9147 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,12 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.29"; + pname = "sudo"; + version = "1.8.30"; src = fetchurl { - urls = - [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" - "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" - ]; - sha256 = "0z4wyadh9cks17gdpfgx4kvbrlnyb6nai2sd6chk7qh4jsngylyf"; + url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; + sha256 = "1rvrqlqrrjsd06dczgj9cwjdkpkqil5zzlwh87h06ms6qzfx6nm3"; }; prePatch = '' diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 1f00d42f277..716973a3e2e 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - installFlags = "sysconfdir=$(out)/etc localstatedir=$(TMPDIR)"; + installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(TMPDIR)" ]; meta = { homepage = "https://www.ucolick.org/~will/#super"; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index f5184b98562..062bf40b7d6 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "stackprotector" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + configurePhase = '' for a in lcptools utils tb_polgen; do substituteInPlace $a/Makefile --replace /usr/sbin /sbin @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { substituteInPlace docs/Makefile --replace /usr/share /share ''; - installFlags = "DESTDIR=$(out)"; + installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index 5d54758cc7c..f7526ac7225 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://tpmquotetools.sourceforge.net/; license = licenses.bsd3; - maintainers = with maintainers; [ ak ndowens ]; + maintainers = with maintainers; [ ak ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 1e5a16e1958..11b0b067ccb 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0ayvmqg4fj9cliwbl4pb12mailq7062j3f9v8arpv6x5r4hydlpy"; + sha256 = "052aj79gwmydc7ph1g567cbssqf8dsmqxad47k5hc5sc58bx7c93"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index a99df36beb6..08731cd6db2 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Configuration editing tool"; license = licenses.lgpl2; homepage = http://augeas.net/; - maintainers = with maintainers; [ offline ndowens ]; + maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index 5653c70d431..dd6e3d4a84b 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocl-icd opencl-headers ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix index c29ebc925bc..f1a87847a5c 100644 --- a/pkgs/tools/system/collectd/plugins.nix +++ b/pkgs/tools/system/collectd/plugins.nix @@ -24,7 +24,7 @@ , lm_sensors , mongoc , mosquitto -, net_snmp +, net-snmp , postgresql , protobufc , python @@ -243,10 +243,10 @@ let buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ]; }; snmp = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; }; snmp_agent = { - buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ]; }; statsd = {}; swap = {}; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 8d8b710750c..4f492def162 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -2,22 +2,18 @@ buildGoModule rec { pname = "ctop"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "bcicen"; repo = pname; rev = "v${version}"; - sha256 = "0mm6hl5qklfv0yffj6cgypsgcrk4fq6p60djycfgj20yhz9cmf9x"; + sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; }; - patches = [ - # Version 0.7.2 does not build with go 1.13. - # TODO: Remove once(and if) https://github.com/bcicen/ctop/pull/178 is merged and lands in a release. - ./go-1.13-deps.patch - ]; + modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; - modSha256 = "0ad1gvamckg94r7f68cnjdbq9nyz6c3hh339hy4hghxd3rd1qskn"; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; meta = with lib; { description = "Top-like interface for container metrics"; diff --git a/pkgs/tools/system/ctop/go-1.13-deps.patch b/pkgs/tools/system/ctop/go-1.13-deps.patch deleted file mode 100644 index 153c0f36f81..00000000000 --- a/pkgs/tools/system/ctop/go-1.13-deps.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/go.mod b/go.mod -index 4921cba..cbb4028 100644 ---- a/go.mod -+++ b/go.mod -@@ -18,9 +18,6 @@ require ( - github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect - github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect - github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c -- github.com/kr/pretty v0.1.0 // indirect -- github.com/maruel/panicparse v0.0.0-20170227222818-25bcac0d793c // indirect -- github.com/maruel/ut v1.0.0 // indirect - github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c // indirect - github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect - github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 -@@ -39,3 +36,5 @@ require ( - ) - - replace github.com/gizak/termui => github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 -+ -+go 1.13 -diff --git a/go.sum b/go.sum -new file mode 100644 -index 0000000..5ca7d55 ---- /dev/null -+++ b/go.sum -@@ -0,0 +1,64 @@ -+github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15 h1:VtP6TygBMvrR+SMMPHj3z3jvnj4vcafMRLIw4at7xww= -+github.com/Azure/go-ansiterm v0.0.0-20160622173216-fa152c58bc15/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -+github.com/BurntSushi/toml v0.3.0 h1:e1/Ivsx3Z0FVTV0NSOv/aVgbUWyQuzj7DDnFblkRvsY= -+github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -+github.com/Microsoft/go-winio v0.3.8 h1:dvxbxtpTIjdAbx2OtL26p4eq0iEvys/U5yrsTJb3NZI= -+github.com/Microsoft/go-winio v0.3.8/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= -+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -+github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410 h1:RxP6uUzJlS1Qa3+HYls3u+nQMKlnqC3RhL7wWC4Y4+E= -+github.com/Sirupsen/logrus v0.0.0-20150423025312-26709e271410/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= -+github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5 h1:2pI3ZsoefWIi++8EqmANoC7Px/v2lRwnleVUcCuFgLg= -+github.com/bcicen/termui v0.0.0-20180326052246-4eb80249d3f5/go.mod h1:yIA9ITWZD1p4/DvCQ44xvhyVb9XEUlVnY1rzGSHwbiM= -+github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd h1:xqaBnULC8wEnQpRDXAsDgXkU/STqoluz1REOoegSfNU= -+github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE= -+github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d h1:MJ4ge3i0lehw+gE3JcGUUp8TmWjsLAlQlhmdASs/9wk= -+github.com/coreos/go-systemd v0.0.0-20151104194251-b4a58d95188d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -+github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35 h1:ly3dRUfvdP5i/t9iqVHd2VQQIDtO3tpfFWPah7g4CFw= -+github.com/docker/docker v0.0.0-20170502054910-90d35abf7b35/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -+github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204 h1:JYhQLEn7v7EtrpA9ByRz51gwlk8qt12EGP9XlbX/qw4= -+github.com/docker/go-connections v0.0.0-20170301234100-a2afab980204/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -+github.com/docker/go-units v0.3.2 h1:Kjm80apys7gTtfVmCvVY8gwu10uofaFSrmAKOVrtueE= -+github.com/docker/go-units v0.3.2/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -+github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2 h1:JuVaWSoRMBrstn2l8cxKXjK8l/qurk5qyJ9dq7EIQmU= -+github.com/fsouza/go-dockerclient v0.0.0-20170307141636-318513eb1ab2/go.mod h1:KpcjM623fQYE9MZiTGzKhjfxXAV9wbyX2C1cyRHfhl0= -+github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55 h1:oIgNYSrSUbNH5DJh6DMhU1PiOKOYIHNxrV3djLsLpEI= -+github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -+github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ= -+github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -+github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 h1:67fHcS+inUoiIqWCKIqeDuq2AlPHNHPiTqp97LdQ+bc= -+github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -+github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c h1:/hc+TxW4Q1v6aqNPHE5jiaNF2xEK0CzWTgo25RQhQ+U= -+github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c/go.mod h1:FJRkXmPrkHw0WDjB/LXMUhjWJ112Y6JUYnIVBOy8oH8= -+github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c h1:eFzthqtg3W6Pihj3DMTXLAF4f+ge5r5Ie5g6HLIZAF0= -+github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -+github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzCv8LZP15IdmG+YdwD2luVPHITV96TkirNBM= -+github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -+github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884 h1:fcs71SMqqDhUD+PbpIv9xf3EH9F9s6HfiLwr6jKm1VA= -+github.com/nsf/termbox-go v0.0.0-20180303152453-e2050e41c884/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= -+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ= -+github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= -+github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg= -+github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -+github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= -+github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -+github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e h1:HJbgNpzYMeTLPpkMwbPNTPlhNd9r4xQtqcZG6qoIGgs= -+github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= -+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= -+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -+github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b h1:UzwAjzrPQVJoxLfb26YI2WRrhD3g09ZHt9vAQckWiPY= -+github.com/syndtr/gocapability v0.0.0-20150716010906-2c00daeb6c3b/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -+github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc h1:0HAHLwEY4k1VqaO1SzBi4XxT0KA06Cv+QW2LXknBk9g= -+github.com/vishvananda/netlink v0.0.0-20150820014904-1e2e08e8a2dc/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= -+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= -+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= -+golang.org/x/net v0.0.0-20170308210134-a6577fac2d73 h1:5kGFsglTK4KqaHYb/WCmYmj+Gm1+dzbilbtzruHj6dw= -+golang.org/x/net v0.0.0-20170308210134-a6577fac2d73/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= -+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -+golang.org/x/sys v0.0.0-20170308153327-99f16d856c98 h1:U3NsAsR1IG0Aet3Z+IToBDWbPoJ7hjwgDpqqch4APkU= -+golang.org/x/sys v0.0.0-20170308153327-99f16d856c98/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 9bc6ecc6ddf..76f53b55f3d 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ perl ]; meta = { diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index b69d440499f..3aef366ea06 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "di"; - version = "4.47.2"; + version = "4.47.3"; src = fetchurl { url = "https://gentoo.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1g97pp2hznskqlkhl6ppyzgdmv878bcqiwh633kdnm70d1pvh192"; + sha256 = "0m4npba50sf5s61g5z3xd2r7937zwja941f2h3f081xi24c2hfck"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = https://gentoo.com/di/; license = licenses.zlib; updateWalker = true; - maintainers = with maintainers; [ manveru ndowens ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 365cfeab058..f02923de349 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -18,6 +18,16 @@ stdenv.mkDerivation rec { url = "https://patch-diff.githubusercontent.com/raw/rhboot/efivar/pull/133.patch"; sha256 = "038cwldb8sqnal5l6mhys92cqv8x7j8rgsl8i4fiv9ih9znw26i6"; }) + (fetchurl { + name = "fix-misaligned-pointer.patch"; + url = "https://github.com/rhboot/efivar/commit/b98ba8921010d03f46704a476c69861515deb1ca.patch"; + sha256 = "0ni9mz7y40a2wf1d1q5n9y5dhcbydxvfdhqic7zsmgnaxs3a0p27"; + }) + (fetchurl { + name = "fix-gcc9-error.patch"; + url = "https://github.com/rhboot/efivar/commit/c3c553db85ff10890209d0fe48fb4856ad68e4e0.patch"; + sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky"; + }) ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index cc9b95d06c6..86aa5adb6f8 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -14,11 +14,13 @@ stdenv.mkDerivation rec { CXXFLAGS = "-fpermissive -Wno-error=catch-value"; NIX_LDFLAGS = "-lblkid"; - cmakeFlags = [ + cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" "-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ]; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 6ef39a647f7..3dd84aa8a9c 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--disable-checks" ]; - installTargets = "install-staged"; # install does also try to change permissions of /etc/* files + installTargets = [ "install-staged" ]; # install does also try to change permissions of /etc/* files # fcron tries to install pid into system directory on install installFlags = [ diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 79b2769ab0d..3718f69370e 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.16"; + version = "3.17"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "10ygvmzsrqh2bs8v0a304gkl8h50437xfaz1ck7j2ymckipnbha0"; + sha256 = "1s37w8bhg23ml1f89x0bkaifywlkgh31305vmip4xfvh3j3vjbym"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 0c254bb2854..4adc8160829 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { homepage = http://gdmap.sourceforge.net; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 18b452b3ca7..d323f048ba0 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Hardware detection tool from openSUSE"; license = licenses.gpl2; homepage = https://github.com/openSUSE/hwinfo; - maintainers = with maintainers; [ bobvanderlinden ndowens ]; + maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 274e65bb41d..5cd3a707dde 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Disk I/O latency measuring tool"; - maintainers = with maintainers; [ raskin ndowens ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl3Plus; homepage = https://github.com/koct9i/ioping; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index c906ad3c8cf..3105cba5a34 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"} ) ''; - makeFlags = if static then "AM_LDFLAGS=-all-static" else ""; + makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static"; dontDisableStatic = static; meta = with lib; { diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 74bc177023f..788319c0c04 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "lr"; - version = "1.4.1"; + version = "1.5"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "0mpaqn0zfhxdf9wzs1wgdd29bjcyl3rgfdlqbwhiwcy2h3vy2h8s"; + sha256 = "1dxla14ldyym01lhmacfwps1vim0fk67c2ik2w08gg534siyj770"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = https://github.com/chneukirchen/lr; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index ff6a6e03cc8..4f8cfb966e8 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig , CoreFoundation, IOKit, libossp_uuid , curl, libcap, libuuid, lm_sensors, zlib , withCups ? false, cups @@ -12,12 +12,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.18.1"; + version = "1.19.0"; pname = "netdata"; - src = fetchurl { - url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; - sha256 = "08g5jp63k8y5gbg8v9hxj75q0533c6cyzpjml9z1g5h2h4zaik1r"; + src = fetchFromGitHub { + owner = "netdata"; + repo = "netdata"; + rev = "v${version}"; + sha256 = "1s6kzx4xh8b6v7ki8h2mfzprj5rxvlgx2md20cr8c0v81qpz3q3q"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { ./no-files-in-etc-and-var.patch ]; - NIX_CFLAGS_COMPILE = optional withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index c3927c29dd2..138787b98f1 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,9 +1,9 @@ diff --git a/Makefile.am b/Makefile.am -index f2087bb..7a70cfb 100644 +index 2625dcc..1fdd645 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -116,10 +116,10 @@ AM_CFLAGS = \ - $(NULL) +@@ -113,10 +113,10 @@ AM_CFLAGS = \ + $(NULL) sbin_PROGRAMS = -dist_cache_DATA = packaging/installer/.keep @@ -17,70 +17,113 @@ index f2087bb..7a70cfb 100644 plugins_PROGRAMS = LIBNETDATA_FILES = \ +diff --git a/collectors/Makefile.am b/collectors/Makefile.am +index 7431025..f62f8ac 100644 +--- a/collectors/Makefile.am ++++ b/collectors/Makefile.am +@@ -30,11 +30,6 @@ SUBDIRS = \ + usercustompluginsconfigdir=$(configdir)/custom-plugins.d + usergoconfigdir=$(configdir)/go.d + +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) +- $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) +- + dist_noinst_DATA = \ + README.md \ + $(NULL) diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index 2989b4b..64de7d6 100644 +index b3b2fb9..68b768e 100644 --- a/collectors/charts.d.plugin/Makefile.am +++ b/collectors/charts.d.plugin/Makefile.am -@@ -32,7 +32,6 @@ dist_charts_DATA = \ +@@ -31,13 +31,8 @@ dist_charts_DATA = \ userchartsconfigdir=$(configdir)/charts.d dist_userchartsconfig_DATA = \ - .keep \ $(NULL) +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) +- chartsconfigdir=$(libconfigdir)/charts.d + dist_chartsconfig_DATA = \ + $(NULL) diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am -index 3b5a0a5..b7abe01 100644 +index 411bce9..ba60276 100644 --- a/collectors/node.d.plugin/Makefile.am +++ b/collectors/node.d.plugin/Makefile.am -@@ -23,7 +23,6 @@ dist_noinst_DATA = \ +@@ -23,13 +23,8 @@ dist_noinst_DATA = \ usernodeconfigdir=$(configdir)/node.d dist_usernodeconfig_DATA = \ - .keep \ $(NULL) +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(usernodeconfigdir) +- nodeconfigdir=$(libconfigdir)/node.d + dist_nodeconfig_DATA = \ + $(NULL) diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am -index 652a35d..cf4b2cc 100644 +index cb14e35..8a6c5a7 100644 --- a/collectors/python.d.plugin/Makefile.am +++ b/collectors/python.d.plugin/Makefile.am -@@ -29,7 +29,6 @@ dist_python_DATA = \ +@@ -29,13 +29,8 @@ dist_python_DATA = \ userpythonconfigdir=$(configdir)/python.d dist_userpythonconfig_DATA = \ - .keep \ $(NULL) +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) +- pythonconfigdir=$(libconfigdir)/python.d + dist_pythonconfig_DATA = \ + $(NULL) diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am -index e63bf98..0f59782 100644 +index 87b6ca7..9d010c7 100644 --- a/collectors/statsd.plugin/Makefile.am +++ b/collectors/statsd.plugin/Makefile.am -@@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \ +@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \ userstatsdconfigdir=$(configdir)/statsd.d dist_userstatsdconfig_DATA = \ - .keep \ $(NULL) - +- +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index 62a4c6d..4d651df 100644 +index f63faa8..8912ef2 100644 --- a/health/Makefile.am +++ b/health/Makefile.am -@@ -16,7 +16,6 @@ dist_noinst_DATA = \ +@@ -16,13 +16,8 @@ dist_noinst_DATA = \ userhealthconfigdir=$(configdir)/health.d dist_userhealthconfig_DATA = \ - .keep \ $(NULL) +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) +- healthconfigdir=$(libconfigdir)/health.d + dist_healthconfig_DATA = \ + health.d/adaptec_raid.conf \ diff --git a/system/Makefile.am b/system/Makefile.am -index b085dca..ccfa588 100644 +index ad68c65..bf6a840 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -17,10 +17,6 @@ CLEANFILES = \ +@@ -16,14 +16,6 @@ CLEANFILES = \ include $(top_srcdir)/build/subst.inc SUFFIXES = .in @@ -88,6 +131,25 @@ index b085dca..ccfa588 100644 - edit-config \ - $(NULL) - +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(configdir) +- nodist_noinst_DATA = \ - netdata-openrc \ - netdata.logrotate \ + netdata-openrc \ + netdata.logrotate \ +diff --git a/web/Makefile.am b/web/Makefile.am +index ccaccd7..f2fed50 100644 +--- a/web/Makefile.am ++++ b/web/Makefile.am +@@ -11,10 +11,6 @@ SUBDIRS = \ + + usersslconfigdir=$(configdir)/ssl + +-# Explicitly install directories to avoid permission issues due to umask +-install-exec-local: +- $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) +- + dist_noinst_DATA = \ + README.md \ + gui/confluence/README.md \ diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 1d8eeff209e..89c84c8c9ca 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' sed -i tq \ -e 's|\bfq\b|'$out'/bin/fq|g' \ diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index 60175d27f15..d1c3d0ec6c0 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ opencl-clhpp ocl-icd ]; - NIX_LDFLAGS = [ "-lOpenCL" ]; + NIX_LDFLAGS = "-lOpenCL"; installPhase = '' install -Dm755 opencl-info $out/bin/opencl-info diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 22154796b31..b773529a0d7 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "DNS=yes" ]; - installTargets = "install install-lib"; + installTargets = [ "install" "install-lib" ]; # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9776960327e..9a4a2238558 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { xorgproto libX11 libXext libXt fontconfig freetype # fontsrv wants ft2build.h provides system fonts for acme and sam. ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - darwin.cf-private Carbon Cocoa IOKit Metal QuartzCore + Carbon Cocoa IOKit Metal QuartzCore ]); builder = ./builder.sh; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 5a3ba8b6619..64c184a6122 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; buildPhase = "sh -e make.sh"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index 96f0a754f61..7c5b9a18966 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null -, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null +, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null , libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null @@ -24,14 +24,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc - postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl + postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis mongoc ] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient ++ stdenv.lib.optional stdenv.isLinux systemd; - hardeningDisable = [ "format" ]; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { (mkFlag (libmysqlclient != null) "mysql") (mkFlag (postgresql != null) "pgsql") (mkFlag (libdbi != null) "libdbi") - (mkFlag (net_snmp != null) "snmp") + (mkFlag (net-snmp != null) "snmp") (mkFlag (libuuid != null) "uuid") (mkFlag (curl != null) "elasticsearch") (mkFlag (gnutls != null) "gnutls") @@ -95,9 +93,7 @@ stdenv.mkDerivation rec { (mkFlag (hadoop != null) "omhdfs") (mkFlag (rdkafka != null) "omkafka") (mkFlag (libmongo-client != null) "ommongodb") - (mkFlag (czmq != null) "imzmq3") (mkFlag (czmq != null) "imczmq") - (mkFlag (czmq != null) "omzmq3") (mkFlag (czmq != null) "omczmq") (mkFlag (rabbitmq-c != null) "omrabbitmq") (mkFlag (hiredis != null) "omhiredis") diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 036e3a83cf2..68ea32e1e8a 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ groff ]; - installFlags = ''DESTDIR=$(out)''; + installFlags = [ "DESTDIR=$(out)" ]; postConfigure = '' sed -e s@/usr/man/@/share/man/@ -i Makefile diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index c98634e1199..7d3e62d7beb 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.10.11"; + version = "0.10.14"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "16z45fmvncpa0bv91dpwarqfm9p7aiqkmlcpmv2y23rh6sikhkdq"; + sha256 = "0lazjxrlqzhxd6fg3y1vh38h66v8swkd9q2say4m6sglzkfqdfnq"; }; postPatch = '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "BASHDIR=${placeholder "out"}/share/bash-completion/completions" ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.hostPlatform.isMusl "-D_LINUX_SYSINFO_H=1"; # Won't build on i686 because the binary will be linked again in the # install phase without checking the dependencies. This will prevent diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index 9cec99145b9..ad11cd2e3b6 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -37,7 +37,7 @@ assert enableQt -> qwt != null; ] ++ stdenv.lib.optional enableNtfs ntfs3g ++ stdenv.lib.optional enableExtFs e2fsprogs - ++ stdenv.lib.optional enableQt [ qtbase qttools qwt ]; + ++ stdenv.lib.optionals enableQt [ qtbase qttools qwt ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/system/uefitool/common.nix b/pkgs/tools/system/uefitool/common.nix new file mode 100644 index 00000000000..7d5ee82dcf9 --- /dev/null +++ b/pkgs/tools/system/uefitool/common.nix @@ -0,0 +1,39 @@ +{ version, sha256, installFiles }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qmake, cmake, zip }: + +mkDerivation rec { + passthru = { + inherit version; + inherit sha256; + inherit installFiles; + }; + pname = "uefitool"; + inherit version; + + src = fetchFromGitHub { + inherit sha256; + owner = "LongSoft"; + repo = pname; + rev = version; + }; + + buildInputs = [ qtbase ]; + nativeBuildInputs = [ qmake cmake zip ]; + + configurePhase = ":"; + buildPhase = "bash unixbuild.sh"; + + installPhase = '' + mkdir -p "$out"/bin + cp ${lib.concatStringsSep " " installFiles} "$out"/bin + ''; + + meta = with lib; { + description = "UEFI firmware image viewer and editor"; + homepage = "https://github.com/LongSoft/uefitool"; + license = licenses.bsd2; + maintainers = with maintainers; [ ajs124 ]; + # uefitool supposedly works on other platforms, but their build script only works on linux in nixpkgs + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix new file mode 100644 index 00000000000..cced17e6ddd --- /dev/null +++ b/pkgs/tools/system/uefitool/variants.nix @@ -0,0 +1,15 @@ +{ libsForQt5 }: +let + common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; +in rec { + new-engine = common rec { + version = "A56"; + sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp"; + installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; + }; + old-engine = common rec { + version = "0.27.0"; + sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"; + installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ]; + }; +} diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index bce6d0c4185..1391a2a5ed2 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { patches = [ ./dont_static_link.patch ]; + # fix build with gcc9 + NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + postPatch = '' substituteInPlace Makefile \ --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 02d90472440..62423ff594f 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x"; }; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "Simple xargs and apply replacement"; homepage = https://github.com/chneukirchen/xe; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan ndowens ]; + maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 7437d2765a9..bc265c5a5ae 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to convert ANSI to other formats"; longDescription = '' - Tool to remove ANSI or convert them to another format + Tool to remove ANSI or convert them to another format (HTML, TeX, LaTeX, RTF, Pango or BBCode) ''; homepage = "http://www.andre-simon.de/doku/ansifilter/en/ansifilter.php"; diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index d4f40270915..64ef092f36b 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = licenses.gpl2; - maintainers = with maintainers; [ ndowens ]; + maintainers = with maintainers; []; }; } diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 561ee06136d..c1183d4c5a0 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Implementation of Markdown markup language in C"; homepage = http://www.pell.portland.or.us/~orc/Code/discount/; license = licenses.bsd3; - maintainers = with maintainers; [ shell ndowens ]; + maintainers = with maintainers; [ shell ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 146338df916..b7efe02f4cd 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://waterlan.home.xs4all.nl/dos2unix.html"; changelog = "https://sourceforge.net/p/dos2unix/dos2unix/ci/dos2unix-${version}/tree/dos2unix/NEWS.txt?format=raw"; license = licenses.bsd2; - maintainers = with maintainers; [ c0bw3b ndowens ]; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 7a5f6c8dd81..0d5a50570f5 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { (if interactive then "--with-readline=${readline.dev}" else "--without-readline") ]; - makeFlags = "AR=${stdenv.cc.targetPrefix}ar"; + makeFlags = [ + "AR=${stdenv.cc.targetPrefix}ar" + ]; inherit doCheck; diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 13e8e48a921..51cafeb8c4a 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,37 +1,58 @@ -{ stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, gcc }: +{ stdenv, fetchFromGitLab, getopt, lua, boost, pkgconfig, swig, perl, gcc }: with stdenv.lib; -stdenv.mkDerivation rec { - pname = "highlight"; - version = "3.54"; - - src = fetchFromGitLab { - owner = "saalen"; - repo = "highlight"; - rev = "v${version}"; - sha256 = "1144qv3c02hd3qrnms9cxfprdmkvz06vy4zjq500wg4iz7r8654m"; +let + self = stdenv.mkDerivation rec { + pname = "highlight"; + version = "3.54"; + + src = fetchFromGitLab { + owner = "saalen"; + repo = "highlight"; + rev = "v${version}"; + sha256 = "1144qv3c02hd3qrnms9cxfprdmkvz06vy4zjq500wg4iz7r8654m"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig swig perl ] ++ optional stdenv.isDarwin gcc; + + buildInputs = [ getopt lua boost ]; + + prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/makefile \ + --replace 'CXX=g++' 'CXX=clang++' + ''; + + preConfigure = '' + makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/ CXX=$CXX AR=$AR" + ''; + + # This has to happen _before_ the main build because it does a + # `make clean' for some reason. + preBuild = optionalString (!stdenv.isDarwin) '' + make -C extras/swig $makeFlags perl + ''; + + postCheck = optionalString (!stdenv.isDarwin) '' + perl -Iextras/swig extras/swig/testmod.pl + ''; + + preInstall = optionalString (!stdenv.isDarwin) '' + mkdir -p $out/${perl.libPrefix} + install -m644 extras/swig/highlight.{so,pm} $out/${perl.libPrefix} + make -C extras/swig clean # Clean up intermediate files. + ''; + + meta = with stdenv.lib; { + description = "Source code highlighting tool"; + homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; + platforms = platforms.unix; + maintainers = with maintainers; [ willibutz ]; + }; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; - - buildInputs = [ getopt lua boost ]; - - prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/makefile \ - --replace 'CXX=g++' 'CXX=clang++' - ''; - - preConfigure = '' - makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/ CXX=$CXX AR=$AR" - ''; - - meta = with stdenv.lib; { - description = "Source code highlighting tool"; - homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; - platforms = platforms.unix; - maintainers = with maintainers; [ ndowens willibutz ]; - }; -} +in + if stdenv.isDarwin then self + else perl.pkgs.toPerlModule self diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 600907311ef..621408866e8 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; - maintainers = with maintainers; [ ericsagnes ndowens ]; + maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 9ebc9840b07..626963bc601 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -2,24 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - sha256 = "0xlcpyfmil7sszv4008v4ipqswz49as4nzac0kzmzsb86np191q0"; + sha256 = "1q8h6pc1i89j1zl4s234inl9v95vsdrry1fzlis89sl2mnbv8ywy"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ (stdenv.lib.optional stdenv.isDarwin Security) openssl ]; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "16q17gm59lpjqa18q289cjmjlf2jicag12jz529x5kh11x6bjl8v"; + cargoSha256 = "1hxsfls6fpllc9yg5ib3qz6pa62j1y1va8a6356j6812csk4ifnn"; checkInputs = [ ansi2html ]; checkPhase = '' - # Skip tests that use the network. - cargo test -- --skip terminal::iterm2 + # Skip tests that use the network and that include files. + cargo test -- --skip terminal::iterm2 --skip terminal::resources::tests::remote \ + --skip magic::tests::detect_mimetype_of_svg_image \ + --skip magic::tests::detect_mimetype_of_png_image ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 8b2032dcaba..baccdfdedba 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -9,9 +9,7 @@ stdenv.mkDerivation { buildInputs = [ libmtsupport libfacet libbtree multitrandata ]; - NIX_LDFLAGS = [ - "-lbtree" - ]; + NIX_LDFLAGS = "-lbtree"; patchPhase = '' sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \ diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 415ff0b31b7..f7543dc0f70 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ndowens ]; + maintainers = with maintainers; []; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index 5f0e7461361..c45398e31a1 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }: stdenv.mkDerivation rec { version = "1.1"; @@ -12,6 +12,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = stdenv.lib.optionals stdenv.isDarwin [ + (fetchpatch { + url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch"; + sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8"; + }) + ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; + + postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' + substituteInPlace Makefile \ + --replace "-msse2" "" --replace "-DUSE_SSE2" "" + ''; + installPhase = '' install -Dm755 qgrep $out/bin/qgrep ''; @@ -23,5 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.yrashk ]; platforms = platforms.all; }; - } diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 25e9c07f351..261149229b6 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { pname = "reckon"; version = (import ./gemset.nix).reckon.version; - env = bundlerEnv { - name = "${pname}-${version}-gems"; - - gemdir = ./.; - }; - phases = [ "installPhase" ]; buildInputs = [ makeWrapper ]; - installPhase = '' + installPhase = let + env = bundlerEnv { + name = "${pname}-${version}-gems"; + + gemdir = ./.; + }; + in '' mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon ''; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 9242014cdca..3549e7c1c94 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man"; + makeFlags = [ "TREE=\$(out)" "MANTREE=\$(TREE)/share/man" ]; preBuild = '' sed -e "s@/bin/mv@$(type -P mv)@" -i replace.h diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 521b123d878..df54724d384 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg -, pandoc, poppler_utils, ripgrep, Security +, pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract }: rustPlatform.buildRustPackage rec { @@ -19,9 +19,33 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}" ''; + # Use upstream's example data to run a couple of queries to ensure the dependencies + # for all of the adapters are available. + installCheckPhase = '' + set -e + export PATH="$PATH:$out/bin" + + test1=$(rga --rga-no-cache "hello" exampledir/ | wc -l) + test2=$(rga --rga-no-cache --rga-adapters=tesseract "crate" exampledir/screenshot.png | wc -l) + + if [ $test1 != 26 ] + then + echo "ERROR: test1 failed! Could not find the word 'hello' 26 times in the sample data." + exit 1 + fi + + if [ $test2 != 1 ] + then + echo "ERROR: test2 failed! Could not find the word 'crate' in the screenshot." + exit 1 + fi + ''; + + doInstallCheck = true; + meta = with stdenv.lib; { description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; longDescription = '' @@ -33,7 +57,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = https://github.com/phiresky/ripgrep-all; license = with licenses; [ agpl3Plus ]; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ zaninime ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 4b1275d041f..963ef99c68a 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3"; }; - cargoSha256 = "11477l4l1y55klw5dp2kbsnv989vdz1547ml346hcfbkzv7m450v"; + cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = https://github.com/BurntSushi/ripgrep; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ tailhook globin ]; + maintainers = with maintainers; [ tailhook globin ma27 ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index b7f8bd6df38..2cc40510121 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnum4 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ]; + NIX_CFLAGS_COMPILE = "-Wno-deprecated"; preInstall = '' install -d -m755 "$out"/lib diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index a80a6d3d799..50bceb4fcb3 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { # _FORTIFY_SOURCE requires compiling with optimization (-O) NIX_CFLAGS_COMPILE = "-O"; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "simple markup - markdown like syntax"; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 276fb639205..585c183a81c 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = pantheon.updateScript { + attrPath = pname; + }; + }; + meta = with stdenv.lib; { description = "Your little expandable text snippet helper"; longDescription = '' diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index 923adf8571d..f9c7e3cdfc6 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; unpackPhase = "tar xf $src"; - installTargets = "install install.man"; - installFlags = "BINDIR=$(out)/bin MANDIR=$(out)/share/man/man1"; + installTargets = [ "install" "install.man" ]; + installFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man/man1" ]; preBuild = '' sed -i '1i#include <stdlib.h>\n#include <string.h>' untex.c mkdir -p $out/bin $out/share/man/man1 diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 7b08cffe42d..3360fd4cbe0 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Command-line interface to various pastebins"; homepage = http://wgetpaste.zlin.dk/; license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ndowens ]; + maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 6e66090d88f..c8d10a6e269 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Extract urls from text"; homepage = https://github.com/mvdan/xurls; - maintainers = with maintainers; [ koral ndowens ]; + maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 15e5ddf2f19..177f9326dd2 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0x529137rxy6ld64xqa6xmn93121ripxvkf3sc7hv3wg6km182sw"; }; - patchFlags = "-p2"; + patchFlags = [ "-p2" ]; patches = [ (fetchpatch { name = "zimreader_tntnet221.patch"; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 83aa667f58f..44c5f6d1f24 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -259,7 +259,7 @@ stdenv.mkDerivation rec { ''; preInstall = "mkdir -p $out/etc/vim"; - makeFlags = if stdenv.isCygwin then "DESTDIR=/." else null; + makeFlags = stdenv.lib.optional stdenv.isCygwin "DESTDIR=/."; meta = with stdenv.lib; { description = "Text-based document generation system"; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index c681eaa6ddc..0b5c79756bd 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = https://xmlgraphics.apache.org/fop/; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ bjornfor ndowens ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index aa32d52dfc6..2a126ac5c83 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A quite complete and fast LATEX to HTML translator"; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 6622a03decc..a4b0fb99f3e 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -128,8 +128,6 @@ in buildEnv { mkdir $out/share/texmf-local ) '' + - # updmap.cfg seems like not needing changes - # now filter hyphenation patterns, in a hacky way ATM (let pnames = uniqueStrings (map (p: p.pname) pkgList.splitBin.wrong); @@ -214,7 +212,12 @@ in buildEnv { texlinks.sh "$out/bin" && wrapBin (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links? + + # Disable unavailable map files echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force + # Regenerate the map files (this is optional) + perl `type -P updmap.pl` --sys --force + perl `type -P mktexlsr.pl` ./share/texmf-* # to make sure '' + # install (wrappers for) scripts, based on a list from upstream texlive diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 5594143bfbc..4dea8dba6ed 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { pname = "bento4"; - version = "1.5.1-628"; + version = "1.5.1-629"; src = fetchFromGitHub { owner = "axiomatic-systems"; repo = "Bento4"; rev = "v${version}"; - sha256 = "1fv0k7f3ifwa0c0x22wblm6i8x9zbc13pg047a9i74n456p0mzp3"; + sha256 = "1614idy0r7qrkiaq4kz3gh1b1bpx592aqvi574kxnjrxc34kpmb3"; }; patches = [ ./libap4.patch ]; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 31d26a6c72a..3e72d8b8af5 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdv libjpeg libpng ] ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; - NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; + NIX_CFLAGS_COMPILE = lib.optionalString (!withMinimal) "-I${SDL.dev}/include/SDL"; postPatch = '' sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix new file mode 100644 index 00000000000..b57fa540837 --- /dev/null +++ b/pkgs/tools/video/rav1e/default.nix @@ -0,0 +1,45 @@ +{ rustPlatform, fetchFromGitHub, fetchurl, stdenv, lib, nasm }: + +rustPlatform.buildRustPackage rec { + pname = "rav1e"; + version = "0.2.1"; + + src = stdenv.mkDerivation rec { + name = "${pname}-${version}-source"; + + src = fetchFromGitHub { + owner = "xiph"; + repo = "rav1e"; + rev = "v${version}"; + sha256 = "1lv8g1vw11lanyx6lqr34hb6m4x1fvwb60kgg5nk8s8hgdr18i0y"; + }; + cargoLock = fetchurl { + url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock"; + sha256 = "1d51wcm537pzfmq48vsv87dwf035yl03qkfc0372gchpv079561w"; + }; + + installPhase = '' + mkdir -p $out + cp -R ./* $out/ + cp ${cargoLock} $out/Cargo.lock + ''; + }; + + cargoSha256 = "0frr4sx05pwvj9gmlvmis6lrnbwk3x579fv3kw38374jy33nrr6z"; + + nativeBuildInputs = [ nasm ]; + + meta = with lib; { + description = "The fastest and safest AV1 encoder"; + longDescription = '' + rav1e is an AV1 video encoder. It is designed to eventually cover all use + cases, though in its current form it is most suitable for cases where + libaom (the reference encoder) is too slow. + Features: https://github.com/xiph/rav1e#features + ''; + inherit (src.src.meta) homepage; + license = licenses.bsd2; + maintainers = [ maintainers.primeos ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index c09da3dd231..857524661bf 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { "BINDIR=${placeholder "out"}/bin" "MANDIR=${placeholder "out"}/share/man" ]; - installTargets = "install install.man"; + installTargets = [ "install" "install.man" ]; meta = { description = "VNC recorder"; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 8fca318529f..b9b16e4d8ec 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; - buildFlags = "CC=cc"; + buildFlags = [ "CC=cc" ]; installPhase = '' install -D {,$out/bin/}yamdi diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4f522103003..f7191dba0e4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ mapAliases ({ buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 + catfish = xfce.catfish; # added 2019-12-22 checkbashism = checkbashisms; # added 2016-08-16 cide = throw "deprecated in 2019-09-11: abandoned by upstream"; cinepaint = throw "cinepaint has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 @@ -70,6 +71,7 @@ mapAliases ({ clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 conkerorWrapper = conkeror; # added 2015-01 + compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 @@ -109,6 +111,7 @@ mapAliases ({ evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 + facette = throw "facette has been removed."; # added 2020-01-06 ffadoFull = ffado; # added 2018-05-01 firefox-esr-wrapper = firefox-esr; # 2016-01 firefox-wrapper = firefox; # 2016-01 @@ -191,6 +194,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 @@ -270,6 +274,7 @@ mapAliases ({ networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + nix-review = nixpkgs-review; # added 2019-12-22 nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 @@ -344,6 +349,7 @@ mapAliases ({ quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 + rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 rhc = throw "deprecated in 2019-04-09: abandoned by upstream."; @@ -391,6 +397,7 @@ mapAliases ({ smbclient = samba; # added 2018-04-25 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + net_snmp = net-snmp; # added 2019-12-21 spaceOrbit = space-orbit; # addewd 2016-05-23 speech_tools = speech-tools; # added 2018-04-25 speedtest_cli = speedtest-cli; # added 2015-02-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad7a9654970..7b8f3c91dc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -508,6 +508,8 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; + act = callPackage ../development/tools/misc/act {}; + actdiag = with python3.pkgs; toPythonApplication actdiag; actkbd = callPackage ../tools/system/actkbd { }; @@ -629,7 +631,9 @@ in arandr = callPackage ../tools/X11/arandr { }; - inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_3 arangodb_3_4 arangodb_3_5; + inherit (callPackages ../servers/nosql/arangodb { + stdenv = gcc8Stdenv; + }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; arcanist = callPackage ../development/tools/misc/arcanist {}; @@ -756,11 +760,6 @@ in apg = callPackage ../tools/security/apg { }; - apt = callPackage ../tools/package-management/apt { - # include/c++/6.4.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory - stdenv = gcc5Stdenv; - }; - apt-dater = callPackage ../tools/package-management/apt-dater { }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -771,7 +770,7 @@ in bitwarden = callPackage ../tools/security/bitwarden { }; - bitwarden-cli = callPackage ../tools/security/bitwarden-cli { }; + inherit (nodePackages) bitwarden-cli; bitwarden_rs = callPackage ../tools/security/bitwarden_rs { inherit (darwin.apple_sdk.frameworks) Security CoreServices; @@ -811,6 +810,8 @@ in cloudflare-wrangler = callPackage ../development/tools/cloudflare-wrangler { }; + codeql = callPackage ../development/tools/analysis/codeql { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; ccextractor = callPackage ../applications/video/ccextractor { }; @@ -899,7 +900,7 @@ in github-commenter = callPackage ../development/tools/github-commenter { }; - gitless = callPackage ../applications/version-management/gitless { }; + gitless = callPackage ../applications/version-management/gitless { python = python3; }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; @@ -1083,6 +1084,10 @@ in backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { }; + bandwhich = callPackage ../tools/networking/bandwhich { + inherit (darwin.apple_sdk.frameworks) Security; + }; + bar = callPackage ../tools/system/bar {}; base16-shell-preview = callPackage ../misc/base16-shell-preview { }; @@ -1394,6 +1399,8 @@ in clac = callPackage ../tools/misc/clac {}; + clash = callPackage ../tools/networking/clash { }; + clasp = callPackage ../tools/misc/clasp { }; cli53 = callPackage ../tools/admin/cli53 { }; @@ -1614,7 +1621,7 @@ in dua = callPackage ../tools/misc/dua { }; - inherit (ocamlPackages) dune; + inherit (ocamlPackages) dune dune_2; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1909,6 +1916,8 @@ in meson = callPackage ../development/tools/build-managers/meson { }; + meson-tools = callPackage ../misc/meson-tools { }; + metabase = callPackage ../servers/metabase { }; mididings = callPackage ../tools/audio/mididings { }; @@ -1997,6 +2006,8 @@ in psstop = callPackage ../tools/system/psstop { }; + precice = callPackage ../development/libraries/precice { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; pyCA = python3Packages.callPackage ../applications/video/pyca {}; @@ -2029,6 +2040,8 @@ in stagit = callPackage ../development/tools/stagit { }; + step-ca = callPackage ../tools/security/step-ca { }; + step-cli = callPackage ../tools/security/step-cli { }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; @@ -2045,6 +2058,8 @@ in rainloop-community rainloop-standard; + rav1e = callPackage ../tools/video/rav1e { }; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { }; @@ -2067,7 +2082,6 @@ in rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken - czmq = czmq3; }; rsyslog-light = rsyslog.override { @@ -2077,7 +2091,7 @@ in libmysqlclient = null; postgresql = null; libdbi = null; - net_snmp = null; + net-snmp = null; libuuid = null; gnutls = null; libgcrypt = null; @@ -2238,6 +2252,8 @@ in atool = callPackage ../tools/archivers/atool { }; + bash_unit = callPackage ../tools/misc/bash_unit { }; + bsc = callPackage ../tools/compression/bsc { inherit (llvmPackages) openmp; }; @@ -2512,6 +2528,8 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; + age = callPackage ../tools/security/age { }; + brotli = callPackage ../tools/compression/brotli { }; biosdevname = callPackage ../tools/networking/biosdevname { }; @@ -2949,8 +2967,11 @@ in uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { inherit (pythonPackages) sphinx; + inherit (darwin.apple_sdk.frameworks) Security; }; + volctl = callPackage ../tools/audio/volctl { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; @@ -3000,7 +3021,7 @@ in # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; - elk7Version = "7.3.1"; + elk7Version = "7.5.1"; elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; @@ -3053,7 +3074,7 @@ in enscript = callPackage ../tools/text/enscript { }; - ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { }; + ensemble-chorus = callPackage ../applications/audio/ensemble-chorus { stdenv = gcc8Stdenv; }; entr = callPackage ../tools/misc/entr { }; @@ -3173,9 +3194,7 @@ in fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; - fcppt = callPackage ../development/libraries/fcppt { - stdenv = gcc8Stdenv; - }; + fcppt = callPackage ../development/libraries/fcppt { }; fcrackzip = callPackage ../tools/security/fcrackzip { }; @@ -3206,7 +3225,6 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; fltrdr = callPackage ../tools/misc/fltrdr { - stdenv = gcc8Stdenv; icu = icu63; }; @@ -3230,6 +3248,10 @@ in filet = callPackage ../applications/misc/filet { }; + findomain = callPackage ../tools/networking/findomain { + inherit (darwin.apple_sdk.frameworks) Security; + }; + findutils = callPackage ../tools/misc/findutils { }; finger_bsd = callPackage ../tools/networking/bsd-finger { }; @@ -3294,6 +3316,7 @@ in fontforge = lowPrio (callPackage ../tools/misc/fontforge { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + python = python3; }); fontforge-gtk = fontforge.override { withSpiro = true; @@ -3345,7 +3368,7 @@ in freetds = callPackage ../development/libraries/freetds { }; - frescobaldi = callPackage ../misc/frescobaldi {}; + frescobaldi = python3Packages.callPackage ../misc/frescobaldi {}; frostwire = callPackage ../applications/networking/p2p/frostwire { }; frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; @@ -3778,6 +3801,8 @@ in gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; + gsmlib = callPackage ../development/libraries/gsmlib { }; + gssdp = callPackage ../development/libraries/gssdp { }; gt5 = callPackage ../tools/system/gt5 { }; @@ -3843,6 +3868,8 @@ in pixz = callPackage ../tools/compression/pixz { }; + plplot = callPackage ../development/libraries/plplot { }; + pxattr = callPackage ../tools/archivers/pxattr { }; pxz = callPackage ../tools/compression/pxz { }; @@ -4013,7 +4040,9 @@ in hwinfo = callPackage ../tools/system/hwinfo { }; - hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { }; + hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { + stdenv = gcc8Stdenv; + }; hylafaxplus = callPackage ../servers/hylafaxplus { }; @@ -4475,7 +4504,9 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; - matrix-synapse = callPackage ../servers/matrix-synapse { python3 = python38; }; + /* Python 3.8 is currently broken with matrix-synapse since `python38Packages.bleach` fails + (https://github.com/NixOS/nixpkgs/issues/76093) */ + matrix-synapse = callPackage ../servers/matrix-synapse { /*python3 = python38;*/ }; matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {}; @@ -5106,6 +5137,8 @@ in nemiver = callPackage ../development/tools/nemiver { }; + neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -5798,7 +5831,8 @@ in prototypejs = callPackage ../development/libraries/prototypejs { }; - proxmark3 = callPackage ../tools/security/proxmark3 { }; + inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; }) + proxmark3 proxmark3-unstable; proxychains = callPackage ../tools/networking/proxychains { }; @@ -5899,7 +5933,9 @@ in qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; - qgrep = callPackage ../tools/text/qgrep {}; + qgrep = callPackage ../tools/text/qgrep { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreFoundation; + }; qhull = callPackage ../development/libraries/qhull { }; @@ -5963,6 +5999,8 @@ in rc = callPackage ../shells/rc { }; + rdbtools = callPackage ../development/tools/rdbtools { python = python3; }; + rdma-core = callPackage ../os-specific/linux/rdma-core { }; react-native-debugger = callPackage ../development/tools/react-native-debugger { }; @@ -5976,6 +6014,8 @@ in redsocks = callPackage ../tools/networking/redsocks { }; + reredirect = callPackage ../tools/misc/reredirect { }; + retext = libsForQt5.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -6112,7 +6152,9 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { }; + runelite = callPackage ../games/runelite { + jre = openjdk11; + }; runningx = callPackage ../tools/X11/runningx { }; @@ -6268,6 +6310,8 @@ in shocco = callPackage ../tools/text/shocco { }; + shorewall = callPackage ../tools/networking/shorewall { }; + shotwell = callPackage ../applications/graphics/shotwell { }; shout = nodePackages.shout; @@ -6722,6 +6766,8 @@ in tmuxinator = callPackage ../tools/misc/tmuxinator { }; + tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { }; + tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { }); tmsu = callPackage ../tools/filesystems/tmsu { }; @@ -6808,7 +6854,11 @@ in triggerhappy = callPackage ../tools/inputmethods/triggerhappy {}; - trilium = callPackage ../applications/office/trilium { }; + inherit (callPackage ../applications/office/trilium {}) + trilium-desktop + trilium-server + ; + trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; @@ -7499,6 +7549,8 @@ in zsh-autosuggestions = callPackage ../shells/zsh/zsh-autosuggestions { }; + zsh-powerlevel10k = callPackage ../shells/zsh/zsh-powerlevel10k { }; + zsh-powerlevel9k = callPackage ../shells/zsh/zsh-powerlevel9k { }; zsh-command-time = callPackage ../shells/zsh/zsh-command-time { }; @@ -7798,8 +7850,8 @@ in gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; - gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/8); - gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc8; + gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); + gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; gcc-unwrapped = gcc.cc; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { @@ -8001,7 +8053,7 @@ in isl = isl_0_17; })); - gfortran = gfortran8; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -8051,6 +8103,14 @@ in profiledCompiler = false; }); + gfortran9 = wrapCC (gcc9.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8080,36 +8140,11 @@ in gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.7-2013q3-20130916"; - releaseType = "update"; - sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.8-2014q1-20140314"; - releaseType = "update"; - sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.9-2015q1-20150306"; - releaseType = "update"; - sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - dirName = "5.0"; - subdirName = "5-2016-q2-update"; - version = "5.4-2016q2-20160622"; - releaseType = "update"; - sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; - ncurses = pkgsi686Linux.ncurses5; - }; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; - gcc-arm-embedded = gcc-arm-embedded-8; + gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; + gcc-arm-embedded = gcc-arm-embedded-9; gforth = callPackage ../development/compilers/gforth {}; @@ -8140,7 +8175,13 @@ in psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); - spago = haskell.lib.justStaticExecutables haskellPackages.spago; + purescript-psa = nodePackages.purescript-psa; + + spago = callPackage ../development/tools/purescript/spago { }; + + pulp = nodePackages.pulp; + + pscid = nodePackages.pscid; tacacsplus = callPackage ../servers/tacacsplus { }; @@ -8204,13 +8245,19 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix { + go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); - go_1_13 = callPackage ../development/compilers/go/1.13.nix { + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); go = go_1_13; @@ -8439,7 +8486,7 @@ in llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ isl = isl_0_14; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -8447,7 +8494,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_39.tools; targetLlvmLibraries = targetPackages.llvmPackages_39.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -8455,7 +8502,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_4.tools; targetLlvmLibraries = targetPackages.llvmPackages_4.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; }); @@ -8463,7 +8510,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -8471,7 +8518,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { # with gcc-7 on i686: undefined reference to `__divmoddi4' # Failing tests with gcc8. stdenv = overrideCC stdenv (if stdenv.hostPlatform.isi686 then gcc6 else gcc7); @@ -8481,7 +8528,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -8489,7 +8536,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -8497,14 +8544,13 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); llvmPackages_latest = llvmPackages_9; lorri = callPackage ../tools/misc/lorri { - inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -8636,19 +8682,19 @@ in inherit (darwin) apple_sdk; }; - rust_1_39_0 = callPackage ../development/compilers/rust/1_39_0.nix { + rust_1_40_0 = callPackage ../development/compilers/rust/1_40_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_39_0; + rust = rust_1_40_0; - rustPackages_1_39_0 = rust_1_39_0.packages.stable; + rustPackages_1_40_0 = rust_1_40_0.packages.stable; rustPackages_1_38_0 = rust_1_38_0.packages.stable; - rustPackages = rustPackages_1_39_0; + rustPackages = rustPackages_1_40_0; - inherit (rustPackages) cargo rustc rustPlatform; + inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; @@ -8662,6 +8708,7 @@ in cargo-flamegraph = callPackage ../development/tools/cargo-flamegraph { inherit (darwin.apple_sdk.frameworks) Security; + inherit (linuxPackages) perf; }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; @@ -8750,6 +8797,7 @@ in scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; scala = scala_2_13; + metals = callPackage ../development/tools/metals { }; scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; @@ -8820,6 +8868,11 @@ in tinycc = callPackage ../development/compilers/tinycc { }; + tinygo = callPackage ../development/compilers/tinygo { + inherit (llvmPackages_9) llvm clang-unwrapped lld; + avrgcc = pkgsCross.avr.buildPackages.gcc; + }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { stdenv = gccStdenv; }; @@ -8922,6 +8975,8 @@ in clojure = callPackage ../development/interpreters/clojure { }; + clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { }; + clooj = callPackage ../development/interpreters/clojure/clooj.nix { }; dhall = callPackage ../development/interpreters/dhall { }; @@ -9272,7 +9327,14 @@ in svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; - poetry = with python3Packages; toPythonApplication poetry; + + poetry = callPackage ../development/tools/poetry { + python = python3; + }; + poetry2nix = callPackage ../development/tools/poetry2nix/poetry2nix { + inherit pkgs lib; + }; + pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; @@ -9329,13 +9391,30 @@ in }) ruby_2_4 ruby_2_5 - ruby_2_6; + ruby_2_6 + ruby_2_7; + + rubyMinimal = ruby.override { + # gem support is minimal overhead + rubygemsSupport = true; + useRailsExpress = false; + zlibSupport = false; + opensslSupport = false; + gdbmSupport = false; + cursesSupport = false; + docSupport = false; + yamlSupport = false; + fiddleSupport = false; + # remove gcc from runtime closure + removeReferenceToCC = true; + }; ruby = ruby_2_6; rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems; rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems; + rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems; mruby = callPackage ../development/compilers/mruby { }; @@ -9350,7 +9429,7 @@ in spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; @@ -9399,6 +9478,8 @@ in samples = true; }; + h3 = callPackage ../development/misc/h3 { }; + amtk = callPackage ../development/libraries/amtk { }; avrlibc = callPackage ../development/misc/avr/libc {}; @@ -9734,7 +9815,7 @@ in conan = callPackage ../development/tools/build-managers/conan { }; - cookiecutter = pythonPackages.cookiecutter; + cookiecutter = with python3Packages; toPythonApplication cookiecutter; corundum = callPackage ../development/tools/corundum { }; @@ -10349,6 +10430,8 @@ in procodile = callPackage ../tools/system/procodile { }; + pry = callPackage ../development/tools/pry { }; + pup = callPackage ../development/tools/pup { }; puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; @@ -10548,7 +10631,6 @@ in texlab = callPackage ../development/tools/misc/texlab { inherit (darwin.apple_sdk.frameworks) Security; - texlab-citeproc-build-deps = nodePackages."texlab-citeproc-build-deps-../tools/misc/texlab/citeproc"; }; tflint = callPackage ../development/tools/analysis/tflint { }; @@ -10727,14 +10809,11 @@ in armadillo = callPackage ../development/libraries/armadillo {}; - arrayfire = callPackage ../development/libraries/arrayfire { - # fails to build with gcc >= 7 - stdenv = gcc6Stdenv; - }; + arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ gtest = gtest.override { static = true; }; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); @@ -10798,7 +10877,9 @@ in inherit (llvmPackages_6) llvm clang-unwrapped; }; - belle-sip = callPackage ../development/libraries/belle-sip { }; + belle-sip = callPackage ../development/libraries/belle-sip { + stdenv = gcc8Stdenv; + }; libbfd = callPackage ../development/libraries/libbfd { }; @@ -10883,8 +10964,6 @@ in ccrtp = callPackage ../development/libraries/ccrtp { }; - ccrtp_1_8 = callPackage ../development/libraries/ccrtp/1.8.nix { }; - cctz = callPackage ../development/libraries/cctz { }; celt = callPackage ../development/libraries/celt {}; @@ -10963,8 +11042,6 @@ in cointop = callPackage ../applications/misc/cointop { }; - commoncpp2 = callPackage ../development/libraries/commoncpp2 { }; - ctl = callPackage ../development/libraries/ctl { }; ctpp2 = callPackage ../development/libraries/ctpp2 { }; @@ -11067,8 +11144,6 @@ in fltk = fltk13; }; - dirac = callPackage ../development/libraries/dirac { }; - directfb = callPackage ../development/libraries/directfb { }; discord-rpc = callPackage ../development/libraries/discord-rpc { @@ -11154,7 +11229,6 @@ in inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav; - inherit (pythonPackages) gst-python; }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -11625,6 +11699,8 @@ in glib-networking = callPackage ../development/libraries/glib-networking {}; + glirc = haskell.lib.justStaticExecutables haskellPackages.glirc; + gom = callPackage ../development/libraries/gom { }; ace = callPackage ../development/libraries/ace { }; @@ -11651,8 +11727,6 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - pangox_compat = callPackage ../development/libraries/pangox-compat { }; - gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; @@ -11735,6 +11809,8 @@ in gtkspellmm = callPackage ../development/libraries/gtkspellmm { }; + gtk-layer-shell = callPackage ../development/libraries/gtk-layer-shell { }; + gts = callPackage ../development/libraries/gts { }; gumbo = callPackage ../development/libraries/gumbo { }; @@ -11815,27 +11891,27 @@ in icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; } // - (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu59 = callPackage ../development/libraries/icu/59.nix ({ nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu60 = callPackage ../development/libraries/icu/60.nix ({ nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu63 = callPackage ../development/libraries/icu/63.nix ({ nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); icu64 = callPackage ../development/libraries/icu/64.nix ({ nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); @@ -11898,9 +11974,11 @@ in isso = callPackage ../servers/isso { }; - itk4 = callPackage ../development/libraries/itk/4.x.nix { }; + itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; - itk = callPackage ../development/libraries/itk { }; + itk = callPackage ../development/libraries/itk { + stdenv = gcc8Stdenv; + }; jasper = callPackage ../development/libraries/jasper { }; @@ -12181,6 +12259,8 @@ in libcredis = callPackage ../development/libraries/libcredis { }; + libctb = callPackage ../development/libraries/libctb { }; + libctemplate = callPackage ../development/libraries/libctemplate { }; libcouchbase = callPackage ../development/libraries/libcouchbase { }; @@ -13177,6 +13257,10 @@ in microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { }; + micronucleus = callPackage ../development/tools/misc/micronucleus { }; + + micropython = callPackage ../development/interpreters/micropython { }; + mimalloc = callPackage ../development/libraries/mimalloc { }; minizip = callPackage ../development/libraries/minizip { }; @@ -13410,11 +13494,6 @@ in ois = callPackage ../development/libraries/ois {}; - opal = callPackage ../development/libraries/opal { - ffmpeg = ffmpeg_2; - stdenv = gcc6Stdenv; - }; - openh264 = callPackage ../development/libraries/openh264 { }; openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { }; @@ -13590,8 +13669,6 @@ in pstreams = callPackage ../development/libraries/pstreams {}; - ptlib = callPackage ../development/libraries/ptlib {}; - pugixml = callPackage ../development/libraries/pugixml { }; pybind11 = pythonPackages.pybind11; @@ -14057,12 +14134,11 @@ in soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; - soapysdr = callPackage ../applications/radio/soapysdr { inherit (python3Packages) python numpy; }; + soapysdr = callPackage ../applications/radio/soapysdr { }; soapyremote = callPackage ../applications/radio/soapyremote { }; soapysdr-with-plugins = callPackage ../applications/radio/soapysdr { - inherit (python3Packages) python numpy; extraPackages = [ limesuite soapyairspy @@ -14440,6 +14516,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { + stdenv = gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -14555,6 +14632,8 @@ in x265 = callPackage ../development/libraries/x265 { }; + xandikos = callPackage ../servers/xandikos { }; + inherit (callPackages ../development/libraries/xapian { }) xapian_1_4; xapian = xapian_1_4; @@ -14654,13 +14733,7 @@ in cppzmq = callPackage ../development/libraries/cppzmq {}; - czmq3 = callPackage ../development/libraries/czmq/3.x.nix {}; - czmq4 = callPackage ../development/libraries/czmq/4.x.nix {}; - czmq = czmq4; - - czmqpp = callPackage ../development/libraries/czmqpp { - czmq = czmq3; - }; + czmq = callPackage ../development/libraries/czmq/default.nix {}; zmqpp = callPackage ../development/libraries/zmqpp { }; @@ -14925,6 +14998,16 @@ in mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; + # Redwax collection + mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; + mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; + mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; + mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; mod_evasive = callPackage ../servers/http/apache-modules/mod_evasive { }; @@ -15039,6 +15122,8 @@ in do-agent = callPackage ../servers/monitoring/do-agent { }; + dodgy = with python3Packages; toPythonApplication dodgy; + dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; @@ -15071,8 +15156,6 @@ in exim = callPackage ../servers/mail/exim { }; - facette = callPackage ../servers/monitoring/facette { }; - fcgiwrap = callPackage ../servers/fcgiwrap { }; felix = callPackage ../servers/felix { }; @@ -15187,6 +15270,14 @@ in mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi; mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; + mod_ca = pkgs.apacheHttpdPackages.mod_ca; + mod_crl = pkgs.apacheHttpdPackages.mod_crl; + mod_csr = pkgs.apacheHttpdPackages.mod_csr; + mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp; + mod_scep = pkgs.apacheHttpdPackages.mod_scep; + mod_spkac = pkgs.apacheHttpdPackages.mod_spkac; + mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; + mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; inherit (callPackages ../servers/mpd { }) mpd mpd-small mpdWithFeatures; @@ -15418,11 +15509,13 @@ in checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; + pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { }; + neo4j = callPackage ../servers/nosql/neo4j { }; check-esxi-hardware = callPackage ../servers/monitoring/plugins/esxi.nix {}; - net_snmp = callPackage ../servers/monitoring/net-snmp { }; + net-snmp = callPackage ../servers/monitoring/net-snmp { }; newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; @@ -15431,6 +15524,8 @@ in riemann = callPackage ../servers/monitoring/riemann { }; riemann-dash = callPackage ../servers/monitoring/riemann-dash { }; + unpfs = callPackage ../servers/unpfs {}; + oidentd = callPackage ../servers/identd/oidentd { }; openfire = callPackage ../servers/xmpp/openfire { }; @@ -15524,6 +15619,8 @@ in psqlodbc = callPackage ../development/libraries/psqlodbc { }; + public-inbox = perlPackages.callPackage ../servers/mail/public-inbox { }; + pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; @@ -15647,8 +15744,6 @@ in sickrage = callPackage ../servers/sickbeard/sickrage.nix { }; - sipcmd = callPackage ../applications/networking/sipcmd { }; - sipwitch = callPackage ../servers/sip/sipwitch { }; slimserver = callPackage ../servers/slimserver { }; @@ -15813,6 +15908,8 @@ in alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { }; + alertmanager-bot = callPackage ../servers/monitoring/alertmanager-bot { }; + alsa-firmware = callPackage ../os-specific/linux/alsa-firmware { }; alsaLib = callPackage ../os-specific/linux/alsa-lib { }; @@ -15827,10 +15924,12 @@ in inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware + armTrustedFirmwareTools armTrustedFirmwareAllwinner armTrustedFirmwareQemu armTrustedFirmwareRK3328 armTrustedFirmwareRK3399 + armTrustedFirmwareS905 ; microcodeAmd = callPackage ../os-specific/linux/microcode/amd.nix { }; @@ -15911,6 +16010,8 @@ in coredns = callPackage ../servers/dns/coredns { }; + corerad = callPackage ../tools/networking/corerad { }; + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cpuset = callPackage ../os-specific/linux/cpuset { }; @@ -16149,6 +16250,7 @@ in linux_mptcp_94 = callPackage ../os-specific/linux/kernel/linux-mptcp-94.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long ] @@ -16166,6 +16268,7 @@ in linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 1; }; @@ -16173,6 +16276,7 @@ in linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 2; }; @@ -16180,6 +16284,7 @@ in linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 3; }; @@ -16187,6 +16292,7 @@ in linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + request_key_helper ]; rpiVersion = 4; }; @@ -16194,6 +16300,7 @@ in linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated kernelPatches.cpu-cgroup-v2."4.4" kernelPatches.modinst_arg_list_too_long # https://github.com/NixOS/nixpkgs/issues/42755 @@ -16207,6 +16314,7 @@ in linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated kernelPatches.cpu-cgroup-v2."4.9" kernelPatches.modinst_arg_list_too_long ]; @@ -16215,6 +16323,7 @@ in linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version kernelPatches.cpu-cgroup-v2."4.11" @@ -16226,6 +16335,7 @@ in linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long kernelPatches.export_kernel_fpu_functions."4.14" ]; @@ -16234,6 +16344,7 @@ in linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -16241,18 +16352,22 @@ in linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" ]; }; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper ]; }; linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long ]; }; @@ -16260,6 +16375,7 @@ in linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper kernelPatches.modinst_arg_list_too_long ]; }; @@ -16306,6 +16422,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; digimend = callPackage ../os-specific/linux/digimend { }; @@ -16421,7 +16539,7 @@ in virtualbox = pkgs.virtualboxHardened; }; - wireguard = callPackage ../os-specific/linux/wireguard { }; + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; @@ -16559,9 +16677,13 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; - libselinux = callPackage ../os-specific/linux/libselinux { }; + libselinux = callPackage ../os-specific/linux/libselinux { + python = python3; + }; - libsemanage = callPackage ../os-specific/linux/libsemanage { }; + libsemanage = callPackage ../os-specific/linux/libsemanage { + python = python3; + }; libraw = callPackage ../development/libraries/libraw { }; @@ -16955,12 +17077,14 @@ in ubootTools ubootA20OlinuxinoLime ubootBananaPi + ubootBananaPim3 ubootBananaPim64 ubootBeagleboneBlack ubootClearfog ubootGuruplug ubootJetsonTK1 ubootNovena + ubootOdroidC2 ubootOdroidXU3 ubootOrangePiPc ubootOrangePiZeroPlus2H5 @@ -17561,6 +17685,8 @@ in polytopes_db = callPackage ../data/misc/polytopes_db { }; + pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; @@ -17621,7 +17747,9 @@ in stdmanpages = callPackage ../data/documentation/std-man-pages { }; - starship = callPackage ../tools/misc/starship { }; + starship = callPackage ../tools/misc/starship { + inherit (darwin.apple_sdk.frameworks) Security; + }; stig = callPackage ../applications/networking/p2p/stig { }; @@ -18035,7 +18163,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { ffmpeg = ffmpeg_4; @@ -18165,8 +18293,6 @@ in carla = qt5.callPackage ../applications/audio/carla { }; - catfish = callPackage ../applications/search/catfish { }; - catimg = callPackage ../tools/misc/catimg { }; catt = python3Packages.callPackage ../applications/video/catt { }; @@ -18434,6 +18560,8 @@ in docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; + docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; + doodle = callPackage ../applications/search/doodle { }; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; @@ -18543,6 +18671,7 @@ in emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { withX = false; + withNS = false; withGTK2 = false; withGTK3 = false; })); @@ -18903,7 +19032,6 @@ in Kerberos AVFoundation MediaToolbox CoreLocation Foundation AddressBook; inherit (darwin) libobjc; - inherit (rustPackages_1_38_0) cargo rustc; }; }); @@ -19117,6 +19245,8 @@ in inherit (darwin) IOKit; }; + glow = callPackage ../applications/editors/glow { }; + glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; gmtk = callPackage ../development/libraries/gmtk { }; @@ -19242,6 +19372,8 @@ in hashit = callPackage ../tools/misc/hashit { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; + hello = callPackage ../applications/misc/hello { }; hello-unfree = callPackage ../applications/misc/hello-unfree { }; @@ -19356,11 +19488,14 @@ in wlroots = callPackage ../development/libraries/wlroots { }; - sway = callPackage ../applications/window-managers/sway { }; + sway-unwrapped = callPackage ../applications/window-managers/sway { }; + sway = callPackage ../applications/window-managers/sway/wrapper.nix { }; swaybg = callPackage ../applications/window-managers/sway/bg.nix { }; swayidle = callPackage ../applications/window-managers/sway/idle.nix { }; swaylock = callPackage ../applications/window-managers/sway/lock.nix { }; + swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; + waybar = callPackage ../applications/misc/waybar { pulseSupport = config.pulseaudio or false; }; @@ -19776,13 +19911,15 @@ in libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "fresh"; }); }); libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice; libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = callPackage ../applications/office/libreoffice/still.nix + libreoffice = callPackage ../applications/office/libreoffice (libreoffice-args // { + variant = "still"; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -19875,7 +20012,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop libgnome-keyring webkitgtk; + inherit (gnome3) gnome-desktop libgnome-keyring; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/chrootenv.nix { }; @@ -19964,6 +20101,9 @@ in menumaker = callPackage ../applications/misc/menumaker { }; + mercurial_4 = callPackage ../applications/version-management/mercurial/4.9.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; mercurial = callPackage ../applications/version-management/mercurial { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; @@ -20054,6 +20194,8 @@ in ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; }; + monitor = callPackage ../applications/system/monitor { }; + moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; @@ -20112,7 +20254,7 @@ in clerk = callPackage ../applications/audio/clerk { }; - nbstripout = callPackage ../applications/version-management/nbstripout { }; + nbstripout = callPackage ../applications/version-management/nbstripout { python = python3; }; ncmpc = callPackage ../applications/audio/ncmpc { }; @@ -20288,7 +20430,9 @@ in libmlt = mlt; }; - shogun = callPackage ../applications/science/machine-learning/shogun { }; + shogun = callPackage ../applications/science/machine-learning/shogun { + stdenv = gcc8Stdenv; + }; sky = callPackage ../applications/networking/instant-messengers/sky {}; @@ -20298,6 +20442,8 @@ in softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; + spacegun = callPackage ../applications/networking/cluster/spacegun {}; + stride = callPackage ../applications/networking/instant-messengers/stride { }; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -20471,9 +20617,7 @@ in openfx = callPackage ../development/libraries/openfx {}; - openimageio = callPackage ../applications/graphics/openimageio { - stdenv = gcc6Stdenv; - }; + openimageio = callPackage ../applications/graphics/openimageio { }; openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; @@ -20528,8 +20672,8 @@ in osmo = callPackage ../applications/office/osmo { }; palemoon = callPackage ../applications/networking/browsers/palemoon { - # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 - stdenv = gcc49Stdenv; + # https://www.palemoon.org/sourcecode.shtml + stdenv = gcc7Stdenv; }; pamix = callPackage ../applications/audio/pamix { }; @@ -20723,7 +20867,7 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; @@ -20786,7 +20930,9 @@ in qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; + qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { + boost = boost17x; + }; qmetro = callPackage ../applications/misc/qmetro { }; @@ -21332,6 +21478,7 @@ in swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; + boost = boost168; }; sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { }; @@ -21380,7 +21527,9 @@ in tailor = callPackage ../applications/version-management/tailor {}; - taizen = callPackage ../applications/misc/taizen { }; + taizen = callPackage ../applications/misc/taizen { + inherit (darwin.apple_sdk.frameworks) Security; + }; tangogps = callPackage ../applications/misc/tangogps { gconf = gnome2.GConf; @@ -21598,10 +21747,15 @@ in twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + ueberzug = with python3Packages; toPythonApplication ueberzug; + umurmur = callPackage ../applications/networking/umurmur { }; udocker = pythonPackages.callPackage ../tools/virtualization/udocker { }; + uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); + uefitool = uefitoolPackages.new-engine; + unigine-valley = callPackage ../applications/graphics/unigine-valley { }; inherit (ocaml-ng.ocamlPackages_4_05) unison; @@ -22121,7 +22275,7 @@ in inherit (xorg) xcompmgr; - compton = callPackage ../applications/window-managers/compton {}; + picom = callPackage ../applications/window-managers/picom {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; @@ -22307,6 +22461,8 @@ in yed = callPackage ../applications/graphics/yed {}; + yeetgif = callPackage ../applications/graphics/yeetgif { }; + inherit (gnome3) yelp; yelp-tools = callPackage ../development/misc/yelp-tools { }; @@ -22798,6 +22954,8 @@ in gtypist = callPackage ../games/gtypist { }; + gweled = callPackage ../games/gweled {}; + gzdoom = callPackage ../games/gzdoom { }; harmonist = callPackage ../games/harmonist { }; @@ -22983,7 +23141,7 @@ in privateer = callPackage ../games/privateer { }; - pysolfc = callPackage ../games/pysolfc { }; + pysolfc = python3Packages.callPackage ../games/pysolfc { }; qweechat = callPackage ../applications/networking/irc/qweechat { }; @@ -23361,6 +23519,8 @@ in ### DESKTOP ENVIRONMENTS + cdesktopenv = callPackage ../desktops/cdesktopenv { }; + cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); deepin = recurseIntoAttrs (import ../desktops/deepin { @@ -23527,7 +23687,9 @@ in alliance = callPackage ../applications/science/electronics/alliance { }; - ants = callPackage ../applications/science/biology/ants { }; + ants = callPackage ../applications/science/biology/ants { + stdenv = gcc8Stdenv; + }; aragorn = callPackage ../applications/science/biology/aragorn { }; @@ -23541,6 +23703,10 @@ in bftools = callPackage ../applications/science/biology/bftools { }; + blast = callPackage ../applications/science/biology/blast { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; + cd-hit = callPackage ../applications/science/biology/cd-hit { }; cmtk = callPackage ../applications/science/biology/cmtk { }; @@ -23587,10 +23753,16 @@ in kssd = callPackage ../applications/science/biology/kssd { }; + last = callPackage ../applications/science/biology/last { }; + macse = callPackage ../applications/science/biology/macse { }; migrate = callPackage ../applications/science/biology/migrate { }; + minia = callPackage ../applications/science/biology/minia { + boost = boost159; + }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { }; muscle = callPackage ../applications/science/biology/muscle { }; @@ -23677,6 +23849,8 @@ in svaba = callPackage ../applications/science/biology/svaba { }; + tebreak = callPackage ../applications/science/biology/tebreak { }; + trimal = callPackage ../applications/science/biology/trimal { }; truvari = callPackage ../applications/science/biology/truvari { }; @@ -23767,6 +23941,7 @@ in lie = callPackage ../applications/science/math/LiE { }; magma = callPackage ../development/libraries/science/math/magma { }; + clmagma = callPackage ../development/libraries/science/math/clmagma { }; mathematica = callPackage ../applications/science/math/mathematica { }; mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { }; @@ -23992,7 +24167,6 @@ in mcrl2 = callPackage ../applications/science/logic/mcrl2 { }; minisat = callPackage ../applications/science/logic/minisat {}; - minisatUnstable = callPackage ../applications/science/logic/minisat/unstable.nix {}; monosat = callPackage ../applications/science/logic/monosat {}; @@ -24100,16 +24274,9 @@ in fped = callPackage ../applications/science/electronics/fped { }; - kicad = callPackage ../applications/science/electronics/kicad { - wxGTK = wxGTK30; - boost = boost160; - }; - kicad-with-packages3d = kicad.overrideAttrs (old: { modules = old.modules ++ [ old.passthru.packages3d ]; }); - - kicad-unstable = python.pkgs.callPackage ../applications/science/electronics/kicad/unstable.nix { - wxGTK = wxGTK30; - boost = boost160; - }; + kicad = callPackage ../applications/science/electronics/kicad { }; + kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; @@ -24256,7 +24423,7 @@ in root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; }); rink = callPackage ../applications/science/misc/rink { }; @@ -24457,13 +24624,9 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = callPackage ../applications/networking/instant-messengers/ekiga { }; - dumb = callPackage ../misc/dumb { }; - emulationstation = callPackage ../misc/emulators/emulationstation { - stdenv = gcc5Stdenv; - }; + emulationstation = callPackage ../misc/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -24533,6 +24696,8 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + gobuster = callPackage ../tools/security/gobuster { }; + guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; @@ -24541,7 +24706,9 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { }; + helm = callPackage ../applications/audio/helm { + stdenv = gcc8Stdenv; + }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; @@ -24854,7 +25021,7 @@ in "Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = callPackage ../tools/package-management/nix-review { }; + nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { }; @@ -24940,6 +25107,8 @@ in pjsip = callPackage ../applications/networking/pjsip { }; + pounce = callPackage ../servers/pounce { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; @@ -25070,11 +25239,7 @@ in seafile-shared = callPackage ../misc/seafile-shared { }; serviio = callPackage ../servers/serviio {}; - selinux-python = callPackage ../os-specific/linux/selinux-python { - # needs python3 bindings - libselinux = libselinux.override { python = python3; }; - libsemanage = libsemanage.override { python = python3; }; - }; + selinux-python = callPackage ../os-specific/linux/selinux-python { }; slock = callPackage ../misc/screensavers/slock { conf = config.slock.conf or null; @@ -25163,6 +25328,8 @@ in tup = callPackage ../development/tools/build-managers/tup { }; + tusk = callPackage ../applications/office/tusk { }; + trufflehog = callPackage ../tools/security/trufflehog { }; tvbrowser-bin = callPackage ../applications/misc/tvbrowser/bin.nix { }; @@ -25177,6 +25344,8 @@ in inherit (gnome2) GConf; }; + unityhub = callPackage ../development/tools/unityhub { }; + urbit = callPackage ../misc/urbit { }; utf8proc = callPackage ../development/libraries/utf8proc { }; @@ -25585,6 +25754,8 @@ in wasmtime = callPackage ../development/interpreters/wasmtime {}; + wfuzz = with python3Packages; toPythonApplication wfuzz; + bemenu = callPackage ../applications/misc/bemenu { }; dapper = callPackage ../development/tools/dapper { }; @@ -25599,6 +25770,8 @@ in kodelife = callPackage ../applications/graphics/kodelife {}; + _3proxy = callPackage ../applications/networking/3proxy {}; + pigeon = callPackage ../development/tools/pigeon {}; verifpal = callPackage ../tools/security/verifpal {}; @@ -25619,4 +25792,6 @@ in sentencepiece = callPackage ../development/libraries/sentencepiece {}; + kcli = callPackage ../development/tools/kcli {}; + } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8f1133d9ba2..c4c18b264f1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -62,6 +62,18 @@ in { buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; + ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { + bootPkgs = packages.ghc863Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_7; + llvmPackages = pkgs.llvmPackages_7; + }; + ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix { + bootPkgs = packages.ghc863Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc863Binary; inherit (buildPackages.python3Packages) sphinx; @@ -120,6 +132,16 @@ in { ghc = bh.compiler.ghc881; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; + ghc882 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc882; + ghc = bh.compiler.ghc882; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; + }; + ghc8101 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8101; + ghc = bh.compiler.ghc8101; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f46d953fb48..4a7743b1090 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -16,8 +16,12 @@ let buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + buildDune2Package = buildDunePackage.override { dune = dune_2; }; + alcotest = callPackage ../development/ocaml-modules/alcotest {}; + alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { }; @@ -187,6 +191,8 @@ let cppo = callPackage ../development/tools/ocaml/cppo { }; + cpu = callPackage ../development/ocaml-modules/cpu { }; + cpuid = callPackage ../development/ocaml-modules/cpuid { }; crunch = callPackage ../development/tools/ocaml/crunch { }; @@ -237,6 +243,12 @@ let dune = callPackage ../development/tools/ocaml/dune { }; + dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; }; + + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; }; + earley = callPackage ../development/ocaml-modules/earley { }; earlybird = callPackage ../development/ocaml-modules/earlybird { }; @@ -326,6 +338,8 @@ let then callPackage ../development/ocaml-modules/ipaddr { } else ipaddr_p4; + irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; + iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; iter = callPackage ../development/ocaml-modules/iter { }; @@ -362,10 +376,32 @@ let httpaf = callPackage ../development/ocaml-modules/httpaf { }; + index = callPackage ../development/ocaml-modules/index { }; + inifiles = callPackage ../development/ocaml-modules/inifiles { }; iri = callPackage ../development/ocaml-modules/iri { }; + irmin = callPackage ../development/ocaml-modules/irmin { }; + + irmin-fs = callPackage ../development/ocaml-modules/irmin/fs.nix { }; + + irmin-git = callPackage ../development/ocaml-modules/irmin/git.nix { }; + + irmin-graphql = callPackage ../development/ocaml-modules/irmin/graphql.nix { }; + + irmin-http = callPackage ../development/ocaml-modules/irmin/http.nix { }; + + irmin-mem = callPackage ../development/ocaml-modules/irmin/mem.nix { }; + + irmin-pack = callPackage ../development/ocaml-modules/irmin/pack.nix { }; + + irmin-test = callPackage ../development/ocaml-modules/irmin/test.nix { }; + + irmin-unix = callPackage ../development/ocaml-modules/irmin/unix.nix { }; + + irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { pcre = ocaml_pcre; }; @@ -470,6 +506,8 @@ let lwt = ocaml_lwt; }; + macaddr = callPackage ../development/ocaml-modules/macaddr { }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; @@ -730,6 +768,8 @@ let pa_test = callPackage ../development/ocaml-modules/pa_test { }; + parany = callPackage ../development/ocaml-modules/parany { }; + pipebang = callPackage ../development/ocaml-modules/pipebang { }; pprint = callPackage ../development/ocaml-modules/pprint { }; @@ -871,6 +911,8 @@ let xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; + yaml = callPackage ../development/ocaml-modules/yaml { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 22249e644e9..2dc64f63465 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4721,6 +4721,20 @@ let propagatedBuildInputs = [ DataCompare ]; }; + DevelLeak = buildPerlPackage rec { + pname = "Devel-Leak"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NI-S/Devel-Leak-${version}.tar.gz"; + sha256 = "0lkj2xwc3lhxv7scl43r8kfmls4am0b98sqf5vmf7d72257w6hkg"; + }; + meta = { + homepage = "https://metacpan.org/release/Devel-Leak"; + description = "Utility for looking for perl objects that are not reclaimed"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; # According to Debian + }; + }; + DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; version = "1.80"; @@ -6088,9 +6102,13 @@ let }; buildInputs = [ CaptureTiny ]; propagatedBuildInputs = [ EmailAbstract EmailAddress MooXTypesMooseLike SubExporter Throwable TryTiny ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; postPatch = '' patchShebangs --build util ''; + preCheck = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang util/sendmail + ''; meta = { homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; @@ -11228,7 +11246,7 @@ let outputs = [ "out" "dev" ]; # no "devdoc" - installTargets = "install"; + installTargets = [ "install" ]; meta = with stdenv.lib; { homepage = "https://www.mhonarc.org/"; @@ -15711,6 +15729,28 @@ let }; }; + SearchXapian = buildPerlPackage rec { + pname = "Search-Xapian"; + version = "1.2.25.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-${version}.tar.gz"; + sha256 = "0hpa8gi38j0ibq8af6dy69lm1bl5jnq76nsa69dbrzbr88l5m594"; + }; + patches = [ + (fetchpatch { + url = "https://git.xapian.org/?p=xapian;a=patch;h=69ad652b7ad7912801e686db2da55d73f79fbf75"; + name = "fix-automated-testing-false-negative"; + sha256 = "1241mpyf8mgx7szyl5sxa6wl388rzph3q51mn9v4yjbm0k5l0sxr"; + stripLen = 1; + }) + ]; + buildInputs = [ pkgs.xapian ExtUtilsMakeMaker DevelLeak ]; + meta = { + description = "Perl XS frontend to the Xapian C++ search library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + SerealDecoder = buildPerlPackage { pname = "Sereal-Decoder"; version = "4.007"; @@ -19209,7 +19249,7 @@ let sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 - NIX_CFLAGS_COMPILE = [ "-DHAS_VPRINTF" ]; + NIX_CFLAGS_COMPILE = "-DHAS_VPRINTF"; }; TextUnidecode = buildPerlPackage { @@ -19505,6 +19545,8 @@ let url = mirror://cpan/authors/id/G/GB/GBARR/TimeDate-2.30.tar.gz; sha256 = "11lf54akr9nbivqkjrhvkmfdgkbhw85sq0q4mak56n6bf542bgbm"; }; + # https://rt.cpan.org/Public/Bug/Display.html?id=124509 + patches = [ ../development/perl-modules/timedate-2020.patch ]; }; TimeDuration = buildPerlPackage { @@ -20296,7 +20338,7 @@ let AUTOMATED_TESTING = false; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; - NIX_CFLAGS_LINK = [ "-lxcb" "-lxcb-util" "-lxcb-xinerama" "-lxcb-icccm" ]; + NIX_CFLAGS_LINK = "-lxcb -lxcb-util -lxcb-xinerama -lxcb-icccm"; doCheck = false; # requires an X server meta = { description = "XCB bindings for X"; @@ -20573,7 +20615,7 @@ let }; propagatedBuildInputs = [ XMLParser XMLSAX ]; # Avoid creating perllocal.pod, which contains a timestamp - installTargets = "pure_install"; + installTargets = [ "pure_install" ]; meta = { description = "SAX Driver for Expat"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7beaa43adad..6adc4c837d5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -507,10 +507,10 @@ let }; protobuf = buildPecl { - version = "3.11.1"; + version = "3.11.2"; pname = "protobuf"; - sha256 = "1dv2hln2rifjlljry4b7qqx3gx68fm0a6nf66sh4ls2p9if1jzp2"; + sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; @@ -520,7 +520,6 @@ let ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; - broken = isPhp74; # Build error }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed66a20db53..ada5daa000b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -108,7 +108,7 @@ in { inherit buildSetupcfg; inherit (callPackage ../development/interpreters/python/hooks { }) - flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook wheelUnpackHook; + eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook wheelUnpackHook; # helpers @@ -268,6 +268,8 @@ in { azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; @@ -280,8 +282,16 @@ in { azure-graphrbac = callPackage ../development/python-modules/azure-graphrbac { }; + azure-identity = callPackage ../development/python-modules/azure-identity { }; + azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; + + azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; + + azure-keyvault-secrets = callPackage ../development/python-modules/azure-keyvault-secrets { }; + azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; @@ -466,6 +476,8 @@ in { bash_kernel = callPackage ../development/python-modules/bash_kernel { }; + bashlex = callPackage ../development/python-modules/bashlex { }; + bayespy = callPackage ../development/python-modules/bayespy { }; beanstalkc = callPackage ../development/python-modules/beanstalkc { }; @@ -532,12 +544,18 @@ in { cocotb = callPackage ../development/python-modules/cocotb { }; + compiledb = callPackage ../development/python-modules/compiledb { }; + connexion = callPackage ../development/python-modules/connexion { }; + coordinates = callPackage ../development/python-modules/coordinates { }; + cozy = callPackage ../development/python-modules/cozy { }; codespell = callPackage ../development/python-modules/codespell { }; + crc32c = callPackage ../development/python-modules/crc32c { }; + curio = callPackage ../development/python-modules/curio { }; dendropy = callPackage ../development/python-modules/dendropy { }; @@ -550,6 +568,8 @@ in { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; + databases = callPackage ../development/python-modules/databases { }; + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; datasette = callPackage ../development/python-modules/datasette { }; @@ -701,6 +721,8 @@ in { gumath = callPackage ../development/python-modules/gumath { }; + h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; @@ -717,8 +739,6 @@ in { helper = callPackage ../development/python-modules/helper { }; - histbook = callPackage ../development/python-modules/histbook { }; - hdmedians = callPackage ../development/python-modules/hdmedians { }; hocr-tools = callPackage ../development/python-modules/hocr-tools { }; @@ -741,6 +761,8 @@ in { i3ipc = callPackage ../development/python-modules/i3ipc { }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; + imutils = callPackage ../development/python-modules/imutils { }; inotify-simple = callPackage ../development/python-modules/inotify-simple { }; @@ -757,6 +779,8 @@ in { jira = callPackage ../development/python-modules/jira { }; + junitparser = callPackage ../development/python-modules/junitparser { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; kconfiglib = callPackage ../development/python-modules/kconfiglib { }; @@ -821,15 +845,22 @@ in { mpi = pkgs.openmpi; }; - msrestazure = callPackage ../development/python-modules/msrestazure { }; + msal = callPackage ../development/python-modules/msal { }; + + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + msrest = callPackage ../development/python-modules/msrest { }; + msrestazure = callPackage ../development/python-modules/msrestazure { }; + multiset = callPackage ../development/python-modules/multiset { }; mwclient = callPackage ../development/python-modules/mwclient { }; mwoauth = callPackage ../development/python-modules/mwoauth { }; + nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; nbsmoke = callPackage ../development/python-modules/nbsmoke { }; @@ -897,6 +928,8 @@ in { pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + pcpp = callPackage ../development/python-modules/pcpp { }; + pdf2image = callPackage ../development/python-modules/pdf2image { }; pdfminer = callPackage ../development/python-modules/pdfminer_six { }; @@ -993,6 +1026,8 @@ in { PyChromecast = callPackage ../development/python-modules/pychromecast { }; + pycm = callPackage ../development/python-modules/pycm { }; + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; @@ -1141,6 +1176,8 @@ in { slurm = pkgs.slurm; }; + pysmb = callPackage ../development/python-modules/pysmb { }; + pysmf = callPackage ../development/python-modules/pysmf { }; pyspinel = callPackage ../development/python-modules/pyspinel {}; @@ -1323,6 +1360,16 @@ in { snapcast = callPackage ../development/python-modules/snapcast { }; + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); + + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); + sparse = callPackage ../development/python-modules/sparse { }; spglib = callPackage ../development/python-modules/spglib { }; @@ -1454,16 +1501,22 @@ in { aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioresponses = callPackage ../development/python-modules/aioresponses { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; aiounifi = callPackage ../development/python-modules/aiounifi { }; + aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; ajpy = callPackage ../development/python-modules/ajpy { }; @@ -1553,6 +1606,8 @@ in { argcomplete = callPackage ../development/python-modules/argcomplete { }; + area = callPackage ../development/python-modules/area { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; chai = callPackage ../development/python-modules/chai { }; @@ -1639,6 +1694,8 @@ in { babelfish = callPackage ../development/python-modules/babelfish {}; + bandit = callPackage ../development/python-modules/bandit {}; + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; @@ -1702,6 +1759,10 @@ in { bumps = callPackage ../development/python-modules/bumps {}; + bx-python = callPackage ../development/python-modules/bx-python { + inherit (pkgs) zlib; + }; + cached-property = callPackage ../development/python-modules/cached-property { }; caffe = toPythonModule (pkgs.caffe.override { @@ -1797,11 +1858,13 @@ in { defusedxml = callPackage ../development/python-modules/defusedxml {}; + dodgy = callPackage ../development/python-modules/dodgy { }; + dugong = callPackage ../development/python-modules/dugong {}; easysnmp = callPackage ../development/python-modules/easysnmp { openssl = pkgs.openssl; - net_snmp = pkgs.net_snmp; + net-snmp = pkgs.net-snmp; }; iowait = callPackage ../development/python-modules/iowait {}; @@ -1940,6 +2003,8 @@ in { certifi = callPackage ../development/python-modules/certifi { }; + certipy = callPackage ../development/python-modules/certipy {}; + characteristic = callPackage ../development/python-modules/characteristic { }; chart-studio = callPackage ../development/python-modules/chart-studio { }; @@ -2151,6 +2216,8 @@ in { pyjet = callPackage ../development/python-modules/pyjet {}; + pyjks = callPackage ../development/python-modules/pyjks {}; + PyLD = callPackage ../development/python-modules/PyLD { }; python-jose = callPackage ../development/python-modules/python-jose {}; @@ -2596,6 +2663,8 @@ in { then callPackage ../development/python-modules/gurobipy/linux.nix {} else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; hiro = callPackage ../development/python-modules/hiro {}; @@ -2612,10 +2681,14 @@ in { hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + hstspreload = callPackage ../development/python-modules/hstspreload { }; + htmlmin = callPackage ../development/python-modules/htmlmin {}; httpauth = callPackage ../development/python-modules/httpauth { }; + httpx = callPackage ../development/python-modules/httpx { }; + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; identify = callPackage ../development/python-modules/identify { }; @@ -2803,6 +2876,10 @@ in { oset = callPackage ../development/python-modules/oset { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; + + oyaml = callPackage ../development/python-modules/oyaml { }; + pamela = callPackage ../development/python-modules/pamela { }; paperspace = callPackage ../development/python-modules/paperspace { }; @@ -2912,6 +2989,8 @@ in { inherit (pkgs) meson pkgconfig; }; + python-lzf = callPackage ../development/python-modules/python-lzf { }; + pyramid = callPackage ../development/python-modules/pyramid { }; pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; @@ -2938,6 +3017,10 @@ in { python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; + python-lzo = callPackage ../development/python-modules/python-lzo { + inherit (pkgs) lzo; + }; + junos-eznc = callPackage ../development/python-modules/junos-eznc {}; raven = callPackage ../development/python-modules/raven { }; @@ -3134,18 +3217,24 @@ in { django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + + django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; - django-storages = callPackage ../development/python-modules/django-storages { }; - - django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; + django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; django-sites = callPackage ../development/python-modules/django-sites { }; django-sr = callPackage ../development/python-modules/django-sr { }; + django-storages = callPackage ../development/python-modules/django-storages { }; + + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; django_tagging = callPackage ../development/python-modules/django_tagging { }; @@ -3357,6 +3446,8 @@ in { flask-swagger = callPackage ../development/python-modules/flask-swagger { }; + flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; flask_wtf = callPackage ../development/python-modules/flask-wtf { }; @@ -3366,7 +3457,7 @@ in { wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkgconfig; + inherit (pkgs) pkg-config; }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -3695,8 +3786,10 @@ in { ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - ipython = if pythonOlder "3.5" then + ipython = if isPy27 then callPackage ../development/python-modules/ipython/5.nix { } + else if isPy35 then + callPackage ../development/python-modules/ipython/7.9.nix { } else callPackage ../development/python-modules/ipython { }; @@ -3968,7 +4061,8 @@ in { matrix-nio = callPackage ../development/python-modules/matrix-nio { }; - mautrix-appservice = callPackage ../development/python-modules/mautrix-appservice { }; + mautrix = callPackage ../development/python-modules/mautrix { }; + mautrix-appservice = self.mautrix; # alias 2019-12-28 maya = callPackage ../development/python-modules/maya { }; @@ -4147,6 +4241,8 @@ in { nameparser = callPackage ../development/python-modules/nameparser { }; + names = callPackage ../development/python-modules/names { }; + nbconvert = callPackage ../development/python-modules/nbconvert { }; nbformat = callPackage ../development/python-modules/nbformat { }; @@ -4220,6 +4316,8 @@ in { notebook = if isPy3k then callPackage ../development/python-modules/notebook { } else callPackage ../development/python-modules/notebook/2.nix { }; + notedown = callPackage ../development/python-modules/notedown { }; + notify = callPackage ../development/python-modules/notify { }; notify2 = callPackage ../development/python-modules/notify2 {}; @@ -4234,7 +4332,9 @@ in { numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { }; + numcodecs = callPackage ../development/python-modules/numcodecs { + inherit (pkgs) gcc8; + }; numexpr = callPackage ../development/python-modules/numexpr { }; @@ -4300,6 +4400,8 @@ in { orderedset = callPackage ../development/python-modules/orderedset { }; + python-multipart = callPackage ../development/python-modules/python-multipart { }; + python-otr = callPackage ../development/python-modules/python-otr { }; plone-testing = callPackage ../development/python-modules/plone-testing { }; @@ -4314,7 +4416,19 @@ in { rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - cachetools = callPackage ../development/python-modules/cachetools {}; + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools {}; + cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + + }); + in if isPy3k then cachetools' else cachetools_2; + + cma = callPackage ../development/python-modules/cma { }; cmd2 = callPackage ../development/python-modules/cmd2 {}; @@ -4348,6 +4462,8 @@ in { fasteners = callPackage ../development/python-modules/fasteners { }; + aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + aioeventlet = callPackage ../development/python-modules/aioeventlet { }; aiokafka = callPackage ../development/python-modules/aiokafka { }; @@ -4496,6 +4612,12 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + prox-tv = callPackage ../development/python-modules/prox-tv { + # We need to use blas instead of openblas on darwin, + # see https://github.com/NixOS/nixpkgs/pull/45013. + useOpenblas = ! stdenv.isDarwin; + }; + pvlib = callPackage ../development/python-modules/pvlib { }; pybase64 = callPackage ../development/python-modules/pybase64 { }; @@ -4699,6 +4821,8 @@ in { pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pysha3 = callPackage ../development/python-modules/pysha3 { }; @@ -4895,7 +5019,16 @@ in { pywinrm = callPackage ../development/python-modules/pywinrm { }; - pyxattr = callPackage ../development/python-modules/pyxattr { }; + pyxattr = let + pyxattr' = callPackage ../development/python-modules/pyxattr { }; + pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + version = "0.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + }; + }); + in if isPy3k then pyxattr' else pyxattr_2; pyamg = callPackage ../development/python-modules/pyamg { }; @@ -5000,6 +5133,8 @@ in { repocheck = callPackage ../development/python-modules/repocheck { }; + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + restview = callPackage ../development/python-modules/restview { }; readme = callPackage ../development/python-modules/readme { }; @@ -5040,6 +5175,8 @@ in { requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; + resampy = callPackage ../development/python-modules/resampy { }; restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; @@ -5100,6 +5237,8 @@ in { typesentry = callPackage ../development/python-modules/typesentry { }; + typesystem = callPackage ../development/python-modules/typesystem { }; + s3transfer = callPackage ../development/python-modules/s3transfer { }; seqdiag = callPackage ../development/python-modules/seqdiag { }; @@ -5166,6 +5305,8 @@ in { shippai = callPackage ../development/python-modules/shippai {}; + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; + simanneal = callPackage ../development/python-modules/simanneal { }; simplegeneric = callPackage ../development/python-modules/simplegeneric { }; @@ -5184,8 +5325,14 @@ in { slimit = callPackage ../development/python-modules/slimit { }; + snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; + + snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + snitun = callPackage ../development/python-modules/snitun { }; + snscrape = callPackage ../development/python-modules/snscrape { }; snug = callPackage ../development/python-modules/snug { }; @@ -5316,6 +5463,8 @@ in { inherit (pkgs) tiledb; }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; + tiros = callPackage ../development/python-modules/tiros { }; tinydb = callPackage ../development/python-modules/tinydb { }; @@ -5356,6 +5505,10 @@ in { uarray = callPackage ../development/python-modules/uarray { }; + ueberzug = callPackage ../development/python-modules/ueberzug { + inherit (pkgs.xorg) libX11 libXext; + }; + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; umap-learn = callPackage ../development/python-modules/umap-learn { }; @@ -5671,6 +5824,10 @@ in { sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; + sphinxcontrib-tikz = callPackage ../development/python-modules/sphinxcontrib-tikz { + texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; + }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; Pweave = callPackage ../development/python-modules/pweave { }; @@ -6065,6 +6222,8 @@ in { ofxtools = callPackage ../development/python-modules/ofxtools { }; + orm = callPackage ../development/python-modules/orm { }; + basemap = callPackage ../development/python-modules/basemap { }; dict2xml = callPackage ../development/python-modules/dict2xml { }; @@ -6147,6 +6306,8 @@ in { xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + xmodem = callPackage ../development/python-modules/xmodem {}; + xmpppy = callPackage ../development/python-modules/xmpppy {}; xstatic = callPackage ../development/python-modules/xstatic {}; @@ -6211,6 +6372,8 @@ in { pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; @@ -6316,6 +6479,8 @@ in { jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + javaproperties = callPackage ../development/python-modules/javaproperties { }; tempora= callPackage ../development/python-modules/tempora { }; @@ -6387,12 +6552,16 @@ in { twilio = callPackage ../development/python-modules/twilio { }; + twofish = callPackage ../development/python-modules/twofish { }; + uranium = callPackage ../development/python-modules/uranium { }; uuid = callPackage ../development/python-modules/uuid { }; versioneer = callPackage ../development/python-modules/versioneer { }; + viewstate = callPackage ../development/python-modules/viewstate { }; + vine = callPackage ../development/python-modules/vine { }; visitor = callPackage ../development/python-modules/visitor { }; @@ -6482,6 +6651,10 @@ in { pysensors = callPackage ../development/python-modules/pysensors { }; + python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + + pysnooper = callPackage ../development/python-modules/pysnooper { }; + sseclient = callPackage ../development/python-modules/sseclient { }; warrant = callPackage ../development/python-modules/warrant { }; @@ -6636,6 +6809,8 @@ in { webrtcvad = callPackage ../development/python-modules/webrtcvad { }; + wfuzz = callPackage ../development/python-modules/wfuzz { }; + wget = callPackage ../development/python-modules/wget { }; runway-python = callPackage ../development/python-modules/runway-python { }; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 003fb9c4fff..5e392ff1b88 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -135,6 +135,11 @@ in /* Linux on the fuloong */ fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon; + /* Javacript */ + ghcjs = mapTestOnCross lib.systems.examples.ghcjs { + haskell.packages.ghcjs.hello = nativePlatforms; + }; + /* Linux on Raspberrypi */ rpi = mapTestOnCross lib.systems.examples.raspberryPi rpiCommon; rpi-musl = mapTestOnCross lib.systems.examples.muslpi rpiCommon; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f832268899d..7060fea588a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -46,7 +46,7 @@ let jobs.go.x86_64-darwin jobs.mariadb.x86_64-darwin jobs.nix.x86_64-darwin - jobs.nox.x86_64-darwin + jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin jobs.nix-info-tested.x86_64-darwin jobs.openssh.x86_64-darwin @@ -60,6 +60,7 @@ let jobs.stack.x86_64-darwin jobs.stdenv.x86_64-darwin jobs.vim.x86_64-darwin + jobs.cachix.x86_64-darwin # UI apps # jobs.firefox-unwrapped.x86_64-darwin @@ -97,14 +98,15 @@ let jobs.pandoc.x86_64-linux jobs.python.x86_64-linux jobs.python3.x86_64-linux - # Needed by travis-ci to test PRs - jobs.nox.x86_64-linux + # Needed by contributors to test PRs (by inclusion of the PR template) + jobs.nixpkgs-review.x86_64-linux # Needed for support jobs.nix-info.x86_64-linux jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. jobs.thunderbird.x86_64-linux jobs.unar.x86_64-linux + jobs.cachix.x86_64-linux /* jobs.tests.cc-wrapper.x86_64-linux @@ -134,7 +136,7 @@ let jobs.stdenv.x86_64-darwin jobs.python.x86_64-darwin jobs.python3.x86_64-darwin - jobs.nox.x86_64-darwin + jobs.nixpkgs-review.x86_64-darwin jobs.nix-info.x86_64-darwin jobs.nix-info-tested.x86_64-darwin jobs.git.x86_64-darwin diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 687086b6ed3..40673426136 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -55,7 +55,7 @@ self: super: let removeUnknownConfigureFlags = f: with self.lib; remove "--disable-shared" (remove "--enable-static" f); - + ocamlFixPackage = b: b.overrideAttrs (o: { configurePlatforms = [ ]; @@ -63,7 +63,7 @@ self: super: let buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ]; propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; }); - + ocamlStaticAdapter = _: super: self.lib.mapAttrs (_: p: if p ? overrideAttrs then ocamlFixPackage p else p) @@ -143,6 +143,9 @@ in { static = true; shared = false; }; + fmt = super.fmt.override { + enableShared = false; + }; gifsicle = super.gifsicle.override { static = true; }; @@ -152,7 +155,11 @@ in { optipng = super.optipng.override { static = true; }; - openblas = super.openblas.override { enableStatic = true; }; + openblas = super.openblas.override { + enableStatic = true; + enableShared = false; + }; + mkl = super.mkl.override { enableStatic = true; }; nix = super.nix.override { withAWS = false; }; # openssl 1.1 doesn't compile openssl = super.openssl_1_0_2.override { @@ -162,6 +169,10 @@ in { # --disable-shared flag stdenv = super.stdenv; }; + arrow-cpp = super.arrow-cpp.override { + enableShared = false; + python = { pkgs = { python = null; numpy = null; }; }; + }; boost = super.boost.override { enableStatic = true; enableShared = false; @@ -170,9 +181,25 @@ in { # --disable-shared flag stdenv = super.stdenv; }; + thrift = super.thrift.override { + static = true; + twisted = null; + }; + double-conversion = super.double-conversion.override { + static = true; + }; gmp = super.gmp.override { withStatic = true; }; + gflags = super.gflags.override { + enableShared = false; + }; + glog = super.glog.override { + static = true; + }; + gtest = super.gtest.override { + static = true; + }; cdo = super.cdo.override { enable_all_static = true; }; @@ -191,6 +218,12 @@ in { # it doesn’t like the --disable-shared flag stdenv = super.stdenv; }; + woff2 = super.woff2.override { + static = true; + }; + snappy = super.snappy.override { + static = true; + }; lz4 = super.lz4.override { enableShared = false; enableStatic = true; @@ -209,7 +242,7 @@ in { kmod = super.kmod.override { withStatic = true; }; - + curl = super.curl.override { # a very sad story: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 gssSupport = false; @@ -223,6 +256,10 @@ in { staticOnly = true; }; + zstd = super.zstd.override { + enableShared = false; + }; + llvmPackages_8 = super.llvmPackages_8 // { libraries = super.llvmPackages_8.libraries // rec { libcxxabi = super.llvmPackages_8.libraries.libcxxabi.override { @@ -241,6 +278,6 @@ in { ocaml-ng = self.lib.mapAttrs (_: set: if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - + python27 = super.python27.override { static = true; }; } |