diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:01:13 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-02-20 04:02:05 +0000 |
| commit | 515d3cfa24df96c9e134ac5b87c2396f81354551 (patch) | |
| tree | 5e67ec19079d3b44ada0c0ac88ccd411ac22070f /pkgs/applications | |
| parent | 372bd003cd2d95a181ccd069322d2229f72acd8a (diff) | |
| parent | 7bdc103ac8424e08f02f6e9344979d0a821caa62 (diff) | |
| download | nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.gz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.bz2 nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.lz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.xz nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.tar.zst nixpkgs-515d3cfa24df96c9e134ac5b87c2396f81354551.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications')
263 files changed, 7279 insertions, 2948 deletions
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 3e03cf2da73..ebd0a7a44a6 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj"; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index b926ff09d22..d3399315376 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.11"; + version = "0.9.12"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7"; + sha256 = "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index fdfca08c0b0..a159ca7f685 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "elisa"; - version = "19.12.0"; + version = "19.12.2"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac"; + sha256 = "0g6zj4ix97aa529w43v1z3n73b8l5di6gscs40hyx4sl1sb7fdh6"; }; buildInputs = [ vlc ]; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 21cd3fbdb25..74a5f4d383d 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -3,25 +3,30 @@ , fetchFromGitHub , makeWrapper , pkgconfig +, cmake , llvm , emscripten , openssl , libsndfile , libmicrohttpd +, gnutls +, libtasn1 +, p11-kit , vim +, which }: with stdenv.lib.strings; let - version = "2.5.23"; + version = "2.20.2"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; + sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy"; fetchSubmodules = true; }; @@ -40,8 +45,8 @@ let inherit src; - nativeBuildInputs = [ makeWrapper pkgconfig vim ]; - buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ]; + nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { @@ -50,39 +55,13 @@ let preConfigure = '' - makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix - - # The makefile sets LLVM_<version> depending on the current llvm - # version, but the detection code is quite brittle. - # - # Failing to properly detect the llvm version means that the macro - # LLVM_VERSION ends up being the raw output of `llvm-config --version`, while - # the code assumes that it's set to a symbol like `LLVM_35`. Two problems result: - # * <command-line>:0:1: error: macro names must be identifiers.; and - # * a bunch of undefined reference errors due to conditional definitions relying on - # LLVM_XY being defined. - # - # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION - # to something the makefile will recognize. - sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix + cd build ''; - postPatch = '' - # fix build with llvm 5.0.2 by adding it to the list of known versions - # TODO: check if still needed on next update - substituteInPlace compiler/Makefile.unix \ - --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2" + cmakeFlags = '' + -C ../backends/all.cmake -C ../targets/all.cmake .. ''; - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. postInstall = '' # syntax error when eval'd directly pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" @@ -90,10 +69,6 @@ let ''; postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - # The 'faustoptflags' is 'source'd into other faust scripts and # not used as an executable, so patch 'uname' usage directly # rather than use makeWrapper. @@ -160,8 +135,6 @@ let # 'faustoptflags' to absolute paths. for script in "$out"/bin/*; do substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \ --replace " error " "echo" done ''; @@ -200,19 +173,22 @@ let propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; + libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs; postFixup = '' # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ + --set FAUSTLDDIR "${faust}/lib" \ --set FAUSTLIB "${faust}/share/faust" \ - --set FAUST_LIB_PATH "${faust}/share/faust" \ --set FAUSTINC "${faust}/include/faust" \ + --set FAUSTARCH "${faust}/share/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" + --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ + --prefix LIBRARY_PATH $libPath done ''; }); diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 7762ca39369..f032f435a35 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,6 +1,7 @@ { faust , gtk2 , jack2Full +, alsaLib , opencv , libsndfile }: @@ -18,6 +19,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ gtk2 jack2Full + alsaLib opencv libsndfile ]; diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix new file mode 100644 index 00000000000..2562237424e --- /dev/null +++ b/pkgs/applications/audio/faust/faust2jackrust.nix @@ -0,0 +1,18 @@ +{ stdenv +, faust +, libjack2 +, cargo +, binutils +, gcc +, gnumake +, openssl +, pkgconfig + +}: + +faust.wrapWithBuildEnv { + + baseName = "faust2jackrust"; + + propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ]; +} diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 7a44ebe6769..47945de7833 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0"; }; - cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q"; + cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd"; nativeBuildInputs = [ meson diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index b51b72f1c8a..332f2ca2342 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,14 +1,15 @@ -{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype +{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: let - version = "4.6.1"; + version = "4.7.1"; deps = [ alsaLib atk + at-spi2-atk cairo cups dbus @@ -48,7 +49,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g"; + sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r"; }; dontBuild = true; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 7f86e2c2071..bc508f92e3b 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ]; + # Somehow this does not get set automatically + cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ]; + meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; homepage = http://milkytracker.org; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 2df54fa7fb4..c1c8bb964e4 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook +{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook , gst_all_1, glib-networking, gobject-introspection }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy"; - version = "2.3.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj"; + sha256 = "0fpjprjw143ixak68iwxjpscdjgyb7rsr1cxj7fsdrw6hc83nq4z"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { glib-networking gobject-introspection ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 pykka tornado_4 requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 88cdde2ceb2..6d9147a7f5d 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,18 +1,17 @@ -{ stdenv, pythonPackages, mopidy, mopidy-local-images }: +{ stdenv, python3Packages, mopidy, mopidy-local-images }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.43.0"; + version = "3.44.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05"; + sha256 = "0gap0cyw6sfb4487i1x220rr9fbsz6xyw68l15ar0vfll0zv0760"; }; propagatedBuildInputs = [ mopidy - mopidy-local-images - ] ++ (with pythonPackages; [ + ] ++ (with python3Packages; [ configobj requests tornado_4 diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 483852455aa..a01bf6c80d3 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pythonPackages, mopidy }: +{ stdenv, fetchurl, python3Packages, mopidy }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "3.1.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz"; - sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl"; + sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; }; - propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; + propagatedBuildInputs = [ mopidy python3Packages.pyspotify ]; doCheck = false; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 136f6fc1427..0d8fd8e2637 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m"; + sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k"; }; - cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh"; + cargoSha256 = "0081wc3xw11hivz0nwy4my3y4a53ch857bq989dr0pm9p2pirvj1"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b40ab6d4f7a..d6cf17c159f 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.2.3"; + version = "2.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16"; + sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix new file mode 100644 index 00000000000..fb2b3063276 --- /dev/null +++ b/pkgs/applications/audio/r128gain/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, substituteAll +, ffmpeg +, python3Packages +, sox +}: + +python3Packages.buildPythonApplication rec { + pname = "r128gain"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "desbma"; + repo = "r128gain"; + rev = version; + sha256 = "0fnxis2g7mw8mb0cz9bws909lrndli7ml54nnzda49vc2fhbjwxr"; + }; + + patches = [ + ( + substituteAll { + src = ./ffmpeg-location.patch; + inherit ffmpeg; + } + ) + ]; + + propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; + checkInputs = with python3Packages; [ requests sox ]; + + # Testing downloads media files for testing, which requires the + # sandbox to be disabled. + doCheck = false; + + meta = with lib; { + description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; + homepage = "https://github.com/desbma/r128gain"; + license = licenses.lgpl2Plus; + maintainers = [ maintainers.AluisioASG ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/applications/audio/r128gain/ffmpeg-location.patch new file mode 100644 index 00000000000..ff118024011 --- /dev/null +++ b/pkgs/applications/audio/r128gain/ffmpeg-location.patch @@ -0,0 +1,31 @@ +diff --git i/r128gain/__init__.py w/r128gain/__init__.py +index 53fc3ef..f144e15 100755 +--- i/r128gain/__init__.py ++++ w/r128gain/__init__.py +@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None): + Example: 0x3040100 for FFmpeg 3.4.1 + """ + r = collections.OrderedDict() +- cmd = (ffmpeg_path or "ffmpeg", "-version") ++ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version") + output = subprocess.run(cmd, + check=True, + stdout=subprocess.PIPE, +@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin + os.devnull, + **additional_ffmpeg_args, + f="null"), +- cmd=ffmpeg_path or "ffmpeg") ++ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg") + + # run + logger().debug(cmd_to_string(cmd)) +@@ -740,7 +740,7 @@ def cl_main(): + help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count") + arg_parser.add_argument("-f", + "--ffmpeg-path", +- default=shutil.which("ffmpeg"), ++ default="@ffmpeg@/bin/ffmpeg", + help="""Full file path of ffmpeg executable (only needed if not in PATH). + If not specified, autodetect""") + arg_parser.add_argument("-d", diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index e32fd42af32..140b163e25c 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -1,39 +1,49 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, flac, sox }: +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, installShellFiles +, flac +, sox +, withAucdtect ? false +, aucdtect ? null +}: stdenv.mkDerivation rec { pname = "redoflacs"; - version = "0.30.20150202"; + version = "0.30.20190903"; src = fetchFromGitHub { - owner = "sirjaren"; - repo = "redoflacs"; - rev = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735"; - sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j"; + owner = "sirjaren"; + repo = "redoflacs"; + rev = "4ca544cbc075d0865884906208cb2b8bc318cf9e"; + sha256 = "19lcl09d4ngz2zzwd8dnnxx41ddvznhar6ggrlf1xvkr5gd7lafp"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; installPhase = '' runHook preInstall install -Dm755 -t $out/bin redoflacs install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md + installManPage redoflacs.1 runHook postInstall ''; postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]} + --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger"; - homepage = src.meta.homepage; - license = licenses.gpl2; - platforms = platforms.all; + homepage = src.meta.homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 2ba9d4f50c3..54f8fe4c9ad 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.9"; + name = "snd-20.0"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys"; + sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index ac72a26b0ee..534ea135880 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -105,5 +105,7 @@ mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; platforms = lib.platforms.linux; + # sonic-pi depends on ruby 2.4 which we don't support anymore + broken = true; }; } diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 6164c1cfe93..d1c981de2d5 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -2,21 +2,23 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, redland -, qmake, rubberband, serd, sord, vampSDK, fftwFloat +, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, rubberband, serd, sord, vampSDK, fftwFloat +, capnproto, liboggz, libfishsound, libid3tag, opusfile +, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "2.4.1"; + version = "4.0.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz"; - sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; + sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -26,23 +28,22 @@ stdenv.mkDerivation rec { libpulseaudio libmad libogg # ? - # fishsound + libfishsound liblo libX11 + capnproto + liboggz + libid3tag + opusfile ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - configurePhase = '' - for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake PREFIX=$out && cd ..; - done - ''; + enableParallelBuilding = true; - installPhase = '' - mkdir -p $out/{bin,share/sonic-visualiser} - cp sonic-visualiser $out/bin/ - cp -r samples $out/share/sonic-visualiser/ + # comment out the tests + preConfigure = '' + sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; meta = with stdenv.lib; { @@ -51,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; - broken = true; }; } diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index fc630e78078..db54055def4 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "0gp7xb63icraqg7f0j91q474acph3ligzak2k8qqr9cqbgg509f4"; + sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h"; }; - cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2"; + cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux libxcb + ++ stdenv.lib.optional stdenv.isLinux libxcb ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 30cedfa8bb8..263fe986df3 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8"; }; - cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib"; + cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n"; cargoBuildFlags = [ "--no-default-features" diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 4648c9b5ab3..ce0153e9f26 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,38 +1,70 @@ -{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, makeWrapper, mpg123 }: +{ stdenv, fetchFromGitHub +, alsaLib, flac, libmad, libvorbis, mpg123 +, dsdSupport ? true +, faad2Support ? true, faad2 +, ffmpegSupport ? true, ffmpeg +, opusSupport ? true, opusfile +, resampleSupport ? true, soxr +, sslSupport ? true, openssl +}: let - runtimeDeps = [ faad2 flac libmad libvorbis mpg123 ]; - rpath = stdenv.lib.makeLibraryPath runtimeDeps; + concatStringsSep = stdenv.lib.concatStringsSep; + optional = stdenv.lib.optional; + opts = [ "-DLINKALL" ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL"; + in stdenv.mkDerivation { - name = "squeezelite-git-2018-08-14"; + pname = "squeezelite"; + + # versions are specified in `squeezelite.h` + # see https://github.com/ralph-irving/squeezelite/issues/29 + version = "1.9.6.1196"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b"; - sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh"; + rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0"; + sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; }; - buildInputs = [ alsaLib ] ++ runtimeDeps; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ alsaLib flac libmad libvorbis mpg123 ] + ++ optional faad2Support faad2 + ++ optional ffmpegSupport ffmpeg + ++ optional opusSupport opusfile + ++ optional resampleSupport soxr + ++ optional sslSupport openssl; enableParallelBuilding = true; + postPatch = '' + substituteInPlace opus.c \ + --replace "<opusfile.h>" "<opus/opusfile.h>" + ''; + + preBuild = '' + export OPTS="${concatStringsSep " " opts}" + ''; + installPhase = '' runHook preInstall install -Dm755 -t $out/bin squeezelite install -Dm644 -t $out/share/doc/squeezelite *.txt *.md - wrapProgram $out/bin/squeezelite --set LD_LIBRARY_PATH $RPATH runHook postInstall ''; meta = with stdenv.lib; { description = "Lightweight headless squeezebox client emulator"; homepage = https://github.com/ralph-irving/squeezelite; - license = licenses.gpl3; + license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; + maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; }; - RPATH = rpath; } diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index f6c9fee7a1c..0add60cc19e 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.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a"; + sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix index 5bc81a6daf6..ad574c82b46 100644 --- a/pkgs/applications/blockchains/ethabi.nix +++ b/pkgs/applications/blockchains/ethabi.nix @@ -1,10 +1,8 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "ethabi"; - version = "7.0.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "paritytech"; @@ -13,13 +11,11 @@ buildRustPackage rec { sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4"; }; - cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm"; - - cargoBuildFlags = ["--features cli"]; + cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm"; meta = with stdenv.lib; { description = "Ethereum function call encoding (ABI) utility"; - homepage = https://github.com/ethcore/ethabi/; + homepage = "https://github.com/ethcore/ethabi/"; maintainers = [ maintainers.dbrock ]; license = licenses.gpl3; inherit version; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index bc354a5213e..758673229af 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,29 +1,30 @@ { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, -cups, vivaldi-ffmpeg-codecs, libpulseaudio }: +cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "19.5.24"; + version = "20.1.30"; src = fetchurl { - url = "https://exodusbin.azureedge.net/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1yx296i525qmpqh8f2vax7igffg826nr8cyq1l0if35374bdsqdw"; + url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; + sha256 = "0jns5zqjm0gqn18ypghbgk6gb713mh7p44ax1r8y4vcwijlp5nql"; }; sourceRoot = "."; unpackCmd = '' - ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" + ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" ''; installPhase = '' - mkdir -p $out/bin $out/share/applications - cd Exodus-linux-x64 - cp -r . $out - ln -s $out/Exodus $out/bin/Exodus - ln -s $out/exodus.desktop $out/share/applications - substituteInPlace $out/share/applications/exodus.desktop \ - --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" + mkdir -p $out/bin $out/share/applications + cd Exodus-linux-x64 + cp -r . $out + ln -s $out/Exodus $out/bin/Exodus + ln -s $out/bin/Exodus $out/bin/exodus + ln -s $out/exodus.desktop $out/share/applications + substituteInPlace $out/share/applications/exodus.desktop \ + --replace 'Exec=bash -c "cd `dirname %k` && ./Exodus"' "Exec=Exodus" ''; dontPatchELF = true; @@ -31,35 +32,36 @@ stdenv.mkDerivation rec { preFixup = let libPath = lib.makeLibraryPath [ - glib - nss - nspr - gtk3-x11 - gnome2.pango - atk - cairo - gdk-pixbuf - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - xorg_sys_opengl - utillinux - xorg.libXrandr - xorg.libXScrnSaver - alsaLib - dbus.lib - at-spi2-atk - cups.lib - libpulseaudio - systemd - vivaldi-ffmpeg-codecs + glib + nss + nspr + gtk3-x11 + gnome2.pango + atk + cairo + gdk-pixbuf + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + xorg_sys_opengl + utillinux + xorg.libXrandr + xorg.libXScrnSaver + alsaLib + dbus.lib + at-spi2-atk + at-spi2-core + cups.lib + libpulseaudio + systemd + vivaldi-ffmpeg-codecs ]; in '' patchelf \ diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index fd18b3fa399..dd45746c8df 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.8.1-beta"; + version = "0.9.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb"; + sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; }; - modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787"; + modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix index 7f28d97bf81..6937d6efb09 100644 --- a/pkgs/applications/blockchains/parity/parity.nix +++ b/pkgs/applications/blockchains/parity/parity.nix @@ -17,6 +17,9 @@ rustPlatform.buildRustPackage { pname = "parity"; inherit version; inherit cargoSha256; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + src = fetchFromGitHub { owner = "paritytech"; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index b50b14258cc..cf83be9b50d 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq"; buildInputs = [ pkgconfig openssl openssl.dev ]; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 31703f8fb2a..5032594468e 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1"; installPhase = '' diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 31d0806df8a..e4248e32447 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -3,17 +3,19 @@ rustPlatform.buildRustPackage rec { pname = "amp"; - # The latest release (0.5.2) does not compile, so we use a git snapshot instead. - version = "unstable-2019-06-09"; + version = "0.6.1"; src = fetchFromGitHub { owner = "jmacdonald"; repo = pname; - rev = "2c88e82a88ada8a5fd2620ef225192395a4533a2"; - sha256 = "0ha1xiabq31s687gkrnszf3zc7b3sfdl79iyg5ygbc49mzvarp8c"; + rev = version; + sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j"; }; - cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + + cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 60d00b7fbc7..414e205b9a9 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg"; }; betaVersion = { - version = "3.6.0.19"; # "Android Studio 3.6 RC 2" - build = "192.6165589"; - sha256Hash = "1d47nfhzb0apfzin4bg5bck4jjid3jipm5s4n36r7fh20lpx93z5"; + version = "3.6.0.20"; # "Android Studio 3.6 RC 3" + build = "192.6186006"; + sha256Hash = "153piq67yps5jwqrbciam4kpxziavml29d8ya5bi2rvfhipdd7da"; }; latestVersion = { # canary & dev version = "4.0.0.9"; # "Android Studio 4.0 Canary 9" diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch new file mode 100644 index 00000000000..94c70da276c --- /dev/null +++ b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch @@ -0,0 +1,8 @@ +diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt +index 4909ff1..02fa145 100644 +--- a/src/she/CMakeLists.txt ++++ b/src/she/CMakeLists.txt +@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) + add_definitions(-DUSE_MOUSE_POLLER) ++ add_definitions(-DALLEGRO_NO_FIX_ALIASES) + endif() diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 170fde7b9ca..6e6d7db8177 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -6,12 +6,16 @@ , cmark }: +# Unfree version is not redistributable: +# https://dev.aseprite.org/2016/09/01/new-source-code-license/ +# Consider supporting the developer: https://aseprite.org/#buy + let skia = callPackage ./skia.nix {}; in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.11" else "1.1.7"; + version = if unfree then "1.2.16.3" else "1.1.7"; src = fetchFromGitHub { owner = "aseprite"; @@ -19,7 +23,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; fetchSubmodules = true; sha256 = if unfree - then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8" + then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; }; @@ -36,7 +40,9 @@ stdenv.mkDerivation rec { skia libGL ]; - patches = lib.optionals unfree [ + patches = if !unfree then [ + ./allegro-glibc-2.30.patch + ] else [ (fetchpatch { url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index 8bf2adf484e..c89ebd4ad0c 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja -, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib +, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib , mesa, libX11 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ python2 gn ninja ]; buildInputs = [ - fontconfig expat icu58 libjpeg libpng libwebp zlib + fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib mesa libX11 ]; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index eee5a696555..48cd58570f8 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage { sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf"; }; - cargoSha256 = "0qa8ypp5a7sf1gic482zh3i6s94w6k6bgmk5ynfvwi7g49ql7c4z"; - verifyCargoDeps = true; + cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3"; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 83dff4a4f29..1db952cf1a5 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1lj5i71nw2m9xwv6q48b86kipiwj927bxiwxppb4isqax2w6250d"; /* updated by script */ + sha256 = "0namvc8dfm562dgvs4mrv1c6lyi4j8yxw402fkw55l0xqv3ff0a9"; /* 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.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "09vicd2czag07f2f7dy0mmcvz5kryv659m32zm9rlsr4nai1i3y3"; /* updated by script */ + sha256 = "15rs866fp4lrsqdk13fnbg7ncdfrhky1m5sl90p32v45j90hagrg"; /* 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.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "09lgdd7gkx94warjc7wah9w7s9lj81law8clavjjyjas8bhhf1hz"; /* updated by script */ + sha256 = "034aq5lf64apc152xr0889hg2xak2if9n5xl6zvd3f9q9srhivxn"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "06dzqjsq6jqgv8askzskm0bllzm9i8rzmhkjsv4na2phvdxf6qi2"; /* updated by script */ + sha256 = "0ly3cdzm4hp4qchdadjmbd39jnqpmpnlk6vgp8s4amsv35b6hydd"; /* 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.3.2"; /* updated by script */ + version = "2019.3.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1zp64pnzz2jy232g8fgkqmn34afbhbkkhgyb9z1v1qfb533p39ig"; /* updated by script */ + sha256 = "1305zvb5n2zqnny4l50qfv7jd1sj4ffhrig4rpfiqg65ncfpypwb"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.3.1"; /* updated by script */ + version = "2019.3.2"; /* 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 = "0xadjx4szd9rk3bl3fqzhnfq744gmkbz9li80j5rqm27qhf4axfx"; /* updated by script */ + sha256 = "0mwzhvrhvsyb8r7sjcigv9jazim1zyipb3ym4xsd2gyl3ans2vm9"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index 811284491dd..dc8eb200fff 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "manuskript"; - version = "0.10.0"; + version = "0.11.0"; format = "other"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { repo = pname; owner = "olivierkes"; rev = version; - sha256 = "0q413vym7hzjpyg3krj5y63hwpncdifjkyswqmr76zg5yqnklnh3"; + sha256 = "1l6l9k6k69yv8xqpll0zv9cwdqqg4zvxy90l6sx5nv2yywh5crla"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix index 2c36be1c21b..692b82dc688 100644 --- a/pkgs/applications/editors/mle/default.nix +++ b/pkgs/applications/editors/mle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mle"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; rev = "v${version}"; - sha256 = "053zvxkjx2zwq6lwkycirxz1m9sjc3zi9ic8fvp3mjvbqfri1y3x"; + sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1"; }; # Fix location of Lua 5.3 header and library diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index 764d7004940..a9b2abd0cb3 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2"; buildInputs = [ gtk webkitgtk ]; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index aae37b5a262..c77cfd9c2b6 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -14,7 +14,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "0jlw0qksak4bdzddpsj74pm2f2bgpj3cwrlspdjjy0j9qzg0mpl9"; }; - propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; + propagatedBuildInputs = with pythonPackages; [ + pynvim + psutil + setuptools + ]; meta = { description = "A tool that helps controlling nvim processes from a terminal"; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 87dc1a6cfe7..2b4abb1f162 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.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1756gp3f2pmxz2k4xg4cfdbdav848qb0vjglyiy1n2k9xc79dyxz"; + sha256 = "1raba835kvqq4lfpk141vg81ll7sg3jyhwyr6758pdjmncncg0wr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 485f1d0dca3..e5ee1da7580 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0013"; + version = "8.2.0227"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f"; + sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index b6861a9023f..cd3e5676e8c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,15 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn"; - x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0"; + x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs"; + x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv"; }.${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.42.0"; + version = "1.42.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 e7bdacc1390..eafe1718c2f 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 = "0n4wcg072a0b76jjv08cig2kygkmakvwav5vvl0h6ww9sbdcwl1x"; - x86_64-darwin = "0xvyh9qypsyzw02vpmnfa0hdszj8ylvf78yjbmg86m4xml0sbj9r"; + x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy"; + x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni"; }.${system}; sourceRoot = { @@ -25,7 +25,7 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.41.1"; + version = "1.42.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 90e7af9944d..747777c75af 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "saga"; - version = "7.3.0"; + version = "7.5.0"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -18,8 +18,8 @@ stdenv.mkDerivation { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.3.0/saga-7.3.0.tar.gz"; - sha256 = "1g7v6vx7b8mfhbbg03pdk4kyks20maqbcdbasnxazhs8pl2zih7k"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.5.0/saga-7.5.0.tar.gz"; + sha256 = "0s5195802xwlkb2w4i4vd9ys95d7fnzn5cnnixh1csaqc2x1qp6r"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index 84d7f3ddb49..1ee1d3376db 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f"; # failures: structures::polyline::test::test_polyline_split diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index f15804038e7..c5c29459b45 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.2.2"; + version = "4.3.0"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8"; + sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index ad86e66204b..55a5d49f752 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, cmake, itk, Cocoa }: +{ stdenv, fetchgit, cmake, itk4, Cocoa }: stdenv.mkDerivation { pname = "c3d"; - version = "2018-10-04"; + version = "unstable-2019-10-22"; src = fetchgit { - url = "https://git.code.sf.net/p/c3d/git"; - rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0"; - sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w"; + url = "https://github.com/pyushkevich/c3d"; + rev = "c04e2b84568654665c64d8843378c8bbd58ba9b0"; + sha256 = "0lzldxvshl9q362mg76byc7s5zc9qx7mxf2wgyij5vysx8mihx3q"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk ] + buildInputs = [ itk4 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { @@ -20,6 +20,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl2; - broken = true; + broken = stdenv.isAarch64; + # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index e64e384a9a7..abe3bd19f74 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -60,11 +60,11 @@ let in mkDerivation rec { pname = "drawpile"; - version = "2.1.15"; + version = "2.1.16"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0w6bdg1rnnjzjg8xzqv3a9qhw41q41sjvp6f8m0sqxjfax05lqin"; + sha256 = "1mz64c1a5x906j2jqq7i16l1q1d97wgm2y0ybmmcyqzg09x9wyaw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 2b3b992d24b..d3950c06c33 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -36,7 +36,7 @@ , libmypaint , gexiv2 , harfbuzz -, mypaint-brushes +, mypaint-brushes1 , libwebp , libheif , libgudev @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { xorg.libXpm glib-networking libmypaint - mypaint-brushes + mypaint-brushes1 ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 0eb4f21e53c..6cbe5448b40 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.0"; + version = "3.34.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m"; + sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp"; }; patches = [ diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 1acaf4850eb..5ebbee0e4d6 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -7,59 +7,81 @@ , libpng , librsvg , gobject-introspection +, libmypaint +, mypaint-brushes , gdk-pixbuf , pkgconfig -, python2 -, scons +, python3 , swig , wrapGAppsHook }: let - inherit (python2.pkgs) pycairo pygobject3 numpy; -in stdenv.mkDerivation { + inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication; +in buildPythonApplication rec { pname = "mypaint"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mypaint"; repo = "mypaint"; - rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f"; - sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf"; + rev = "v${version}"; + sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r"; fetchSubmodules = true; }; nativeBuildInputs = [ intltool pkgconfig - scons swig wrapGAppsHook gobject-introspection # for setup hook ]; - buildInputs = [ gtk3 gdk-pixbuf + libmypaint + mypaint-brushes json_c lcms2 libpng librsvg pycairo pygobject3 - python2 ]; propagatedBuildInputs = [ numpy + pycairo + pygobject3 ]; - postInstall = '' - sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint + checkInputs = [ + gtk3 + ]; + + buildPhase = '' + runHook preBuild + + ${python3.interpreter} setup.py build + + runHook postBuild ''; - preFixup = '' - gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH) + installPhase = '' + runHook preInstall + + ${python3.interpreter} setup.py managed_install --prefix=$out + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + + HOME=$TEMPDIR ${python3.interpreter} setup.py test + + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 3093fa107d6..51d03831e32 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "173jfjvdag97f6jvfg366hjk9v3cz301cbzpcahy51rbf1cip1w1"; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index c0a0206ddd1..2ef1e26f5ac 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -6,7 +6,7 @@ with stdenv.lib; let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do - ln -s "$backend" "$out/lib/sane/$(basename "$backend")" + symlink "$backend" "$out/lib/sane/$(basename "$backend")" done fi @@ -16,14 +16,14 @@ let installSanePath = path: '' if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then cat "$conf" >> "$out/etc/sane.d/$name" else - ln -s "$conf" "$out/etc/sane.d/$name" + symlink "$conf" "$out/etc/sane.d/$name" fi done fi if [ -e "${path}/etc/sane.d/dll.d" ]; then find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do - ln -s "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" + symlink "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)" done fi ''; @@ -33,6 +33,14 @@ stdenv.mkDerivation { phases = "installPhase"; installPhase = '' + function symlink () { + local target=$1 linkname=$2 + if [ -e "$linkname" ]; then + echo "warning: conflict for $linkname. Overriding $(readlink $linkname) with $target." + fi + ln -sfn "$target" "$linkname" + } + mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane '' + concatMapStrings installSanePath paths; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 3c45b05e9e8..6788a5df3ff 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -91,11 +91,9 @@ let kate = callPackage ./kate.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; kcalc = callPackage ./kcalc.nix {}; - kcalcore = callPackage ./kcalcore.nix {}; kcalutils = callPackage ./kcalutils.nix {}; kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; - kcontacts = callPackage ./kcontacts.nix {}; kdav = callPackage ./kdav.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index a335b0ef8e8..424c759b56c 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/19.08.3/ ) +WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.1/src ) diff --git a/pkgs/applications/kde/kcalcore.nix b/pkgs/applications/kde/kcalcore.nix deleted file mode 100644 index 4ac9c9b925a..00000000000 --- a/pkgs/applications/kde/kcalcore.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - kdelibs4support, libical -}: - -mkDerivation { - name = "kcalcore"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kdelibs4support libical ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix deleted file mode 100644 index 12b3198a26b..00000000000 --- a/pkgs/applications/kde/kcontacts.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, - kcoreaddons, kconfig, kcodecs, ki18n, qtbase, -}: - -mkDerivation { - name = "kcontacts"; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch deleted file mode 100644 index 46722ff5fba..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt -index 99f7dbf..03e953b 100644 ---- a/resources/CMakeLists.txt -+++ b/resources/CMakeLists.txt -@@ -45,7 +45,6 @@ add_subdirectory( imap ) - if (Libkolabxml_FOUND) - add_subdirectory( kolab ) - endif() --add_subdirectory( facebook ) - add_subdirectory( maildir ) - - add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 6d7bd0daa96..65719514f96 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -14,7 +14,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes @@ -22,6 +21,4 @@ mkDerivation { kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns ]; - # Attempts to build some files before dependencies have been generated - enableParallelBuilding = false; } diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series deleted file mode 100644 index cc3e104775f..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/series +++ /dev/null @@ -1 +0,0 @@ -00-no-facebook.patch diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 8d199a291c4..60cf49fa05e 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -1,1741 +1,1734 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde/fetch.sh { fetchurl, mirror }: { akonadi = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-19.08.3.tar.xz"; - sha256 = "cfdfa4767b1bd420c7979cf5125cc56d3926181f8484dc39ecd84a9e0808ee6c"; - name = "akonadi-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-19.12.1.tar.xz"; + sha256 = "991680be1b57a5335690341ab2a681fc7d8e77a4951673021f0662f3005856a3"; + name = "akonadi-19.12.1.tar.xz"; }; }; akonadi-calendar = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-calendar-19.08.3.tar.xz"; - sha256 = "1ec66241551b0bd3e2cabd2df1547e3622b3c74e0ddaec535b5666141180a094"; - name = "akonadi-calendar-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-19.12.1.tar.xz"; + sha256 = "4bec3252bd1a32874a22b28dcb82a2aed533b31e1955ca68803ddf076dbbd5be"; + name = "akonadi-calendar-19.12.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-calendar-tools-19.08.3.tar.xz"; - sha256 = "539bef47c9586f1edb87cedf63cce140dab4f19b6a94fbe08b0cd4c083cf6ffc"; - name = "akonadi-calendar-tools-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz"; + sha256 = "0650e12b2155b08cf70cc4620f9ea3868bad66affc4668775cd050539eacbec9"; + name = "akonadi-calendar-tools-19.12.1.tar.xz"; }; }; akonadiconsole = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadiconsole-19.08.3.tar.xz"; - sha256 = "37253a4b56afc34e52a05b58f63d1cdce221a11432c713f159b5c033a6018947"; - name = "akonadiconsole-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadiconsole-19.12.1.tar.xz"; + sha256 = "e6a755875b9ef9db4f022888b77bd011a5edf2c21667074b971d15818659dd5b"; + name = "akonadiconsole-19.12.1.tar.xz"; }; }; akonadi-contacts = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-contacts-19.08.3.tar.xz"; - sha256 = "a95ff2621e198e2685b7cd591e39437e68b5670cd710ce06088bd16618d281df"; - name = "akonadi-contacts-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-contacts-19.12.1.tar.xz"; + sha256 = "0fbca91b3251d57291629e441ecf5cdd9b71a56f74f05f6c55a428402d3b4c91"; + name = "akonadi-contacts-19.12.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-import-wizard-19.08.3.tar.xz"; - sha256 = "1a11207826ecc59af73ca2dae1b6299a6cd9c71c093e634043295747ba8f6553"; - name = "akonadi-import-wizard-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-import-wizard-19.12.1.tar.xz"; + sha256 = "a58d29407eebd9ce895d38b121cb034f92c81b85afd1b8da9c70cc3d7dc29b3d"; + name = "akonadi-import-wizard-19.12.1.tar.xz"; }; }; akonadi-mime = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-mime-19.08.3.tar.xz"; - sha256 = "e779a2b73b628702aec52b1d4345533f54f06624915b193766af3ef6a16d030f"; - name = "akonadi-mime-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-mime-19.12.1.tar.xz"; + sha256 = "9ca3794a36e31a5dd759b741e91420f4910f05b0d726f6e803d365b8ab058f5b"; + name = "akonadi-mime-19.12.1.tar.xz"; }; }; akonadi-notes = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-notes-19.08.3.tar.xz"; - sha256 = "7c701d8a032161f9a58a55dd7e71a9a261fed8044ddc59d6d5f04bb742801b65"; - name = "akonadi-notes-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-notes-19.12.1.tar.xz"; + sha256 = "cf8059cb14eca880c09fc83285576b4d03a8edf0799cebdf42d59084bb6904ca"; + name = "akonadi-notes-19.12.1.tar.xz"; }; }; akonadi-search = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akonadi-search-19.08.3.tar.xz"; - sha256 = "3a04a82b7f13aad0a5c283931b347a951b8b4bf299bfc6f8cdbc5ba299d01f9b"; - name = "akonadi-search-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akonadi-search-19.12.1.tar.xz"; + sha256 = "78a0feaa41d4b474a2e90c74230bc5196349e1c4e72ad46fe341a1cb6e51a5b8"; + name = "akonadi-search-19.12.1.tar.xz"; }; }; akregator = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/akregator-19.08.3.tar.xz"; - sha256 = "c3aab6ebba25eab8c76b113a900af33a90222257f957650d0bbc0c47d5cf4bc9"; - name = "akregator-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/akregator-19.12.1.tar.xz"; + sha256 = "e6f00777059e5b9fe2458a7e4248a59652f08d836518bf0395aaf2ed77ef4d52"; + name = "akregator-19.12.1.tar.xz"; }; }; analitza = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/analitza-19.08.3.tar.xz"; - sha256 = "9247172f3ffbc0fd3308b4b40f5d76eaa2a5012dc49525c3087caf5cdfc1513e"; - name = "analitza-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/analitza-19.12.1.tar.xz"; + sha256 = "0c6c4ee1b4546ab84eb9503220ca0aa09f80cdd7cea3b89201db1d5aac2c4ce5"; + name = "analitza-19.12.1.tar.xz"; }; }; ark = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ark-19.08.3.tar.xz"; - sha256 = "bc1fcd84632c628a10e8536d56b65a7acbd4235ed0e034fec864b78bdc36f8f1"; - name = "ark-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ark-19.12.1.tar.xz"; + sha256 = "37b9dfc0b6005ebd0f2757ecce940568839e8a5d73b3bcbc1931ce4eccbb9d0c"; + name = "ark-19.12.1.tar.xz"; }; }; artikulate = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/artikulate-19.08.3.tar.xz"; - sha256 = "99831d51bf8cb4032ba9af7c4ae0712f7b3668b7c51bce8f942808c1e5e42f85"; - name = "artikulate-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/artikulate-19.12.1.tar.xz"; + sha256 = "407f72193c7c4ec3f8ac7fa93889803f2ec6523aebb59bdf9a9210e9fac0ee7d"; + name = "artikulate-19.12.1.tar.xz"; }; }; audiocd-kio = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/audiocd-kio-19.08.3.tar.xz"; - sha256 = "98d836def762b839b9636acc540158d5b4789a84d1bdb535ae139b10e9e144a4"; - name = "audiocd-kio-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/audiocd-kio-19.12.1.tar.xz"; + sha256 = "3b4433bbbdd56bbafcf0418eaebb655b8fd4e03a4c29489112394393f3dc3815"; + name = "audiocd-kio-19.12.1.tar.xz"; }; }; baloo-widgets = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/baloo-widgets-19.08.3.tar.xz"; - sha256 = "edb9284b1a7d73b0c824390aa875593650880eb77c2680a2942c9fd65f436a2d"; - name = "baloo-widgets-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/baloo-widgets-19.12.1.tar.xz"; + sha256 = "a9fb3a136267bb0089192f7bc523903bd304e528160d9f653ccd052b4a8c110c"; + name = "baloo-widgets-19.12.1.tar.xz"; }; }; blinken = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/blinken-19.08.3.tar.xz"; - sha256 = "620fe5ffb656f829a7ca72a2df40c19ff0562e3700f51bd66b7d8a6a486ed3c9"; - name = "blinken-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/blinken-19.12.1.tar.xz"; + sha256 = "4a1f7c782dc236d963bc1de11b7dcbc79012d47e3e6cc5ce692ca91ecb788388"; + name = "blinken-19.12.1.tar.xz"; }; }; bomber = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/bomber-19.08.3.tar.xz"; - sha256 = "3a0ef6ca5a05253b1554218a1dc699c5547a073da5cecdf75445e0f72b687fd3"; - name = "bomber-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/bomber-19.12.1.tar.xz"; + sha256 = "f0007dae42d6586ab6c9da5775c835fb515cbf180698a1453a90efd2ba8f2795"; + name = "bomber-19.12.1.tar.xz"; }; }; bovo = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/bovo-19.08.3.tar.xz"; - sha256 = "2f950820ebdb52f1c81476b36b5ea07808fe8da154e7757a85ca8ac2c1b37735"; - name = "bovo-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/bovo-19.12.1.tar.xz"; + sha256 = "54cee2f71e9736057187c8121313b9c73f6cadd0fa463ea2a29cf0e86969d5ae"; + name = "bovo-19.12.1.tar.xz"; }; }; calendarsupport = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/calendarsupport-19.08.3.tar.xz"; - sha256 = "2406dd3387383cc58eb0e6f10bf50cc1b206c75096c6c6af27c1102c6d818ec3"; - name = "calendarsupport-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/calendarsupport-19.12.1.tar.xz"; + sha256 = "6f5e3282ff385044061320b7ccb4bef80a1848fa890afcbd12e16bd2524a4189"; + name = "calendarsupport-19.12.1.tar.xz"; }; }; cantor = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/cantor-19.08.3.tar.xz"; - sha256 = "5b0f0b0b3990c83a927d2545baa9596119025dbf25242a9d46b1c76a26fcbfe5"; - name = "cantor-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/cantor-19.12.1.tar.xz"; + sha256 = "509ebe0bc173124d28e29483effa07985eef24cdd989e5e4e1fc233632cdf568"; + name = "cantor-19.12.1.tar.xz"; }; }; cervisia = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/cervisia-19.08.3.tar.xz"; - sha256 = "bf156c080f000b342f81e7a8450d6ca942627e5a08cc5ac9c02fc5b44d1f37a7"; - name = "cervisia-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/cervisia-19.12.1.tar.xz"; + sha256 = "2a7d32ac0c1460c135397cedec177db8eb99117b53ec2c9652763b0e90184188"; + name = "cervisia-19.12.1.tar.xz"; }; }; dolphin = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/dolphin-19.08.3.tar.xz"; - sha256 = "de71f52324c15d692448ac4c79c1e0fcf35df5c03349a8bcbebfae20d9f69d4e"; - name = "dolphin-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/dolphin-19.12.1.tar.xz"; + sha256 = "492b4ca71e33373c7000aad5c7daf6e04d7ad537e1fde8a73d2c3db15858e8c8"; + name = "dolphin-19.12.1.tar.xz"; }; }; dolphin-plugins = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/dolphin-plugins-19.08.3.tar.xz"; - sha256 = "82860ef615954e94f3f382ad60fb144fcfcf7777b8a890f281c0cce55da13a55"; - name = "dolphin-plugins-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz"; + sha256 = "9392571a7004c08aac02dcc6453f58b6d0de4716b7cd61776f78d9b1783c60e0"; + name = "dolphin-plugins-19.12.1.tar.xz"; }; }; dragon = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/dragon-19.08.3.tar.xz"; - sha256 = "f9172f6ddf75cf8e4be19d50f80994d59545fdea966674fb67abe7a7c934810a"; - name = "dragon-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/dragon-19.12.1.tar.xz"; + sha256 = "a804ae2089c0e96700e91d90ba2100d9a42a81a128a3fdbb037ed94c31f380cd"; + name = "dragon-19.12.1.tar.xz"; + }; + }; + elisa = { + version = "19.12.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/19.12.1/src/elisa-19.12.1.tar.xz"; + sha256 = "4929da2ebe68a3dc0d22a809a7b2a84493aa6f072e16515bd557ddaac51fd8fa"; + name = "elisa-19.12.1.tar.xz"; }; }; eventviews = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/eventviews-19.08.3.tar.xz"; - sha256 = "3c110fb5001e71d664aaa3b09a3689c0bb16ca12ee169e98f6ff454a0ee81ba4"; - name = "eventviews-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/eventviews-19.12.1.tar.xz"; + sha256 = "5eb73fb2c541a6b073ad231a28abe6affc0cad92f5fd4d36a4b58aba8a46193c"; + name = "eventviews-19.12.1.tar.xz"; }; }; ffmpegthumbs = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ffmpegthumbs-19.08.3.tar.xz"; - sha256 = "c91ad8e83df474971cf9766f2398e88e45d02dd2e51a7a794ace02f22c38c0f0"; - name = "ffmpegthumbs-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ffmpegthumbs-19.12.1.tar.xz"; + sha256 = "5f7853788c07d409bc2dd2fd7c9afab4cd847f3d2dc6db4dc30cfd78e762bdbd"; + name = "ffmpegthumbs-19.12.1.tar.xz"; }; }; filelight = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/filelight-19.08.3.tar.xz"; - sha256 = "95fa38574292a2aa8d3d90749fbbb61c5005889ef1df1aaa04d2d789bbf4fb00"; - name = "filelight-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/filelight-19.12.1.tar.xz"; + sha256 = "29806a4149b3fb60f81372d56c184d0e2f861816639a0a21b85cd7af314f860b"; + name = "filelight-19.12.1.tar.xz"; }; }; granatier = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/granatier-19.08.3.tar.xz"; - sha256 = "eac24bb0b0bcf7e12e4059187e0fd542503bae620637a4f35a339e6f63ab3890"; - name = "granatier-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/granatier-19.12.1.tar.xz"; + sha256 = "98051d292dd5a3ba3f873e8bc2bed6cdae291c9516b9cb21a64703b3135baa7f"; + name = "granatier-19.12.1.tar.xz"; }; }; grantlee-editor = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/grantlee-editor-19.08.3.tar.xz"; - sha256 = "4d81e56ee89bf8ff19ba112b2ecaf6080b7fbc6768030b4dbb4f15a1099a5bce"; - name = "grantlee-editor-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/grantlee-editor-19.12.1.tar.xz"; + sha256 = "63a2571369aff6cc648b064bcbc32227eede19475cad8937cfc454984423ea0c"; + name = "grantlee-editor-19.12.1.tar.xz"; }; }; grantleetheme = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/grantleetheme-19.08.3.tar.xz"; - sha256 = "ab1b0f55399c520191cf1241d85881e3f5b441ee82b387e7fbef55e77dc0e748"; - name = "grantleetheme-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/grantleetheme-19.12.1.tar.xz"; + sha256 = "f23aaf86ff8c630a2f3498b3eebcd6533b01ee806dcf4130df7dd55e3b890ddd"; + name = "grantleetheme-19.12.1.tar.xz"; }; }; gwenview = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/gwenview-19.08.3.tar.xz"; - sha256 = "7e7ad69eaa7a6b2d0549e94d1dab0d012107c822d66483d54aa8268900820255"; - name = "gwenview-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/gwenview-19.12.1.tar.xz"; + sha256 = "ed36590a0193fbe22f08c1a026e58f86a3067f516b3a894f29b72aa229967c84"; + name = "gwenview-19.12.1.tar.xz"; }; }; incidenceeditor = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/incidenceeditor-19.08.3.tar.xz"; - sha256 = "e6753efc2841a5b0b63a2b02f07c5b77274214576e5e9fc66b962b18c516266d"; - name = "incidenceeditor-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/incidenceeditor-19.12.1.tar.xz"; + sha256 = "1f1345db2e518bfe9405df5fa441ece3af1093cbc75066673d252a0760262484"; + name = "incidenceeditor-19.12.1.tar.xz"; }; }; juk = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/juk-19.08.3.tar.xz"; - sha256 = "6ef343b31b4b996d3a576e91a8a0b57b55b61ed76e9ddc51c5072a6243cb3030"; - name = "juk-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/juk-19.12.1.tar.xz"; + sha256 = "de1d9f3581f791ea050700b467dce4b38d9ec2dc20884b495826e479d3245edf"; + name = "juk-19.12.1.tar.xz"; }; }; k3b = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/k3b-19.08.3.tar.xz"; - sha256 = "197ea67fa9ef66f8ee084608fd1907e2b3db108eec643d5bd6a0980f838f2b23"; - name = "k3b-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/k3b-19.12.1.tar.xz"; + sha256 = "59def9d9c9e14de52a14d58a22c15173d98086d9a156a3a463b9607dc7be602d"; + name = "k3b-19.12.1.tar.xz"; }; }; kaccounts-integration = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kaccounts-integration-19.08.3.tar.xz"; - sha256 = "9106718c3ac8beeb11dc8a8d2ad53c7cc4a364ab6246ca9a24ea05dfe7415723"; - name = "kaccounts-integration-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-integration-19.12.1.tar.xz"; + sha256 = "0dda504f51b86207180aceb00d86d42cb16c7ebe81c60ca1ed6bf8fa20699127"; + name = "kaccounts-integration-19.12.1.tar.xz"; }; }; kaccounts-providers = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kaccounts-providers-19.08.3.tar.xz"; - sha256 = "55093c9ab5e001f126e86e1dbf55209c5f6365d9aad392cf506eab6a95d59a23"; - name = "kaccounts-providers-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-providers-19.12.1.tar.xz"; + sha256 = "abcd1fa9f63248f3ce7f9c98d940b124ff5c70c1a3381a6cfad6ce7012b23c69"; + name = "kaccounts-providers-19.12.1.tar.xz"; }; }; kaddressbook = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kaddressbook-19.08.3.tar.xz"; - sha256 = "e343187628af4b6142cc7177ea67a3460b6f2b96c608a5b4bd469f2d314bf4ae"; - name = "kaddressbook-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kaddressbook-19.12.1.tar.xz"; + sha256 = "32e19973015151ac32fe7ae1f0a17e82e2834ce69ba052f31e8d197930f0be5c"; + name = "kaddressbook-19.12.1.tar.xz"; }; }; kajongg = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kajongg-19.08.3.tar.xz"; - sha256 = "dcf4738fb312762363caa88f9e26e7f7ab2102ad29ce938b71ed36177fb98662"; - name = "kajongg-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kajongg-19.12.1.tar.xz"; + sha256 = "2f0944ea23cefb07187e0c176ae0a12cbba1b591aefeab9be9a59d5cab9e7a59"; + name = "kajongg-19.12.1.tar.xz"; }; }; kalarm = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kalarm-19.08.3.tar.xz"; - sha256 = "34d73be35b0cdf6189bf3792e939fa9557bffff8271966d9fc49217e488317e8"; - name = "kalarm-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kalarm-19.12.1.tar.xz"; + sha256 = "06a8d9544d1107ac3f2e8c4c2e9604055706dcb6b7f3b0267f0d4cb45f1caf35"; + name = "kalarm-19.12.1.tar.xz"; }; }; kalarmcal = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kalarmcal-19.08.3.tar.xz"; - sha256 = "f6e9d0c99d228fc922e52ae3ddb33f2b691290e58a48edc816de72fc44d73871"; - name = "kalarmcal-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kalarmcal-19.12.1.tar.xz"; + sha256 = "18644d5cbc61b414675de66dd25d9a1dd30b0e93851f6223292f052d30a365e6"; + name = "kalarmcal-19.12.1.tar.xz"; }; }; kalgebra = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kalgebra-19.08.3.tar.xz"; - sha256 = "7832584a161c2f611ce980ad98932533c998d37e6e4e2b7afbd0b4e98ce88a65"; - name = "kalgebra-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kalgebra-19.12.1.tar.xz"; + sha256 = "49d623186800eb8f6fbb91eb43fb14dff78e112624c9cda6b331d494d610b16a"; + name = "kalgebra-19.12.1.tar.xz"; }; }; kalzium = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kalzium-19.08.3.tar.xz"; - sha256 = "5dc3423a0f2646b59233f92b6a6e81b4a0bcdb819aa543c83270fe4cc5592933"; - name = "kalzium-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kalzium-19.12.1.tar.xz"; + sha256 = "f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943"; + name = "kalzium-19.12.1.tar.xz"; }; }; kamera = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kamera-19.08.3.tar.xz"; - sha256 = "93a8a3dc6c4927b28a6ee0f09f1709e67f5bc38281b3775390513f2e69086942"; - name = "kamera-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kamera-19.12.1.tar.xz"; + sha256 = "831d7b3d7ffdc73b03116b564fb1a23c651d468cae97c1c31791f6df1a8890ac"; + name = "kamera-19.12.1.tar.xz"; }; }; kamoso = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kamoso-19.08.3.tar.xz"; - sha256 = "437ddca6849ff3ad964737794ab8d22f8d152ad4aa9172dd838c77c59fc81448"; - name = "kamoso-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kamoso-19.12.1.tar.xz"; + sha256 = "c1776bf7f8eafd9f4c501aabc0df30035a0f1d40951e525312aa257e67cf74a7"; + name = "kamoso-19.12.1.tar.xz"; }; }; kanagram = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kanagram-19.08.3.tar.xz"; - sha256 = "74f7daaed8db4f2b445479307dbe974d3f3f1c8197ab8604712e109c8a4d36d2"; - name = "kanagram-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kanagram-19.12.1.tar.xz"; + sha256 = "2127eada150ee3f023948b637890aa93d602874fd6c037c4bd031886a12a2fdc"; + name = "kanagram-19.12.1.tar.xz"; }; }; kapman = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kapman-19.08.3.tar.xz"; - sha256 = "0edc811df5d4e729851e4af980fb414d70af66218091c017c16054a5181af80e"; - name = "kapman-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kapman-19.12.1.tar.xz"; + sha256 = "cd5bef40c51bc6ef635adab501acd2a40c2291c989c4ba3ef6e34a1cbebe4c49"; + name = "kapman-19.12.1.tar.xz"; }; }; kapptemplate = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kapptemplate-19.08.3.tar.xz"; - sha256 = "23776b6b56e97fac0d8372d856a6fc9014b057f98ad5a96298b0685943c3da2a"; - name = "kapptemplate-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kapptemplate-19.12.1.tar.xz"; + sha256 = "b2fc583125aae1968c0342063a6cfcea2dbeff21e0ef505a021b689ed3a34085"; + name = "kapptemplate-19.12.1.tar.xz"; }; }; kate = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kate-19.08.3.tar.xz"; - sha256 = "ab9f076e7e825fca64252b366e637e34157f1f875aa573bdae333fc240e0ec71"; - name = "kate-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz"; + sha256 = "9d2401907e5b163d5af0af5b4d28383896ef709bcde7f6ee2234e1a3adc28a47"; + name = "kate-19.12.1.tar.xz"; }; }; katomic = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/katomic-19.08.3.tar.xz"; - sha256 = "a02df5d0d03fdd478ead1ba705089514b6debfae553be8d814edfb6952149eac"; - name = "katomic-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/katomic-19.12.1.tar.xz"; + sha256 = "bc51424757434e905b5b611a6fa634147e533e375922c03f896a093fa61e57a3"; + name = "katomic-19.12.1.tar.xz"; }; }; kbackup = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kbackup-19.08.3.tar.xz"; - sha256 = "c71156528087e0c799b4c957b6525b85763bdeb35ebc58ba480878f2f0daf97d"; - name = "kbackup-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kbackup-19.12.1.tar.xz"; + sha256 = "1b30c142576d823043d4e78fa37592e8df79b5e13ea7a980d336b25c1093ecf8"; + name = "kbackup-19.12.1.tar.xz"; }; }; kblackbox = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kblackbox-19.08.3.tar.xz"; - sha256 = "16f885a5baa0ee593c85f745246f2b3af9106a3befb0c9b7aa8695e3aed382f4"; - name = "kblackbox-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kblackbox-19.12.1.tar.xz"; + sha256 = "57901d6bf56228691b6c6436ca2f60e62542854e80f9c4fda7a60362a216e1ed"; + name = "kblackbox-19.12.1.tar.xz"; }; }; kblocks = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kblocks-19.08.3.tar.xz"; - sha256 = "9d2553472a3f61e1be584bed2d9295a60b8074fdcd264213d67dc20f63033563"; - name = "kblocks-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kblocks-19.12.1.tar.xz"; + sha256 = "1077477910d1dfff60f1abad7b1cf937daf1f3e3a5e8b18407b7e2809b2fc3d9"; + name = "kblocks-19.12.1.tar.xz"; }; }; kblog = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kblog-19.08.3.tar.xz"; - sha256 = "7b030a13c79a6add2b6f46b840e347609b39099c937d5bc5fb9310e2da987164"; - name = "kblog-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kblog-19.12.1.tar.xz"; + sha256 = "6385ecfc024cf554a55e2840c3faf6b9e6ee81eb3536d5632899d32aecd54b9f"; + name = "kblog-19.12.1.tar.xz"; }; }; kbounce = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kbounce-19.08.3.tar.xz"; - sha256 = "21e4bc2e2f3c23d4b954c8b336aab9faa5ba6021ca1487baf39595ff31d82e0b"; - name = "kbounce-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kbounce-19.12.1.tar.xz"; + sha256 = "e9e1df6f2f57e102d95707b82b0aa582f9f1a6c3e395660b5faa33ef953e7fb3"; + name = "kbounce-19.12.1.tar.xz"; }; }; kbreakout = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kbreakout-19.08.3.tar.xz"; - sha256 = "1c49d80dcbaa7745932c6b64c520072099e66767e8d1f725a332f79a7ee89f3f"; - name = "kbreakout-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kbreakout-19.12.1.tar.xz"; + sha256 = "17475a5aa80f494876fb3b91d32df4c447417e79f4dd60d46f594cfab03f489f"; + name = "kbreakout-19.12.1.tar.xz"; }; }; kbruch = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kbruch-19.08.3.tar.xz"; - sha256 = "9674aba5a6683e418ed03cc011e3817eb28418538dd9200a808f9813e5112dfc"; - name = "kbruch-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kbruch-19.12.1.tar.xz"; + sha256 = "94f9951c0ee3b4aea6d649f971f2d946d462b916a76e4e76ddafa809ce7e5550"; + name = "kbruch-19.12.1.tar.xz"; }; }; kcachegrind = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcachegrind-19.08.3.tar.xz"; - sha256 = "8fc5e0643bb826b07cb5d283b8bd6fd5da4979f6125b43b1db3a9db60b02a36a"; - name = "kcachegrind-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcachegrind-19.12.1.tar.xz"; + sha256 = "210e04441519c47d103871e52d98351abc41a04b9385c577a7839eec31a2f400"; + name = "kcachegrind-19.12.1.tar.xz"; }; }; kcalc = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcalc-19.08.3.tar.xz"; - sha256 = "7c61d96bcd45621d021ae8a56224dcf81999cb14ab7b1d7976a47eee2be25d2e"; - name = "kcalc-19.08.3.tar.xz"; - }; - }; - kcalcore = { - version = "19.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcalcore-19.08.3.tar.xz"; - sha256 = "86d0467d3929eb6471507cbc790277968eb8f0aa4449e1b3ee8ecc555d32dbaa"; - name = "kcalcore-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcalc-19.12.1.tar.xz"; + sha256 = "51630cd5c6d7ebbf35fb91419acfe9b2d2719ebfcdc2fff8358dbfaa2cecda57"; + name = "kcalc-19.12.1.tar.xz"; }; }; kcalutils = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcalutils-19.08.3.tar.xz"; - sha256 = "821742c98dd55a1334c13ea9d59e177ade048b1d3ade4775803eb288c98c93da"; - name = "kcalutils-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcalutils-19.12.1.tar.xz"; + sha256 = "0298e92d84d9f4b612ea1a27abee1368bc624af2bc5bc4b5eb1053a27575ea04"; + name = "kcalutils-19.12.1.tar.xz"; }; }; kcharselect = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcharselect-19.08.3.tar.xz"; - sha256 = "f294965fc7cf8b1063b611233a98fab13a00263f1d4fd254fb8b53b3f125bc52"; - name = "kcharselect-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcharselect-19.12.1.tar.xz"; + sha256 = "5f23458974d6fa66c49d434937e7a7a31cc94e46616db866b35316025bb84b0c"; + name = "kcharselect-19.12.1.tar.xz"; }; }; kcolorchooser = { - version = "19.08.3"; - src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcolorchooser-19.08.3.tar.xz"; - sha256 = "0c3d45ceb9029f0d316e61b3f403838b4c7de82a3211a231b539e6755386c657"; - name = "kcolorchooser-19.08.3.tar.xz"; - }; - }; - kcontacts = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcontacts-19.08.3.tar.xz"; - sha256 = "17778fc501f9de9b5c8c58b57aebb09c4be088bcd9aefa5fc9afbd92f2e5626c"; - name = "kcontacts-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcolorchooser-19.12.1.tar.xz"; + sha256 = "713d1151f45382d8a889187ebb02f8e73ffbf28ac8abea0e03626888711d2c22"; + name = "kcolorchooser-19.12.1.tar.xz"; }; }; kcron = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kcron-19.08.3.tar.xz"; - sha256 = "b2270bb3390570ee49b887e5cda1c596c351fd0cd83183f091ef1b078fa55669"; - name = "kcron-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kcron-19.12.1.tar.xz"; + sha256 = "8c7d5fa24349b9ff7c4927579876ef84895398d8cde6122804d7104a4f4d5963"; + name = "kcron-19.12.1.tar.xz"; }; }; kdav = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdav-19.08.3.tar.xz"; - sha256 = "e85a0a8dcfdccc1dc0afaee364c45d57c6807fadb6926ae1a5afc54c4fb0a9f0"; - name = "kdav-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdav-19.12.1.tar.xz"; + sha256 = "5059a295f3ecd9046da6f5ecadab596b3e47c75c5090650a1d6cd1f86a8b7498"; + name = "kdav-19.12.1.tar.xz"; }; }; kdebugsettings = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdebugsettings-19.08.3.tar.xz"; - sha256 = "10ccbc85c36a81ba7fdf3230f16c3b9974d240d17347d21aa7b67e9b5f85c78d"; - name = "kdebugsettings-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdebugsettings-19.12.1.tar.xz"; + sha256 = "2730430123e6198131acbabb5d02800981082f7249f0d9b9001b5313b2d45f35"; + name = "kdebugsettings-19.12.1.tar.xz"; }; }; kde-dev-scripts = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kde-dev-scripts-19.08.3.tar.xz"; - sha256 = "c7998753f67c6efbe818ca1f96c5681c7abe3078ce6beeb307562309ca243c28"; - name = "kde-dev-scripts-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-scripts-19.12.1.tar.xz"; + sha256 = "c2965dee649abea0791774ae264230dbe673af07eb0bd85bf3e8c7c6a739cea5"; + name = "kde-dev-scripts-19.12.1.tar.xz"; }; }; kde-dev-utils = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kde-dev-utils-19.08.3.tar.xz"; - sha256 = "82a573941c1a99480294fe3e8658440da64e652eb62e2a7354751894a6a899e2"; - name = "kde-dev-utils-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-utils-19.12.1.tar.xz"; + sha256 = "94f983c9b49ed3bc59b20849b23e7c26b64b7b303fbd86147c4bc823f87cda7d"; + name = "kde-dev-utils-19.12.1.tar.xz"; }; }; kdeedu-data = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdeedu-data-19.08.3.tar.xz"; - sha256 = "dfdbe10415247bdd1b6926f6fcea943d13c6e0a1ab1a562aac6e0b7109420286"; - name = "kdeedu-data-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdeedu-data-19.12.1.tar.xz"; + sha256 = "d140f048e1ca8bd777b4a431904b3313a86446a5fd04e1f9c4e1fb4641a09b15"; + name = "kdeedu-data-19.12.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdegraphics-mobipocket-19.08.3.tar.xz"; - sha256 = "d9ea38255c967dcf0de820e6ad663e721188f5541c18c459e611f6d72ddc8e8f"; - name = "kdegraphics-mobipocket-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-mobipocket-19.12.1.tar.xz"; + sha256 = "546d11af89e97831cc09868051142d4180e9621cc537c2941272b42a85e71c6a"; + name = "kdegraphics-mobipocket-19.12.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdegraphics-thumbnailers-19.08.3.tar.xz"; - sha256 = "14d342336e92b3913d46a415da9fcf53d239f0ceb16aed99c1e095641ce6ddb4"; - name = "kdegraphics-thumbnailers-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-thumbnailers-19.12.1.tar.xz"; + sha256 = "a91335c11637a351d3ea8798f5519ac5596d655aec92266e46ed2a1bab46a299"; + name = "kdegraphics-thumbnailers-19.12.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdenetwork-filesharing-19.08.3.tar.xz"; - sha256 = "4074d996c693bdd69fd88e6f2acede79c05b2eceef1d3ed81f311247640ef366"; - name = "kdenetwork-filesharing-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdenetwork-filesharing-19.12.1.tar.xz"; + sha256 = "823e31424998e96084eeb909dfb7ee6a8e8e6d33b5d2a57ada7d583350967684"; + name = "kdenetwork-filesharing-19.12.1.tar.xz"; }; }; kdenlive = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdenlive-19.08.3.tar.xz"; - sha256 = "64ab3cf06222b95f021941d8c430c70918c04c3ea988f7ccf5ef87c6b69b4465"; - name = "kdenlive-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdenlive-19.12.1.tar.xz"; + sha256 = "fccf34a4660ce8a78ceefe8a4b9dd93d104f6871976d991ceec769366627dc77"; + name = "kdenlive-19.12.1.tar.xz"; }; }; kdepim-addons = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdepim-addons-19.08.3.tar.xz"; - sha256 = "8c85cec6b827da6025364ec6bbccdf2ab22c73380933aed69cf3c86be52cff24"; - name = "kdepim-addons-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdepim-addons-19.12.1.tar.xz"; + sha256 = "091e3fd007ad54cd1dcd4e2d51c4ac883a2d9e365ca78592aa91a37835c4dcf5"; + name = "kdepim-addons-19.12.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdepim-apps-libs-19.08.3.tar.xz"; - sha256 = "3c478455a0f4704aa4f8a42e92f0657e01b749c568dc6e89bfae5496eefeab83"; - name = "kdepim-apps-libs-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdepim-apps-libs-19.12.1.tar.xz"; + sha256 = "4ff633c98cd128f2409cb78c193dd72f1078ae29eba8db3e304248a019e17e43"; + name = "kdepim-apps-libs-19.12.1.tar.xz"; }; }; kdepim-runtime = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdepim-runtime-19.08.3.tar.xz"; - sha256 = "2673967456b7eacbd69ca678761e479bfa65a0ec6455c86b3a83c76d766a71ea"; - name = "kdepim-runtime-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdepim-runtime-19.12.1.tar.xz"; + sha256 = "31b1fe9778723079048d0fe1750028fd3f5f5b467ee10dcfa7fab37202a6ca39"; + name = "kdepim-runtime-19.12.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdesdk-kioslaves-19.08.3.tar.xz"; - sha256 = "cd957c67712616b9c7f00c8d733f723d98779c5805561770970bb3e2173478e0"; - name = "kdesdk-kioslaves-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-kioslaves-19.12.1.tar.xz"; + sha256 = "e8e8f02e019bad7983cdc5cddbd435ccf676fd804ee7f960653acdda5676abb2"; + name = "kdesdk-kioslaves-19.12.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdesdk-thumbnailers-19.08.3.tar.xz"; - sha256 = "62757c71653d9a9541410104f13035b024e8bab7b21b729a306cb2ac445db8ac"; - name = "kdesdk-thumbnailers-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-thumbnailers-19.12.1.tar.xz"; + sha256 = "77f64ddb075407f781cf2d658af760840f9427cc171e8ec15805f47105da0e56"; + name = "kdesdk-thumbnailers-19.12.1.tar.xz"; }; }; kdf = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdf-19.08.3.tar.xz"; - sha256 = "eef733c2089ce8fc40405653fa5e3aaafe67a1cc5d074f744e49b185291c0617"; - name = "kdf-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdf-19.12.1.tar.xz"; + sha256 = "bf5c96e5a78e0465e9b91617ffff0c37f04e896dc059d70962bbdd943c6c1c04"; + name = "kdf-19.12.1.tar.xz"; }; }; kdialog = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdialog-19.08.3.tar.xz"; - sha256 = "2fa2e07fb9975e2e32e26a2a17350ef253b93471017e5945a2df0fef2eeba787"; - name = "kdialog-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdialog-19.12.1.tar.xz"; + sha256 = "2a13d1957089e4a0307681786b9b5467b5df777311afd4598dd1cb69b4e070f6"; + name = "kdialog-19.12.1.tar.xz"; }; }; kdiamond = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kdiamond-19.08.3.tar.xz"; - sha256 = "6a433c8b628f105d210efd5b5532763e09a4e7190d71f8cf11931ab1605abeec"; - name = "kdiamond-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kdiamond-19.12.1.tar.xz"; + sha256 = "4f7770138d16bb7b91920b7f3c7024a89ef35dc330a2ac929a2fa5d4ee12b982"; + name = "kdiamond-19.12.1.tar.xz"; }; }; keditbookmarks = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/keditbookmarks-19.08.3.tar.xz"; - sha256 = "ce2e90f24cac8dabe3e3804232715b47e247d51c86699162e2f7f63d1f290b05"; - name = "keditbookmarks-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/keditbookmarks-19.12.1.tar.xz"; + sha256 = "11a950d53bc6e0b50d62a3ced2b74eaaa85c595b845ca8f2dcfa65e69d407fb0"; + name = "keditbookmarks-19.12.1.tar.xz"; }; }; kfind = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kfind-19.08.3.tar.xz"; - sha256 = "6ebb7d361a8456e3a3bc7bac995a0224cd76eefd724ff62ba0d6348f7eb1f4f2"; - name = "kfind-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kfind-19.12.1.tar.xz"; + sha256 = "e9f5defa7796bbb54208b28af1fa76333a38e743d7febb8dd14739cf00d376eb"; + name = "kfind-19.12.1.tar.xz"; }; }; kfloppy = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kfloppy-19.08.3.tar.xz"; - sha256 = "aed5533db83513e7ad9d4108920fc0241569d6b1b649d95ef36a36bbc1f72cab"; - name = "kfloppy-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kfloppy-19.12.1.tar.xz"; + sha256 = "77581323d16f8666fefca3372c91567dfe5233c0f92c79ead11b2253aee64e2c"; + name = "kfloppy-19.12.1.tar.xz"; }; }; kfourinline = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kfourinline-19.08.3.tar.xz"; - sha256 = "c35b52b41398616798d75e62fa77488bf84e924e91a432cd1b96b1c09ad1f9ee"; - name = "kfourinline-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kfourinline-19.12.1.tar.xz"; + sha256 = "76e31b59f1b31ddb755def377324d5fa5b5a4835f1f537a30632a028bf671a3e"; + name = "kfourinline-19.12.1.tar.xz"; }; }; kgeography = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kgeography-19.08.3.tar.xz"; - sha256 = "1f2969db9ed5b9cc3d56a8cc12fa24cdace473edcd05baaf3c7b460fa7b2da8c"; - name = "kgeography-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kgeography-19.12.1.tar.xz"; + sha256 = "47f809fdb6da503c0b00f5d2052f9def3af0964ace45325e683227a1971c3a1b"; + name = "kgeography-19.12.1.tar.xz"; }; }; kget = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kget-19.08.3.tar.xz"; - sha256 = "5a107da8313731114e7b5528f4c0cf6e0ab62867e20a9caa802de23812c69800"; - name = "kget-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kget-19.12.1.tar.xz"; + sha256 = "33b043857b3d1c55d877d1c3af2bcc46feefe15019b7af40a9951c16e288658c"; + name = "kget-19.12.1.tar.xz"; }; }; kgoldrunner = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kgoldrunner-19.08.3.tar.xz"; - sha256 = "44aec483cbd9d0bffb4eb9606d456ba375cb772fe72ab2c9d76a64930ede2c9b"; - name = "kgoldrunner-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kgoldrunner-19.12.1.tar.xz"; + sha256 = "1f2044656732ab7a72117139576201ca1701666d525c93b726473d4cd9aed29c"; + name = "kgoldrunner-19.12.1.tar.xz"; }; }; kgpg = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kgpg-19.08.3.tar.xz"; - sha256 = "85bb9adbd7a7213bdd4913c2153582e938543db49cf2414b8794a850f63f3ab6"; - name = "kgpg-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kgpg-19.12.1.tar.xz"; + sha256 = "e64dc85f303e45b8a7ef635525f6834c4fd2db36c5131fdb231fa11f7237fdb5"; + name = "kgpg-19.12.1.tar.xz"; }; }; khangman = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/khangman-19.08.3.tar.xz"; - sha256 = "82e34738f34efef5f03bf98a3a99a0590a5a265cce016b4a2f25ca05e9d078c3"; - name = "khangman-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/khangman-19.12.1.tar.xz"; + sha256 = "42fa9d9a9a72fe4b14127b12d5b662d66c00c1899eeefba6102be95136333def"; + name = "khangman-19.12.1.tar.xz"; }; }; khelpcenter = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/khelpcenter-19.08.3.tar.xz"; - sha256 = "a03817fb16739b1b235dc54ddeda2c2ebc6605a0c7678e02af24c05271c0b77a"; - name = "khelpcenter-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/khelpcenter-19.12.1.tar.xz"; + sha256 = "cd38f6b719f4f6228e3a7f94fc63f16020e86382ca402179ae767f2f0b846466"; + name = "khelpcenter-19.12.1.tar.xz"; }; }; kidentitymanagement = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kidentitymanagement-19.08.3.tar.xz"; - sha256 = "6ed512d3b42378a767299660c2b9fe142b840cdaaae70c522104c37275221f37"; - name = "kidentitymanagement-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kidentitymanagement-19.12.1.tar.xz"; + sha256 = "7df38592610e0ed74c55baf6670331d07b2df0c98484d5f8cf8f135b6d229702"; + name = "kidentitymanagement-19.12.1.tar.xz"; }; }; kig = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kig-19.08.3.tar.xz"; - sha256 = "69dacdbb10bcefe43e5141b0b33b51ca4704f5a5b933e194a4891be92affd21c"; - name = "kig-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kig-19.12.1.tar.xz"; + sha256 = "507d89cddc0e128ab398ce0f551af22af0ba1583a4419574296cfefb96d944ee"; + name = "kig-19.12.1.tar.xz"; }; }; kigo = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kigo-19.08.3.tar.xz"; - sha256 = "2e20837b52550c7c33bd2e5f741a2395a8a1666b793e4b034bd27714177b8502"; - name = "kigo-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kigo-19.12.1.tar.xz"; + sha256 = "235df9bca39b02dac6648b408d71f7b0978604f8389ea7ef5aa8e0be87fbcf9d"; + name = "kigo-19.12.1.tar.xz"; }; }; killbots = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/killbots-19.08.3.tar.xz"; - sha256 = "75f5d53eda4dbe96250caa2faa16514d7c68538d7e8c9deea4eff0d80e3628e2"; - name = "killbots-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/killbots-19.12.1.tar.xz"; + sha256 = "3d524028e7df412e4306daf4e7b1aca803d26b65985fa429c98db10cffff010f"; + name = "killbots-19.12.1.tar.xz"; }; }; kimagemapeditor = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kimagemapeditor-19.08.3.tar.xz"; - sha256 = "9c69541c774d15ac02164c52c9e4ba523e76e195231bf6db528fd94407347434"; - name = "kimagemapeditor-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kimagemapeditor-19.12.1.tar.xz"; + sha256 = "9869f3a060dc44f2fad0646fa9c0f1c2924d68c3cc3de5147170456f27a39e77"; + name = "kimagemapeditor-19.12.1.tar.xz"; }; }; kimap = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kimap-19.08.3.tar.xz"; - sha256 = "46ca8d265b7191d75db8c6a4d988624385c9ab8eae702a42e6eb4b81be581051"; - name = "kimap-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kimap-19.12.1.tar.xz"; + sha256 = "898e1f3b233b3631ffc74859d54bf402d36f0c5bae7f792e97d3fa5116d8bd0e"; + name = "kimap-19.12.1.tar.xz"; }; }; kio-extras = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kio-extras-19.08.3.tar.xz"; - sha256 = "e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f"; - name = "kio-extras-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kio-extras-19.12.1.tar.xz"; + sha256 = "79b3735510c3c8da9b3e019ee5a54b115f85bb8d89f1c04dbbf16dde3007e7b6"; + name = "kio-extras-19.12.1.tar.xz"; }; }; kipi-plugins = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kipi-plugins-19.08.3.tar.xz"; - sha256 = "f540e517421503b54e906633c71c2f688bb920c5aefe7d05a13d0eeaf0356a9b"; - name = "kipi-plugins-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kipi-plugins-19.12.1.tar.xz"; + sha256 = "bcd27ab29b491f13116a156e403126d04ffbaa352b581eca7fb0904e13c5dabe"; + name = "kipi-plugins-19.12.1.tar.xz"; }; }; kirigami-gallery = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kirigami-gallery-19.08.3.tar.xz"; - sha256 = "4ceeb854aa95902effb99cb2e5956a2f237ac3880f5b5d8e22849ed7887288df"; - name = "kirigami-gallery-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kirigami-gallery-19.12.1.tar.xz"; + sha256 = "de7f9d739feeac481223c7992179cb3cfaa2aabca1097b0d3597c5c9d737cb19"; + name = "kirigami-gallery-19.12.1.tar.xz"; }; }; kiriki = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kiriki-19.08.3.tar.xz"; - sha256 = "1ceaea286294d8a5371d0792ee38cf4b8922495587cc430b6b01bd92642be2f5"; - name = "kiriki-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kiriki-19.12.1.tar.xz"; + sha256 = "f3079b53ed45ec46def7a95b336d441dba18151cc77c88ef8ce2d02fcf1d6375"; + name = "kiriki-19.12.1.tar.xz"; }; }; kiten = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kiten-19.08.3.tar.xz"; - sha256 = "6759463f195c50bdcdb2378a8142d1e00a1cea05b769d95a69d2cfdeb1864601"; - name = "kiten-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kiten-19.12.1.tar.xz"; + sha256 = "abee050c05b54fae25562237b91a14156dabcb26ea142c714b5ec9e1907f54f3"; + name = "kiten-19.12.1.tar.xz"; }; }; kitinerary = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kitinerary-19.08.3.tar.xz"; - sha256 = "d13e701b8a988999477c030fffe687b4c333a330717a15b72651458f35e6e151"; - name = "kitinerary-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kitinerary-19.12.1.tar.xz"; + sha256 = "6497469e9966c9c21c2810a1f21c2633b89e54dafb74d5689aa24382e3824926"; + name = "kitinerary-19.12.1.tar.xz"; }; }; kjumpingcube = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kjumpingcube-19.08.3.tar.xz"; - sha256 = "a1e6147105a0d467629118bf6cac974a1a698d15f48563e494ce75e126fec734"; - name = "kjumpingcube-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kjumpingcube-19.12.1.tar.xz"; + sha256 = "3e4abd57d14dccc9b39669eebdab578fc865464b8a4309c3ab8103002edc2ff0"; + name = "kjumpingcube-19.12.1.tar.xz"; }; }; kldap = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kldap-19.08.3.tar.xz"; - sha256 = "b65ba5fefab7ecb92a7d38ac718e53077d9d9a87d73f121e32019aad90b48bae"; - name = "kldap-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kldap-19.12.1.tar.xz"; + sha256 = "5595f840c2b97e96f265ffd91fb007f4beb198aaf67a0dbfd941108acbcb9aa3"; + name = "kldap-19.12.1.tar.xz"; }; }; kleopatra = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kleopatra-19.08.3.tar.xz"; - sha256 = "44b9873fbdeb88416d33b54491b75d35eac1589d70ef70505456e89068eb1caf"; - name = "kleopatra-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kleopatra-19.12.1.tar.xz"; + sha256 = "94ee94031696dd5d79d7a0ca00a2e51b4569466689e8a76c129deae645af08f4"; + name = "kleopatra-19.12.1.tar.xz"; }; }; klettres = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/klettres-19.08.3.tar.xz"; - sha256 = "205ed817469a72caaf73683c618fcd0800176038345e46555c4c78d644b3a1bf"; - name = "klettres-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/klettres-19.12.1.tar.xz"; + sha256 = "4f103d85918d40e0a3ffc451bf3862c45b37b8bd2453e6ee7d21d4c738967c36"; + name = "klettres-19.12.1.tar.xz"; }; }; klickety = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/klickety-19.08.3.tar.xz"; - sha256 = "7e4509d47c363173630d536b401d8f1ccb7db4c62d75dd4a449e89dc56c9632e"; - name = "klickety-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/klickety-19.12.1.tar.xz"; + sha256 = "66cba17839023b6fe563a461da8f52a3c8a2bd4949195da2d63d780547f2e159"; + name = "klickety-19.12.1.tar.xz"; }; }; klines = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/klines-19.08.3.tar.xz"; - sha256 = "aaa7825b4bfd61b650ddf28dd975b04cebdb7c09c9b137f17d686570a5212ebc"; - name = "klines-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/klines-19.12.1.tar.xz"; + sha256 = "111c4e607c4ba434a8ff593e45ba669c78e6c1fbf9e4d77d0fc5d611e733604e"; + name = "klines-19.12.1.tar.xz"; }; }; kmag = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmag-19.08.3.tar.xz"; - sha256 = "216e5db763f72ff1f4ada339912dc686fa7a6cea0dafc8b9eab35601edabc950"; - name = "kmag-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmag-19.12.1.tar.xz"; + sha256 = "59e5a59407894976574acf78e7248fd0609ce6ee222c60388a99e5576ac2061f"; + name = "kmag-19.12.1.tar.xz"; }; }; kmahjongg = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmahjongg-19.08.3.tar.xz"; - sha256 = "d74446083f6ead6d7571e0ca4ff37af3f8167cc16ed7f67576155a000b41ca22"; - name = "kmahjongg-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmahjongg-19.12.1.tar.xz"; + sha256 = "e157f2e603c03128fb99ac4d0b4bc3ab2002a60960c780a3907e35bb8aee9bd3"; + name = "kmahjongg-19.12.1.tar.xz"; }; }; kmail = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmail-19.08.3.tar.xz"; - sha256 = "d39d40ed61fc6828af06ad2a713b4c741685cec68471c57e18001277d3be4d3f"; - name = "kmail-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmail-19.12.1.tar.xz"; + sha256 = "a8fa4a604f8f88b91beebf0f3f9bb0ac7c040671bd75ab4478d8087a21cde40c"; + name = "kmail-19.12.1.tar.xz"; }; }; kmail-account-wizard = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmail-account-wizard-19.08.3.tar.xz"; - sha256 = "eb998583eb99f9e06eda35c7d44819ffac33fbe1a068c597bc43db271f194f68"; - name = "kmail-account-wizard-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmail-account-wizard-19.12.1.tar.xz"; + sha256 = "e7cbda3946b19d01f5c3a722d2c104b7be072ab411f80437a25b8200d73e7cfa"; + name = "kmail-account-wizard-19.12.1.tar.xz"; }; }; kmailtransport = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmailtransport-19.08.3.tar.xz"; - sha256 = "24cf570b2ab77a69e55adb013e1d7e3eaf17f5ced900d8e5166890bb3ab64d12"; - name = "kmailtransport-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmailtransport-19.12.1.tar.xz"; + sha256 = "1a46563c441a7d09e6cc2bf98a628b724944193e0df88607d5d867f4fa65c1a4"; + name = "kmailtransport-19.12.1.tar.xz"; }; }; kmbox = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmbox-19.08.3.tar.xz"; - sha256 = "e29d0df5344babb08f1befce2be9eae6a2e872f74757367454651ad26dd8658d"; - name = "kmbox-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmbox-19.12.1.tar.xz"; + sha256 = "7442fd3a421a917a3f27e47259a7da7e08ff6191290a0e9e67c67005c82c606a"; + name = "kmbox-19.12.1.tar.xz"; }; }; kmime = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmime-19.08.3.tar.xz"; - sha256 = "e659e1154fbc11db624f1b76bc1a8e5cf8c7f6731cef7b4ff6fad9ccf90580dd"; - name = "kmime-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmime-19.12.1.tar.xz"; + sha256 = "4d6db5d59b239b884bf8811f3ea616520ab1f69224a809cef3f79023b2563085"; + name = "kmime-19.12.1.tar.xz"; }; }; kmines = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmines-19.08.3.tar.xz"; - sha256 = "4ebb5d932ab43f11f81d0fa64aef871ffecaab4a2c3a5c4dbf10416a86fa8329"; - name = "kmines-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmines-19.12.1.tar.xz"; + sha256 = "8f921aa4bda7397c0fa6265ba07a6ce68190174864d0ee16ee575be806b49539"; + name = "kmines-19.12.1.tar.xz"; }; }; kmix = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmix-19.08.3.tar.xz"; - sha256 = "cf71abee1ab35423b0daeaf1fbddbcdcb2f40fd946dfabf0cb19b8762b8582bc"; - name = "kmix-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmix-19.12.1.tar.xz"; + sha256 = "97fff89e4a102351d01265a9659c5664b030b9b4f27fa021b997fe7ab8801ad6"; + name = "kmix-19.12.1.tar.xz"; }; }; kmousetool = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmousetool-19.08.3.tar.xz"; - sha256 = "0434d4883d5478168c696ec1a43164ff09a15999416ff198b749d45981983399"; - name = "kmousetool-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmousetool-19.12.1.tar.xz"; + sha256 = "d056fd05ffb900f65670e3a77dc8a0c08fbc02d86f4fba1b34dd8f6b5f60c3e5"; + name = "kmousetool-19.12.1.tar.xz"; }; }; kmouth = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmouth-19.08.3.tar.xz"; - sha256 = "b962dec13a0fa610b4e9fa03f4f0c9ce28cb8c45e8fc18243c26452783ebf2a9"; - name = "kmouth-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmouth-19.12.1.tar.xz"; + sha256 = "da46e472a05920225c3ae0caba21279dc817b7c8e77ae981b1ad6cf2083a49ad"; + name = "kmouth-19.12.1.tar.xz"; }; }; kmplot = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kmplot-19.08.3.tar.xz"; - sha256 = "777408873baa5d6ce236d71bc2935a89fa414fb9f59049ba6e1ae88d581f580e"; - name = "kmplot-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kmplot-19.12.1.tar.xz"; + sha256 = "b82d9f9d4f3d3447e9125b42918819fe8effd5658d9a385da79e81e12f7466cf"; + name = "kmplot-19.12.1.tar.xz"; }; }; knavalbattle = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/knavalbattle-19.08.3.tar.xz"; - sha256 = "e4a50d3873865e8ab4803a9d7350bfc56ee3d59fd718b8abe860ac89e995ae69"; - name = "knavalbattle-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/knavalbattle-19.12.1.tar.xz"; + sha256 = "1cc2c7fec2e2edc634cb1f83cf7e433522b0bc7d76c04cbcde66bb486a832856"; + name = "knavalbattle-19.12.1.tar.xz"; }; }; knetwalk = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/knetwalk-19.08.3.tar.xz"; - sha256 = "ed74cd88364eb263209574655e1cdf77f4776bf339f3313ce20dbf4f950664c4"; - name = "knetwalk-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/knetwalk-19.12.1.tar.xz"; + sha256 = "95725a45c56956a2b8e8e2db36b6baedfc0271af0d6e3541d6143342e6f41ca5"; + name = "knetwalk-19.12.1.tar.xz"; }; }; knights = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/knights-19.08.3.tar.xz"; - sha256 = "1a60de6e31340ecdd3b454d0a90f74f9ab0b81ff9166869d402da77d0acdc93e"; - name = "knights-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/knights-19.12.1.tar.xz"; + sha256 = "60ce0d76eb13c95ba81b0f2dfe5bd3e80ed2226319e4ef97150c3240f428d355"; + name = "knights-19.12.1.tar.xz"; }; }; knotes = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/knotes-19.08.3.tar.xz"; - sha256 = "07ad3c7c8f5e7429c1f112aca10c164468dbbd5c356b504aa1fc172bb1bb1889"; - name = "knotes-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/knotes-19.12.1.tar.xz"; + sha256 = "e89f22ee1a918553be5241e167bd038797391502cb98c5f260c96b25017dd235"; + name = "knotes-19.12.1.tar.xz"; }; }; kolf = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kolf-19.08.3.tar.xz"; - sha256 = "1c864f1abb31b168fd1402217ffc4c00d495f8ebece61ddc1f8c954c29684e1b"; - name = "kolf-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kolf-19.12.1.tar.xz"; + sha256 = "78c5e74d61f8c19b31d4d08781d12a87bc6101d0105081e0c15f4506e36ef6f5"; + name = "kolf-19.12.1.tar.xz"; }; }; kollision = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kollision-19.08.3.tar.xz"; - sha256 = "2240563774c22bf0552504a501710e37eb468afcbc4c3313db7779d086cdf8dc"; - name = "kollision-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kollision-19.12.1.tar.xz"; + sha256 = "a48515f63c0dbcc890aa9c01e344ea5bcb123e587459879796acc39a16243c09"; + name = "kollision-19.12.1.tar.xz"; }; }; kolourpaint = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kolourpaint-19.08.3.tar.xz"; - sha256 = "aac61cfc561b4d4759b086508c53c525db6899ae11a2400c4ca701fcb5649c8d"; - name = "kolourpaint-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kolourpaint-19.12.1.tar.xz"; + sha256 = "a2db2312ddf79024358309da8b70cb2b9979d208372ce5f0960f662b8aab2518"; + name = "kolourpaint-19.12.1.tar.xz"; }; }; kompare = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kompare-19.08.3.tar.xz"; - sha256 = "d0adbae35e979212e9705cb815e309059d8b3d0b7a815d7ff2cd7197eff65f44"; - name = "kompare-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kompare-19.12.1.tar.xz"; + sha256 = "c2eede65a85d59067caf6161606c3de4f18ec6b5e824cb1da9e6b3a8f1b7a92d"; + name = "kompare-19.12.1.tar.xz"; }; }; konqueror = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/konqueror-19.08.3.tar.xz"; - sha256 = "d0ff5b409bbbef5394aeb0bafeb6fea6265feff929fbf4b6a451adc030542d9b"; - name = "konqueror-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/konqueror-19.12.1.tar.xz"; + sha256 = "20da57d7dd141e2c45345457ca90be26af28c2078224eb461dff9f9589889a09"; + name = "konqueror-19.12.1.tar.xz"; }; }; konquest = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/konquest-19.08.3.tar.xz"; - sha256 = "619a834341377475fed24485cf2c3f2ae68f1a8d6cea01b10e0a8408a7eef209"; - name = "konquest-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/konquest-19.12.1.tar.xz"; + sha256 = "178e42f76115f8e8b47494ea7732fb76a692debe714590c06d84f7071930b65a"; + name = "konquest-19.12.1.tar.xz"; }; }; konsole = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/konsole-19.08.3.tar.xz"; - sha256 = "2cc610109ff8ddc6efa6ea83f0153f4b1d72e4be65d8dbde9cfd526c257e7025"; - name = "konsole-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/konsole-19.12.1.tar.xz"; + sha256 = "39797ed81c5ace12fd90f4a6e65c25d33db8e4385ab2baad2bd6a3b2db0ef075"; + name = "konsole-19.12.1.tar.xz"; }; }; kontact = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kontact-19.08.3.tar.xz"; - sha256 = "2bc81b4c051856894d5405532e9663a59abf25bfed1cf0394ee24e219b4752d5"; - name = "kontact-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kontact-19.12.1.tar.xz"; + sha256 = "e9f7911154953d58be962bd392baf7d9c310e9e665adb0c875ed5a50dcfe5e01"; + name = "kontact-19.12.1.tar.xz"; }; }; kontactinterface = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kontactinterface-19.08.3.tar.xz"; - sha256 = "67827b27e46d381a207bcd6986b0285c0b7629ec9b93048e9503768662e211dc"; - name = "kontactinterface-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kontactinterface-19.12.1.tar.xz"; + sha256 = "a88b782b495d662920fd5f51c287c472c107c577af92431b4470787a78866b2c"; + name = "kontactinterface-19.12.1.tar.xz"; }; }; kopete = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kopete-19.08.3.tar.xz"; - sha256 = "d4e407516754cdf66f447e4439f41080586af2ec30c07bd1c88712b089f21221"; - name = "kopete-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kopete-19.12.1.tar.xz"; + sha256 = "eca3610cc9607c27620c7c23f9bb54bdd80d2fb295adaf6636506597fc0b848d"; + name = "kopete-19.12.1.tar.xz"; }; }; korganizer = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/korganizer-19.08.3.tar.xz"; - sha256 = "b675b6c7a2a28a51bd377872c69795157825fd04fbef6dd4c97c33f659adadc7"; - name = "korganizer-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/korganizer-19.12.1.tar.xz"; + sha256 = "8bd84dfdca4f4738152c19d336b8c516f0c79fd888f0361005bc5d6359eeb117"; + name = "korganizer-19.12.1.tar.xz"; }; }; kpat = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kpat-19.08.3.tar.xz"; - sha256 = "b1414eb0c04396468f40ea84fe71077b98476b4b76c0d3abb95ae4afd49e27a7"; - name = "kpat-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kpat-19.12.1.tar.xz"; + sha256 = "cb72a256a2a6a34bd8ee05e09b28f0eedee6643f24f793c5f67a9465040c30c3"; + name = "kpat-19.12.1.tar.xz"; }; }; kpimtextedit = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kpimtextedit-19.08.3.tar.xz"; - sha256 = "75ff2300e771a1fe02a19ef57e2a28489179a92dc184c924be495e878b4444ab"; - name = "kpimtextedit-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kpimtextedit-19.12.1.tar.xz"; + sha256 = "253ded44f3ccb7de1a0a8879e45cc361c14dda2924619aeb04f4286c917f5475"; + name = "kpimtextedit-19.12.1.tar.xz"; }; }; kpkpass = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kpkpass-19.08.3.tar.xz"; - sha256 = "6d70d3bcc949e83543ae7cf9d22280c270107bd9c9cb2882d6b37f6d036f5126"; - name = "kpkpass-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kpkpass-19.12.1.tar.xz"; + sha256 = "b5a079dc1c102c52e29c1d0da3e5a1e51bf9e0a666bb82d6b783f1b55eaa7ada"; + name = "kpkpass-19.12.1.tar.xz"; }; }; kqtquickcharts = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kqtquickcharts-19.08.3.tar.xz"; - sha256 = "f1c54caccbcc97219f8666bdf97cfecdb008c532f1453f27a6971ca54ec5994f"; - name = "kqtquickcharts-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kqtquickcharts-19.12.1.tar.xz"; + sha256 = "641f5c993e627dd6d0778066016d20196b7502e34ab793fcf17dd6b226d08ae8"; + name = "kqtquickcharts-19.12.1.tar.xz"; }; }; krdc = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/krdc-19.08.3.tar.xz"; - sha256 = "d4cbaebaa3cd56ef5ec728a1d09edf72e8dfc18174e59f954a5f7ec8494acfdc"; - name = "krdc-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/krdc-19.12.1.tar.xz"; + sha256 = "b3d9b9c43bfe5801d807be08172ca4c773ff6fc2d846cf5b2456c3360ca21824"; + name = "krdc-19.12.1.tar.xz"; }; }; kreversi = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kreversi-19.08.3.tar.xz"; - sha256 = "30f15e40e1347c7d746bfdef7dffc0a0a9aecef8a960c875b68fab255c43d82c"; - name = "kreversi-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kreversi-19.12.1.tar.xz"; + sha256 = "b81e6544ba23b0869329d734618b3bc4408b585d550985338e6d90bf2d3a17f3"; + name = "kreversi-19.12.1.tar.xz"; }; }; krfb = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/krfb-19.08.3.tar.xz"; - sha256 = "c708e10b909151dee362205af9db72946b9bbb86f3d87aaf2d2a9956a9242e1d"; - name = "krfb-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/krfb-19.12.1.tar.xz"; + sha256 = "7f25790480ac3a8db8a8bd847d80937a0ab763f6c5c12fa2ce704c4b24810287"; + name = "krfb-19.12.1.tar.xz"; }; }; kross-interpreters = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kross-interpreters-19.08.3.tar.xz"; - sha256 = "525527db9e471a062c15b9b22b715dad2e164fb1b19580fc5b963cc7269ce5b5"; - name = "kross-interpreters-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kross-interpreters-19.12.1.tar.xz"; + sha256 = "c5ec40971befd1d214d80c8c2ced3e30aaadfd2d4000ea782751f769783f8130"; + name = "kross-interpreters-19.12.1.tar.xz"; }; }; kruler = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kruler-19.08.3.tar.xz"; - sha256 = "1825ec4b7f6a0ffc00f1ed09d2879a8d9925da49e62bad0a7484d4e90903df79"; - name = "kruler-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kruler-19.12.1.tar.xz"; + sha256 = "0ecbc70561c0d973866c4bd27333a5ddc904b748fb3a64f66b6b06040b30d34a"; + name = "kruler-19.12.1.tar.xz"; }; }; kshisen = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kshisen-19.08.3.tar.xz"; - sha256 = "bae9f0ed77f7b1b33f21a53dc07481665f6acdb9daad71dd550512a710a905af"; - name = "kshisen-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kshisen-19.12.1.tar.xz"; + sha256 = "a361dfc41595640287dd5b800921859ff17a45f7360e5e2fc6f520cc0e421afa"; + name = "kshisen-19.12.1.tar.xz"; }; }; ksirk = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksirk-19.08.3.tar.xz"; - sha256 = "8ab94b45767e648341ead545a2b427c94ee0f71c8abbe7dbb6b85c28748f3cac"; - name = "ksirk-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksirk-19.12.1.tar.xz"; + sha256 = "4f71e4ef3b4d2041edd48537f4b475cb505fc54e45b39b81a08c82d4eec7cc8e"; + name = "ksirk-19.12.1.tar.xz"; }; }; ksmtp = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksmtp-19.08.3.tar.xz"; - sha256 = "16b389a8dcb938ed3f1e2f4b10a5aa31c16eac8df89963a71c08af3e54ada8dd"; - name = "ksmtp-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksmtp-19.12.1.tar.xz"; + sha256 = "6c7d6ce91d65d7430cb31fb4a1fd44a600a5a459b3956807ee3180b5822dbac0"; + name = "ksmtp-19.12.1.tar.xz"; }; }; ksnakeduel = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksnakeduel-19.08.3.tar.xz"; - sha256 = "d6361ce5a46d6e8ca4b5e674f31017a545245ddb907f33963afba2aeaecdf956"; - name = "ksnakeduel-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksnakeduel-19.12.1.tar.xz"; + sha256 = "73e9c55cce88a6e5d00683c73382ee82db64bfe788c14c3a4eda8decf382188f"; + name = "ksnakeduel-19.12.1.tar.xz"; }; }; kspaceduel = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kspaceduel-19.08.3.tar.xz"; - sha256 = "88e25bc037034e3a22f4cea71729fc160d25bcefb978da00d3f7681841b4f7c2"; - name = "kspaceduel-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kspaceduel-19.12.1.tar.xz"; + sha256 = "0bc1f1c12bcfc9e5c778918fb9fa644f5c7ec5c3e687c015d45a7c5c31a27834"; + name = "kspaceduel-19.12.1.tar.xz"; }; }; ksquares = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksquares-19.08.3.tar.xz"; - sha256 = "7e1798e6a306d6ef948035915bdb904ee9efb238dc5a04b4a747185d34856843"; - name = "ksquares-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksquares-19.12.1.tar.xz"; + sha256 = "955225b9fadbda464bdaf1b59c95c3d12310f84484a296968737e9fb87b37b46"; + name = "ksquares-19.12.1.tar.xz"; }; }; ksudoku = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksudoku-19.08.3.tar.xz"; - sha256 = "82bf07385d131968ffd49a58404984fd506481158097aa063d954618d2679a65"; - name = "ksudoku-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksudoku-19.12.1.tar.xz"; + sha256 = "4dd72a5b0bb0c951508bbe2c60ce280efcd0414899e025a2ca4d92336576ec2a"; + name = "ksudoku-19.12.1.tar.xz"; }; }; ksystemlog = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ksystemlog-19.08.3.tar.xz"; - sha256 = "97fca55ae5481d77628531482da99ece40cef2c81de633fe4c1e99206d17391d"; - name = "ksystemlog-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ksystemlog-19.12.1.tar.xz"; + sha256 = "497496ca7451cd34f193ba11fe3100479515a89a34f0437ca2f508a48e68e895"; + name = "ksystemlog-19.12.1.tar.xz"; }; }; kteatime = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kteatime-19.08.3.tar.xz"; - sha256 = "dbe96fdd20545dc5ebe8103aed878dbbca5e015a42827129485a32fdcbf0d592"; - name = "kteatime-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kteatime-19.12.1.tar.xz"; + sha256 = "49a0531b64e93ceb29548a7f75da755e75afda001fce2e6ba906372456b5dc17"; + name = "kteatime-19.12.1.tar.xz"; }; }; ktimer = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktimer-19.08.3.tar.xz"; - sha256 = "d8c80c3929e21a0450574d2e05e2a2384978c70f812eaab25e32402fe3a2f6c5"; - name = "ktimer-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktimer-19.12.1.tar.xz"; + sha256 = "0c5fac1baddfa3144b8930f3d42b78a3eb8681d642a3c3339c903ad2cb30a2ba"; + name = "ktimer-19.12.1.tar.xz"; }; }; ktnef = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktnef-19.08.3.tar.xz"; - sha256 = "86ae57b54047f51d31292fb71f2410660dd5bf7ca54e847b78108c600884ee4d"; - name = "ktnef-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktnef-19.12.1.tar.xz"; + sha256 = "2fce576e517e6ae9001ade6f07a51fcfa899a6569bc4b8c3948827adfc0af20c"; + name = "ktnef-19.12.1.tar.xz"; }; }; ktouch = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktouch-19.08.3.tar.xz"; - sha256 = "8a288377a37f5afbd657c452c45628186646b27585a67312e35930a9fb581d37"; - name = "ktouch-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktouch-19.12.1.tar.xz"; + sha256 = "64b8a025f82b951c69c3be7aa7d3c23f14ccef9ed5e900776eb01462cff9a99f"; + name = "ktouch-19.12.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-accounts-kcm-19.08.3.tar.xz"; - sha256 = "79d2af8b3863d2f4fda51c0bc04b696648d297f2af33e09237b0eed9dd24509f"; - name = "ktp-accounts-kcm-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-accounts-kcm-19.12.1.tar.xz"; + sha256 = "1ae81e4b7bae97d9d18c1fdc9e7083cc810b39d58dff5755dc9d78bd62551577"; + name = "ktp-accounts-kcm-19.12.1.tar.xz"; }; }; ktp-approver = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-approver-19.08.3.tar.xz"; - sha256 = "6051059761a1fe05ad696846a20752707ed6c9ce164aa551e86e3a5ddca4a65f"; - name = "ktp-approver-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-approver-19.12.1.tar.xz"; + sha256 = "502a63f13db44fc8a28f64e37c43839b8da22086bf858dc9c492476d9ba14b50"; + name = "ktp-approver-19.12.1.tar.xz"; }; }; ktp-auth-handler = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-auth-handler-19.08.3.tar.xz"; - sha256 = "6275ea746a28857cc77cc031a75a5f2278cf85dd1ef3c04e47006c4316975659"; - name = "ktp-auth-handler-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-auth-handler-19.12.1.tar.xz"; + sha256 = "109583d4800d293fe11eeaa553d72643f2a3709c0d078a6e842f2e4b228d93e0"; + name = "ktp-auth-handler-19.12.1.tar.xz"; }; }; ktp-call-ui = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-call-ui-19.08.3.tar.xz"; - sha256 = "9245d11a28c2022ec98de6368d03ba8d9a53d8364d4f87efb142a0f843eea67d"; - name = "ktp-call-ui-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-call-ui-19.12.1.tar.xz"; + sha256 = "adb3025f8f878fd4a56ce125bd51c155f26b02661b9365b6321fb456153b0c55"; + name = "ktp-call-ui-19.12.1.tar.xz"; }; }; ktp-common-internals = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-common-internals-19.08.3.tar.xz"; - sha256 = "7ec6466ebaa0f4acb7e38707b013989ef0a7d50bad5520d1a53fcf17b5ef5670"; - name = "ktp-common-internals-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-common-internals-19.12.1.tar.xz"; + sha256 = "4a1f189c1393164fba710e63b0e8f1aae6f22a5faacea0d86544e3e4a471603a"; + name = "ktp-common-internals-19.12.1.tar.xz"; }; }; ktp-contact-list = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-contact-list-19.08.3.tar.xz"; - sha256 = "508085b52fff2e542ea28acb853f1cb3fcdf99d1f72ed99bc42991784fb2efd6"; - name = "ktp-contact-list-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-list-19.12.1.tar.xz"; + sha256 = "c293fa90899d496c4e29b9c9986a3864e06ef22dabbd4583123abbc232f4fe25"; + name = "ktp-contact-list-19.12.1.tar.xz"; }; }; ktp-contact-runner = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-contact-runner-19.08.3.tar.xz"; - sha256 = "fe343560b80a4d9734f0160c8257fffe762801364e5dcbb9cf82edd6ded5683c"; - name = "ktp-contact-runner-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-runner-19.12.1.tar.xz"; + sha256 = "a86d8a67f3d8f3d741c6c4548a58cbdff384e8bd5ed5cd1d82db65456240ac0f"; + name = "ktp-contact-runner-19.12.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-desktop-applets-19.08.3.tar.xz"; - sha256 = "318b6a8f40cbbd7a82a1ed55788f8832133ee8d5685182783a4c00e1b2e6fa2a"; - name = "ktp-desktop-applets-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-desktop-applets-19.12.1.tar.xz"; + sha256 = "63f1a0df6a392f41a54fda8c4896754c2687ba34968cf5bbc0ac84a37c1a1741"; + name = "ktp-desktop-applets-19.12.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-filetransfer-handler-19.08.3.tar.xz"; - sha256 = "cdc90313da9a238197b69d0ebc11d8e4c6ce617063acbf2864d966aff6df1e94"; - name = "ktp-filetransfer-handler-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-filetransfer-handler-19.12.1.tar.xz"; + sha256 = "208aab8c78f4b7f38e331802a63fa10d00a65c115900c72c7a710b799ea56034"; + name = "ktp-filetransfer-handler-19.12.1.tar.xz"; }; }; ktp-kded-module = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-kded-module-19.08.3.tar.xz"; - sha256 = "c16d46035874460f98c4f59e04d50e197c1c70ae9b441dfeb53dd4b319e96d15"; - name = "ktp-kded-module-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-kded-module-19.12.1.tar.xz"; + sha256 = "274f97c6874eeb2af14b937ed20430d2ac2e1a769890a70da8d477ac33ed6082"; + name = "ktp-kded-module-19.12.1.tar.xz"; }; }; ktp-send-file = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-send-file-19.08.3.tar.xz"; - sha256 = "db03d482f7bb101e1655262cd99d46e4a551141b8784bae67162d941fb13644f"; - name = "ktp-send-file-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-send-file-19.12.1.tar.xz"; + sha256 = "5652e40e02ac191ad6e8df276a5faf8805000760261d495f3f4424416da3b977"; + name = "ktp-send-file-19.12.1.tar.xz"; }; }; ktp-text-ui = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktp-text-ui-19.08.3.tar.xz"; - sha256 = "6779fad4ae6198ebf2e0759b53a8a0792bfca477df2c1f538bc00d1da281eae8"; - name = "ktp-text-ui-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktp-text-ui-19.12.1.tar.xz"; + sha256 = "226efc09343bb9218c461858747a1bc084ad8291fbbcc9f49eb888acfe2039c6"; + name = "ktp-text-ui-19.12.1.tar.xz"; }; }; ktuberling = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/ktuberling-19.08.3.tar.xz"; - sha256 = "5204b6eee57554e90d542dc4eca45fbbf0246f261fb1c231b53440c90d26aee1"; - name = "ktuberling-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/ktuberling-19.12.1.tar.xz"; + sha256 = "4c0d594ef72bd2dda5d42daf0f8b430319cbea6d28ba5c9725895b1221cdaace"; + name = "ktuberling-19.12.1.tar.xz"; }; }; kturtle = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kturtle-19.08.3.tar.xz"; - sha256 = "a622b22ea3b98666dbd32f6f6db2093b7f3859be52515b3bedc72684ef7780e7"; - name = "kturtle-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kturtle-19.12.1.tar.xz"; + sha256 = "de10ea1ee142aea6fba8dee0d27d2e431aa806c6d7be4f5b5727cba8984e8d51"; + name = "kturtle-19.12.1.tar.xz"; }; }; kubrick = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kubrick-19.08.3.tar.xz"; - sha256 = "fd11e0969ae08e42316044535008511b3fcae7752c7a86b2ae9ae24c94e44855"; - name = "kubrick-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kubrick-19.12.1.tar.xz"; + sha256 = "485e7e4a30b01cb2661c640214bdc71a3e0a8b61a9071c64ffbbe75e2270af3c"; + name = "kubrick-19.12.1.tar.xz"; }; }; kwalletmanager = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kwalletmanager-19.08.3.tar.xz"; - sha256 = "00c1362d1454f4593e1f99847b97b3da99931c74ceafc3c3350337af0038b985"; - name = "kwalletmanager-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kwalletmanager-19.12.1.tar.xz"; + sha256 = "b2370fbf559a3b8e8551daedada9c97d07041388dc74f8bd1286c64ab18b936b"; + name = "kwalletmanager-19.12.1.tar.xz"; }; }; kwave = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kwave-19.08.3.tar.xz"; - sha256 = "bde8d2c3805b52bdcf0371c28e870d20fdfdd8b69831a9ba4e59ee9ae0a863ef"; - name = "kwave-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kwave-19.12.1.tar.xz"; + sha256 = "e6c336644c00a457b37820fc87668dd9b8a448d8abf84cda267b6e5cd01e0645"; + name = "kwave-19.12.1.tar.xz"; }; }; kwordquiz = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/kwordquiz-19.08.3.tar.xz"; - sha256 = "9561e4817b5b273f74e7591d1ecb82db45140eea2ea36ab3e2f21d81faa1b66d"; - name = "kwordquiz-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/kwordquiz-19.12.1.tar.xz"; + sha256 = "8ee204de56fe2bf33e11d19b9c0c21d7e3dcf26bf550f9dffa79b22a3082659f"; + name = "kwordquiz-19.12.1.tar.xz"; }; }; libgravatar = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libgravatar-19.08.3.tar.xz"; - sha256 = "7f3421d1074065221e7ff892ba5f32614aef08b9ee407b5d8301e20f414bf8fb"; - name = "libgravatar-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libgravatar-19.12.1.tar.xz"; + sha256 = "84525db5f24c04cfa2bb44376a3bd64368e9d9478a160cf862c695052f3fc254"; + name = "libgravatar-19.12.1.tar.xz"; }; }; libkcddb = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkcddb-19.08.3.tar.xz"; - sha256 = "56fe09cfab0455581057aa1681cec01777159a51af1871419cd1b5fb9d4e8ae6"; - name = "libkcddb-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkcddb-19.12.1.tar.xz"; + sha256 = "50c139aaa14a5f27b3818cec7ec6ede4b764d461b6547651b61e4edd295afe6f"; + name = "libkcddb-19.12.1.tar.xz"; }; }; libkcompactdisc = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkcompactdisc-19.08.3.tar.xz"; - sha256 = "912b885badf6aff6b0378fba993633c9fb5cf026dc6791e4cda0c4c27913f425"; - name = "libkcompactdisc-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkcompactdisc-19.12.1.tar.xz"; + sha256 = "95b14098b24a86094b01b357e36ae135fb6c85c838e8735c843d27b101cc2bd9"; + name = "libkcompactdisc-19.12.1.tar.xz"; }; }; libkdcraw = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkdcraw-19.08.3.tar.xz"; - sha256 = "7fe4ade52c2e1e1ec3074fe52ebfc8838193b50791f2f26256f04178015ef87e"; - name = "libkdcraw-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkdcraw-19.12.1.tar.xz"; + sha256 = "bbdd5b1b9b40780b5f2be567d9ba0ab163fe7dcc7121070b788106e0fe966c1e"; + name = "libkdcraw-19.12.1.tar.xz"; }; }; libkdegames = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkdegames-19.08.3.tar.xz"; - sha256 = "019cdc0c702b8c9cacabc36ec2c81951e43ff80dbdfe527cba0dc5f5649dbb89"; - name = "libkdegames-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkdegames-19.12.1.tar.xz"; + sha256 = "317513544e08d03b2381bdb4c0bcd24c844dd8af7ccc4896569dd05933061d9c"; + name = "libkdegames-19.12.1.tar.xz"; }; }; libkdepim = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkdepim-19.08.3.tar.xz"; - sha256 = "36c9457868fd98648a911304a485e8509689bfc280f9d4ad2631ba15f849b059"; - name = "libkdepim-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkdepim-19.12.1.tar.xz"; + sha256 = "1d626a959a0f9fcb24c4e01c553126d40314c789db9bc80d6b52f2bb75e233cd"; + name = "libkdepim-19.12.1.tar.xz"; }; }; libkeduvocdocument = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkeduvocdocument-19.08.3.tar.xz"; - sha256 = "19d816ae3dd2395f53c8bc19a4d62dcd6fcec0bcebbc8ebfe32987afdb87ee14"; - name = "libkeduvocdocument-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkeduvocdocument-19.12.1.tar.xz"; + sha256 = "a0e3921dab9d892d5efcddfbca548f230b508fc81ab4d7735c7610a710791816"; + name = "libkeduvocdocument-19.12.1.tar.xz"; }; }; libkexiv2 = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkexiv2-19.08.3.tar.xz"; - sha256 = "4c8a1acc4fe6c7105130ac93f5486ddbffb09921a9f34d3af418bd7e1695435e"; - name = "libkexiv2-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkexiv2-19.12.1.tar.xz"; + sha256 = "53b9a4ecda0f76df1a5b9f7b8184b85e847838cf97e4ad3036a6c5bb719993e5"; + name = "libkexiv2-19.12.1.tar.xz"; }; }; libkgapi = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkgapi-19.08.3.tar.xz"; - sha256 = "085878396ae2a8bed7e9121d985de848c515992a3c6c989b9510125bc859e67c"; - name = "libkgapi-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkgapi-19.12.1.tar.xz"; + sha256 = "8bfa16ab76b0042e2a0b827cf251b1155c0e693db39ffcb2805613d3393389cf"; + name = "libkgapi-19.12.1.tar.xz"; }; }; libkgeomap = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkgeomap-19.08.3.tar.xz"; - sha256 = "858a6327fe45b67bd31e1f592412a30e0c0f64eb353279480f62b19e51df9576"; - name = "libkgeomap-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkgeomap-19.12.1.tar.xz"; + sha256 = "68c9c5b91e77a4b4a07ca646d58e8e890975825f8f851d850c95dacb7a1d90d2"; + name = "libkgeomap-19.12.1.tar.xz"; }; }; libkipi = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkipi-19.08.3.tar.xz"; - sha256 = "4b06a880a66eae18dc3ed7f4b39e877691c21d60af7603c7679ebcac5a0a7d4b"; - name = "libkipi-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkipi-19.12.1.tar.xz"; + sha256 = "79f0a994b348467353425aea60dc4f4234c9a259cffcb55ac60d8c195bd0122c"; + name = "libkipi-19.12.1.tar.xz"; }; }; libkleo = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkleo-19.08.3.tar.xz"; - sha256 = "5f1a3276646c786e8e25e6765d0f4e6b6ac0e4dccd094c1810b10a10e401576e"; - name = "libkleo-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkleo-19.12.1.tar.xz"; + sha256 = "8e9b78fbeb861370ab81f98150ff9ea8afc960293ae8324fedd0b877302994a7"; + name = "libkleo-19.12.1.tar.xz"; }; }; libkmahjongg = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkmahjongg-19.08.3.tar.xz"; - sha256 = "fd7d036ba3b17246fad42e0366003233c42f5b03df881d6bc6886518c2acb165"; - name = "libkmahjongg-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkmahjongg-19.12.1.tar.xz"; + sha256 = "e6a107a32c01c654a2372fda984724b4acd59dbc2902f3f9c7a7d9e14587639c"; + name = "libkmahjongg-19.12.1.tar.xz"; }; }; libkomparediff2 = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libkomparediff2-19.08.3.tar.xz"; - sha256 = "a1ba5616fda806d5aedab3fb080bbcef5e13c04153fd9659d9d47f0a1a11125d"; - name = "libkomparediff2-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libkomparediff2-19.12.1.tar.xz"; + sha256 = "319d61742f7603a60d781151cd717291c5cb976ff0f2895df9d167526cfb0b4a"; + name = "libkomparediff2-19.12.1.tar.xz"; }; }; libksane = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libksane-19.08.3.tar.xz"; - sha256 = "97808ced0a0c6800c31fa8e810d2a00a3dbda410ed6691e114173b0412b94f93"; - name = "libksane-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libksane-19.12.1.tar.xz"; + sha256 = "5a5998996848e83c80589c8ed0b1a6c1fa48bb61686288d199d831ac810e1603"; + name = "libksane-19.12.1.tar.xz"; }; }; libksieve = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/libksieve-19.08.3.tar.xz"; - sha256 = "a10311192a57d1b7073d73477f5cefdf7c42d0a720d0eaf406986e4f1835ce60"; - name = "libksieve-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/libksieve-19.12.1.tar.xz"; + sha256 = "6c3d49e2ce4d8e6b7c1b4328aa6065a01c7711223dd4f3b9db3a542f9fc0a84c"; + name = "libksieve-19.12.1.tar.xz"; }; }; lokalize = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/lokalize-19.08.3.tar.xz"; - sha256 = "e25de54944ca32b32b4eeddd85e8ca9764a04de7c1d7a2d350d41cbda8105aef"; - name = "lokalize-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/lokalize-19.12.1.tar.xz"; + sha256 = "ee29cff9a513d68cde72e6ace0f893de77be5cb3fe56b4b6e0d1fa5b808b424c"; + name = "lokalize-19.12.1.tar.xz"; }; }; lskat = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/lskat-19.08.3.tar.xz"; - sha256 = "499334ffff57a46973caa4f8571b06ae482bccff9e17dcd9ba82ac7f448365e2"; - name = "lskat-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/lskat-19.12.1.tar.xz"; + sha256 = "0aa36c4cc554b708f7334b32362831537ea52db81b8480b80ffac5c27a041e8f"; + name = "lskat-19.12.1.tar.xz"; }; }; mailcommon = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/mailcommon-19.08.3.tar.xz"; - sha256 = "55ccf161f40b3647f269f71309f9a2fcdf1e2327da53e96c3d8510fc664252bf"; - name = "mailcommon-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/mailcommon-19.12.1.tar.xz"; + sha256 = "160135049bc2e4984f14022af793a9ac05bf488faa6f9eb7bd86a094de1c9bfe"; + name = "mailcommon-19.12.1.tar.xz"; }; }; mailimporter = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/mailimporter-19.08.3.tar.xz"; - sha256 = "fbdfbfe093bb0af05d26492c0839a94ac0a5c0577081bd726626b943be7cb96e"; - name = "mailimporter-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/mailimporter-19.12.1.tar.xz"; + sha256 = "c1a042560438d6f6195a1f64355515489b74a44c1d2f5f547ced6785439215f1"; + name = "mailimporter-19.12.1.tar.xz"; }; }; marble = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/marble-19.08.3.tar.xz"; - sha256 = "cd5d7f758d2234dc8e2fa638b9e1326461655e10dbe21910dbef029e80ef7a68"; - name = "marble-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/marble-19.12.1.tar.xz"; + sha256 = "46ec0dcab4773ccfb843ae52881ae833b038a00b7690977a2e721099264dc8dd"; + name = "marble-19.12.1.tar.xz"; }; }; mbox-importer = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/mbox-importer-19.08.3.tar.xz"; - sha256 = "77fadf4d2dc14830704135237fb7c5f0285204acb9822277944cc03f70b8dc3c"; - name = "mbox-importer-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/mbox-importer-19.12.1.tar.xz"; + sha256 = "04dd6220192095d0f7befb368b9d96a321acac7af43b3575faf25ae89d17b5f4"; + name = "mbox-importer-19.12.1.tar.xz"; }; }; messagelib = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/messagelib-19.08.3.tar.xz"; - sha256 = "db2e48e48d87922f9533ebd3eb021549e6bf8dea5828d83bfdfecb36b1426728"; - name = "messagelib-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/messagelib-19.12.1.tar.xz"; + sha256 = "d2514ac31f78235340353701f735a15f69d99374a55566ec7702a3a5ddd23d05"; + name = "messagelib-19.12.1.tar.xz"; }; }; minuet = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/minuet-19.08.3.tar.xz"; - sha256 = "8af3e0b5fd17d7043499391273232a1649ea3dec5e69faab5a4dc4452080605c"; - name = "minuet-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/minuet-19.12.1.tar.xz"; + sha256 = "735b340f9f0d6ee09c2c6aa76061282da6bd921f8b77683c53311731a77edff1"; + name = "minuet-19.12.1.tar.xz"; }; }; okular = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/okular-19.08.3.tar.xz"; - sha256 = "cea30fe0c2c2b8394e76efe5c945eab1cc9619097291bd9236794b42b09523e5"; - name = "okular-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/okular-19.12.1.tar.xz"; + sha256 = "485044127c6bbe0d4c71f1518da15050957c06b8fe36633462367d15d684d4bd"; + name = "okular-19.12.1.tar.xz"; }; }; palapeli = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/palapeli-19.08.3.tar.xz"; - sha256 = "fc8e4ddd92def4998a0e8b11bc0a45671e5b07e065313aec135e74c056f321bd"; - name = "palapeli-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/palapeli-19.12.1.tar.xz"; + sha256 = "ea4d9dd576066a610444680f3e8686f242bc8be9222020423acab52ec98a185f"; + name = "palapeli-19.12.1.tar.xz"; }; }; parley = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/parley-19.08.3.tar.xz"; - sha256 = "a3d11ddf5a6c8244e5a22c10f6e256ad8bd857802d994550549c7f73f8ed8da8"; - name = "parley-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/parley-19.12.1.tar.xz"; + sha256 = "54b91178a9bd1ff9c1817bd0df69a3a4bb9e4f3488f052034dd45e729f1325b6"; + name = "parley-19.12.1.tar.xz"; }; }; picmi = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/picmi-19.08.3.tar.xz"; - sha256 = "6ed444d40a388e5c1f5f7bda24d35fa119fa5b5ee488def02321f14476bd357d"; - name = "picmi-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/picmi-19.12.1.tar.xz"; + sha256 = "5428ef9add8dd9479f319b8c08fbfefca9ee34fbf503bee1c55b04ecf82ae9f9"; + name = "picmi-19.12.1.tar.xz"; }; }; pimcommon = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/pimcommon-19.08.3.tar.xz"; - sha256 = "76a67c28db71e1187fa192f0e1a07279c690dea313a2a376b2d21b82ab0784ca"; - name = "pimcommon-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/pimcommon-19.12.1.tar.xz"; + sha256 = "d3058407ec578a32df82eb83eb7631d2904e75d6d345ed61dac0f3744840ebf5"; + name = "pimcommon-19.12.1.tar.xz"; }; }; pim-data-exporter = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/pim-data-exporter-19.08.3.tar.xz"; - sha256 = "f89b6588822dd5501e1b93ed3abd9b822725944246ab834777ed0f91f5ab6b91"; - name = "pim-data-exporter-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/pim-data-exporter-19.12.1.tar.xz"; + sha256 = "3f650c1c221826079d7c739e4070e295a7a1b1156f75e8e3100b06f878efed12"; + name = "pim-data-exporter-19.12.1.tar.xz"; }; }; pim-sieve-editor = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/pim-sieve-editor-19.08.3.tar.xz"; - sha256 = "5e8aa5d71ea923baf4376986db77b6dee16d6e281caf22855e97cfeebfb4c1fe"; - name = "pim-sieve-editor-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/pim-sieve-editor-19.12.1.tar.xz"; + sha256 = "3fdca7147c581dce4a014dc2d30bd7e6616c0559654cf9fee68e9292fd6ef037"; + name = "pim-sieve-editor-19.12.1.tar.xz"; }; }; poxml = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/poxml-19.08.3.tar.xz"; - sha256 = "be5feaf46d424a4a4edc5936924f9a8a6d1d5467ecedd0e415aa88e2c3170502"; - name = "poxml-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/poxml-19.12.1.tar.xz"; + sha256 = "f02aa4d1f7de8fb38921fe73076b3e905185979d9b75ff6345efaca8aad0ebb9"; + name = "poxml-19.12.1.tar.xz"; }; }; print-manager = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/print-manager-19.08.3.tar.xz"; - sha256 = "c6420dfa711fc68a6d681d27521eac3c9f1060e57f048594b43f2941a78320ee"; - name = "print-manager-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/print-manager-19.12.1.tar.xz"; + sha256 = "76336be7da80a7494e2e5d5c9ab431047672a98630c7d61f916aa4b9edc35776"; + name = "print-manager-19.12.1.tar.xz"; }; }; rocs = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/rocs-19.08.3.tar.xz"; - sha256 = "533ab2f17160c402550479d7d3be9132b49e1d745c021c7735f0687d12236c8e"; - name = "rocs-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/rocs-19.12.1.tar.xz"; + sha256 = "cc9ff080b05bd6c48ee438c968917d8eb6f6eccb45ca70b45c5e53dce396bb45"; + name = "rocs-19.12.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/signon-kwallet-extension-19.08.3.tar.xz"; - sha256 = "273ff874bf08dd97a12b3b07215bc0ce9fd3c3c59b6bb1f61000411454211a65"; - name = "signon-kwallet-extension-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/signon-kwallet-extension-19.12.1.tar.xz"; + sha256 = "a98397cc15733b9c1010f022a8d6bcf7727c4065ba6ae662273ba97864836bbe"; + name = "signon-kwallet-extension-19.12.1.tar.xz"; }; }; spectacle = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/spectacle-19.08.3.tar.xz"; - sha256 = "3717b7ebd314cac47c263c304c54c14b0115b15cfa4b87201f5ea27a2f4e9b8a"; - name = "spectacle-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/spectacle-19.12.1.tar.xz"; + sha256 = "140f388c531043eeefff8d639eb468d1ed33397925021c6809c0c8a799bb25c9"; + name = "spectacle-19.12.1.tar.xz"; }; }; step = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/step-19.08.3.tar.xz"; - sha256 = "1197b38d9ef14305cf341eba4cd2df08695a9b3f53e2bebff8abb7cbd7a9e2aa"; - name = "step-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/step-19.12.1.tar.xz"; + sha256 = "f171c58b567bb29ed50109b341e53dc00116e814c90f51aa7a6e405326982907"; + name = "step-19.12.1.tar.xz"; }; }; svgpart = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/svgpart-19.08.3.tar.xz"; - sha256 = "1ad667fc6988b64fd379cfb79d00a7c04c97de530e4b61a9ae8a525971ea2a94"; - name = "svgpart-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/svgpart-19.12.1.tar.xz"; + sha256 = "6083457999121ead13b6c267211a78ea04c925d6f9f7447b31677c0b49f6898b"; + name = "svgpart-19.12.1.tar.xz"; }; }; sweeper = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/sweeper-19.08.3.tar.xz"; - sha256 = "0451b9319c4390cfae497922cc135d7d8c4ef74ac81f2c05d2f94458bb3fc8be"; - name = "sweeper-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/sweeper-19.12.1.tar.xz"; + sha256 = "50b1464c08b738f4af4c78b4edc291ce93877a52831b810cd12c8ca6a4df0cf9"; + name = "sweeper-19.12.1.tar.xz"; }; }; umbrello = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/umbrello-19.08.3.tar.xz"; - sha256 = "c4c56354d2765c0d03ffda02cc098cc3e9d72b0c7c22bb0c1cc03dcf5ac31a6a"; - name = "umbrello-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/umbrello-19.12.1.tar.xz"; + sha256 = "077a1b5a3dfe15d37f03ee97ca5b40a1b8e7e0f2305df2f16a966861cc79e0d6"; + name = "umbrello-19.12.1.tar.xz"; }; }; yakuake = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/yakuake-19.08.3.tar.xz"; - sha256 = "1ad2cc026eea9449690aa037ac94b09cd18696d71025204e648501fa7f2cfbaf"; - name = "yakuake-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/yakuake-19.12.1.tar.xz"; + sha256 = "abff4f358f41f544b2e12c340a74d92482241b1b95906b14add7810384602e42"; + name = "yakuake-19.12.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.08.3"; + version = "19.12.1"; src = fetchurl { - url = "${mirror}/stable/applications/19.08.3/src/zeroconf-ioslave-19.08.3.tar.xz"; - sha256 = "b7b00edcc987c298e1dc885e3ceb6acbcbfe40141423d90406a3ccecef2471ed"; - name = "zeroconf-ioslave-19.08.3.tar.xz"; + url = "${mirror}/stable/release-service/19.12.1/src/zeroconf-ioslave-19.12.1.tar.xz"; + sha256 = "39641a186de9d0704a58063a8a37cfb3a405ff6bd9957c7d09efec3bec4dfc60"; + name = "zeroconf-ioslave-19.12.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 7d4f0614d8b..a4d77715199 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -62,7 +62,7 @@ in buildRustPackage rec { sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; }; - cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n"; + cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fd86f21dff0..fc7575ea92c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -93,12 +93,13 @@ mkDerivation rec { netifaces pillow python - pyqt5_with_qtwebkit + pyqt5 sip regex msgpack beautifulsoup4 html2text + pyqtwebengine # the following are distributed with calibre, but we use upstream instead odfpy ] diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 58a85f8f6e9..16be8e06b68 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0wlwq9xg8rzsbj0b29z358k4mbrqy04iraa8x0p26pa95yskgcma"; + sha256 = "05nhgndiq0sm1bvb80sf5fgnm38249dclwzmfm7hzrablmkwgv3c"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 98aebc32dba..e5590bfe855 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.4"; + version = "6.3.5"; 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 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk"; + sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45"; }; installPhase = '' diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index fbe21dd9a5b..da36e89db1f 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: -stdenv.mkDerivation { +mkDerivation { pname = "doomseeker"; version = "2018-03-05"; @@ -13,13 +13,10 @@ stdenv.mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 51e9c4371b5..7c6573630a1 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,10 +1,17 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: -with stdenv.lib; +let + newer-colorer-schemes = fetchFromGitHub { + owner = "colorer"; + repo = "Colorer-schemes"; + rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes) + sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c"; + }; +in stdenv.mkDerivation rec { - build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}"; - name = "far2l-2.1.${build}"; + pname = "far2l"; + version = "2019-12-14.git${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "elfmz"; @@ -16,16 +23,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] - ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; - postPatch = optionalString stdenv.isLinux '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace far2l/bootstrap/trash.sh \ --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' - '' + optionalString stdenv.isDarwin '' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace far2l/CMakeLists.txt \ --replace "-framework System" -lSystem '' + '' - echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh + echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh substituteInPlace far2l/bootstrap/open.sh \ --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' substituteInPlace far2l/vtcompletor.cpp \ @@ -42,14 +49,9 @@ stdenv.mkDerivation rec { --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ --replace '"tar ' '"${gnutar}/bin/tar ' - ( cd colorer/configs/base - patch -p2 < ${ fetchpatch { - name = "nix-language-highlighting.patch"; - url = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch; - sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch"; - } - } - ) + cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc colorer/configs/base/hrc/base/ + cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc colorer/configs/base/hrc/base/ + cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/ ''; installPhase = '' @@ -59,7 +61,8 @@ stdenv.mkDerivation rec { ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp - sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop + cp ../far2l/DE/far2l.desktop $out/share/applications/far2l.desktop + substituteInPlace $out/share/applications/far2l.desktop --replace \''${CMAKE_INSTALL_PREFIX} "$out" cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/ convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png @@ -75,7 +78,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "An orthodox file manager"; homepage = https://github.com/elfmz/far2l; license = licenses.gpl2; diff --git a/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch b/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch new file mode 100644 index 00000000000..31c7a638229 --- /dev/null +++ b/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch @@ -0,0 +1,49 @@ +diff --git i/config.cc w/config.cc +index 04b63f5..7a453d9 100644 +--- i/config.cc ++++ w/config.cc +@@ -182,7 +182,7 @@ Preferences::Preferences(): + pronounceOnLoadPopup( false ), + useInternalPlayer( InternalPlayerBackend::anyAvailable() ), + internalPlayerBackend( InternalPlayerBackend::defaultBackend() ), +- checkForNewReleases( true ), ++ checkForNewReleases( false ), + disallowContentFromOtherSites( false ), + enableWebPlugins( false ), + hideGoldenDictHeader( false ), +@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError ) + c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text(); + } + +- if ( !preferences.namedItem( "checkForNewReleases" ).isNull() ) +- c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" ); ++ //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() ) ++ // c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" ); + + if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() ) + c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" ); +@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError ) + proxy.appendChild( opt ); + } + +- opt = dd.createElement( "checkForNewReleases" ); +- opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) ); +- preferences.appendChild( opt ); ++ //opt = dd.createElement( "checkForNewReleases" ); ++ //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) ); ++ //preferences.appendChild( opt ); + + opt = dd.createElement( "disallowContentFromOtherSites" ); + opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) ); +diff --git i/preferences.cc w/preferences.cc +index 72c3147..7e48f00 100644 +--- i/preferences.cc ++++ w/preferences.cc +@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ): + this, SLOT( customProxyToggled( bool ) ) ); + + ui.checkForNewReleases->setChecked( p.checkForNewReleases ); ++ ui.checkForNewReleases->setEnabled( false ); + ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites ); + ui.enableWebPlugins->setChecked( p.enableWebPlugins ); + ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader ); diff --git a/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch b/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch new file mode 100644 index 00000000000..fc1fcbb0db0 --- /dev/null +++ b/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch @@ -0,0 +1,62 @@ +diff --git i/goldendict.pro w/goldendict.pro +index 328dc20..5202a07 100644 +--- i/goldendict.pro ++++ w/goldendict.pro +@@ -210,21 +210,18 @@ mac { + -llzo2 + !CONFIG( no_ffmpeg_player ) { + LIBS += -lao \ +- -lavutil-gd \ +- -lavformat-gd \ +- -lavcodec-gd ++ -lavutil \ ++ -lavformat \ ++ -lavcodec + } +- INCLUDEPATH = $${PWD}/maclibs/include +- LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon ++ LIBS += -framework AppKit -framework Carbon + OBJECTIVE_SOURCES += lionsupport.mm \ + machotkeywrapper.mm \ + macmouseover.mm \ + speechclient_mac.mm + ICON = icons/macicon.icns + QMAKE_INFO_PLIST = myInfo.plist +- QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \ +- cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \ +- mkdir -p GoldenDict.app/Contents/MacOS/locale & \ ++ QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \ + cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \ + mkdir -p GoldenDict.app/Contents/MacOS/help & \ + cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/ +@@ -232,15 +229,6 @@ mac { + CONFIG += zim_support + !CONFIG( no_chinese_conversion_support ) { + CONFIG += chinese_conversion_support +- CONFIG( x86 ) { +- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \ +- cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \ +- cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/ +- } else { +- QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \ +- cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \ +- cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/ +- } + } + } + DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\" +diff --git i/tiff.cc w/tiff.cc +index e3cb8bf..9ff880f 100644 +--- i/tiff.cc ++++ w/tiff.cc +@@ -6,8 +6,8 @@ + #include "tiff.hh" + + #if defined (Q_OS_MAC) || defined (Q_OS_WIN) +-#include "tiff/tiff.h" +-#include "tiff/tiffio.h" ++#include "tiff.h" ++#include "tiffio.h" + #else + #include "tiff.h" + #include "tiffio.h" diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index e917cc024d5..cd8ecc18223 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,33 +1,68 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell -, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc -, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }: -mkDerivation { +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig +, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv +, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake +, withCC ? true, opencc +, withEpwing ? true, libeb +, withExtraTiff ? true, libtiff +, withFFmpeg ? true, libao, ffmpeg +, withMultimedia ? true +, withZim ? true }: + +mkDerivation rec { + pname = "goldendict"; + version = "2020-01-09"; - name = "goldendict-2019-08-01"; src = fetchFromGitHub { owner = "goldendict"; - repo = "goldendict"; - rev = "0f951b06a55f3a201891cf645a556e773bda5f52"; - sha256 = "1d1hn95vhvsmbq9q96l5adn90g0hg25dl01knb4y4v6v9x4yrl2x"; + repo = pname; + rev = "da197ff5cd0e7326124c9240a1853a0e8b1de439"; + sha256 = "0dlzwjh9wg4bzhhib71jycpp21qw762ww63a37dd50z1ymi61lxc"; }; + patches = [ + ./0001-dont-check-for-updates.patch + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ./0001-dont-use-maclibs.patch + ]; + + postPatch = '' + substituteInPlace goldendict.pro \ + --replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}" + ''; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - qtbase qtsvg qtwebkit qtx11extras qttools - libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff opencc - ]; + qtbase qtsvg qtwebkit qttools + libvorbis hunspell xz lzo + ] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ] + ++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ++ stdenv.lib.optional withCC opencc + ++ stdenv.lib.optional withEpwing libeb + ++ stdenv.lib.optional withExtraTiff libtiff + ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ]; - qmakeFlags = [ + qmakeFlags = with stdenv.lib; [ "goldendict.pro" - "CONFIG+=zim_support" - "CONFIG+=chinese_conversion_support" + (optional withCC "CONFIG+=chinese_conversion_support") + (optional (!withCC) "CONFIG+=no_chinese_conversion_support") + (optional (!withEpwing) "CONFIG+=no_epwing_support") + (optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler") + (optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player") + (optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player") + (optional withZim "CONFIG+=zim_support") ]; - meta = with lib; { - homepage = http://goldendict.org/; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv GoldenDict.app $out/Applications + wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict + ''; + + meta = with stdenv.lib; { + homepage = "http://goldendict.org/"; description = "A feature-rich dictionary lookup program"; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner astsmtl ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ gebner astsmtl sikmir ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index d3d732f410f..2f314508b74 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.20"; + version = "7.22"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "08scvhhdadzz9iydhpkn2k618bgw26z09y6nydi3hi8fc3xfnb8d"; + sha256 = "0gxkx255d8cn5076ync731cdygwvi95rxv463pd4rdw5srbr0gm5"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 6ab297c6970..18f7153b1eb 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.64.0"; + version = "0.64.1"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "10zbi2414c9grqhi9vcj3sczjh7hf20dihvcsirj551fmiqxrvpy"; + sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8"; }; modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl"; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index cbe26b817e2..df690727b27 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 = "4.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "1s9291y38k4adc2wqj7plfhj431nf36zs262jm6mmb2fs910ncgv"; + sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index d3cef00bbe8..b790fb9e6c4 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "1m1drgbyk1m6mf69xqlz9gqcj650n9m4y2fdj7d2yv20q8r31489"; + sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk"; }; dontBuild = true; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Kanban project management software"; homepage = https://kanboard.net; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz lheckemann ]; }; } diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 188e902614f..cdba8c3f686 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -74,10 +74,12 @@ buildPythonApplication rec { }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch - ./no-werror.patch ./png2icns.patch ]; + # Causes build failure due to warning + hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 '' else '' @@ -123,6 +125,6 @@ buildPythonApplication rec { description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ma27 ]; + maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; }; } diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch deleted file mode 100644 index bc1b369d98d..00000000000 --- a/pkgs/applications/misc/kitty/no-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -217,7 +217,7 @@ def init_env( - cflags = os.environ.get( - 'OVERRIDE_CFLAGS', ( - '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11' -- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' -+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden' - ).format( - float_conversion, - optimize, diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index d7d23853e11..45b788a9489 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.7"; + version = "0.9.8.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1b8yz6r6x46xajx900m8s0sjfwiwbpp6nfb780ygfcz6inb1234q"; + sha256 = "10x5aplkjyi2w0793whjjzi777ffh3m4d0sp06qzkpx8jqd46him"; name = "${pname}-${version}.tar.xz"; }; diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 5dd5fa0f512..335279c7084 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -1,26 +1,29 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake -, boost, libvorbis, libsndfile, minizip, gtest }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake +, boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: mkDerivation rec { pname = "lsd2dsl"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "nongeneric"; repo = pname; rev = "v${version}"; - sha256 = "15xjp5xxvl0qc4zp553n7djrbvdp63sfjw406idgxqinfmkqkqdr"; + sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libvorbis libsndfile minizip gtest ]; + buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; - NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; installPhase = '' - install -Dm755 lsd2dsl $out/bin/lsd2dsl - install -m755 qtgui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + install -Dm755 console/lsd2dsl $out/bin/lsd2dsl + install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui + '' + lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/bin/lsd2dsl + wrapQtApp $out/bin/lsd2dsl-qtgui ''; meta = with lib; { @@ -31,6 +34,6 @@ mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index efdfbaadd3d..e5826c09d77 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -38,6 +38,7 @@ buildPythonApplication rec { substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" ''; propagatedBuildInputs = [ + boto3 # needed for caches service pillow pyyaml pyproj diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix new file mode 100644 index 00000000000..b108d1a5647 --- /dev/null +++ b/pkgs/applications/misc/mbutil/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonApplication, fetchFromGitHub, nose }: + +buildPythonApplication rec { + pname = "mbutil"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mapbox"; + repo = pname; + rev = "v${version}"; + sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; + }; + + checkInputs = [ nose ]; + checkPhase = "nosetests"; + + meta = with lib; { + description = "An importer and exporter for MBTiles"; + homepage = "https://github.com/mapbox/mbutil"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index e734e44a2e0..e3154b7cd1c 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -1,36 +1,44 @@ -{ stdenv, fetchurl -, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets +{ lib, mkDerivation, fetchFromGitHub +, libusb1 +, pkg-config +, qmake +, qtbase +, qttools +, qtwebsockets }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "moolticute"; - version = "0.30.8"; + version = "0.42.32-testing"; - src = fetchurl { - url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz"; - sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf"; + src = fetchFromGitHub { + owner = "mooltipass"; + repo = pname; + rev = "v${version}"; + sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05"; }; + outputs = [ "out" "udev" ]; + + nativeBuildInputs = [ pkg-config qmake qttools ]; + buildInputs = [ libusb1 qtbase qtwebsockets ]; + preConfigure = "mkdir -p build && cd build"; - nativeBuildInputs = [ pkgconfig qmake qttools ]; qmakeFlags = [ "../Moolticute.pro" ]; - outputs = [ "out" "udev" ]; preInstall = '' mkdir -p $udev/lib/udev/rules.d sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules ''; - - buildInputs = [ libusb1 qtbase qtwebsockets ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GUI app and daemon to work with Mooltipass device via USB"; longDescription = '' To install udev rules, add `services.udev.packages == [ moolticute.udev ]` into `nixos/configuration.nix`. ''; - homepage = https://github.com/mooltipass/moolticute; + homepage = "https://github.com/mooltipass/moolticute"; license = licenses.gpl3Plus; maintainers = [ maintainers.kirikaza ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index f2df8a09ff2..67f0b4b3926 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "nnn"; - version = "2.9"; + version = "3.0"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "1pifrcrc8fh85b8h8x01hih9wfclb95sf38s443bs3gip1zdrlk3"; + sha256 = "0kmfg61v3xnf8m4m9nna28sr7hdwqbxwivc7j91zhfj2wpdswywp"; }; configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index ce800e8f18b..10c4f2f8448 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: +{ stdenv, fetchgit, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: let buildPlugin = args: python2Packages.buildPythonPackage (args // { @@ -168,13 +168,13 @@ let printtimegenius = buildPlugin rec { pname = "PrintTimeGenius"; - version = "2.0.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f"; + sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; }; preConfigure = '' @@ -183,6 +183,10 @@ let sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py ''; + patches = [ + ./printtimegenius-logging.patch + ]; + meta = with stdenv.lib; { description = "Better print time estimation for OctoPrint"; homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; @@ -191,6 +195,61 @@ let }; }; + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "2019-12-21"; + + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; + sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + }; + + meta = with stdenv.lib; { + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "ieatacid"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + }; + + meta = with stdenv.lib; { + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Sebclem"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + }; + + meta = with stdenv.lib; { + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; }; in self diff --git a/pkgs/applications/misc/octoprint/printtimegenius-logging.patch b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch new file mode 100644 index 00000000000..66c2e83d62c --- /dev/null +++ b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index 6a6610e..cc45902 100644 +--- a/setup.py ++++ b/setup.py +@@ -35,9 +35,9 @@ plugin_license = "AGPLv3" + # Any additional requirements besides OctoPrint should be listed here + # For now, require the working release, which is only 1.3.9rc1. + plugin_requires = ["OctoPrint>=1.3.9rc1", "psutil", "sarge"] +-from sys import version_info +-if version_info[0] < 3: +- plugin_requires.append("logging") ++#from sys import version_info ++#if version_info[0] < 3: ++# plugin_requires.append("logging") + + ### -------------------------------------------------------------------------------------------------------------------- + ### More advanced options that you usually shouldn't have to touch follow after this point diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 8499ad0880c..7b070e32ca5 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; }; - cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; + cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 762d1d6d15c..e283a5381e7 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw"; postInstall = '' diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 21d4b003179..c57153fe0e0 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,7 +3,7 @@ , makeWrapper, perlPackages, mkDerivation }: let - version = "1.6"; + version = "1.6.1"; in mkDerivation rec { pname = "qdirstat"; inherit version; @@ -12,7 +12,7 @@ in mkDerivation rec { owner = "shundhammer"; repo = "qdirstat"; rev = version; - sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; + sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"; }; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index aae38f7d0f1..b9645980c64 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { version = "1.8.1"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; }; diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index a679a4f1112..382e7dbe121 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3.4"; src = fetchurl { - url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/qlandkartegt/${pname}-${version}.tar.gz"; sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; }; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 137ec920f75..4f63ed057b7 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 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk"; + cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl"; meta = with stdenv.lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix new file mode 100644 index 00000000000..74bfbe83e91 --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode-plugins/default.nix @@ -0,0 +1,22 @@ +{ callPackage }: + +{ + autocomplete-all-the-things = callPackage ./urxvt-autocomplete-all-the-things { }; + + bidi = callPackage ./urxvt-bidi { }; + + font-size = callPackage ./urxvt-font-size { }; + + perl = callPackage ./urxvt-perl { }; + + perls = callPackage ./urxvt-perls { }; + + resize-font = callPackage ./urxvt-resize-font { }; + + tabbedex = callPackage ./urxvt-tabbedex { }; + + theme-switch = callPackage ./urxvt-theme-switch { }; + + vtwheel = callPackage ./urxvt-vtwheel { }; + +} diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix index a4e03fa347f..a4e03fa347f 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix index 3e67e4ec085..4b6b4eb8184 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-bidi/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix @@ -16,6 +16,8 @@ perlPackages.buildPerlPackage rec { install -Dm555 misc/bidi "$out/lib/urxvt/perl/bidi" ''; + passthru.perlPackages = [ "self" ]; + meta = with lib; { description = "Text::Bidi Perl package using fribidi, providing a urxvt plugin"; homepage = "https://github.com/mkamensky/Text-Bidi"; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix index 4f4319af6cb..4f4319af6cb 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix index 13e005014f1..13e005014f1 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix index b976388ae2c..dac04141070 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "urxvt-perls"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "muennich"; repo = "urxvt-perls"; rev = version; - sha256 = "1cb0jbjmwfy2dlq2ny8wpc04k79jp3pz9qhbmgagsxs3sp1jg2hz"; + sha256 = "0xvwfw7965ghhd9g6rl6y6fgpd444l46rjqmlgg0rfjypbh6c0p1"; }; installPhase = '' mkdir -p $out/lib/urxvt/perl - cp clipboard \ - keyboard-select \ - url-select \ + cp keyboard-select $out/lib/urxvt/perl + cp deprecated/clipboard \ + deprecated/url-select \ $out/lib/urxvt/perl ''; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix new file mode 100644 index 00000000000..a056e603f00 --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "urxvt-resize-font"; + version = "2019-10-05"; + dontPatchShebangs = true; + + src = fetchFromGitHub { + owner = "simmel"; + repo = "urxvt-resize-font"; + rev = "e966a5d77264e9263bfc8a51e160fad24055776b"; + sha256 = "18ab3bsfdkzzh1n9fpi2al5bksvv2b7fjmvxpx6fzqcy4bc64vkh"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + cp resize-font $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "URxvt Perl extension for resizing the font"; + homepage = "https://github.com/simmel/urxvt-resize-font"; + license = licenses.mit; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix index 2982c02cce9..2982c02cce9 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index ba8ec3a6e72..ba8ec3a6e72 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 2f2c2055803..3d0dec20c9a 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { - name = "rxvt_unicode-vtwheel-0.3.2"; + name = "rxvt-unicode-vtwheel-0.3.2"; src = fetchgit { url = "https://aur.archlinux.org/urxvt-vtwheel.git"; @@ -24,4 +24,4 @@ stdenv.mkDerivation { platforms = with platforms; unix; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/misc/rxvt-unicode/default.nix new file mode 100644 index 00000000000..6512f402ffb --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode/default.nix @@ -0,0 +1,88 @@ +{ stdenv, fetchurl, makeDesktopItem +, libX11, libXt, libXft, libXrender +, ncurses, fontconfig, freetype +, pkgconfig, gdk-pixbuf, perl +, perlSupport ? true +, gdkPixbufSupport ? true +, unicode3Support ? true +}: + +let + pname = "rxvt-unicode"; + version = "9.22"; + description = "A clone of the well-known terminal emulator rxvt"; + + desktopItem = makeDesktopItem { + name = pname; + exec = "urxvt"; + icon = "utilities-terminal"; + comment = description; + desktopName = "URxvt"; + genericName = pname; + categories = "System;TerminalEmulator;"; + }; +in + +with stdenv.lib; + +stdenv.mkDerivation { + name = "${pname}-unwrapped-${version}"; + inherit pname version; + + src = fetchurl { + url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; + sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; + }; + + buildInputs = + [ libX11 libXt libXft ncurses # required to build the terminfo file + fontconfig freetype pkgconfig libXrender + ] ++ optional perlSupport perl + ++ optional gdkPixbufSupport gdk-pixbuf; + + outputs = [ "out" "terminfo" ]; + + patches = [ + ./patches/9.06-font-width.patch + ./patches/256-color-resources.patch + ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; + + + configureFlags = [ + "--with-terminfo=$terminfo/share/terminfo" + "--enable-256-color" + (enableFeature perlSupport "perl") + (enableFeature unicode3Support "unicode3") + ]; + + LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; + CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; + + preConfigure = + '' + # without this the terminfo won't be compiled by tic, see man tic + mkdir -p $terminfo/share/terminfo + export TERMINFO=$terminfo/share/terminfo + '' + + stdenv.lib.optionalString perlSupport '' + # make urxvt find its perl file lib/perl5/site_perl + # is added to PERL5LIB automatically + mkdir -p $out/$(dirname ${perl.libPrefix}) + ln -s $out/lib/urxvt $out/${perl.libPrefix} + ''; + + postInstall = '' + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + cp -r ${desktopItem}/share/applications/ $out/share/ + ''; + + meta = { + inherit description; + homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; + downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch b/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch index c8d2acfbdc5..c8d2acfbdc5 100644 --- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-256-color-resources.patch +++ b/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch b/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch index 636083218fa..636083218fa 100644 --- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-9.06-font-width.patch +++ b/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch b/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch index 5e42e17c156..5e42e17c156 100644 --- a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch +++ b/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/misc/rxvt-unicode/wrapper.nix new file mode 100644 index 00000000000..38978799b5a --- /dev/null +++ b/pkgs/applications/misc/rxvt-unicode/wrapper.nix @@ -0,0 +1,58 @@ +{ callPackage +, symlinkJoin +, makeWrapper +, lib +, rxvt-unicode-unwrapped +, rxvt-unicode-plugins +, perlPackages +, configure ? { availablePlugins, ... }: + { plugins = builtins.attrValues availablePlugins; + extraDeps = [ ]; + perlDeps = [ ]; + } +}: + +let + availablePlugins = rxvt-unicode-plugins; + + # Transform the string "self" to the plugin itself. + # It's needed for plugins like bidi who depends on the perl + # package they provide themself. + mkPerlDeps = p: + let deps = p.perlPackages or [ ]; + in map (x: if x == "self" then p else x) deps; + + # The wrapper is called with a `configure` function + # that takes the urxvt plugins as input and produce + # the configuration of the wrapper: list of plugins, + # extra dependencies and perl dependencies. + # This provides simple way to customize urxvt using + # the `.override` mechanism. + wrapper = { configure, ... }: + let + config = configure { inherit availablePlugins; }; + plugins = config.plugins or (builtins.attrValues availablePlugins); + extraDeps = config.extraDeps or [ ]; + perlDeps = (config.perlDeps or [ ]) ++ lib.concatMap mkPerlDeps plugins; + in + symlinkJoin { + name = "rxvt-unicode-${rxvt-unicode-unwrapped.version}"; + + paths = [ rxvt-unicode-unwrapped ] ++ plugins ++ extraDeps; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/urxvt \ + --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + wrapProgram $out/bin/urxvtd \ + --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + ''; + + passthru.plugins = plugins; + }; + +in + lib.makeOverridable wrapper { inherit configure; } diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix deleted file mode 100644 index 7c239a9b754..00000000000 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft, - ncurses, perl, fontconfig, freetype, pkgconfig, libXrender, - gdkPixbufSupport ? true, gdk-pixbuf, unicode3Support ? true }: - -let - pname = "rxvt-unicode"; - version = "9.22"; - description = "A clone of the well-known terminal emulator rxvt"; - - desktopItem = makeDesktopItem { - name = pname; - exec = "urxvt"; - icon = "utilities-terminal"; - comment = description; - desktopName = "URxvt"; - genericName = pname; - categories = "System;TerminalEmulator;"; - }; -in - -stdenv.mkDerivation ({ - - name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; - - src = fetchurl { - url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; - sha256 = "1pddjn5ynblwfrdmskylrsxb9vfnk3w4jdnq2l8xn2pspkljhip9"; - }; - - buildInputs = - [ libX11 libXt libXft ncurses /* required to build the terminfo file */ - fontconfig freetype pkgconfig libXrender ] - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional gdkPixbufSupport gdk-pixbuf; - - outputs = [ "out" "terminfo" ]; - - patches = [ - ./rxvt-unicode-9.06-font-width.patch - ./rxvt-unicode-256-color-resources.patch - ] - ++ stdenv.lib.optional stdenv.isDarwin ./rxvt-unicode-makefile-phony.patch; - - preConfigure = - '' - mkdir -p $terminfo/share/terminfo - configureFlags="--with-terminfo=$terminfo/share/terminfo --enable-256-color ${if perlSupport then "--enable-perl" else "--disable-perl"} ${if unicode3Support then "--enable-unicode3" else "--disable-unicode3"}"; - export TERMINFO=$terminfo/share/terminfo # without this the terminfo won't be compiled by tic, see man tic - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2" - NIX_LDFLAGS="$NIX_LDFLAGS -lfontconfig -lXrender -lpthread " - '' - # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically - + stdenv.lib.optionalString perlSupport '' - mkdir -p $out/$(dirname ${perl.libPrefix}) - ln -s $out/lib/urxvt $out/${perl.libPrefix} - ''; - - postInstall = '' - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - cp -r ${desktopItem}/share/applications/ $out/share/ - ''; - - meta = with stdenv.lib; { - inherit description; - homepage = http://software.schmorp.de/pkg/rxvt-unicode.html; - downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - license = licenses.gpl3; - }; -}) diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix deleted file mode 100644 index fd0860b3aae..00000000000 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ symlinkJoin, rxvt_unicode, makeWrapper, plugins, perlPackages, perlDeps ? []}: - -let - rxvt_name = builtins.parseDrvName rxvt_unicode.name; - -in symlinkJoin { - name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}"; - - paths = [ rxvt_unicode ] ++ plugins; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/urxvt \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - wrapProgram $out/bin/urxvtd \ - --prefix PERL5LIB : "${perlPackages.makePerlPath perlDeps}" \ - --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" - ''; - - passthru.plugins = plugins; -} diff --git a/pkgs/applications/misc/synergy/build-tests.patch b/pkgs/applications/misc/synergy/build-tests.patch new file mode 100644 index 00000000000..ab08195e794 --- /dev/null +++ b/pkgs/applications/misc/synergy/build-tests.patch @@ -0,0 +1,97 @@ +From 9c2278dad498b8e4040f30c80cf65b3a089ba218 Mon Sep 17 00:00:00 2001 +From: talyz <kim.lindberger@gmail.com> +Date: Fri, 14 Feb 2020 16:26:36 +0100 +Subject: [PATCH] Build tests again + +The tests were accidentally disabled in +688095d0a7d22704b5c3282bc68b41ceca42ab7e. Since then, the code has +drifted slightly: the synergy lib has been renamed from synergy to +synlib in 4263fd17177d7717b04ac6d6ec62efa2f657ed74 and the curl +dependency was dropped in 491bb2de000245a943b8298462c4a9d8f34c9a44. + +This reenables the tests, targets the right lib and removes the +obsolete test. +--- + src/CMakeLists.txt | 2 + + src/test/integtests/CMakeLists.txt | 2 +- + .../integtests/arch/ArchInternetTests.cpp | 37 ------------------- + src/test/unittests/CMakeLists.txt | 2 +- + 4 files changed, 4 insertions(+), 39 deletions(-) + delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ab63a066..fee080ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -22,3 +22,5 @@ add_subdirectory(cmd) + if (SYNERGY_BUILD_LEGACY_GUI) + add_subdirectory(gui) + endif (SYNERGY_BUILD_LEGACY_GUI) ++ ++add_subdirectory(test) +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index f39968a3..096ba3d5 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(integtests ${sources}) + target_link_libraries(integtests +- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) ++ arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS}) +diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp +deleted file mode 100644 +index 95823e9f..00000000 +--- a/src/test/integtests/arch/ArchInternetTests.cpp ++++ /dev/null +@@ -1,37 +0,0 @@ +-/* +- * synergy -- mouse and keyboard sharing utility +- * Copyright (C) 2014-2016 Symless Ltd. +- * +- * This package is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * found in the file LICENSE that should have accompanied this file. +- * +- * This package is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see <http://www.gnu.org/licenses/>. +- */ +- +-#include "arch/Arch.h" +- +-#include "test/global/gtest.h" +- +-#define TEST_URL "https://symless.com/tests/?testString" +-//#define TEST_URL "http://localhost/synergy/tests/?testString" +- +-TEST(ArchInternetTests, get) +-{ +- ARCH_INTERNET internet; +- String result = internet.get(TEST_URL); +- ASSERT_EQ("Hello world!", result); +-} +- +-TEST(ArchInternetTests, urlEncode) +-{ +- ARCH_INTERNET internet; +- String result = internet.urlEncode("hello=+&world"); +- ASSERT_EQ("hello%3D%2B%26world", result); +-} +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 54131eb2..46307e90 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(unittests ${sources}) + target_link_libraries(unittests +- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) ++ arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) +-- +2.25.0 + diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 377d83e5962..645ed7433b3 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,81 +1,73 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper +{ stdenv, lib, fetchFromGitHub, cmake, openssl , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver -, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }: +, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat +, withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "synergy"; - version = "1.8.8"; + version = "1.11.0"; src = fetchFromGitHub { owner = "symless"; repo = "synergy-core"; - rev = "v${version}-stable"; - sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3"; + rev = "${version}-stable"; + sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh"; }; - patches = [./openssl-1.1.patch ./update_gtest_gmock.patch - ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch; + patches = [ ./build-tests.patch + ] ++ lib.optional stdenv.isDarwin ./macos_build_fix.patch; - patch_gcc6 = fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch; - sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d"; - }; - - # Due to the included gtest and gmock not supporting clang - # we replace it with 1.7.0 for synergy-1.8.8. This should - # become unnecessary when we update to a newer version of Synergy. - gmock_zip = fetchurl { - url = https://github.com/google/googlemock/archive/release-1.7.0.zip; - sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0"; - }; - - gtest_zip = fetchurl { - url = https://github.com/google/googletest/archive/release-1.7.0.zip; - sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m"; + # Since the included gtest and gmock don't support clang and the + # segfault when built with gcc9, we replace it with 1.10.0 for + # synergy-1.11.0. This should become unnecessary when upstream + # updates these dependencies. + googletest = fetchFromGitHub { + owner = "google"; + repo = "googletest"; + rev = "release-1.10.0"; + sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz"; }; postPatch = '' - ${unzip}/bin/unzip -d ext/ ${gmock_zip} - ${unzip}/bin/unzip -d ext/ ${gtest_zip} - mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0 - mv ext/googletest-release-1.7.0 ext/gtest-1.7.0 - patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6} - '' - # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt - # it's not able to find it (it's trying to search the store path of libX11 - # instead) and we don't get XRandR support, even though the CMake output - # _seems_ to say so: - # - # Looking for XRRQueryExtension in Xrandr - found - # - # The relevant part however is: - # - # Looking for XRRNotifyEvent - not found - # - # So let's force it: - + lib.optionalString stdenv.isLinux '' - sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \ - set(HAVE_X11_EXTENSIONS_XRANDR_H true) - ' CMakeLists.txt + rm -r ext/* + cp -r ${googletest}/googlemock ext/gmock/ + cp -r ${googletest}/googletest ext/gtest/ + chmod -R +w ext/ ''; - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ]; + cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF"; + + nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook; + + dontWrapQtApps = true; buildInputs = [ - cmake curl openssl + openssl ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver - ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ]; + ] ++ lib.optionals stdenv.isLinux [ + xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat + ]; installPhase = '' mkdir -p $out/bin - cp ../bin/synergyc $out/bin - cp ../bin/synergys $out/bin - cp ../bin/synergyd $out/bin + cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/ + '' + lib.optionalString withGUI '' + cp bin/synergy $out/bin/ + wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]} + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $out/share/icons/hicolor/scalable/apps + cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ + mkdir -p $out/share/applications + substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/ + mv bundle/Synergy.app $out/Applications/ + ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS ''; doCheck = true; - checkPhase = "../bin/unittests"; + checkPhase = "bin/unittests"; meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; diff --git a/pkgs/applications/misc/synergy/macos_build_fix.patch b/pkgs/applications/misc/synergy/macos_build_fix.patch new file mode 100644 index 00000000000..2ce277d261b --- /dev/null +++ b/pkgs/applications/misc/synergy/macos_build_fix.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a2297311..25a51f56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -138,7 +138,7 @@ if (UNIX) + + + if (APPLE) +- set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") ++ set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}") + + find_library (lib_ScreenSaver ScreenSaver) + find_library (lib_IOKit IOKit) +@@ -292,14 +292,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") + ${OPENSSL_ROOT}/lib/libssl.lib + ${OPENSSL_ROOT}/lib/libcrypto.lib + ) +-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- set (OPENSSL_ROOT /usr/local/opt/openssl) +- include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include) +- set (OPENSSL_LIBS +- ${OPENSSL_ROOT}/lib/libssl.a +- ${OPENSSL_ROOT}/lib/libcrypto.a +- ) +-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set (OPENSSL_LIBS ssl crypto) + else() + message (FATAL_ERROR "Couldn't find OpenSSL") diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch deleted file mode 100644 index 56dc6112844..00000000000 --- a/pkgs/applications/misc/synergy/openssl-1.1.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/lib/net/SecureSocket.cpp 2017-07-22 19:33:22.442645291 +0200 -+++ b/src/lib/net/SecureSocket.cpp 2017-07-22 19:36:25.632595581 +0200 -@@ -805,9 +805,14 @@ - showCipherStackDesc(sStack); - } - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release -- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead -+ // of OpenSSL, it's not visible - STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers; -+#else -+ // Use SSL_get_client_ciphers() for newer versions -+ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl); -+#endif - if (cStack == NULL) { - LOG((CLOG_DEBUG1 "remote cipher list not available")); - } diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch deleted file mode 100644 index 003d7d22421..00000000000 --- a/pkgs/applications/misc/synergy/respect_macos_arch.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Sat, 14 Jul 2018 21:56:59 +1000 -Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS - -Only set the macOS architecture if not defined by the user. Use the -OpenSSL libraries and headers from Nix on macOS to prevent architecture -mismatches. ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 14 +------------- - 2 files changed, 2 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2f37424d..c7217e28 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -172,7 +172,7 @@ if (UNIX) - # <= 10.5: 32-bit Intel and PowerPC - set(CMAKE_OSX_ARCHITECTURES "ppc;i386" - CACHE STRING "" FORCE) -- else() -+ elseif (NOT CMAKE_OSX_ARCHITECTURES) - # >= 10.6: Intel only - set(CMAKE_OSX_ARCHITECTURES "i386" - CACHE STRING "" FORCE) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 237ba484..04428636 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -23,11 +23,6 @@ if (WIN32) - set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32) - endif() - --if (APPLE) -- set(OPENSSL_PLAT_DIR openssl-osx) -- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include) --endif() -- - if (WIN32) - set(OPENSSL_LIBS - ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib -@@ -36,14 +31,7 @@ if (WIN32) - endif() - - if (UNIX) -- if (APPLE) -- set(OPENSSL_LIBS -- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a -- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a -- ) -- else() -- set(OPENSSL_LIBS ssl crypto) -- endif() -+ set(OPENSSL_LIBS ssl crypto) - endif() - - add_subdirectory(lib) --- -2.17.1 - diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch deleted file mode 100644 index 87b53e78585..00000000000 --- a/pkgs/applications/misc/synergy/update_gtest_gmock.patch +++ /dev/null @@ -1,158 +0,0 @@ -From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Sat, 14 Jul 2018 22:07:39 +1000 -Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0 - -Fixes compilation under clang on macOS as <tr1/tuple> is now found under -<tuple>. ---- - CMakeLists.txt | 2 +- - ext/toolchain/commands1.py | 4 ++-- - src/lib/platform/CMakeLists.txt | 2 +- - src/lib/server/CMakeLists.txt | 2 +- - src/lib/shared/CMakeLists.txt | 2 +- - src/lib/synergy/CMakeLists.txt | 2 +- - src/test/CMakeLists.txt | 12 ++++++------ - src/test/integtests/CMakeLists.txt | 4 ++-- - src/test/unittests/CMakeLists.txt | 4 ++-- - 9 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94c474e8..2f37424d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -178,7 +178,7 @@ if (UNIX) - CACHE STRING "" FORCE) - endif() - -- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1") -+ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}") - - find_library(lib_ScreenSaver ScreenSaver) - find_library(lib_IOKit IOKit) -diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py -index f32ec483..bf997cf6 100644 ---- a/ext/toolchain/commands1.py -+++ b/ext/toolchain/commands1.py -@@ -251,10 +251,10 @@ class InternalCommands: - macIdentity = None - - # gtest dir with version number -- gtestDir = 'gtest-1.6.0' -+ gtestDir = 'gtest-1.7.0' - - # gmock dir with version number -- gmockDir = 'gmock-1.6.0' -+ gmockDir = 'gmock-1.7.0' - - win32_generators = { - 1 : VisualStudioGenerator('10'), -diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt -index 481d8ef9..1ce67eca 100644 ---- a/src/lib/platform/CMakeLists.txt -+++ b/src/lib/platform/CMakeLists.txt -@@ -31,7 +31,7 @@ endif() - - include_directories( - ../ -- ../../../ext/gtest-1.6.0/include -+ ../../../ext/gtest-1.7.0/include - ) - - if (UNIX) -diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt -index 3cb582ec..0525d627 100644 ---- a/src/lib/server/CMakeLists.txt -+++ b/src/lib/server/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ ../../../ext/gtest-1.7.0/include - ) - - if (UNIX) -diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt -index 891f4aa7..16c8b04a 100644 ---- a/src/lib/shared/CMakeLists.txt -+++ b/src/lib/shared/CMakeLists.txt -@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources}) - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ ../../../ext/gtest-1.7.0/include - ) - - target_link_libraries(shared arch base) -diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt -index 0972be8c..e19fcce5 100644 ---- a/src/lib/synergy/CMakeLists.txt -+++ b/src/lib/synergy/CMakeLists.txt -@@ -36,7 +36,7 @@ endif() - include_directories( - ../ - ../../../ext -- ../../../ext/gtest-1.6.0/include -+ ../../../ext/gtest-1.7.0/include - ) - - if (UNIX) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 8812150a..04cdfc50 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -15,13 +15,13 @@ - # along with this program. If not, see <http://www.gnu.org/licenses/>. - - include_directories( -- ../../ext/gtest-1.6.0 -- ../../ext/gtest-1.6.0/include -- ../../ext/gmock-1.6.0 -- ../../ext/gmock-1.6.0/include) -+ ../../ext/gtest-1.7.0 -+ ../../ext/gtest-1.7.0/include -+ ../../ext/gmock-1.7.0 -+ ../../ext/gmock-1.7.0/include) - --add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc) --add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc) -+add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc) -+add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc) - - if (UNIX) - # ignore warnings in gtest and gmock -diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt -index 2f1ca7f3..6ddbd29a 100644 ---- a/src/test/integtests/CMakeLists.txt -+++ b/src/test/integtests/CMakeLists.txt -@@ -56,8 +56,8 @@ endif() - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ ../../../ext/gtest-1.7.0/include -+ ../../../ext/gmock-1.7.0/include - ) - - if (UNIX) -diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt -index 3e49dc3c..5f6c4fac 100644 ---- a/src/test/unittests/CMakeLists.txt -+++ b/src/test/unittests/CMakeLists.txt -@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources}) - include_directories( - ../../ - ../../lib/ -- ../../../ext/gtest-1.6.0/include -- ../../../ext/gmock-1.6.0/include -+ ../../../ext/gtest-1.7.0/include -+ ../../../ext/gmock-1.7.0/include - ../../../ext - ) - --- -2.17.1 - diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 8d58c888748..bf9770acacd 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg"; + cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { homepage = https://crates.io/crates/taizen; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix new file mode 100644 index 00000000000..8316fd918ab --- /dev/null +++ b/pkgs/applications/misc/tipp10/default.nix @@ -0,0 +1,25 @@ +{ cmake, stdenv, mkDerivation, fetchFromGitLab, + qtmultimedia, qttools, ... }: + +mkDerivation rec { + pname = "tipp10"; + version = "3.1.0"; + + src = fetchFromGitLab { + owner = "a_a"; + repo = pname; + rev = "v${version}"; + sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1"; + }; + + nativeBuildInputs = [ cmake qttools ]; + buildInputs = [ qtmultimedia ]; + + meta = with stdenv.lib; { + description = "Learn and train typing with the ten-finger system"; + homepage = "https://gitlab.com/a_a/tipp10"; + license = licenses.gpl2; + maintainers = with maintainers; [ petabyteboy ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index 8d84ab59d47..c85192603cb 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tippecanoe"; - version = "1.34.3"; + version = "1.35.0"; src = fetchFromGitHub { owner = "mapbox"; repo = pname; rev = version; - sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i"; + sha256 = "0v5ycc3gsqnl9pps3m45yrnb1gvw5pk6jdyr0q6516b4ac6x67m5"; }; buildInputs = [ sqlite zlib ]; @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build vector tilesets from large collections of GeoJSON features"; - homepage = https://github.com/mapbox/tippecanoe; + homepage = "https://github.com/mapbox/tippecanoe"; license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix index 93f233a4f92..f55b3852e5b 100644 --- a/pkgs/applications/misc/todiff/default.nix +++ b/pkgs/applications/misc/todiff/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm"; }; - cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id"; + cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2"; checkPhase = "cargo test --features=integration_tests"; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix new file mode 100644 index 00000000000..cb0ee20f555 --- /dev/null +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf +, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat +, udev, libpulseaudio, utillinux, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "todoist-electron"; + version = "1.19"; + + src = fetchurl { + url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; + sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + }; + + desktopItem = makeDesktopItem { + name = "Todoist"; + exec = "todoist"; + desktopName = "Todoist"; + categories = "Utility;Productivity"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = let + libPath = lib.makeLibraryPath ([ + stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus + nss nspr alsaLib libpulseaudio cups expat udev utillinux + ] ++ (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver + ])); + in '' + mkdir -p "$out/bin" + mv opt "$out/" + + # Patch binary + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}:\$ORIGIN" \ + $out/opt/Todoist/todoist + + # Hacky workaround for RPATH problems + makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]} + + # Desktop item + mkdir -p "$out/share" + ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + + meta = with lib; { + homepage = "https://github.com/KryDos/todoist-linux"; + description = "The Linux wrapper for Todoist web version"; + platforms = [ "x86_64-linux" ]; + license = licenses.isc; + maintainers = with maintainers; [ i077 ]; + }; +} diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 63892439fa0..7b2c4997497 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "udiskie"; - version = "1.7.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb"; + sha256 = "1d8fz0jrnpgldvdwpl27az2kjhpbcjd8nqn3qc2v6682q12p3jqb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 212013fb655..69d6ff84268 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +, howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl @@ -9,21 +10,21 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c"; + sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s"; }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook + meson ninja pkgconfig scdoc wrapGAppsHook cmake ]; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ] + [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl @@ -50,5 +51,6 @@ license = licenses.mit; maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ]; platforms = platforms.unix; + homepage = "https://github.com/alexays/waybar"; }; } diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 6bc118897b0..d8d9598e54a 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "17b845x09q0cfk12hd3f7y08diqrflrr2aj2nwf4szy4f52jk5gz"; + sha256 = "0s7i1qjnh4mfjyrfvbbr1dklqi0n2nwksls21106q633wk9qdlqx"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch deleted file mode 100644 index b9d97e3c328..00000000000 --- a/pkgs/applications/misc/zola/cargo-lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index df5fef3..80f071a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2158,12 +2158,12 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", -- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "sass-sys" --version = "0.4.13" -+version = "0.4.15" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3410,7 +3410,7 @@ dependencies = [ - "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0" - "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421" - "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd" --"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972" -+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22" - "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" - "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 178be491169..201a3eda3cc 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5"; + sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb"; }; - cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8"; + cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz"; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast static site generator with everything built-in"; - homepage = https://www.getzola.org/; + homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ef0b8ec7619..caaecd0ab9f 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.1.23"; + version = "1.3.115"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1kb40h5d76k6p338h75p8lxs0cb88jaasss0cmb7bfc7zykfqmd3"; + sha256 = "1k9g1zjnn0bhyw133padpyym73x8v1i3nm65a040bgkwh6a5jaj8"; }; dontConfigure = true; @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { contribute to your favorite creators automatically. ''; license = licenses.mpl20; - maintainers = with maintainers; [ uskudnik rht ]; + maintainers = with maintainers; [ uskudnik rht jefflabonte ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c4a09c8063d..e600d134e9c 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.314"; + version = "32.0.0.330"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl"; + sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1baa1d6fcc1..bfc4fd02840 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 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm"; - sha256bin64 = "08nvmrrglssrxhp9s8bcj479dfhi83nmnjim6cignfhbzqmwpgdl"; - version = "80.0.3987.87"; + sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61"; + sha256bin64 = "1bmszzgmzv7hkczs6kcsa2r8vv6nhg39q1sv74695mr3j3j4bdp8"; + version = "81.0.4044.17"; }; dev = { - sha256 = "173saw11pvz1fgw60hrfm1hnfjq3hk4zri7jpphk0ws7930zkhf4"; - sha256bin64 = "1g718g0a0m87qkvy0mf1kbhv398iyqks7d9g40cqp5rf1b7yjkw2"; - version = "81.0.4040.5"; + sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61"; + sha256bin64 = "0xx4h82w6jklwlk8p2a2qqk2a9vnf004hmgw69i8iwk6l1d9hxfb"; + version = "81.0.4044.17"; }; stable = { - sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm"; - sha256bin64 = "0qdslcl028v0fx8q0n8f5kjkwd8b0z5yz531dbn7wg2dcbp7vq45"; - version = "80.0.3987.87"; + sha256 = "10myihiyrgnm0ly41k4h8ayl3vv3cpshs3pshpqaba0l8i5r5b9f"; + sha256bin64 = "0pd4ygmyinaq22lmaqjqi1gs3svnb863mkhcf85dzm1354iz1g9k"; + version = "80.0.3987.106"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0e339253ade..9228dfebbdc 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 = "72.0.2"; + version = "73.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ach/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ach/firefox-73.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0d7e31be07e67a439754848dd7b2ae0dca7fdb172cc7900db84a90ce15a40bd2c2e80127700195f4b54e3c3008d4541785c58c0fd0bbce060eae6ece77d38b8f"; + sha512 = "9b93c28d9236318f779df24675207e14976a3a303852f111e3e54f81fe24019f48d16c13c92dcf8301d2f7a40f127c75ca940adda251437d45edd1c11d961395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/af/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/af/firefox-73.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "1ee09340d97967d956d484bb217c5fd7ac3c26ad28714889c18b860f1d03baabc93ea00567743bb0c1650cc7c6934ba56e184e734e89fc0c602cfdbf6366ace8"; + sha512 = "b6828a008030b775176d165082cfa9c6eecfe5857ab0702702c7298b4d946f0aced8338182c5dc84437b7b02e42a33c6df6c1d38b0b4da6cf0bebc3f364d7f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/an/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/an/firefox-73.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0a50c181a81823b80c67619d97bb1d371544a7b2109fbe02822a44070088247fc11fffe920e0f7290186f85719567114797720fae780f2c6eaf3d1c2462c87fd"; + sha512 = "b1676964b0b9a935b4be440d82dca37c75362a4d47b227435d04d84ebde94eec469faf9fceff32235112bd816ae85f5290e776b9e983c9a3566b89205800ca06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ar/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ar/firefox-73.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ca36d482348ffb63af556076e2c3ee159e084837c3e3186f4162856ba573dc0fa8849bdef581440bdfe2e12fbec05b0dca4ba294d9483d99020e26b40be4a5d9"; + sha512 = "058be707b6348036150124d85010f9d8475efd2a6d910a3f4ed114d2b51cb63775b35e83e0799635755c5c016b21595efb20ec5c53a362280dfb424efffe0d54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ast/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ast/firefox-73.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9f9e3a9fe29a83a37f09e4b25cb65ad76f30d7312a79d27455d1e9fd51bfcba6db7b25e15a0d8442e1ca26c6f5aa1614c6e1815a0aef56547e81ea8458b89c94"; + sha512 = "6e36766b939f42f6f8cf551e5ebafbf57a857ab584579797c84eccaf1a669e2f9daeb13b1a897b90153eb502c97f63a55ed7a2bab2de4feb92719e2aaf42ba52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/az/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/az/firefox-73.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "95ee55c2802c4ea246ef3da4121f382d05c60354fae641485c92d7ca05c4c08e1d41b9fe6e5e5109d8e16a14ceed9692ff96d32a81a29770d937c65b5378128e"; + sha512 = "f6c065ac0af3cb2ef1dca288810192b8ee5906f7fa03bab713a8abea4b811c78b4278340bc5226ddd4113851f9b753268965905e020f74875d2ef3d2c2ecafbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/be/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/be/firefox-73.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fcc595ddec94a0f5eb4106b1b462a8aad2d8d030bf5288ca08a3b56ee8138ad019457eaecc891175229a00b94d786633f5e1dd501470e94ed6a5e4b9b8d332f3"; + sha512 = "710c468adc051a5895ef429585f9d94f4f6ac533703f2674c9433c04011e411bde0827739c28d300a2e90cea13db0dac4bca1f37a711ff0bdf19d5c4853b7570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bg/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bg/firefox-73.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ce4ab1fd20bf0aa69a7cae0af232c9d6c7496b1e63469709f0b8914a2ca7a5dc295ca22f59e368b92b6938b22e582d308ed4c5d7b234350b25a4cb8e9e010cdd"; + sha512 = "328586ac2b3182c455f3abab8b6177e97d7389c4150f8708807b52f632d84e88cf342358818514b93b5d8428c6c870b21f1138803e8a7256c95487f5dff5e9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bn/firefox-73.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "62db7f66b5ebb802243b429a90a368e6d0c1cc27e0382273b627bde7a9db48e32b3e3d7359cbeccc2bf70447534b3ec6a1cb4abcc66d715d971cc8cf1e8cc659"; + sha512 = "c7730bc40976685b40161a6238d0982775ec02429923443265d5165d12adb8b863190c4e57c082c09c4c6ab3348be035e338f3c34d78503b521928f3722139eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/br/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/br/firefox-73.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b7836b77b8311989167dc1bbe1b90994c27c03c555134be9df45b160d785b506ed8f7ed0d851f7e2a26ae14e8f8651ea87c077e012836bbeb5e06596dd7498db"; + sha512 = "2083a6598a60dfae7093828fa8c47a149b2af18180b360817333de126077a067a81a1b7aa98aadbbba51cab5a8e66811a8a3513e68f5fb6e0320807cce782502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bs/firefox-73.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "2a7dfc194c72143401fdefa4f4df4a414bed4d1fb370b82d0d7bf144c77707211b431314cbf409f07d43ba1cb28e43b78e5278b9cd7548191c09c71240c634d0"; + sha512 = "4e5f04c7ecd8b4707c5107bc0e862a9ea0f099ce070c6d271c4d5b034330a0595a07c3de2117b1199dd475492edda863e02d541eb2f7e507710e06665741d5c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca-valencia/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca-valencia/firefox-73.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "db3dfc0414f66330d9a60bb545c92bb01c20dd4872436b30b4a27da3706870a9f40377ad40987850c556e2e14c13081a73fc8382b0bf45c356818f1c30e325ec"; + sha512 = "103ba1a390de36018e8ab834d7ae144dd8187e8211d94c18fe2d84935efdeec64093531f2e3dade16fbc123930549ac2282d1c5c915ecef38428726420915925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca/firefox-73.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "d741e0fe55cb9d261832c8cfd5a51e5e88753c2c9483eb5744d80e0885d129a464530771fd5eb1ffba040ac46823fefd74efbadb63935e6d2773a398da160925"; + sha512 = "90f2e9b575e390d57c6ac91f784e20cc740049096747bedeba1fe467e77a2b7b88e119f66e7be46d8f3261ec66aefa73a7ce11e3ea5b4520dcd1fc2467a7d169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cak/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cak/firefox-73.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "98ac16f8771357d9999789bf2df39f0b4e4d28a32be13c07574fba303ede71b6267f991a1112d83cc95de295383d92a865e3ea5173102466b3d1ed0b2d082faf"; + sha512 = "fffd827c9b8b5d5e83eab130ac7c34cae00c166314757576f3fae5f978d090bb9bc6e793eb1265d91c34ee95f4321f1e02d579680990d383e385a346c16ac61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cs/firefox-73.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c959a5b4008c95923ab0cc6ab669811d700c1b4f5dd0de47ce2d519d7acc1ffc98595a1e8948f6ee7563b2b025307b702595d01365daa57c3552a0e61c85a5da"; + sha512 = "f544d707deced655448ce595ff700671d796180d3df9e5e651176a72daed9e203bf8d8bfe6fbd6c57907cefca7bab5e9beda2b785c7306a87e426df88335982d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cy/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cy/firefox-73.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "82b1620bebfac41d498c4ba6bd9d89754dba3c7b48f5073bd41558e735e49a7b95b662efdb247f0eefef8055e07bdea31efbdf579dd17ae7738711fb9679d85d"; + sha512 = "a039a02f17483c4d9b7a5563af4fcc72a73c35ebe9d9d383b3e1ae8013e0dd5b9660ec650a6f11a21d4359605f6252faf1dd99fa8b9525edda5336a3f28138b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/da/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/da/firefox-73.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "71d5d3192f115df501dd889234e33ebe7b9f101bda2f4b604932fb66d172ea2adb475da408e9774466b1d9c379991895787b441c8af11ac36504d96e63eba402"; + sha512 = "f8829df5163a12e806ed29a640159cc220dd8a39eba48b51e03c5524f5976ff4452eb19064441b4e81fd0e30a8c3058117f5a022e2b7a8e76e5e8898eb4ab54a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/de/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/de/firefox-73.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "013bac3db996fb3e4bab75c072b02ab0bd04cf6731cc95757b51df9b28c3ac46fdbdc3a17b61388aea842eb0d00dbefe2e9f32d5d758e207995c39338c82c7d3"; + sha512 = "45c2ec4167c4f6cec18c306fb04c1eb0a430809220157c5757ca7565da3150ab82490c946afd7b255ebc75118fe2a2ee8228a31149545e5901b15b5c9fd113ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/dsb/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/dsb/firefox-73.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "49ff30d580b38749d8f46b9db90037f844305a3fd716d7f276910475f416d2fc9bc1f0e8fd82544572b4c7840437076f5b194cb37bf0cd39fe7b3b3d355fee05"; + sha512 = "f67dc560d458660eb16eed78edce3157c31e195721cd350722c189fbd3936b13e9d230f00e5079a52fcf229bac352f7e6f88c5972c26b3797c470278b352d2e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/el/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/el/firefox-73.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7c5e3c97fed944852c3888ccdcdefa9c156712f3aa70c8ca6c3744e7ae32c7fe85e2fcb57c7707e7e4456d7e0cf2d131818552bcc507f082aa9da2ad89267180"; + sha512 = "247eaa4b6bbbb34e809232f5f907d67e01e95c77397734a5fee7483a6215ab8492e138e1b593a9b1a4b647c7aadf662e14a51e6dfc2b4acb4151be61767393ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-CA/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-CA/firefox-73.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5dceff7aefa5eb668a38487e44fcfdf2d72e4717cd9f6a0beb58bb25c8826086a960a67a70a5d563af0db2865c001ed23eaf7414000d1cf184d10a9267473740"; + sha512 = "d4705fcbccb47d765ed3a56ae7895b285d57486c2c95ac9e12e13b1b403e6cf713291960315808350d452c05ce7441ef3da4042e29d1e2e59ff50bfb3bf567f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-GB/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-GB/firefox-73.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "1f47f38344683e1e0afb5f5aeb46f3a7cb1aa80b38730a88cdc9904e66f35c14cbd9b3002deeee2f7387aec9f30ffbc306a3a655296f15650272b7185e6fb0fc"; + sha512 = "3a27d69fdc1c1d4aa47a3181bf7d9842c0833da8ce1c132da7b289f6d49054e6b666184d1866506bc05f802c9e817e0ca659ac3ea228c91866b64df66ef7dc8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-US/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-US/firefox-73.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "009e4569271e6ffff2325a04ee6b337804c69bf96d3d74682da0a8abc5adf42959658237a01feff736b8336df0c69445fac2d9a8292680173d5f82ecbc262043"; + sha512 = "1acb3149e99d0e38eb624c98a6471b4d8e3fa6eedb13cc516f581aaa561f1de9d3238e6ec9364e937532d2beacd9aba2ccad72872f114013e7490412c56195c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eo/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eo/firefox-73.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a61206783846e1fbe55b065c02c8217905222fa92de0290bf42ba2b06745d6903aea5bd575a318b83c2fc1f1aea149040b6b68d9ff98ad3c0d537081951ffcea"; + sha512 = "d8a598569daeda5e5fdc5c5fd2580e85f5933bb1ebec806373755442d3c660c5b0ad38b24bc41e0b05c734489fe27836f5d22718709d1447bd36b1480b2f02f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-AR/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-AR/firefox-73.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "14d6c0cd17e6560e2f4193e8cd182b8dba0b94edc3fc9e407ba3b9423e153f8d74fa0c797a431ef03586a0c8ed8193f3a8b26bc2683c1cb45a27d9c21401ec41"; + sha512 = "531eea7a2cb3d98b2a61226f72ac1cc33ac94844787f5db0db84a81655f1909a1f9633353b5b0aaa25aa892d15a1789ada008274b955ada991e5eea1c71ab168"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-CL/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-CL/firefox-73.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cef6af646f98a5ba5b5e01dc49317dd54efe392b88d3ce93ee220fe880c0b1dd7855c5a004f1b93ae27583df1fae030f4b90031312bd92443cf77e08e746c844"; + sha512 = "9901d90be922471ab32b5780ece1ea3f5756250229a8d30a336890823dc8dfadc96992f582c3671afef94802b2003d64a7f77ff469ba5a7ce104b34852f123ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-ES/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-ES/firefox-73.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ff17aa9c3c804539d6bcce2e760da2603d914e9d345c7d6e3465d7856a1ee9f581147505779fa81e4d512252fd72334abccd9f2fb1fbbf4ae6ddb47e02561483"; + sha512 = "5615f29da4d69a93b1b07f90f248aada987d56626fd61684ae2d0c4c2d7d2398d30e0de41ce9eb2a7e066b1f34ea07d06f50ccc91dee41dfa2427ed8f2ee8166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-MX/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-MX/firefox-73.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "b587ab2e8daa659011f8001b2b5ee544462e789f1bb46d9f32073f5a3a3cc34e34708035e1dbef6d6385673afecae66c4db18d86056f2fe81d0ddd06314b8164"; + sha512 = "49453184964bb88329f6385afa382f440e2400333cf53e737491f248e43c5522e171bc85da86e3c2e5b6e2aca6c1136c529d91dec58cfade30ff67fc552d09c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/et/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/et/firefox-73.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "b92b11d2ac93c67b858536533794e8da01846485b9dc300b74fc8da3f6856c9278f2cee1599da354bb374a22bd3adfe24924c0c33d080fa9c05c70006a9fe347"; + sha512 = "1e5e2f0bbed1e9dff29f646b8038fb27c46ef8cbf6a978e324efe9522c78983133ea3a675f077f837ffc53816c6120b7ff680fd1ba5a761de74162764aedbcfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eu/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eu/firefox-73.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "30b34427404fdc43c09b5ff6cbc1ef27caec99f8b258ae0d227b0f38383d9b3dc95d7454ce344584706c0340a3859e6fedf125bb87e4f9f11fd1005647b42f8f"; + sha512 = "c99b22564d7d3d16aff4ec9749ce1699b61ddf271ebcd9b24934271b31bacc68936d11f166730f93b5346acbef3116ee67b336364c33bbe3fca1fa18d41c6c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fa/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fa/firefox-73.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f04b9d5205fb63f8a6d8cf83d5845bdcd7d9b9b1b01f59cff61b3a1042f9cd23b077ed1fc10b6484b87bf019e72fdba313568306bf9e19f7e98ea54cf58b5b9b"; + sha512 = "91ca6ec0f36895609184a1be784848ca208534dffa9c554f7d271d16585e9d220cfef7da176ae23e4836f7e8d26493088f863f59dc9f6af5b58e7006d7e4a37c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ff/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ff/firefox-73.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "789a7dc7ce2d13edce2ad38a64507af6e840426665dd98b072271d4da49d9fae34786c7e64f8f0baba0ed70efa784b40d45537ef1f17a019043dbb65fffc7df0"; + sha512 = "07e0096e432fc7e95d26ae4af3cda0238f28272bda6239f54e891df28a50d414301da8218813ed36b959a2db004c55dfc6f1d3a5b1a31a321fed72d6cdc47f11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fi/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fi/firefox-73.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b4562cfd54bbfac093e872798fc503fc8f05952248f448a86a8a30a31998d4cab531b42ad8b894da41b8cc1b88d6c1e0b39b8e92cfb999e2c99057abfdce6479"; + sha512 = "1199ed222e7092a852d3911e576057d52add578acd68a28ec334e377644aed48cf8ea0ca145f6996181bb006a067b3560112599d4bf9dd07528f31a0036d7fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fr/firefox-73.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "da6c9cec5089be3acba9d0ee4ec5456aa3027f8193478e122c71453c109a4356b8cbd9118a170f037a29cbedeeab99b1bfc213e57cc3aebaed907fde31fa5e2b"; + sha512 = "9d287d14eedf1f32c6b5b8b0556191892541db4ef23e7a7a4aeec956ea26e0a5361f15560aac45970cd702909f654058549114cba98f7204adbc1decfe66c074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fy-NL/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fy-NL/firefox-73.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "29b83043e60ef499e75becf12f8b60b855304db7de724120dbcbcb440b0379cabb766bb492c1d5f9eafa2f397cdbc79bc7806793dcba28666597746d743810ba"; + sha512 = "db42296b84eb0a383728e79b024aff82fc3f5da1f35292b5b9a78ec65b8c7955dc502b2a2107ecb845b0816343cf05abeca075a4291bcee78ce8be8d4337b696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ga-IE/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ga-IE/firefox-73.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "22597f1feb06e89286fca9692c4730ae570ec71f2558ab32d4eb0276d970944afe75cf427abc95d1192c37eca29a27fd7cc6c917eb70c983b436daf79432643c"; + sha512 = "789b435790aaade6a52b9ce4aca30bfaf9d9e2899d2cc640b095227712ff06b503b36d64c3330a8c4ca7b867cbb4ee324e66a5f338ac3e01c85773955ff3c70f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gd/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gd/firefox-73.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "96273c0ab26d305dbeabce65e0b7650113edde2882297079527a9802fa5868ded25b5f21af07fce19992b3b3821014f5f611ce2b264c952080e0b8e7867db389"; + sha512 = "bb6aa1596ecc3b71562d4e83a0ab1e49d28a2c4de75b4f5056f8d38b83e65b79231e06ffdabc61ddccf358a79583be568db3374d748686379da2163ceb8494f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gl/firefox-73.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0167a4bb9874e1b0016c464202f14a9c1057a691b6786fd15e8ad44816a2e047728edb987f2fa68bd993583e9d390cf9e1553a8df7d19af0b2a303c10182ed27"; + sha512 = "1315eaedb0bb6336377fd61a3b02cb0391cb81441f1c6c4dc3935bb9bf707fb0d5b8b32ca6c9c6bbef77a5d5c0d4cd476234348f398acdaa24280437b0e0eac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gn/firefox-73.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e58fe8062a18a08d57c20d81ceb2c8c76c210d0fa4e00b10a2aae3bf3e6fd548350cb42e9f4f27aa06a21608976520c2c00533f060a30310e8cf78d218bf08b9"; + sha512 = "6d810e69ad78fe5fc07c2f04c2b2ace6550183fcd9e1e9e3af863c219948999bd0c2c095a8f85806d6b8b6da0d6e88e59789aa55b3eedd821c0dc59e37114005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gu-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gu-IN/firefox-73.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "13cd81296562b497b69df87961fc7a16b701d14fd35e8742f3bf15ccfa144745929323e07c2d4d121940aee589a281e0e90d8007faa638b34193a401892b67fc"; + sha512 = "ed0574ba20986bae45a9ffde86d4b4568de296d4c8809f102c25c85f155ab0bed03f20ac7cfe3eef7225c77193343950ed7bc3714f5e56e709c47aaa02a823ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/he/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/he/firefox-73.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "6ecc9a96ee3157bc183bf3e6cc252f87e84906efd7072a413c392df27869514e41d37bb1a384b3b1e107281830a0ed9d74339cb4acb5001e98c56271a3b57fd0"; + sha512 = "d4c1f23b270bfd827c4babdb24a7a7e97aad1620f886c27430ee4136ded392a4921395fc87fc031608e6e056ebafcc74766b028aebca787bc51025f38d2b0173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hi-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hi-IN/firefox-73.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "23dc8a041f08424c6895c151584c7db9d4dacc76f9fedb2adf91d0fbdff7ef43bdffefdbc06a11d565d15629f3794e40b07d39797289d51394c47113d8054d6c"; + sha512 = "485ec6ddeeb2e6fe9f0a141a33f55491eedd3dfae5793802118ba8bac53322b1f2abc3f14e3eed3c8c9bf5b8beb9e53e3d80d0c2a05fbba850697aa262151298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hr/firefox-73.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e9cd1ae6a782965a4e79b7fb3ee17b2f0d09d2faa659cad1d34add2ecd2645e88006980a8c2a628ecd7622515b1c50c23203c3bbe41801493f767e2c5885932e"; + sha512 = "1d1ccb53fafdef570efe7991902413a6cdc005f5fafd3a395c0ea9d7d764357525429c5f34825a0437242b2e816c86d207c91c92c557bb0b0eafa9bbe86debb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hsb/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hsb/firefox-73.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "24fff6f98710a3729cb4a82a765a3bb4672c4cf5f067845732b6656d2d5c5f08b7035b6cbb341f00385bb0119d7d81cb5ab275f42f4a92533b4fabda161d2967"; + sha512 = "79a71e0255cbaaf49afd0077f0a73a2d8f21037055b6f43a8a16ce6f512712b536fefcc911cbbd6c5ba4db493b1c9d0ecb23e99bfeeccf92a9159dec57328da0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hu/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hu/firefox-73.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0b02c3e55ed81c1a07faf11e159b00987c46cb2225f3c414b824df4fd89bee8d199aafe7f2b9ab78fa8683364a8c30ef9a4b33103310bae32d3fb4fd0b2708de"; + sha512 = "0d5ef5c1589e184fa78ba6cb8bd86530f30dd94ce1e9f2e3a4116539d1f676d60672cb5fc20db3a9e513ec6e7e6fe4b98e340c457ecce583f73bbebf47913eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hy-AM/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hy-AM/firefox-73.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "48d3b6e4f06067e76e7c33daff9dd04b1b1e4745b4c6814880dfdcfac64ec71e378271e963b05cb48a89d3e546fc8bfd607506c783b5bc1624908beac89c2588"; + sha512 = "4198b61f6708feb15d6d20e0a447d8d9f9ae353c77565fbd5c185e74043d7c896ad8a0c5744e4ed4eee813761df9053b0ad578b8a34ce89ff475d477245e23b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ia/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ia/firefox-73.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "1f99776f7c6f5b3786d3806c838a6790e944ed83c42411f79629ddd54b0906fefce18c355b6c04b7799911fef1f90cb9296a0bf1d17ab489370a1e274be6eb9f"; + sha512 = "79f01a78363ce26e31d32c21aa8191db748be7f831aa5143bccdaa35912c23bd5ca3586796b931cb84f92cf28c495fe239b1bf7b6feeca9581bb0c8a94a9c1a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/id/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/id/firefox-73.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "90cfcfa0a6b4d791dee1016fd64af7b195a078c57c4ddb0e2b0e81372d71d0266f592b49cf6509a02aed6e044e0f50f898f09be18c4b5d1d1611789ddcb3b6da"; + sha512 = "afd876da8a8914f88c043f7ffaf8296e14278503e7ff1b94f8563cfc13c2ecf1e0ecf52c18b5c2c16799878de836056f403c67ffd9333a77d3ad3142f9236769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/is/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/is/firefox-73.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "fb9b33dd73e81c80f035f7a47f49a45c7aafcca93dff1f451107a86e9dc566159d2a15fa3a4045ef6a095e2d329956d02e9fe1ceeb29f6ce0d6527d6a383af3a"; + sha512 = "3d98244f97a7c0169f272de877ef3193d4c09392a92ec2ee931d95df610617e00529c1e2c86d31115b4df88dd1a15fee6b6d166a55535396e6203b9b104e0d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/it/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/it/firefox-73.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "cd73f16f1f01f4eb3e1f121a054958c32147baf7f3f7f856e4f5d80515efdb38bb901814734e5825e63c19dec7dc27ba25b4a682430aa8de64d1a72bb24e4533"; + sha512 = "22c2dad95a21743ff3350ac8765340fd96c006dcfcadc68c3fca1814d0b6669066d8f76136cc7c4fc6717929d41df0b0b5a01d40de36b9d1c4eeb8529ed1850d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ja/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ja/firefox-73.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0deea9508673300957dbb33b644f4dabef47a4f502431ee51ca7e4844c7fc5504f59bea5416c70eaa713685091c9af9bb336f0416d3cb78d251f87a3b1d6d194"; + sha512 = "6297f970de4b35aa7e3ad43fc5112ac0a36bedc5b2431f143e65344cebae74ca36da7af3fa23e1c522e62ae13d2069ff2f1114867e0b0960f9f740904f18ae82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ka/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ka/firefox-73.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "00106e34b8353c4e19570e284364d27765f2afda9de181518f33eb5a83b703073c3bbc8a3ecc59f5828a91ae78867db0cfdc1fdae6b3393a3c1d63668d70732a"; + sha512 = "2e4ef3085f01d66e7d2b85b058f7be2a7122f1cfd53757494bc6e66a2fb9840013c2f3f68ef7bcd363f6d3f84926449650e8ff2e1f6641dae70893ff1dc00ff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kab/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kab/firefox-73.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "e993314ae7d3e23662b8dd52fc33922bc25c29d732217e7c3bce051faf0aff43cc7ede1b91f8995e51e6d20eab8c1cdde980f35d40b0105312e215d2509f7504"; + sha512 = "eda0492c8528bb4eb9ddda9f2d585aa63794ba34231b58b5ccf66dd9bc49feca36a837a786c1f0d182398fe5cf5cdc735c45bb56d1aa743554697b6c6a9d1b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kk/firefox-73.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ac0f49449f4b296ca3de4a905c667c0eedb7557b54c3b1c27d6494cbd952ce0d1aa61d73271d88ac0a8520ebe4c2d4454ae9742bfa2b5c7e32443a6920850d6a"; + sha512 = "6d8b29ae3a21f952e7e0633bdee2f82d53d015e134812a24c2bec73e21b923add3fb7470097bd96a6ad41d7cb1488574475c51140db7616d66024178774282c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/km/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/km/firefox-73.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e5709bcbd40481c3198758813ef5e5a9cdad6e256396174cbb006eafcaa6165efbcd920fb91dab5ab415d19e85b5f7a3cb649f4f3ad9035ad773ab51a5a41009"; + sha512 = "95773f7848250ad0c7f4e4a76ccd956e94dbe9994e451b349f862b3854cf2daa021de7b47c014b14e588189413bbabfb84bf3c2245550a4f824c56ab3964645a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kn/firefox-73.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6dc7045adb63e54374dbb6f288bafd710f54f1a637a3849f0c2dd243043e6373ddae941d88a8ec25cde643d0ac856dcc57b75d97356eab29ca01831d0e042724"; + sha512 = "f1c66d17d7c8957ff804b77ef49e5389703506019bb3fe24e44f31f6958e65a83f90082f399a351e8bb3c869f2663c1737ee618cc6ee8732a753bcb50893140d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ko/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ko/firefox-73.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "f3246f4a1da0d019c0456b03d8837244c59cd7931f3766c3f513c9ff9d55d390869ae508c0713bd8236fff562b9becba4bb4046a50e6c2f23549b6b06c800688"; + sha512 = "2661bfba5959c05752c818119ff29e22bdea6ffcd52eccf1f3dcb2f68c9c0f83ed900a9bf77e99de9e2fd1b4bd153339e5a212e5b7b4c365ea12b02f6fd75637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lij/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lij/firefox-73.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7a7aa021c32790fe844f258a55edb51ea4b13ef26d1d7cb2fba609cbd1f09a4b02c227eba639971bf4663d1fc8b943403eeb95839d9ec53d15fd6316c84aec20"; + sha512 = "e1c6d44e2301ec9223798dfef54aa2bd1cf0553ea0691089f5c345ef7cf276727dd420261ae3a4b40855d58e241ea41af2e7856fecf334f534b6ff4459bc0155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lt/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lt/firefox-73.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d3c8d20b7311586dc0693d169b6d47612136d8ca40b31a35641e61f7965778d52bcfe68abcced8356e31d66c2fa208560e8f37f1d7e3621f511721fd7162ce58"; + sha512 = "42316a0775d8cfb8a12545485762268feb74052c6d022b092644dec77048cc4e5f6a2e00288739f0a0b39b5530bc43f2946eaaa16711140bbf2ead3d1c28993b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lv/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lv/firefox-73.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3e770d4f829abd903dae078526918dcd29fbb0b214b1e44017b32cc273cfc9a6cf626f61d6a805e508d37eedf2ab7eb51fc185d0c34be57fefd842b5f3a083b9"; + sha512 = "51118140b18c9f911e1ce9932d08cd5dc9e0a9f6cc31160e51c3e06f640322b3ffd28f74eae5fc7b5bc2a9423e820fbab8392b96f55770e8e4503dfd86cd6111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mk/firefox-73.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "d6b5deb5cef689500f2ded676145a6efb55e301b6718596e127f45b1e3743a0b7606006994f62a978f0d94789f45d60006f0b45e6f4e5444948388a37a1db19c"; + sha512 = "96b5fefd5f1c7f37db059db505864210a872597e8d3f11247c6e68f30122eae15784d5eff7d94a48a38679ca6ea7338a82dc8b0cc65061d03be0c12aa570eefe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mr/firefox-73.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "4def7628770de7a67cce3c5aea45c718ea3f723ae7574d97bc87a4ef41350034abb0081887c3f335699c45a381e0634b1d4b41984a479dc0f0d5ced667e876ab"; + sha512 = "fc5a084fc9d71eaa4a31b4445390ebeea93f828ce0f492802dd38da3a2d5a71f865c5884efb9883545fdb3f2aeb374f93eea133de6c0809b75a924d14ae973a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ms/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ms/firefox-73.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "9713ba2651191cac976aefc43afb3cb640092dd738d9ee9e7518839170281e5f769d0f11b643f70d98b5cb74eac211e78c086787f63ec583636b0b02058461e5"; + sha512 = "c084b4c6e2e9ed3f646b18d14cd7d8f76e46ccd0152a74ee101b0fd532dc91acfef8f26d827e759c2bfd8828ff762a430cec3fc9d0b9e7423166951aaceb8b72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/my/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/my/firefox-73.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "79ed96b7225facd3c759ca36874c42bebc8ed21856a8d46b7170efece2eb48e860065f21295a12561e8e20c2f56734189862420b1278fbf722b36e21d0e2100b"; + sha512 = "8fed2a79499f57b0401da536a557809b152d65fccc91c76fcd2deacbab35b370dcc1c812c8e8217aa4b61e9a02fd41359b84080313fc572fec936ec3ab15935d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nb-NO/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nb-NO/firefox-73.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "12d0b02ae7953997514629a739d7df4c0e5d0b4006dd4b09447ac0710ca5d043605a5f060499f2b5f51689f101f580e7565810a4c1d0782ee408fbfe6925aa2a"; + sha512 = "d316c653e922c6f71d14bd9b6baae661a1d2d93a9ef2ec2c1ac368cdd5797df5896f927c909feef7ccd5323bc4290585ecf119f0bbc6eabe4c69c67127b82c98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ne-NP/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ne-NP/firefox-73.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7d3512fc9cb2f6af9c47c27f54595c957515dea077a5624685f95060783fce7a23bd11ad0f4f74da52345de6704582c5bcb9a162aa29d700adf3feb90b0547b5"; + sha512 = "1ecd87e201addeabc43050279bb175511bedbc5e2e1a541641e5bf6eeadd1edeabaae9e6d7a7cc53d6a4a46d84f256f0abf8bbe9d211dd6b7d8b3bb91b341443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nl/firefox-73.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "5a74e2ab73546a3754933adfc5846ce7cb81fbf0f955ef10189f5da86e36cd4a919cfcbf5b34f0e49dd9a0736b402c005591d9f3270ffd5dadec887df63c272c"; + sha512 = "77d9e23944e5fdc8e08394b46811146d95560663e91a534c115986772b5c0b5c9c2e20dabde58ddbc643b3bf0f600c3b0b2f8f31045cf92ea8353610e0c78c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nn-NO/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nn-NO/firefox-73.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "59684dbc041f9cb97cf1dc6b62cf075c9e09c27a213d79faa2da7e3c76120249f9dd668036926cace1bac2e386ed2e5f2477dfd29a16d4628cd3492df3dc1e69"; + sha512 = "6923adac5fc7c616ad94ff4f45db0c5ba20c5c77cc23661196212b419437db8d1d8b9feab9f68556545b3553b6e22858c2f0c7a2afa81f7b4e914446e92fe418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/oc/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/oc/firefox-73.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "13aec175cfb0e99ebc64a3fa00d96373f578c0b40e9fb748cee39a6e0e38b884c99010426a47835b04ca76f7e14ae690425226eeba0cca828c4e03f9ea9478a3"; + sha512 = "eddd11c121dc1933272d1557d220a5590e5fe695cedb261e382d2a0e560646f1f4706dcc46f4bbf1b6c10df2f0b59e15d43398a32975c9505317aaf86bfc8a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pa-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pa-IN/firefox-73.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "5350381fd1490a9d77bce592b5fe5bb16ea806a19a11b90a6d4458dd5804e291be61981ca6358db4f1c61e7b221bf6032ebd74328080b72c7ce7c69b5dc8c6f2"; + sha512 = "cd2eb4dd3b29299786d094699dbc162be2c073f25b6feda13e9f631f36530dc9abfde5f473c0276fa8b099010c66938f4e8bd9346a2d1761c59f63190944b553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pl/firefox-73.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "73ff9ebe12ceca06c338c75d01f187b3c680d33b7a1ccb9ee9206b97f6249d95eba3047d7e87f01651e4c5e112c5c59be7c50ef5451b6f9e6c384d94d3ec23b1"; + sha512 = "e039394e335b13bd55a214a8345645e1d5640d2dbcf76234cdb5710c2ae0b81e568b8ff8456780edbb74fa2ab186eed004c1d54a04560406909702555a318db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-BR/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-BR/firefox-73.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3660b8376970fb9b70a6d99f68225420b681900e3c3184a503f577cde29e05c94dca80ed3bdfd991497875006769ce8a1e973276dc302e6bc0a8b68472c223c3"; + sha512 = "4649c45fdf1b8b3a93e8a5f88b88c47104b6d1781c89fba4cb9630a8998f3e4e28ad3aafa0265d04a3c10323916fce73d834cc95e5968a10b4a28a9ccf70aee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-PT/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-PT/firefox-73.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "fdcf089be16988c3b31b9628a08a7c60e87913b0bb44a21abd9267358b881c5963694bb956c0f7c075ece3e6f1ee89f814d427d0965537fb75981475806ab6fc"; + sha512 = "44d65ac6e2df986638de77b01c7c544a846f92444de25208247c93ef2701d0398f77de10e9035c8fd383cc998adccbfe2dd76edebb646ba1f29a639786b61259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/rm/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/rm/firefox-73.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b38abcbd3da1b481bbcec3caf1dd948e7f696099740e2386fcadd13f628cdc45177176915a8bee6d5024b19e08a43de99fec7f8296839a3af14f4e80c2c69406"; + sha512 = "6c9694d25cbe53e129148080e365b4964f5e683ede81d7a17fdc94045359480cf57cb8e4004b36645c6cc9c987845ac723e11407302eeca1e2e1fca9924eff2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ro/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ro/firefox-73.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e0b4a164c9a8199309890c541a72377b852638ba1f2bf134b367b5b82945008e72b9d12db49fce800ca0a5bac3d10207b75059a9463b9f19d9570299f66a8c5f"; + sha512 = "b1e98c052f5b51047ebb5c28f83e7c36a74b85d0aab3226438bdbc502619a2f9767cfee6f9a2f72653ab8102f058cdfe40dd7f6cf11f88652ea8f00a0985d9cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ru/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ru/firefox-73.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ce71732d95d5dda49e80d69b1e363e6e623a81917d0babc01e24fb5e81aff3453e368ec901898c22805587958d833fa9a2dd2e96f73fcb37741ea518685f5df5"; + sha512 = "681214c7286392c8267cf73bfd4a57fe3cc9710992019aa645e052a8839234f4f65ccef2e98e6f4e8b4d099a0d2932c8d909291ad46cb581036930715a916565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/si/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/si/firefox-73.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "aaaedbf3901a8047cce09f27f05a7e50b395dae2cf31a155d7b3e027e8edc35ffb5d580c03f8c6a56ddad829da2b52ec1b42f146be183eed022a0768c818cd45"; + sha512 = "daf1cbb9ae4e3892b138fe0f3aaab8aa11fe175c1bed70d374e5da7baf0c77a3d1e836647a8a0e36b1b2791c3fa638c63ca960a361751b7dbaac5d87a1e73e56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sk/firefox-73.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a5a1296e053524ff1aa3779b123406e179a0eae38d7a5b34fed1acc6f70df176cdac22050afee59a7e80c79cedb7b86ec0549726dec9044c7e3bd0a087587b89"; + sha512 = "4d34b4c6eda6297461191388266d5d281be23b4e4390db9999832f384431bd5f5f323be80fa1cbc645b7d1bcb8bd6e80077ae2f0ba66239308eb3b72c062bb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sl/firefox-73.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "b360d85da7d2d8236dd4c731f43417364393b3c379f0b4b88b7521598a7cdc5ea73ecc4c58ed71245e53fa8b2d9b0345f054c27d55d7d1979ed3d97681578314"; + sha512 = "7ab8ea5037264ef3853376c000582b7a423ebf366d84e50fbb642f8510609cbfc7d8cff6b48eea499cf7dd14da3dfbda635871fa7b2990beb386b5e6b1db35f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/son/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/son/firefox-73.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "b92eaba0eb03801064258eb5528ffe46115ebd6b6c7efa6d174b48984da527bd542804c7a5edbf565d724dc1c66b464acb0b83160b4a01e1f845b37a82eb5624"; + sha512 = "afda3965d5934b4cbc3ce0c9df16d286cb3f2054c5bf5a174349691d12abed45d47e0c79a5b4e730cf6791a118daab6cc4e7438ee2e50529002fb9a99db4eb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sq/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sq/firefox-73.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5620a2d17500a7a6385d93dfe8496dfad466ac415ddd871f82baceec799c02b6dc9291aab8799d1938462c83507d54ce3807de42a5a1e2fc41ac780079a27160"; + sha512 = "6a1535b6440a805f60b5085f4e34e54453e36f01cd10536b169cfcd8cb67d61bf325469d33981e261855deb0ea158a68710b4606a912c1a2d8769f0c83ec33d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sr/firefox-73.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "79a01eec8ab15e0f3b7cbffa408245abce4e48f91ad1f81520fda0c9f66f2a5ff483864bb1118365d0a24818cd477d6bb992563e01ef704122387e1356b00c20"; + sha512 = "a5cf593a21ed3c2a825cfb4a7280b1b4a8d4905cf85cd69edcb36f733189ced40a9a5c6e86cbc9870cd9bc1442f4c7ef19621e43181335d0b9d7090a3d4b102e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sv-SE/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sv-SE/firefox-73.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "31351684d7819ce10dfbce8198ae5fb58790f79ee94e277b684eb914b59a686a1eab7e8e8cc3346cbc1a0f630bd181194d34d7e4610351e9d783fa56909d73eb"; + sha512 = "bdf87d4f3a960ac38dfc39183d7a7a7ae68d45e52d4f356a47a122a1a93fcb6d49cac463c6173c87495c39f717c68533e0234f828c45071a9ab59b3b0dbb87af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ta/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ta/firefox-73.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "d3204472eff80b522bcb0e8abad52fe1cc49c778f5cf0766ab45b5ca8e5bf2d60e561b1f72745b7accf209fcab9e23d90477a8388044bd2919c617fe96de3174"; + sha512 = "808628662c860b996124c367ff3d9ae89fd622648b46a985da4c3be50baeecf5b5d4de7de0488b2f46810dd7e8d91dd6923397830c58d27fbbf847772ba42c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/te/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/te/firefox-73.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a4127d25376e59b67c15e4dcb660262a5fd651b32989e8439de8661b026fc1a96590cfe4bbea9183cfd7568f37623face2e69489f398fc5f4601f8ccb17c39bf"; + sha512 = "22190521d45ad61965b5e863d877bf92da4633bfc7638f2f83825f478dda5ca5ad333707a874c0b992b2b9e8613c96f6e5f7144a9e51e696edce88cc36bd8c1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/th/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/th/firefox-73.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4b13582eb740408fe252328f00bd3217456f406cddb131912074112d59aa2b1b97a056c71e2c1f7030a29ea82c0f4c3240ecc4ffbebd104e8544fd4eef51133d"; + sha512 = "0131790f8fc79abff771b28e4b3f4f894c680f790e9999be22ebb968a869b17dc18c4fb15f992bcc025863eaed5887662a3ccb98c4d3e85f385ec00c37f1b891"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tl/firefox-73.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "48312b1d86756044a19c47d30ef662f4fded179cde72d9f82f47fe4fcf38df29f5f020dce26c8faa37bf5eb3cb5f389547a0fca3e504edd934ad7a414a1e70cc"; + sha512 = "5c20780883b844c5f3206c4c2d7fb0d341afdfa5b30f87d0356445cf279b0be7396433e1f6ef7aa20c88016f540eb773a66aee172c678a172f378b7ffa28c2d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tr/firefox-73.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "5ebd816cace4f8b10a8bb3891e4dc3fde9a60c24945a3cb54a05a5683c15f9c1710c427f31dbfd7ba3ff035d6dcce3719c08180e4fee8e4022b3c91c297c35d0"; + sha512 = "211842a6177af5397be00b18d42e038c2a82a185305dc2bc36803713d16461321ec96838c21873a23816198bcd2d9e1b5298b2885afa60506702e8f07b803b7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/trs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/trs/firefox-73.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "993bc4ccb6d60e93663e13df7176df38682d5980c2b73ac2b7b43b05792a5dae88d4f959940405fecfa2e4cf8d11ac07838f44cd03db395361ee67af4fe27a1c"; + sha512 = "3d1292229c645bbd3529763c4729be8ed044bb8081f0127b39f62a3b21c670889c915fd982866451ce494299438caf7380e4b72b971c4163a2e9e96575550439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uk/firefox-73.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8c61661884089446bbf0359a89550b41f09d3aa6ce9d1f95e7fc0d2d0d3fb6a232f3c3fe26f9124a88af981eec9bc6646030f97f0d412298358272fa440930eb"; + sha512 = "58da46b39c491278be85ff9a37eabe993166b9f950aabf6b5776634779d2427bd8c044e7b851462d59584051299c954fd5e35491a32a2c893678ca0fce0b4a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ur/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ur/firefox-73.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "64b83bd3057e1d7edd804e948626a1d6c6801ff0c91717140d75da5778c4ff9afb52eb08d982d3e9474f9dc1daf8de5887b2ccbba41e490b567c380980635564"; + sha512 = "c0f35fb5e3967fcefb7bd708e621abb138a3972b52d871ffd5f9e636c9d27e040e5f99313c72ae31cfa2313c9edc2ac9b64e9ec1710a5b1288bf7d1a7be80136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uz/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uz/firefox-73.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "ffe82703e4d66ccf612ac616fd94befd35fd41d26f2dba2d1cd269dc95500dc762c85c3fe2e881fcd8bae04c75486edee55d90a43c0b6c379eacf1f2270b76f1"; + sha512 = "68d335c31ac07a2790c4fc142b3f17c527bcb289e0f6e19a228dce248062c89df18874fe22a73623f6d94309fe4089a072dcaab533bdcdc1855c539395222b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/vi/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/vi/firefox-73.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c4bea8bb131ea97dd52b3849d1edfc36f88afe5550c3a7ad67b2b0f860ded462834b62804a92823149c5bb4d38a76e1e239b626d15c48dd388e9eaf232d03bc0"; + sha512 = "e7c846995285b3194a12b14a844c4cb01871012d1f7df241c3b9ad73191c567c04127a4d7a7aa2ed33ecf6deff8d483a92b2b3511ffe180e4f61cdb114a3285d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/xh/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/xh/firefox-73.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "74e09c80cd60f97712e4b5a374b9a32a1bc99c160e34a324b360afc3396d057456a988e8706139ac62525ee8002755e8a1ca52587de83028340fb6c767f1f432"; + sha512 = "cc9b6e46fbfe9fae1be6e501069932e35b8e53a91bee226ed8b7179cff98e3092e984dfb194fdc0e4554b983bdf203b28e271ff40565bb30a140aff24bf88e02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-CN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-CN/firefox-73.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d922dfa80f19904e8905a30074ad57f124c4cf81fcfbbf157f6b9a775f12943909584e21b1ef247540f26e1f5392e1e13852e0bee46bc082b0038cee15cecd3b"; + sha512 = "d967c3de22a110ed948a055d3d1e5f29ff473a8eebf1cc08d960135dac0bdb3a812c240cf46f789be8de5a5769bec2518d60dff5b31c8149275c0650b387053d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-TW/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-TW/firefox-73.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4e5fb29e77467554b767f4f59de3a0d4844de91955782d9a859b6b7a7d379c673325e1c6f090d6af477a67d8b91dbc57e5c3169f77e14dd43fccf2aba508db6a"; + sha512 = "3e9838ef076f360f09c30deb25298d23c7c067ee4956061b5d19c51eba91e28bacb9e22cf6fc6f7df929d1fd541f5aae383137aefeb3c0f2f0d41625875578e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ach/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ach/firefox-73.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "84669f751e3871de2ce92959b944eab1f4f6e808ab275c20389eb253c11815548d4c5ff766ac331562d13165d7bdc7498a1ff376777e98b428d68f83d09f789c"; + sha512 = "62f98561f7dc2b856474d5915ab1ce9f9939cfc4102d33532c2f933fc1887be5995abe4b16fa715647ee1b7b5a68e5fd9f263e928d05b6f6ae35ce924aaaea2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/af/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/af/firefox-73.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "230e212b172566edc7e3e30e7c4d76b94abf55d2c6bfe1d64e75a5769b1d758770b123b77edd2315c4a12641b1edb12be2a7f080dd44a59fe1a3f05f53fd86a6"; + sha512 = "cb203a3cddc9fd71178c1d158f31ca55b15f3388761c4347a3b2fdbde921effc335ea6f2b49b4fbda624b79621df9196b2e08bc42caeeab9feedac05a25aa04c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/an/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/an/firefox-73.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "af8a603d252961198255cda016b018d443226cf7143dbb7859494b871999ed1548efe6a8c7aba6bbdec0f8e0bcb7657e84ce3f12b45e23ab5df7067d462b1014"; + sha512 = "77bec37a0584e2cb00dbbe6278f21f3814a73ffcd026b33c2c4ccf13e13561263e314aee2c39595d037a9a49e54510844db44d521d3c550a19f1c2bddb66be00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ar/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ar/firefox-73.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "70c4214324eceec873654620e5a6b9a1f304c392ca83e989030cb43541092d3a1ab9562d58bc0178ce2862392793f65c5adeaff323006cb24cb0e7c660a4d0b8"; + sha512 = "c84047c4267fd8f872876a87a809604a1d65245804b5cdf45ccbca764d9ec9b39cd6edb13e282a7ab0278bcd17111487d5a22a36d9cfb7c1544353111395216a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ast/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ast/firefox-73.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "af157cacc34a9f31f04b6fc46cacd7dbc9b3894dee6209e52341f4ad72499e296bbde0b2a6e1b6ce9400559260f9aad5e3ffa3273e56e046528fad7926ba9fd2"; + sha512 = "8d87ec12eefa47af400d0c3da5c103587019d3f4584ccb5ff7fc02017451be0417673a3b539ce3191339f9afd8bf9e562aa962883bbabe3355cbfba2c7748cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/az/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/az/firefox-73.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "863399e7ee8b05c1ad5a35aec88bc0fa9137fe2f1677329cf3ac1ec43db2d20edf28cf6fa07efde7ebac800790c2971dfdaa4f52fdccfe1ff77195f3b1c0a1aa"; + sha512 = "0801cdd56ed2217f52bdde2f541112540853f79385d3488a2d01e9e95e5d8e8cd4f3d2433f9c272dc7309445f11ae36ab4edd0bc24ad343cce46ef3d74826261"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/be/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/be/firefox-73.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "0aa85d3e64ce5a27710fd2cf49abac8d63bca791f480d28480f4c0cb725d44a36f723f711392eccc5d1ab90cb150027a17b37cac5ed7cd099c80d8d7c1f1bf57"; + sha512 = "34a7d7abb122fa4fe4d38cda591fc88a5b5e38bf0415a89a87cc04fe14216408c56b3c7a67a29eff8409cea95bb82df4ed885110e0b39a5606e8278ef30085d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bg/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bg/firefox-73.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b20d322b2955591dc56fd01a0f321cfdc3595533881e27c23ea63ecf6878dadc24f8e357e882d554b58c340a598825ce2325bf08fd65d174a648686992ffae17"; + sha512 = "a1deaa04a797865ab9d62d1c820ed837c723bb66723397218d9afc114c4d1146c64f3c49ac558c69476938ef5c4f815b300bc25e53cedeef41c9022a6173e24f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bn/firefox-73.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "3ca4fa19d0fdcf2110af4ff36be438e84e23f534f854ae2a24f56d5e3befc57700951c948f45f730e7439109dedeaf0f7ebf27c8fcfe1d9a14f886f5724d009e"; + sha512 = "8fa4631d3a5c4aabb0ddd587f66a8802530864dbf99e1035d3a13efda65cba93a7824e72abfb6388ebdad045d981ac818368406ac345fa4bfb65b8560a9e1943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/br/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/br/firefox-73.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "2d89f28124cb2650a78728e3860d206f627d54886817727884f60157c561a00773fc8688fff3418c76a6c2e4286b9d1277b249c6e5a7c9de03d9d1a62c78494e"; + sha512 = "c9de94ec51f4cb7bc77c5db2b5d359cfe24d60c76fd6c368907f6dfae8c2166b6b0a4954d791e808a52b145cc5acba1e2bf82237d63b357fb2920b1e4a057bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bs/firefox-73.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e047abeba9c53a321484bce65617c3ce5def9ae06153f0317739e716d1617fed2e95fd4fb1959e36e24784b036d273f872250ce865975a977a25c0f98f054bbb"; + sha512 = "08bd5b8a337e0968c618903ba137d9340f83282bae27f286d4fd65f89c7ecdd36d771cf7a63767102e1885c7588d29645feab07e1c7c970c0ba9e5b8c38db7be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca-valencia/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca-valencia/firefox-73.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "91de80a3eb281ad887f5c053803d1869aa41e43f2fc7438edecbc5a8ede86e9e401e27db8e66494a84d4c1681f3e8a43dcabb3fdfad5bb763f50bff11c7151ca"; + sha512 = "5036cfd9bda8de708d90a3ba216bb74526a2a4b00bf16a435b8e346deeb713080049a3f39b2e9f5bc73799203c91eddce07df3bd0affa49135b3cea2d2c4081f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca/firefox-73.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4b94b5f074848fa6164f2eb6df555ac190846380ca719d09225b63d4e0438a96035f0b3cdf5ce23c6c39fce055909bb4d6ca6f056fb223b652193539b3566bc3"; + sha512 = "1576e57936866754bcce40c8daa9fcbb7b8c4b86c44c66dd0288764a12cfb7b03c9274327d06e3d1e98808a720acb5c01fb1cbd83b1cc580208e29754cfb8864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cak/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cak/firefox-73.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4a60942861ff2a1a3992c664a425c1f957b5f6f3ce9877ace5cdb13ec38a04d843a822c3b07180d4907b91774d9f7194d7e2b8f4b5f807556c3c5735c1a20cc9"; + sha512 = "715ff756b1781ee74a12025163443ae22fa54891f8978356acb816db254f0e9ab999b8855e6b542329a42fae6a3f3bd319295b9b17953234c1107668f3414009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cs/firefox-73.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0a1e8b063d06d92c5a0eddb2aec88ca41029a686d4914fda9d4e7addae9b6acd03c0667eed020faad6a0e82c234fa97529a94fb0771042bdf363c887a9aec2f3"; + sha512 = "835be53ef8be7772decc01e0ddc9115075c26f15bef7b4cc659022e2c7c6997bcdebd8ab4efa431e61af92c13b59734e4e9a433efd068ac2bc93fd79aa706f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cy/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cy/firefox-73.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "688a86f70b5d1901e6531414587453341fb647ec3a4560103e52c70fcd8c91dd499dbe716572ec8585c3aacfe378d64b82c63790b2f190e286ad1e0bf7b99477"; + sha512 = "be5702229cad8438312ee14e24b3267bea91e131736bc8dd4796798285dacec2863843f844bcac47eb64dd9a2ebb6966f161a3530db7743dfb8ccb3b5cab9fe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/da/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/da/firefox-73.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "84adac21cb7800d3f8afe3fe0d17492cd6a1d2e2cac60969b4403191ff0b1a8cf04fbe772c5a02fcc24ef93372c76b95fbe92f2f4c4b595a929397cb3fce2ccf"; + sha512 = "bda6c747c1eb8de22850aa418fcdf57f5a39d96546cccff3d82ffd1be93bd1be499abcce60f5e1b76595eddb1fdd4e3dee3855fb25fdb8c1f2ad82ba97a9d854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/de/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/de/firefox-73.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a7cbb78ce08d5783997529c61f51ddae197b9d7fa683847444d74978c191a2053b5845dc4d93898e0453ca59894cab4dc28cf9f79baa22b7a4304eea59e3f0f8"; + sha512 = "aa7510f2dc6846ace6a9754a4105197b238a22bcb034ea22453b7550aa00b3ad87d6aa9a7e909366daccf21427659802e7bc3eb285ceb4e38bb1c906cc782399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/dsb/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/dsb/firefox-73.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9d2821f99755cf024f4c7215274c6f3b6cff8c00ceb9c1d82f77becf3251f5c81776834a034fedd22ba15ea21aa606955ed743563a176632d592dbe4e55b7c0b"; + sha512 = "9a97a6b634685f02e3af6492378a3db600ccc80678ec9d9fb75e08ea123ae6d3016254a2fea5b4736530480671e7095fc21840e6c3db50bcc8343a800897b704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/el/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/el/firefox-73.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "69023e2ef7c3c5d3716421b603cbd85d7b812c201c1d1e2efb69a47d43de500306a0d493f9a8380bbd1490fdd85c564c0b2a9ed54d792ffc93cf67b399887fb4"; + sha512 = "7b15f63414a9b08fe54ca249b99e80a9a2a62a0a9462911b31c4220c7941eea7e1f4d170d969770fa1a0bf76b25cf539ee0eb5c41106fab3200ed32ea580fe94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-CA/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-CA/firefox-73.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "2309e3a8e2973871911757392806fb74086c010c374334c8169fd91f8e45664746d693f63a0376a07f529ee4160f4f75ed22f4aefce5deba39d43df30d683943"; + sha512 = "92c8f0132880dd0d3af36e1ee489ec87a7169ce76afda68367f977a3dba346aed727d04a9ada0aa96c1c26e6b029e27b2edaa266074f49399ba10f7cedc12bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-GB/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-GB/firefox-73.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "8db7fb10afa8deb76352ff324ef44becf01db57acb01caa2bd7e69714ddf327912f4795e874a2056acae4f7d970b688ec4b08a4912774e88f6d67d11a208a977"; + sha512 = "b4cc2106924be7ed68a96a97fe3410ddf6a0dd57861a6e93185f396ec92ad40dcf901de8785e9814a9e9499b5828c34c61910c88a257e1f45103f737030d7376"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-US/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-US/firefox-73.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "6665f3683537437a3487cded3219a8228bf58b9294acc205ae18197ffdf240a67f623d827795672217194f327c0747708cc4997d25a1da90e8131e8a32667c94"; + sha512 = "5b8bd3558e30d65d9368e86c79695c7cd5d5fca159a678394285bd5a72f74cd70775dadf176d22ee99dfc939333bb3c64225385e2e9330e04298a62718821cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eo/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eo/firefox-73.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "65e52bd65313c31e9d354bf35896d410123b139aa27fbead0e41bba2cd8bc4737fb4e12fd741429c209cdb31661eafb1c49509359fe333c6082d9c3346e686a5"; + sha512 = "e80c74cef34d4be438792e7436fa14e3008029c7ddba9884f3a5bd6f1a20ca51612e5f3a1e6c5939d69740921b0717b2ce5bf20c1a740ec6d167cd28809492c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-AR/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-AR/firefox-73.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "5d680d2135e4ba5e7c6ce7771e8b3fc34d753329fb8034e8018af302d451868730cd5175aca40b95a47319c5299b8f34d9bcf180270dd9d2cd4ca9413d0606f6"; + sha512 = "2dfd113477eac29985af07c05a3d2c0574104f91e44e8625fe5ec51bc5debc262d2f812761edff5a63ebff408f2e560eaced510ce34256f497317e0af5066b49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-CL/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-CL/firefox-73.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "a1e81b2a68ce3808630efceb578d6d786ec0a4ad11de5985febd811ab49e60a5c91f60d4682a4b980a658ee03683e53f55d338851d3a475507411b7092090762"; + sha512 = "7cd5fe37c8eefe0ef5488feb3a4c9640f8cc25e5c01c31d84e755a84d7c42e2b1ee89fcd78cd797b3bb34c465d06966ff5f994b7b6412008628646a987abac52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-ES/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-ES/firefox-73.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d7807a206fa3c169a3d36a9b41f8649b83db1a43b2f54de7d238fde37728d59e27c0f8654223f02c7f9970d358830a29776a4bba1ff2e25629ef289ab0612b4a"; + sha512 = "7d2a3fec526f8e812597c1184a3a811c0a1f7d1545aea8f826ac934e1b694d35692aa8f47bb2a42f7a5c183075e620e29a77a927d99dea54326bc690110c575e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-MX/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-MX/firefox-73.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "bf0ac4aeb7d527969da7633a6142238c9b9e2c57612cf32582f1316fda1cad020a5c53de18d009db9489dbd781af5de1d1da72a6956b1a08bff3a149372b6982"; + sha512 = "03df019ca336e8b6ae455b91058c5ffbdeeed6bec6f039962c00d8b8d83668783e072f91a82439092bcc4794c1be0e52dc6f88303147f97fd67d81feb14d58a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/et/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/et/firefox-73.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3213ae4c41a450ff0e487f661df8716a6e6ba24fc29d41dc7acc8807f1d0af8e065d65b441f6eb47c3a2c2554e3848ccf83f786b69e536e44f6dac994d76478b"; + sha512 = "85d6ef77f080e8617cf490d945d45f453d04a635e1b410fa1ad78c86afd5d43a9a39c8ef7be0b4676b057d7131168a1d8ad0dab5a4fbe230266f96d25baa8fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eu/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eu/firefox-73.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "90f4364bc45540c8543c38291de35013e6198918cc2e32016b707c6dfe96ab5177501fd165204c6386cc3efc7204b86bfaf131af9ab164c0662124a5149d4cad"; + sha512 = "e20b16ff5539c00627bb44efc87fcbbc4017006d6a74e0a6e9421b91c297327b42405fd6b65e8b98d71028a8ca35323b7c55da9c4ab77fe7a511c2a75aec6f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fa/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fa/firefox-73.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "be2e0aeba63a36348956862f636e6afd6c7dca6e76fbb103c91456737eb487dcac4073bbb57f45987f8308b395fb5ae0424b36b982e0ecb8d3ef90d259660818"; + sha512 = "ecb9935bd89a41128955005ce003700e15efb007a98f0653f88145cc21af2ed719a0edc342b4343712814a9bd16011322cb454f36e4236d0c73a5b5306d45035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ff/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ff/firefox-73.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "5881048229f3f17a2c766c12ec4e734311f3841a3737fae4ad459c50eba5c889e98c4666f8a87074fe87f59c33603ad056cea8bda23ab449babc3eb230d442b4"; + sha512 = "6bd4c591f7e6a7c0d08ccc64d7086f1863e1a2d8760c63b02a250a8b47e9c50a0f36191d7ef18d85ead4046678095cc101670511d9790962312ae1d6032ad9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fi/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fi/firefox-73.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1bc13da6298705ad2bcd40ca0994b1b6288416defed2a8bafedcf5d7a3e0239a550540eae7e2ec6556c4ab5ede77a6b451b906ce61f753fea2b9c1cea5205e99"; + sha512 = "60237eaa42baefa008a1fe6fcfe30694c63e832df64a12175b34967a2358ad2bc0b08854a45ce698fdf9d4b2ef21dcf63e87cabd624254fc71dea5b9e1610b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fr/firefox-73.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c5bb1bf92b1f24a3bcd493a183ac70683b01fe7bdc337e96c41582c043adfd0f429f3eb90f543a9af98dbbef915e6a5e2aa3f90f96414828c9cfa30e58187aa8"; + sha512 = "6f7b38cea8b38d746623ed37fe2be83d5a3ab3c9ed2b6be88e78c0c28ccafea70ce0a11088e35a45427d3c5e3a84939c3c6c2be16b15e7270d4296088ba8c3fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fy-NL/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fy-NL/firefox-73.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "fbd38bc075181e87abbd457e5c763146e4ddb590004d7e76fdc29ddba8c3d66ae718705339bdb224bb782eb8633771f8c287ab0d585f27a37614f3a7a284d97a"; + sha512 = "dc0eedb90ccbeb5a0de494c3a60c94704582d1b681e3281c3ab3b60fe3d1140bb5463d66e2ed36c8549a581a8e28d1b0a09ee1fef903baa6680a7c43c3d6b8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ga-IE/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ga-IE/firefox-73.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c2276b743f3c5efecfd58bc397a202eb4efa02eaf30d5b18221c8de365e4ab625617e1430a056304b2c4a30ed901376e8ac14bf28b806d2c0b284bd732f546d1"; + sha512 = "9c64b6586f102dfe190c8a600474bcf4a32c7b268a7ba3cb60d673636aa340407d492a7fb377308d6f0b6759b76069f4e5f573499f36ad570905060d00d85d21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gd/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gd/firefox-73.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "327f677c3d4f71c3802f515ebe36decf236725e1fc318f55afc0985aa800b206a5f7fa215a219e1c2c54ffd24f2f95baa6194822325aa6144b0ae1f8fdd22d2a"; + sha512 = "5f3e92b500a371e5228a2bd7c176e116e8eee7210f14dbe130ecb2a1f5f337e2a413702aec2685fec27245c281c97931bcc08c0fc7ca0cc4954c3e507e42fd16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gl/firefox-73.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d8aef85685637cc5186c5b0b6f9458f29955ffea90725973efaaca806cb48cf817095e08ee1d2ec533ccebc6199e671e04acf460d1b8a88c795b9842b1a55be1"; + sha512 = "8fcb6890fc7664f11a833585e14e0d70f6d4f4d52b9a8cf4917a86b452d96f9b1ce76502a15bba116dec18b31b61976ccf8680949c67e53c93cec786373f2654"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gn/firefox-73.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "95585c2c547ec4224841178f6cd8697139fd6166aaceb749abc444425e100961f230cf1b98b76b8774b849e6a10a37f1be3047d97e48130407cd5c27f9031f71"; + sha512 = "6729111f3c0e4511ae70afd2db2c9dbf9640d01c16b711cbbd1ce7c4ee689cdb844a03b2aaf93215aa85b91d3a519f135ee5fe895cb2f96c77e296ed8528b942"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gu-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gu-IN/firefox-73.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "396b68a041957adb0a15390261cc152f41cd339511a94933ace779e5494a595ab36243ce533ed158f57c4bd2418e7b66764ce9c2cb4e93f7708fb29aa6a12b0c"; + sha512 = "9152dd76206762dfe6fbb4ede85d2aa606c1c5455945fd6cdb31aa65267042a292f99378a7ba51c793cf50753d51ec21e896938b58d6092eef032d5c2ca89d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/he/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/he/firefox-73.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "884ef44f1b5f017d46abcd268b87c6c433ffd8c30f5afb66cf66441558e819bda15d9843b7fba3413c8f148f6d8c583506b6a754d91e2baea70c5cad321909a9"; + sha512 = "bdbf71a917eeb72a47fdca61253b5f7861ab8b20d05b61833e5d6359f808fd34c518f192c8eb55883530f0b82c56f0d289c78dc369badbb59050ab092f2d2794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hi-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hi-IN/firefox-73.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ca548c8b992d9c11a76f17b0790ca024a8c40893da10d50cd96f133f99459c981a2f2f37ad08f570bae809b6b08684d051651786840db33be4990f502fc5ba5d"; + sha512 = "1cd239f79716e277518ad870bad8d01be7f558e60f1ef69d632a87e4fea570dae219fbf63d57ede37e2128888860f1899e2d702e24117071885d71e5a95061fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hr/firefox-73.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "d51a5454a6908d349b1b7239176f57fbd118d41d6bfe578c64bb9fe074628afc25acd1731221e6531a85a84d8193765d46e49843e7743f32be96b26180e9b593"; + sha512 = "47e3c93ea8a5c7094d02840a0c4dfcd74d91cb81a718a42505284f29d7dc7ae779c21ce04413eb4889369a22867f4562afb132769430ebeefe2095c23352edc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hsb/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hsb/firefox-73.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "19bcad2ccfc2c00d1a735a006c126f7e9610c979310fd1af30ae1d9bbe2e1b6a35ccad8441ff1a2c5d1bf7f4b006751da6f848415ea28cbe2c47b2ebe1b97bd6"; + sha512 = "dbf79eab22d233809bcaa8bf9464abc143bd120f6c9258b95d61538104cb18584208a9f55206f27be5a8b7f9b2ad7ed42f58562d37b14f86a61dca0b18fa4401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hu/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hu/firefox-73.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2b598a6adb47878224759492c1834b317ba6fd68839de83ddad835c09f5bdf92c5b89a71351b64aa9f8332f61d685ecf56ca2423128142e03a6904708cd693d1"; + sha512 = "d8878f168fd05f6334477078ef647f70ab1e89e144756238b12dc8da7b7b703fd56958cdb4119c66e66cf3f8c0260d2fe9ce65d9d9e094c52c775b1234e2a8d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hy-AM/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hy-AM/firefox-73.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "76e940fd65f81be02750c299a2375e2252b1e2595193aa52ae6238a4931b08d461ffb2806a6c6ea7ac24a343d183bfacb1a57d349d4c57ae6e3f68ee09833322"; + sha512 = "9348b29a96e8cacc331b544ef219049e1228ecfb4c282ea1e9a859eeb5f16d261d6ba48d6d6bf1d2cb9be6d7ca2f3f6ecfb5f58e42a54fe9eaa04742b3a42532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ia/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ia/firefox-73.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "6554fa82b4e6e7dc20a5dc83148752661ba12aeb4ed19500a21f9d3e46b7cc37881b53ff0100c9f382b2e24e16dc99ce1fc338677e40ae4eeb3d4d1a9bc8ca80"; + sha512 = "b8abbd7321a68fb1eb3418a8b8b871e4f27fcce07a26bed73d91482bc22030217599b515bdca16c4f409581ea3f73afca7dc506c85e4b19e0f4d9c27abd0a602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/id/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/id/firefox-73.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "dd12e9a4cc83e13c6a7f49d7a52de3f46b4439405a28bdb855406394483cd90120a4b5ce9bd5df912a70128bbd532d158c1b3eddeaa1b7c95ca4b8334429d599"; + sha512 = "b70c61f469f18b06baf12efecf1b4f9d617bb47721810d6069c7d3e1491cdc5701a4bce4f3c26a54825ea4ed48706a69aae731aa3514488fd90533bd128625eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/is/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/is/firefox-73.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "01e7e45c6e45d7a20dfeeef16558684a6f38b6d97e84bd084246c17d891a19432f9fb77b7c2b0daedb12755853e53efbb0fa567f2f306c385d9c6e7e2fe1d661"; + sha512 = "2fd9b1e7cd86c28dd43d6e0b39fb4bfafa82c05dfdeace15c792d5f2c21b80b67a664f2abe0c9f9d4dc3a1e4fc214e38428124d740aa7f63ebc4c82210e7d646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/it/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/it/firefox-73.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e000567bccea7588af26e9e51883bcea340ee237d2626dc9e63eb241efc49962d60712bcbd4527caaade8eae7a64ead080e7df0150436f37aedcfd5cc212146c"; + sha512 = "44f2b7ca7f2e5f14107a243b1d711b487e8c71e73808f849756e65f3e61040917104836e912ba8c356754ee1b04986eabe85f4cfab10e1b49a5867dd33242648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ja/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ja/firefox-73.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5bc1f2078288499005e189adcf2c6fe3fcaf3f642d624c2451da2611b804072771161c59ffb58021cedeabfb91415644a201db519e5d6211e78ee52f32e97979"; + sha512 = "86d5e55c23ec5077f32c290a4200d2b53e28184d2e01ead019a8d8d810724e692b9364cf28d7088c881bbd32cba55a6c649cae448fb92b7b1c9f309134b9ad1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ka/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ka/firefox-73.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "ffa42e8f3c098b199d68321c1354cbd6e21ba7f36add6e9000c8a2ea524f3ffd70ad13128b4c67ba5f376158dd87f7565a8bf876bb385481f823b5fdbf74d8d3"; + sha512 = "11b4a38f291728dfa67ce79c050cac6197e73f1de746991cb85906f648df14b72bc1d94c4e287e89575cef201a98cc91774df3872d974dfc1c3d644b596e7bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kab/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kab/firefox-73.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "0315ea8f56f8525f9758e919c97437b8ea8781e04a98c2a34502b98196c6b27030759e26098051cd4f27c96c7de4bee3f28ff8cf9ebc87b12aac7e7924a79275"; + sha512 = "7d817167020b89bc460e3b5ac6bad95c32c62b2e7ac816d69a4e943fad80ee06dece53762cdc6b8dbac27958cc4b851e12d777eb08c84638f0c0234a9681053e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kk/firefox-73.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "4c0e327fdafe298dcf897e68fbd1557bab24ddb91bcfbe3bf92a19662f6fc6c4c8862585d909639fc7a4c6bd4b875d52d8a6d0867049ca1b1ffbb00d8e8d9195"; + sha512 = "998241399f8019c1385b2e005bf55f715ef734e0720ac3482726ac9bac82c0d656eb38511793ae96fadd810949c8ca084e4cd0810a7a0a1d0a07c9c88b69ffa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/km/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/km/firefox-73.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "34a45eda40d599116be8f320ad99e25dd2d9607d91c99aa8b1eb5b05eae32dbb526391a4a08ce5b8d411a6d6fff23dd9d01e276f75653d9c2adc5a4177511df2"; + sha512 = "530210e9760266ae5680333cf94d8cdce20fcb2e8762503413b42e7bd593a163d0c9c37392aac6b89526a2109f6edfe3f6baa0ee1e0c8e85fb7938badfbd8d66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kn/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kn/firefox-73.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "6bce122a0a2a88ee17b29ad2e98e99293c077fb70ac63604b407f4426bf39c9ee3d91057b9e60df6604a71183a266fa7f27bda01c0fa60bde898872d5325e9ca"; + sha512 = "43bc6d75ae2efdd31c9bc02e1808da3999ab5d1fe64df2194343bcbc9436adab4e530b67ff088727bd379c099911afd8733d6b3bd73872a6e9e5ceb14c2c7346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ko/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ko/firefox-73.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b746676d728ebdf3dfd646bf25b007c61c7ce960f7cf77f80601cb38e6fb56cdb6d6d7ba36e84f55b7969f2f8f882def133126e0598b43ac569380cd897f2f5"; + sha512 = "08ac6c0704f13ac266adcdd8ba8eeb62e18ddf4c3e4633acef3df31f07b6a5d4608a15d4c3bfc25b3c16556ada6296843f1ef7115bd37515cd1d5110dbf85064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lij/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lij/firefox-73.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "453ae335ec815eea785d822ceb8224d590b8615b21f316ee7f6c06e9a0e02c341d26b9e938fd5eed60727df719c8d8394df312bb28868cd21ccaff60d3212d9d"; + sha512 = "7ed520a475ab533d33e392e7fb24f2444caf9fe5cb06aa5499740d36b8fbfc899af7c8f6495c46f9e363606d33fe067da9fa72a2d41a820731d764d698eeb075"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lt/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lt/firefox-73.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e6da72f2ff519a0e348ff8c9cfe7a29a3253eaa16e8ef58fac79868b9e4e4ff9fb453e763397209e0490658005ecd2d4bd339b366afd7f8936d51186e55c94ae"; + sha512 = "6e49543423ec6c0e968b85702fec46587c01fb5a35c28e1617f3e206512c5b072856a7bd455549ad31c2828d1f6baac40f5916b8e38c622c84b7a54a6468ce3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lv/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lv/firefox-73.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c9f958bf85e43fbebad9b9dee033cbaaeeac010065a7b79c6b4e90967f16ab747f4fd0d01af4316094876eaa80b35ad67b6b485ab4b02a3765ce3583cbe7eae2"; + sha512 = "c8c7e30bde45f99026b3874ee70d4b9ac44d1a4921b448883faf54c9e1323066464d4eed3671b372a8e342e9bae9226ac64525a1ca285d7015f1854e5d4eda3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mk/firefox-73.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "3c936346e9f915f24b806d299bdb2ab665d03f3d2c12a7b52506109ed1aca4f87fd3a099f6fca6fba1bce46784bc3a93d54ed2d9e8b704990bbc757bf4e1b798"; + sha512 = "e22388afa540e7abe6575525663ac7365555d7d515ad49233bfb3de16db778a634dc166b8e9680f837978cf6662bf1f460f95ae40520116988822050de731a65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mr/firefox-73.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "92622561297d3e8dcbbe56d2333f3b46ea66cbd72efc64c20c339d33046244e68f98687a9c5b5c5e6738eb6e88d392781cb1c56d96647e454a7e1bd111761ff9"; + sha512 = "ad71b75a9b309c9166b72416ec06edc90a6621ff27fcaed07c16a42147664e3b116db8e3ffc9bdba8ddda862dbd29074b62feb9ffbebab6d36437bd5a50318d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ms/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ms/firefox-73.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "9ba4f473ca8e56576d4c13e467b49f7cbb2f4af43e78406361d4222a74412f7b336419da504168754828796eb2f5211fdbd0afd8f6bf4030aff7a9855919b119"; + sha512 = "f4c3f8d93cfbf89b862929d74eacd3398531f43617288aefcdf7b0f4b5857e9a790802755791a202aab465349bd4f979d257d5925b45a8a28b4245ba10d5d0e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/my/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/my/firefox-73.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8abe55c550aa5f185fa0919641749de22d807625d1ad84b561265653b17e04a267311b6d5be5d3e327af04f2ad5bc17352a2d48df7927c7183cf5578c9ebcdc6"; + sha512 = "4ca9a42291faa8bb4c39a9efc0f8067407ee486e37a0b32576d2519a0189efd2c86ea45ea6c19f44d321d485ccf7479a58d9fc84bc3022fa211046adcd1cac8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nb-NO/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nb-NO/firefox-73.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c15e35640a4b6672fce9263a15dfbb519474652ce2024d6627d3a853ae8017071ea62eea0cc3524ea5c099aa3eb0de34e51d6765e0dd507a58311db6b810de44"; + sha512 = "fd54231a3888ae659df17b64d1f8150d112bc9191387f3621b0edf8a97571b90613d387c8fcd1944a263bc20c4c2f701bc4eac3765e6d2c4529c93c70cd07780"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ne-NP/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ne-NP/firefox-73.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d5b54a65c3b12d7090061e23ab3e0428c6e870b1dd7c6293d13011921b868db6dfd8ed9f4e0ffa33d2af7c5f53ae2ad50eaeea0a87b0a9af676d32f6563d1e5b"; + sha512 = "1530837c31b3f062ef0d13063d7ac071e0434a3bc9d44f53d17675cee3f6cec4f19305ce01a5ffba0c9be9d2661a6f563790d54449408eb95449c62a378e0217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nl/firefox-73.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3c7c0e1b45948125a01b3447e6bb4d1bf48e79c16477bdaef5145e67d154f101b299ec696d22588052a5d7e3e87b226418795c3aeef9991d226bbd344d7e8c7d"; + sha512 = "914ac5e5a1495d753ca9bbefc8fc57375252bcbdb35c6b92a37ac12bb3218edbfd7caf641a52bf1448950c3ba84bbc13b7396199ef0c6b1678090fa40d3ea26c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nn-NO/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nn-NO/firefox-73.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f4391136225aa0e477c748d541e94be9b75b955ef8a756d12ac3213a7a83f0b273d320b512bd3cd82393f6fd1b1470f02206cb37562554179d0c23b3b6ab83cd"; + sha512 = "3218d09d98d61d7c804d6ecd8be2ed48dee8f0fd9c2cea42e44a1c38485e3cb466955eb84e23ca308f1d724afdd33931d780d9f76b5d54ce942d00f0d31463b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/oc/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/oc/firefox-73.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "af5c368c519a95d575ca0cd3b719406ece8823350c828fb4984b58584c1abe8b743ee99bbbd29f98a543510c91358a80817d707070c2b2e341529e33ea955e64"; + sha512 = "a7bf0def44278d66532b7e4edbc0deaafaa3a0be1a3ac41ba22848893c4ad8e651114e0d39e49eb49458dfb257280c32cf8bd6bb503c8f3198db1872324a7345"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pa-IN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pa-IN/firefox-73.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "9e1f51321f34b9d4ae207b2630c7be558f16b0d1e3a0b7fcde82c908dc435b044388a3a23da99e28c7be3889275d67041cd53276b8a4af04f7b01e00f06ae3b8"; + sha512 = "d052c6d72e88a31492567d03097c3efba10ab0dc4d8fd0cd489ebbe45949896effb514a7af1fa30356f3cb97a0b08caa47472d0032558197e608b1ec130bd7bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pl/firefox-73.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3b5ec2695ceb35dd2b0d70b3f47cad9b692eb11447ed9bbf4b3fa8e049a35911802ee455a132fa812eaded78ef18df31ef3a8a11c8c95b260bc89350a7355181"; + sha512 = "a4dc584b9222558203be7dab78c58f5e7fb86dcba9ee565d2978ed7d8da1cdc2cc3c9bb8f93ccba8f1c5ccd9074bb642ee99d0225056a54522cb499575ce1e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-BR/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-BR/firefox-73.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "df5fbe1a058233864e7ffae44538b14540ed4846ca5bdbfbf07eb627a8753c3bdaf68b337eb6e69900df8cf3930a9468e7c626583af60761854a282fd5d52b95"; + sha512 = "5ecc7aa9752a373c511a208dad606774f589e36b5daa1434c8e7d76bbd835c8f2b9c6b20c176bee0ab6fc7b4355af1f25243563eb4d97d988059bf3d08e7d279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-PT/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-PT/firefox-73.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0145016eb55586388a49fe052daf5d7cadadda15ae88ccbf1410f35de0d0e4fbcf7afa5ab5889c9c88a0937691617a51ac53dc8db070aa199b17840275d03ec8"; + sha512 = "31c3585e7612f71b2d7369d477930aebafcc54ca8d21ed6f84ef0073144ca5fdfd1bc45e6f19b702c26ab5c6797c52420d8fa5451b889c7706f509b6c4dd5ad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/rm/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/rm/firefox-73.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "9890545266e1f31a27c50a4782acb6d3af0825699e6ec78151d872d7a181c6258a08764cbf046d483593bfd8467c4c78b9bc316fef20bf444afa73b7bcc14795"; + sha512 = "eb82d612861e1a0434edc04dd79ce33e42d116e27b001139371b7fa2802b94a46c7035152be2248941cb7ae576484da743175491c63121be8651dfe9b74a0d82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ro/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ro/firefox-73.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e13b760d6d61079136b4449ee14a8d2cbaf72512071f4475d8fdb95337ef86970ee3eb72f987c1e07290650898108f0e90948ecb2ae027ba40b5fdd53ff7303e"; + sha512 = "c5229abd0b1fce59debd4d72af3d7bcf8a3f37c5abdf9f1a6b4851c19b7191492da42901683e57c9233efff16cd99bc1499d8e16ddf7a405807c7d00a41c205e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ru/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ru/firefox-73.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "3c51eb7be0e7a23b2f3ee8b8ec5cd420ceda5bcc3aad6b76ff4406ea0b59fd77327b295d78df6990556cc9c6f8d221978d6af58890d4122cfb604891fe6d574d"; + sha512 = "3b965b0cba404679e6c9756367dfa3dd8ecb028b440cc7bb949df353f5a27efdece0878eb44f950b3bfa7e8842483b929ff70ba1fd25bce5ed0a23d7b505c0cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/si/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/si/firefox-73.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1a4bb6b01a0d9bc89b270844d4c1e235354abc447068b45b3630733d1735b66e65c808f70c532474c31298b7962b463c7b71bda89ae2f302fcb847101e0734b4"; + sha512 = "569f2910116f51cb3be82cc2d07f76d4f8b61cdb6ca96024290cd5e523c6711009106658a09305ebf2c596928de35eca1bdc578541a9eb14fe853fead902c7c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sk/firefox-73.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c46e2914e4afdd9b3e6a0eec1f2e5ff9082944221a35d9a4de8439f5c31ee705b37575eebad365e19ad2a447eea065a712cb02150757cf053be83986e69700c4"; + sha512 = "109afe184afc873727c4c880280ce38f6577f0688c42c7a18b692d54a4eeb3f24dd8c5ca1a062df886bb171c50d30d6707125005baa29a1db9ec5091746164e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sl/firefox-73.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "335256ef9a8c9008119fc7de2f14c4c51e288f65cfeac0ce8dea737cab04772739f99401ef7b8873e95e0290239502a227d3a6772d7fab96ae7e78437b6854a7"; + sha512 = "63af29eadaa34738b715aa23609a20decd0a805a252a80051ed54fb8a332f6ae7eb17f73159469a755eb736a1523b0552ac3dc01de5fe2a5903e21e0286c833c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/son/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/son/firefox-73.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1de8c05e776163d5015487ee1c48b63f8c2beb6699c3502e9bd08058529a59324df59f26426852558e30018657978ea613b97e2e651a6dc500379d4a61651947"; + sha512 = "348898f1a01cbe5191c31c8a806547b74890762163a8aeee07b61aebc969a36567255f00bf8bda7f0dfb29b81396ab71ff39054dc1910c7b7a2ec225aaeb7ff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sq/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sq/firefox-73.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "02794e37e26dbc6b8df8a62d9a29a5e47cf0a45a1929265c1177c97181592a5ecaa99b5549bb95da00a0559d1488723a4454866d2e5edb08413b984165150140"; + sha512 = "278e02254b09df8469c3ca0fd56e72b9b663be621e930a1f261276e58242c84ec9ce717a0924bfec01953e15a0a36c746a17ff43a30e98c6862697995e7f7fac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sr/firefox-73.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "dbe5862115a4f55f2c78de57b03198e08dce35d491b60238955d406b0696600bec8f116615a41bac3d80d5e77e1faccdc33663056b4b15aad952d0b096d73260"; + sha512 = "1d7f2d1f341d2621500bc4eb0885c6e2709c4621d34fcf8c1f35d3054af17b0c0490acb92867841ab605b8a6b764d9689ccf7eb6325a136f00531068c2a83d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sv-SE/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sv-SE/firefox-73.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "4c0d9dea8339def7a3dc300da9f8cfa1ba6d6eb5a5899918bf0ab8211b4b5aab4367ca91a7a290aa5faa3424588d29bc34e89ab645bca155d8ce6150e225b946"; + sha512 = "38772f54d574a7b0dda06a535adf934e60e06d1753c4df4a9dd52dfe1cc08dc1fcdb1e0350e889facdfbdde95707cd70d705b9f7fc6f2d030ea92bf59de820ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ta/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ta/firefox-73.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d70089c118868484a556e747a72cab6242ca7a5aedd7425c59f273170ec559afd9b057d7106226a9948540641d25829b21b4bb9b4bf15b02f3ec2702badac873"; + sha512 = "c75d17e579c45961c92d9a0c238276a9371f27d438182b366c8804d7d4899e9d4cb689455b5d1dfb6100165bd1b4fef1215059779eec7fd215e485fd26f4db33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/te/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/te/firefox-73.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bb65f50f55d11b79c1943df102b6f3479127c89c74bf4cc7aeb5fa8dea61116f23caef84a770016567285cbd7788c923f3c87af5598d7ffb805c541e0c69a0fc"; + sha512 = "5d791b6bb7ad154970646e83e77513e92e284d32169d9ec6f8ae66e252be3ab6618e927cf73693d81986a2bc10ed27dc2f46ef8b39065eae028828282153803b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/th/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/th/firefox-73.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5dc7eb602e0ab548d5f337bd79630c516968544bcf6f801093676f784f54e20b5218d2fd0b323cff31292aca15616e2485e75c3475f71c2681222bc10a74e367"; + sha512 = "6015ae88939f2bcaeb2f354ae0003695fb111e60ac0c137cd4d6cdfbb1ef27699b76bd1d02587af1996002a39955e7c1ed537f906328695b820b024c8b91ddd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tl/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tl/firefox-73.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "3318940aafc8af7421a2e1973a1bdfabb6670dda5a104de41f4ed1abbb3c904e6319ceb6f94fddcf11e4d18e5f72d439f5e4506f6b42f9b5adddbf291e9e2532"; + sha512 = "471e73795238f2f65550ffc73b604f1ef41b92470b811c440fee5d2cfe41b77c3fcc38be0d2ed85f7f86c005407095780a12e8ffad02fd5f435c6492feefb8bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tr/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tr/firefox-73.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fedcec77a95458fd334be9c8af587923d6281a50ed9c146a32f289f51138ab27d0cf551ccaae77fec2f5e4aa2565c12af7267d5476e777d95761ac2f6904cdcb"; + sha512 = "464f2df89fd62ee8649786516df21a10ad9bc0faf90f6970144dd2b3397c58643c1f7d1ada6f9f7d7710777b903de89e2bc04c7ab7b057e8fa07ec667bf62f9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/trs/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/trs/firefox-73.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "1f4293cf978b92114b25aecf7f633608eb0ec52274147b939bda57463bfa170467484d3eac34183588b58ebcab6c68b20d59561961489069b7fdb120474806ba"; + sha512 = "d9462735ef137af2defa7d580567479e97d5527b8941880a27979f496a0d74da39cce10eb3503dda54b4a732433182d3725123ecf0b49ebb503bfd56fdf5a286"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uk/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uk/firefox-73.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "7e7b442ed847d07ee42c9665835a6fbb06f1b8e61e04dccbe623624facc0fb4ed3832b91192819190be785decaf07a61575f198f089f852b814328a168e2af5e"; + sha512 = "966b2fd86876b694c66e68f7e8c33e380e021be7e24196816f741ec491eddbbee33318f922b03eb8c66c5302e0d5eb582aaa1d341860b82d7c7a4a7949254bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ur/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ur/firefox-73.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "4519a75106a92aa6b6c172fe565818f554aa9da3a6cad86fa6fc4ead9f3fec24bf5065f69e12d985b7798b7d0b019033b88b81605d9599746bbd58786d2d2025"; + sha512 = "03fa60920c5cbb89035fbd665135b2911bdeaa3d4387c38184aa6f7589369390ae8bfcc0ebca83749f5c2e811a8a74d0ad5dbb62a1befd009f674c7a21449fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uz/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uz/firefox-73.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "41f4eb9cb1f002373ab5d1587c92f6b3fc5b0729117dfe4d74e399d1c8b08c595fdf8d22a253296f4f838dae1f8c4eb15fb634a77a2d60f8d4d61fb402b2a1cc"; + sha512 = "e66657c54a7edaaa80d932f8447d9edffc2e7625c6241de6ad47272c77586b5eeacb299f3cb9f75a43791d145762883632ec409c1c2b5d32d8d81d42e54cf62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/vi/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/vi/firefox-73.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "02a6856c5a9a13820cd26333d6968159743907304e58fa1973592f694968d3b9ab229811f239a0f5c37974ef16c504c71d2312127293b8276c7077b03dcbe0b8"; + sha512 = "2fc3f94a80262819d72525e5ddce77344d482d22ac33992931c79d15d4476d4c564be306a35468358b7b02c167d294510c197496894fb8107062fe897bcb049f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xh/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xh/firefox-73.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d0076f85cd30481b7d174fe89b245c13063b6bf64465c0a6cd288ece96c662d77e25ff2412afe334310375dc3ea39bdfa31c81b1b67ca5d54f09d2e871e7d23b"; + sha512 = "806db4368b5c5f248f3992140a23734451f9b8122caf249466c63cea69e063a1274b620009d7e6e8ea45bd43f29997995ff0d23580a8bd2376e950926e9807f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-CN/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-CN/firefox-73.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d560bab6c8deef31fe2f582faa1cf827eac11e60b2ce8695be5c8682972247bd9b6abc3b7c0e2ec174e3dec09374c3a909554660b449abeea821c9b69fdc3550"; + sha512 = "b4ea2b4c2f54a7c3dc2f16754aa38555e81221062827c3339fac543528cc52062b9e9c910dc597b21f2ad1a267ca2cf1faa8362f3c9c78b52480169251b073da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-TW/firefox-72.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-TW/firefox-73.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "06c70f2d07a84f98c5fc2407e29a53fdf08174c661908f788ef7b4b652a0c589c192c0eb6d5eb51e2b4fd6d529d491899c93e153cfd1e58169f3eb037d112dfc"; + sha512 = "ed2e55f3279472c9e3b2bc0b51762b797f61c4fdb3fe95c652e5d2243516ea17f2dadc1711bd19154389215ede42a97bac9a607aabc14ac24d5e43a2913420cb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8ba899457b3..4aa8105559b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -103,10 +103,6 @@ stdenv.mkDerivation ({ sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp"; }) ] - ++ lib.optional (lib.versionAtLeast ffversion "71") (fetchpatch { - url = "https://phabricator.services.mozilla.com/D56873?download=true"; - sha256 = "183949phd2n27nhiq85a04j4fjn0jxmldic6wcjrczsd8g2rrr5k"; - }) ++ patches; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index c61483c6772..2a5a82aed6a 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 = "72.0.2"; + ffversion = "73.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "13l23p2dqsf2cpdzaydqqq4kbxlc5jxggz9r2i49avn4q9bqx036zvsq512q1hk37bz2bwq8zdr0530s44zickinls150xq14kq732d"; + sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9"; }; patches = [ @@ -42,10 +42,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.4.2esr"; + ffversion = "68.5.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1n7ssx4w5b822bq8zcv6vsy5ph1xjyj9qh6zbnknym5bc0spzk19nrkrpl8a2m26z6xj2lgw1n19gjf4ab6jpfxv3cqq4qwmm0v2fz1"; + sha512 = "39i05r7r4rh2jvc8v4m2s2i6d33qaa075a1lc8m9gx7s3rw8yxja2c42cv5hq1imr9zc4dldbk88paz6lv1w8rhncm0dkxw8z6lxkqa"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 9f49925b267..53255ec5183 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos +, kerberos, libdrm, mesa # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -58,7 +58,7 @@ let liberation_ttf curl utillinux xdg_utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - kerberos + kerberos libdrm mesa ] ++ optional pulseSupport libpulseaudio ++ [ gtk ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5ecb6bfb076..3d711f92d1c 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.314"; + version = "32.0.0.330"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456" + "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b" else - "0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a" + "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b" else if arch == "x86_64" then - "0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz" + "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj" else - "0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn"; + "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962"; }; 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 353aff7e707..b003a1b3f5c 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.314"; + version = "32.0.0.330"; 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 - "0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz" + "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84" else - "0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2"; + "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 4824e6aabdd..12cf9b30fa6 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.0"; + version = "1.10.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"; + sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index c925483147b..4fafe19b379 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.4"; + version = "9.0.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k"; + sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s"; + sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y"; }; }; in diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6825d2af64f..d2de889bf7b 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.10.1745.27-1"; + version = "2.11.1811.38-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1z9biiycxcxyw7i1lqhvk8092hqvidaipkfdvkz632vxcg33jz4q"; + sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw"; }; unpackPhase = '' @@ -51,8 +51,7 @@ in stdenv.mkDerivation rec { --set-rpath "${libPath}" \ opt/${vivaldiName}/vivaldi-bin '' + stdenv.lib.optionalString proprietaryCodecs '' - sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \ - VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName} + ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' echo "Finished patching Vivaldi binaries" ''; @@ -82,7 +81,7 @@ in stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \ ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"} '' + stdenv.lib.optionalString enableWidevine '' - ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so + ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 3207409a6ba..2643bd3e58d 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "chromium-codecs-ffmpeg"; - version = "74.0.3729.169"; + version = "78.0.3904.70"; src = fetchurl { - url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb"; - sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc"; + url = "https://launchpadlibrarian.net/449403909/${name}-extra_${version}-0ubuntu0.16.04.2_amd64.deb"; + sha256 = "00j604nm49z6hbyw7xsxcvmdjf7117kb478plkpizzvmm3w72b9v"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index a21de1acad2..6e807aac5df 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -4,22 +4,23 @@ stdenv.mkDerivation rec { name = "widevine"; - version = "4.10.1196.0"; + version = "4.10.1582.1"; src = fetchurl { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y"; + sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r"; }; buildInputs = [ unzip ]; unpackPhase = '' - unzip $src libwidevinecdm.so - find . + unzip $src ''; installPhase = '' - install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so + install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json + install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt + install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index b7e0ba75115..c5d6e45ac88 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2019.12.0"; + version = "2020.2.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0cc78bysp7z76h4ddiwbsrygz4m4r71f8xylg99pc5qyg8p3my4p"; + sha256 = "1fzndqkmfpx15fllxqxbh7n4m13ydlp50dvkdh8n384j09ndmx4r"; }; modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p"; @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; - homepage = https://www.cloudflare.com/products/argo-tunnel; + homepage = "https://www.cloudflare.com/products/argo-tunnel"; license = licenses.unfree; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice maintainers.enorris ]; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix new file mode 100644 index 00000000000..7f9ebda93c0 --- /dev/null +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, packr }: + +buildGoModule rec { + pname = "argocd"; + version = "1.4.2"; + commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo-cd"; + rev = "v${version}"; + sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj"; + }; + + modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg"; + + nativeBuildInputs = [ packr ]; + + patches = [ ./use-go-module.patch ]; + + buildFlagsArray = '' + -ldflags= + -X github.com/argoproj/argo-cd/common.version=${version} + -X github.com/argoproj/argo-cd/common.buildDate=unknown + -X github.com/argoproj/argo-cd/common.gitCommit=${commit} + -X github.com/argoproj/argo-cd/common.gitTreeState=clean + ''; + + # run packr to embed assets + preBuild = '' + packr + ''; + + meta = with lib; { + description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes"; + homepage = "https://github.com/argoproj/argo"; + license = licenses.asl20; + maintainers = with maintainers; [ shahrukh330 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/argocd/use-go-module.patch b/pkgs/applications/networking/cluster/argocd/use-go-module.patch new file mode 100644 index 00000000000..ac597f4187e --- /dev/null +++ b/pkgs/applications/networking/cluster/argocd/use-go-module.patch @@ -0,0 +1,3058 @@ +diff --git a/Gopkg.lock b/Gopkg.lock +deleted file mode 100644 +index 03737a95..00000000 +--- a/Gopkg.lock ++++ /dev/null +@@ -1,2103 +0,0 @@ +-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +- +- +-[[projects]] +- digest = "1:6d5a057da97a9dbdb10e7beedd2f43452b6bf7691001c0c8886e8dacf5610349" +- name = "bou.ke/monkey" +- packages = ["."] +- pruneopts = "" +- revision = "bdf6dea004c6fd1cdf4b25da8ad45a606c09409a" +- version = "v1.0.1" +- +-[[projects]] +- digest = "1:9702dc153c9bb6ee7ee0587c248b7024700e89e4a7be284faaeeab9da32e1c6b" +- name = "cloud.google.com/go" +- packages = ["compute/metadata"] +- pruneopts = "" +- revision = "767c40d6a2e058483c25fa193e963a22da17236d" +- version = "v0.18.0" +- +-[[projects]] +- digest = "1:8ec1618fc3ee146af104d6c13be250f25e5976e34557d4afbfe4b28035ce6c05" +- name = "github.com/Knetic/govaluate" +- packages = ["."] +- pruneopts = "" +- revision = "d216395917cc49052c7c7094cf57f09657ca08a8" +- version = "v3.0.0" +- +-[[projects]] +- digest = "1:63e57618d792cccb87ad7cb8a0602e6205732beb3b01b0ea858fc4a5fd3ce8f1" +- name = "github.com/MakeNowJust/heredoc" +- packages = ["."] +- pruneopts = "" +- revision = "efb6ca8de9d5385c3963279701760e37637cf238" +- version = "v2.0.1" +- +-[[projects]] +- digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca" +- name = "github.com/Masterminds/semver" +- packages = ["."] +- pruneopts = "" +- revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" +- version = "v1.4.2" +- +-[[projects]] +- digest = "1:71c0dfb843260bfb9b03357cae8eac261b8d82e149ad8f76938b87a23aa47c43" +- name = "github.com/PuerkitoBio/purell" +- packages = ["."] +- pruneopts = "" +- revision = "b938d81255b5473c57635324295cb0fe398c7a58" +- +-[[projects]] +- branch = "master" +- digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c" +- name = "github.com/PuerkitoBio/urlesc" +- packages = ["."] +- pruneopts = "" +- revision = "de5bf2ad457846296e2031421a34e2568e304e35" +- +-[[projects]] +- branch = "master" +- digest = "1:a1b56af5e69569454f55ef4842485a0da5616e240a610d77c987e17a73b0e265" +- name = "github.com/TomOnTime/utfutil" +- packages = ["."] +- pruneopts = "" +- revision = "09c41003ee1d5015b75f331e52215512e7145b8d" +- +-[[projects]] +- branch = "master" +- digest = "1:52905b00a73cda93a2ce8c5fa35185daed673d59e39576e81ad6ab6fb7076b3c" +- name = "github.com/argoproj/pkg" +- packages = [ +- "errors", +- "exec", +- "rand", +- "time", +- ] +- pruneopts = "" +- revision = "02a6aac40ac4cd23de448afe7a1ec0ba4b6d2b96" +- +-[[projects]] +- digest = "1:d8a2bb36a048d1571bcc1aee208b61f39dc16c6c53823feffd37449dde162507" +- name = "github.com/asaskevich/govalidator" +- packages = ["."] +- pruneopts = "" +- revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f" +- version = "v9" +- +-[[projects]] +- branch = "master" +- digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb" +- name = "github.com/beorn7/perks" +- packages = ["quantile"] +- pruneopts = "" +- revision = "3a771d992973f24aa725d07868b467d1ddfceafb" +- +-[[projects]] +- digest = "1:6e2b0748ea11cffebe87b4a671a44ecfb243141cdd5df54cb44b7e8e93cb7ea3" +- name = "github.com/casbin/casbin" +- packages = [ +- ".", +- "config", +- "effect", +- "errors", +- "log", +- "model", +- "persist", +- "persist/file-adapter", +- "rbac", +- "rbac/default-role-manager", +- "util", +- ] +- pruneopts = "" +- revision = "aaed1b7a7eac65d37ec4e15e308429fdf0bd6a9e" +- version = "v1.9.1" +- +-[[projects]] +- branch = "master" +- digest = "1:9c19f8c33e635e0439c8afc167d6d02e3aa6eea5b69d64880244fd354a99edc4" +- name = "github.com/chai2010/gettext-go" +- packages = [ +- "gettext", +- "gettext/mo", +- "gettext/plural", +- "gettext/po", +- ] +- pruneopts = "" +- revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb" +- +-[[projects]] +- branch = "v2" +- digest = "1:d8ee1b165eb7f4fd9ada718e1e7eeb0bc1fd462592d0bd823df694443f448681" +- name = "github.com/coreos/go-oidc" +- packages = ["."] +- pruneopts = "" +- revision = "1180514eaf4d9f38d0d19eef639a1d695e066e72" +- +-[[projects]] +- digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b" +- name = "github.com/davecgh/go-spew" +- packages = ["spew"] +- pruneopts = "" +- revision = "346938d642f2ec3594ed81d874461961cd0faa76" +- version = "v1.1.0" +- +-[[projects]] +- digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6" +- name = "github.com/dgrijalva/jwt-go" +- packages = ["."] +- pruneopts = "" +- revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" +- version = "v3.2.0" +- +-[[projects]] +- digest = "1:c05f1899f086e3b4613d94d9e6f7ba6f4b6587498a1aa6037c5c294b22f5a743" +- name = "github.com/docker/distribution" +- packages = [ +- "digestset", +- "reference", +- ] +- pruneopts = "" +- revision = "2461543d988979529609e8cb6fca9ca190dc48da" +- version = "v2.7.1" +- +-[[projects]] +- digest = "1:b021ef379356343bdc13ec101e546b756fcef4b1186d08163bef7d3bc8c1e07f" +- name = "github.com/docker/docker" +- packages = [ +- "pkg/term", +- "pkg/term/winconsole", +- ] +- pruneopts = "" +- revision = "fc4825d5ef5e0e1af74904208f9b925c22f0b6f8" +- version = "v1.6.0-rc5" +- +-[[projects]] +- branch = "master" +- digest = "1:d6c13a378213e3de60445e49084b8a0a9ce582776dfc77927775dbeb3ff72a35" +- name = "github.com/docker/spdystream" +- packages = [ +- ".", +- "spdy", +- ] +- pruneopts = "" +- revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85" +- +-[[projects]] +- branch = "master" +- digest = "1:f1a75a8e00244e5ea77ff274baa9559eb877437b240ee7b278f3fc560d9f08bf" +- name = "github.com/dustin/go-humanize" +- packages = ["."] +- pruneopts = "" +- revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e" +- +-[[projects]] +- digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8" +- name = "github.com/emicklei/go-restful" +- packages = [ +- ".", +- "log", +- ] +- pruneopts = "" +- revision = "3658237ded108b4134956c1b3050349d93e7b895" +- version = "v2.7.1" +- +-[[projects]] +- digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b" +- name = "github.com/emirpasic/gods" +- packages = [ +- "containers", +- "lists", +- "lists/arraylist", +- "trees", +- "trees/binaryheap", +- "utils", +- ] +- pruneopts = "" +- revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46" +- version = "v1.9.0" +- +-[[projects]] +- digest = "1:46ddeb9dd35d875ac7568c4dc1fc96ce424e034bdbb984239d8ffc151398ec01" +- name = "github.com/evanphx/json-patch" +- packages = ["."] +- pruneopts = "" +- revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f" +- version = "v4.5.0" +- +-[[projects]] +- branch = "master" +- digest = "1:549f95037fea25e00a5341ac6a169a5b3e5306be107f45260440107b779b74f9" +- name = "github.com/exponent-io/jsonpath" +- packages = ["."] +- pruneopts = "" +- revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5" +- +-[[projects]] +- digest = "1:23a5efa4b272df86a8ebffc942f5e0c1aac4b750836037394cc450b6d91e241a" +- name = "github.com/fatih/camelcase" +- packages = ["."] +- pruneopts = "" +- revision = "44e46d280b43ec1531bb25252440e34f1b800b65" +- version = "v1.0.0" +- +-[[projects]] +- digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22" +- name = "github.com/ghodss/yaml" +- packages = ["."] +- pruneopts = "" +- revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" +- version = "v1.0.0" +- +-[[projects]] +- branch = "master" +- digest = "1:eb77b66abaf9649747230eb973350bd1c311a0d0362213192efbdd222082b072" +- name = "github.com/go-openapi/analysis" +- packages = ["."] +- pruneopts = "" +- revision = "5957818e100395077187fb7ef3b8a28227af06c6" +- +-[[projects]] +- branch = "master" +- digest = "1:ee273c95c1414ef11bd4da259b40e83f41c1d5a6bee7d1b54a05ef5f3565fd92" +- name = "github.com/go-openapi/errors" +- packages = ["."] +- pruneopts = "" +- revision = "b2b2befaf267d082d779bcef52d682a47c779517" +- +-[[projects]] +- branch = "master" +- digest = "1:1287439f7765209116509fffff2b8f853845e4b35572b41a1aadda42cbcffcc2" +- name = "github.com/go-openapi/jsonpointer" +- packages = ["."] +- pruneopts = "" +- revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" +- +-[[projects]] +- branch = "master" +- digest = "1:07ac8ac445f68b0bc063d11845d479fb7e09c906ead7a8c4165b59777df09d74" +- name = "github.com/go-openapi/jsonreference" +- packages = ["."] +- pruneopts = "" +- revision = "36d33bfe519efae5632669801b180bf1a245da3b" +- +-[[projects]] +- branch = "master" +- digest = "1:c4a8c916364abeda1c5cf36684320298bbf4d87718b0b2bd9c4ca663157fdc75" +- name = "github.com/go-openapi/loads" +- packages = ["."] +- pruneopts = "" +- revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9" +- +-[[projects]] +- branch = "master" +- digest = "1:1d9c762f6695e6e7ed0b4c055fa0eab7d20c2b36c935943282273d37f114e302" +- name = "github.com/go-openapi/runtime" +- packages = [ +- ".", +- "logger", +- "middleware", +- "middleware/denco", +- "middleware/header", +- "middleware/untyped", +- "security", +- ] +- pruneopts = "" +- revision = "cd9d8ed52e4b4665463cbc655500e4faa09c3c16" +- +-[[projects]] +- branch = "master" +- digest = "1:fd4008f8283b993180f0626d0c7b2f48880e9dbb6bd92a91cac7ded30dc66777" +- name = "github.com/go-openapi/spec" +- packages = ["."] +- pruneopts = "" +- revision = "1de3e0542de65ad8d75452a595886fdd0befb363" +- +-[[projects]] +- branch = "master" +- digest = "1:4ddc424130bcfbf6f782f433192ca2502a02a09e4ac55dcbecf91f22ed4e3138" +- name = "github.com/go-openapi/strfmt" +- packages = ["."] +- pruneopts = "" +- revision = "481808443b00a14745fada967cb5eeff0f9b1df2" +- +-[[projects]] +- branch = "master" +- digest = "1:366052ef634d344217d6720719c9f8e95de13a94d211f09785b0ba3c4c181b06" +- name = "github.com/go-openapi/swag" +- packages = ["."] +- pruneopts = "" +- revision = "84f4bee7c0a6db40e3166044c7983c1c32125429" +- +-[[projects]] +- branch = "master" +- digest = "1:671e25496d550c80a9d6e7e588d32b380c6b4877f113750724f69acc6ce6790f" +- name = "github.com/go-openapi/validate" +- packages = ["."] +- pruneopts = "" +- revision = "b0a3ed684d0fdd3e1eda00433382188ce8aa7169" +- +-[[projects]] +- digest = "1:024c9473f363a12918e87e7efc778091839beab514b01309a6ecd8aa336c8065" +- name = "github.com/go-redis/cache" +- packages = [ +- ".", +- "internal/lrucache", +- "internal/singleflight", +- ] +- pruneopts = "" +- revision = "c58ada1e23a3b66593f81c70572c20a0bb805a90" +- version = "v6.3.5" +- +-[[projects]] +- digest = "1:b73fabc1ff8f2417bc5cc51d3f7274d6af5300b5ad9b8606967213134c1700dc" +- name = "github.com/go-redis/redis" +- packages = [ +- ".", +- "internal", +- "internal/consistenthash", +- "internal/hashtag", +- "internal/pool", +- "internal/proto", +- "internal/util", +- ] +- pruneopts = "" +- revision = "22be8a3eaf992c828cecb69dc07348313bf08d2e" +- version = "v6.15.1" +- +-[[projects]] +- digest = "1:842c1acbacc80da775cfc0c412c4fe322c2d1b86c260db632987730d0d67a6bd" +- name = "github.com/gobuffalo/packr" +- packages = ["."] +- pruneopts = "" +- revision = "7f4074995d431987caaa35088199f13c44b24440" +- version = "v1.11.0" +- +-[[projects]] +- digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c" +- name = "github.com/gobwas/glob" +- packages = [ +- ".", +- "compiler", +- "match", +- "syntax", +- "syntax/ast", +- "syntax/lexer", +- "util/runes", +- "util/strings", +- ] +- pruneopts = "" +- revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" +- version = "v0.2.3" +- +-[[projects]] +- branch = "master" +- digest = "1:9a06e7365c6039daf4db9bbf79650e2933a2880982cbab8106cb74a36617f40d" +- name = "github.com/gogits/go-gogs-client" +- packages = ["."] +- pruneopts = "" +- revision = "5a05380e4bc2440e0ec12f54f6f45648dbdd5e55" +- +-[[projects]] +- digest = "1:d69d2ba23955582a64e367ff2b0808cdbd048458c178cea48f11ab8c40bd7aea" +- name = "github.com/gogo/protobuf" +- packages = [ +- "gogoproto", +- "plugin/compare", +- "plugin/defaultcheck", +- "plugin/description", +- "plugin/embedcheck", +- "plugin/enumstringer", +- "plugin/equal", +- "plugin/face", +- "plugin/gostring", +- "plugin/marshalto", +- "plugin/oneofcheck", +- "plugin/populate", +- "plugin/size", +- "plugin/stringer", +- "plugin/testgen", +- "plugin/union", +- "plugin/unmarshal", +- "proto", +- "protoc-gen-gofast", +- "protoc-gen-gogo/descriptor", +- "protoc-gen-gogo/generator", +- "protoc-gen-gogo/generator/internal/remap", +- "protoc-gen-gogo/grpc", +- "protoc-gen-gogo/plugin", +- "protoc-gen-gogofast", +- "sortkeys", +- "vanity", +- "vanity/command", +- ] +- pruneopts = "" +- revision = "5628607bb4c51c3157aacc3a50f0ab707582b805" +- version = "v1.3.1" +- +-[[projects]] +- branch = "master" +- digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a" +- name = "github.com/golang/glog" +- packages = ["."] +- pruneopts = "" +- revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" +- +-[[projects]] +- digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18" +- name = "github.com/golang/protobuf" +- packages = [ +- "jsonpb", +- "proto", +- "protoc-gen-go", +- "protoc-gen-go/descriptor", +- "protoc-gen-go/generator", +- "protoc-gen-go/generator/internal/remap", +- "protoc-gen-go/grpc", +- "protoc-gen-go/plugin", +- "ptypes", +- "ptypes/any", +- "ptypes/duration", +- "ptypes/empty", +- "ptypes/struct", +- "ptypes/timestamp", +- ] +- pruneopts = "" +- revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" +- version = "v1.2.0" +- +-[[projects]] +- digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6" +- name = "github.com/google/btree" +- packages = ["."] +- pruneopts = "" +- revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" +- version = "v1.0.0" +- +-[[projects]] +- digest = "1:9fcb267c272bc5054564b392e3ff7e65e35400fd9914afb1d169f92b95e7dbc9" +- name = "github.com/google/go-cmp" +- packages = [ +- "cmp", +- "cmp/internal/diff", +- "cmp/internal/flags", +- "cmp/internal/function", +- "cmp/internal/value", +- ] +- pruneopts = "" +- revision = "2d0692c2e9617365a95b295612ac0d4415ba4627" +- version = "v0.3.1" +- +-[[projects]] +- digest = "1:14d826ee25139b4674e9768ac287a135f4e7c14e1134a5b15e4e152edfd49f41" +- name = "github.com/google/go-jsonnet" +- packages = [ +- ".", +- "ast", +- "parser", +- ] +- pruneopts = "" +- revision = "dfddf2b4e3aec377b0dcdf247ff92e7d078b8179" +- +-[[projects]] +- branch = "master" +- digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692" +- name = "github.com/google/gofuzz" +- packages = ["."] +- pruneopts = "" +- revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" +- +-[[projects]] +- branch = "master" +- digest = "1:d0899ec7c2f61fd5e4ccba7dbefe72e366a3ecce23ecdb982c768fa1d38812fb" +- name = "github.com/google/shlex" +- packages = ["."] +- pruneopts = "" +- revision = "c34317bd91bf98fab745d77b03933cf8769299fe" +- +-[[projects]] +- digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16" +- name = "github.com/googleapis/gnostic" +- packages = [ +- "OpenAPIv2", +- "compiler", +- "extensions", +- ] +- pruneopts = "" +- revision = "ee43cbb60db7bd22502942cccbc39059117352ab" +- version = "v0.1.0" +- +-[[projects]] +- digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d" +- name = "github.com/gorilla/websocket" +- packages = ["."] +- pruneopts = "" +- revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" +- version = "v1.4.0" +- +-[[projects]] +- branch = "master" +- digest = "1:e1fd67b5695fb12f54f979606c5d650a5aa72ef242f8e71072bfd4f7b5a141a0" +- name = "github.com/gregjones/httpcache" +- packages = [ +- ".", +- "diskcache", +- ] +- pruneopts = "" +- revision = "901d90724c7919163f472a9812253fb26761123d" +- +-[[projects]] +- branch = "master" +- digest = "1:9dca8c981b8aed7448d94e78bc68a76784867a38b3036d5aabc0b32d92ffd1f4" +- name = "github.com/grpc-ecosystem/go-grpc-middleware" +- packages = [ +- ".", +- "auth", +- "logging", +- "logging/logrus", +- "logging/logrus/ctxlogrus", +- "retry", +- "tags", +- "tags/logrus", +- "util/backoffutils", +- "util/metautils", +- ] +- pruneopts = "" +- revision = "bc372cc64f55abd91995ba3f219b380ffbc59e9d" +- +-[[projects]] +- digest = "1:e24dc5ef44694848785de507f439a24e9e6d96d7b43b8cf3d6cfa857aa1e2186" +- name = "github.com/grpc-ecosystem/go-grpc-prometheus" +- packages = ["."] +- pruneopts = "" +- revision = "c225b8c3b01faf2899099b768856a9e916e5087b" +- version = "v1.2.0" +- +-[[projects]] +- digest = "1:9feb7485bc57adbcbc1e1037ca05588e9d8b0a3a1875fbf730021fc118859b75" +- name = "github.com/grpc-ecosystem/grpc-gateway" +- packages = [ +- "protoc-gen-grpc-gateway", +- "protoc-gen-grpc-gateway/descriptor", +- "protoc-gen-grpc-gateway/generator", +- "protoc-gen-grpc-gateway/gengateway", +- "protoc-gen-grpc-gateway/httprule", +- "protoc-gen-swagger", +- "protoc-gen-swagger/genswagger", +- "protoc-gen-swagger/options", +- "runtime", +- "runtime/internal", +- "utilities", +- ] +- pruneopts = "" +- revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec" +- version = "v1.3.1" +- +-[[projects]] +- branch = "master" +- digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94" +- name = "github.com/hashicorp/golang-lru" +- packages = [ +- ".", +- "simplelru", +- ] +- pruneopts = "" +- revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" +- +-[[projects]] +- digest = "1:23bc0b496ba341c6e3ba24d6358ff4a40a704d9eb5f9a3bd8e8fbd57ad869013" +- name = "github.com/imdario/mergo" +- packages = ["."] +- pruneopts = "" +- revision = "163f41321a19dd09362d4c63cc2489db2015f1f4" +- version = "0.3.2" +- +-[[projects]] +- digest = "1:6f7a8f1f3e04174c426eea1c8661ef49a6b4c63bd2e40c0ad74b5ba9051f4812" +- name = "github.com/improbable-eng/grpc-web" +- packages = ["go/grpcweb"] +- pruneopts = "" +- revision = "16092bd1d58ae1b3c2d8be1cb67e65956f945dea" +- version = "0.7.0" +- +-[[projects]] +- digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" +- name = "github.com/inconshreveable/mousetrap" +- packages = ["."] +- pruneopts = "" +- revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" +- version = "v1.0" +- +-[[projects]] +- branch = "master" +- digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f" +- name = "github.com/jbenet/go-context" +- packages = ["io"] +- pruneopts = "" +- revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4" +- +-[[projects]] +- digest = "1:302ad9379eb146668760df4d779a95379acab43ce5f9a28f27f3273f98232020" +- name = "github.com/jonboulle/clockwork" +- packages = ["."] +- pruneopts = "" +- revision = "2eee05ed794112d45db504eb05aa693efd2b8b09" +- version = "v0.1.0" +- +-[[projects]] +- digest = "1:31c6f3c4f1e15fcc24fcfc9f5f24603ff3963c56d6fa162116493b4025fb6acc" +- name = "github.com/json-iterator/go" +- packages = ["."] +- pruneopts = "" +- revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682" +- +-[[projects]] +- branch = "master" +- digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df" +- name = "github.com/kballard/go-shellquote" +- packages = ["."] +- pruneopts = "" +- revision = "95032a82bc518f77982ea72343cc1ade730072f0" +- +-[[projects]] +- digest = "1:41e0bed5df4f9fd04c418bf9b6b7179b3671e416ad6175332601ca1c8dc74606" +- name = "github.com/kevinburke/ssh_config" +- packages = ["."] +- pruneopts = "" +- revision = "81db2a75821ed34e682567d48be488a1c3121088" +- version = "0.5" +- +-[[projects]] +- branch = "master" +- digest = "1:448b4a6e39e46d8740b00dc871f26d58dc39341b160e01267b7917132831a136" +- name = "github.com/konsorten/go-windows-terminal-sequences" +- packages = ["."] +- pruneopts = "" +- revision = "b729f2633dfe35f4d1d8a32385f6685610ce1cb5" +- +-[[projects]] +- branch = "master" +- digest = "1:93018a4331df9925058905133cb997aec8f54d5303f4536a23e49b5648632d06" +- name = "github.com/liggitt/tabwriter" +- packages = ["."] +- pruneopts = "" +- revision = "89fcab3d43de07060e4fd4c1547430ed57e87f24" +- +-[[projects]] +- branch = "master" +- digest = "1:ccc20cacf54eb16464dad02efa1c14fa7c0b9e124639b0d2a51dcc87b0154e4c" +- name = "github.com/mailru/easyjson" +- packages = [ +- "buffer", +- "jlexer", +- "jwriter", +- ] +- pruneopts = "" +- revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" +- +-[[projects]] +- digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28" +- name = "github.com/matttproud/golang_protobuf_extensions" +- packages = ["pbutil"] +- pruneopts = "" +- revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" +- version = "v1.0.1" +- +-[[projects]] +- digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf" +- name = "github.com/mitchellh/go-homedir" +- packages = ["."] +- pruneopts = "" +- revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4" +- version = "v1.0.0" +- +-[[projects]] +- digest = "1:713b341855f1480e4baca1e7c5434e1d266441340685ecbde32d59bdc065fb3f" +- name = "github.com/mitchellh/go-wordwrap" +- packages = ["."] +- pruneopts = "" +- revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c" +- version = "v1.0.0" +- +-[[projects]] +- branch = "master" +- digest = "1:eb9117392ee8e7aa44f78e0db603f70b1050ee0ebda4bd40040befb5b218c546" +- name = "github.com/mitchellh/mapstructure" +- packages = ["."] +- pruneopts = "" +- revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b" +- +-[[projects]] +- digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd" +- name = "github.com/modern-go/concurrent" +- packages = ["."] +- pruneopts = "" +- revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" +- version = "1.0.3" +- +-[[projects]] +- digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855" +- name = "github.com/modern-go/reflect2" +- packages = ["."] +- pruneopts = "" +- revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" +- version = "1.0.1" +- +-[[projects]] +- digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11" +- name = "github.com/opencontainers/go-digest" +- packages = ["."] +- pruneopts = "" +- revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" +- version = "v1.0.0-rc1" +- +-[[projects]] +- digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c" +- name = "github.com/patrickmn/go-cache" +- packages = ["."] +- pruneopts = "" +- revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0" +- version = "v2.1.0" +- +-[[projects]] +- digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689" +- name = "github.com/pelletier/go-buffruneio" +- packages = ["."] +- pruneopts = "" +- revision = "c37440a7cf42ac63b919c752ca73a85067e05992" +- version = "v0.2.0" +- +-[[projects]] +- branch = "master" +- digest = "1:5f0faa008e8ff4221b55a1a5057c8b02cb2fd68da6a65c9e31c82b72cbc836d0" +- name = "github.com/petar/GoLLRB" +- packages = ["llrb"] +- pruneopts = "" +- revision = "33fb24c13b99c46c93183c291836c573ac382536" +- +-[[projects]] +- digest = "1:4709c61d984ef9ba99b037b047546d8a576ae984fb49486e48d99658aa750cd5" +- name = "github.com/peterbourgon/diskv" +- packages = ["."] +- pruneopts = "" +- revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" +- version = "v3.0.0" +- +-[[projects]] +- digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca" +- name = "github.com/pkg/errors" +- packages = ["."] +- pruneopts = "" +- revision = "645ef00459ed84a119197bfb8d8205042c6df63d" +- version = "v0.8.0" +- +-[[projects]] +- digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411" +- name = "github.com/pmezard/go-difflib" +- packages = ["difflib"] +- pruneopts = "" +- revision = "792786c7400a136282c1664665ae0a8db921c6c2" +- version = "v1.0.0" +- +-[[projects]] +- branch = "master" +- digest = "1:90daff4630a8cf2fa207dbd3ccaed0e860936ead1851a473019674e6b5993a13" +- name = "github.com/pquerna/cachecontrol" +- packages = [ +- ".", +- "cacheobject", +- ] +- pruneopts = "" +- revision = "525d0eb5f91d30e3b1548de401b7ef9ea6898520" +- +-[[projects]] +- digest = "1:9d34d575593e3dd27bbd119138ba009ef1535a0df2aad7259e1dd5aed7405eea" +- name = "github.com/prometheus/client_golang" +- packages = [ +- "prometheus", +- "prometheus/internal", +- "prometheus/promhttp", +- ] +- pruneopts = "" +- revision = "7858729281ec582767b20e0d696b6041d995d5e0" +- +-[[projects]] +- branch = "master" +- digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561" +- name = "github.com/prometheus/client_model" +- packages = ["go"] +- pruneopts = "" +- revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" +- +-[[projects]] +- branch = "master" +- digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498" +- name = "github.com/prometheus/common" +- packages = [ +- "expfmt", +- "internal/bitbucket.org/ww/goautoneg", +- "model", +- ] +- pruneopts = "" +- revision = "c7de2306084e37d54b8be01f3541a8464345e9a5" +- +-[[projects]] +- branch = "master" +- digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e" +- name = "github.com/prometheus/procfs" +- packages = [ +- ".", +- "internal/util", +- "nfs", +- "xfs", +- ] +- pruneopts = "" +- revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92" +- +-[[projects]] +- digest = "1:6bb048133650d1fb7fbff9fb3c35bd5c7e8653fc95c3bae6df94cd17d1580278" +- name = "github.com/robfig/cron" +- packages = ["."] +- pruneopts = "" +- revision = "45fbe1491cdd47d74d1bf1396286d67faee8b8b5" +- version = "v3.0.0" +- +-[[projects]] +- digest = "1:5f47c69f85311c4dc292be6cc995a0a3fe8337a6ce38ef4f71e5b7efd5ad42e0" +- name = "github.com/rs/cors" +- packages = ["."] +- pruneopts = "" +- revision = "9a47f48565a795472d43519dd49aac781f3034fb" +- version = "v1.6.0" +- +-[[projects]] +- digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430" +- name = "github.com/russross/blackfriday" +- packages = ["."] +- pruneopts = "" +- revision = "05f3235734ad95d0016f6a23902f06461fcf567a" +- version = "v1.5.2" +- +-[[projects]] +- digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8" +- name = "github.com/sergi/go-diff" +- packages = ["diffmatchpatch"] +- pruneopts = "" +- revision = "1744e2970ca51c86172c8190fadad617561ed6e7" +- version = "v1.0.0" +- +-[[projects]] +- digest = "1:01d968ff6535945510c944983eee024e81f1c949043e9bbfe5ab206ebc3588a4" +- name = "github.com/sirupsen/logrus" +- packages = [ +- ".", +- "hooks/test", +- ] +- pruneopts = "" +- revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d" +- version = "v1.1.0" +- +-[[projects]] +- branch = "master" +- digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c" +- name = "github.com/skratchdot/open-golang" +- packages = ["open"] +- pruneopts = "" +- revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c" +- +-[[projects]] +- digest = "1:022a4e2a8c327eb46a99088a51c0dda5d5be86928ace2afd72145dc1d746a323" +- name = "github.com/soheilhy/cmux" +- packages = ["."] +- pruneopts = "" +- revision = "e09e9389d85d8492d313d73d1469c029e710623f" +- version = "v0.1.4" +- +-[[projects]] +- digest = "1:0c63b3c7ad6d825a898f28cb854252a3b29d37700c68a117a977263f5ec94efe" +- name = "github.com/spf13/cobra" +- packages = ["."] +- pruneopts = "" +- revision = "0.0.5" +- +-[[projects]] +- digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d" +- name = "github.com/spf13/pflag" +- packages = ["."] +- pruneopts = "" +- revision = "583c0c0531f06d5278b7d917446061adc344b5cd" +- version = "v1.0.1" +- +-[[projects]] +- digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c" +- name = "github.com/src-d/gcfg" +- packages = [ +- ".", +- "scanner", +- "token", +- "types", +- ] +- pruneopts = "" +- revision = "f187355171c936ac84a82793659ebb4936bc1c23" +- version = "v1.3.0" +- +-[[projects]] +- digest = "1:306417ea2f31ea733df356a2b895de63776b6a5107085b33458e5cd6eb1d584d" +- name = "github.com/stretchr/objx" +- packages = ["."] +- pruneopts = "" +- revision = "facf9a85c22f48d2f52f2380e4efce1768749a89" +- version = "v0.1" +- +-[[projects]] +- digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75" +- name = "github.com/stretchr/testify" +- packages = [ +- "assert", +- "mock", +- ] +- pruneopts = "" +- revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" +- version = "v1.2.2" +- +-[[projects]] +- digest = "1:51cf0fca93f4866709ceaf01b750e51d997c299a7bd2edf7ccd79e3b428754ae" +- name = "github.com/vmihailenco/msgpack" +- packages = [ +- ".", +- "codes", +- ] +- pruneopts = "" +- revision = "a053f3dac71df214bfe8b367f34220f0029c9c02" +- version = "v3.3.1" +- +-[[projects]] +- digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f" +- name = "github.com/xanzy/ssh-agent" +- packages = ["."] +- pruneopts = "" +- revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c" +- version = "v0.2.0" +- +-[[projects]] +- branch = "master" +- digest = "1:3cf699a0df65293cc8fd2339606950d3e2f6d02a435703951d1da411a23f7cef" +- name = "github.com/yudai/gojsondiff" +- packages = [ +- ".", +- "formatter", +- ] +- pruneopts = "" +- revision = "0525c875b75ca60b9e67ddc44496aa16f21066b0" +- +-[[projects]] +- branch = "master" +- digest = "1:9857bb2293f372b2181004d8b62179bbdb4ab0982ec6f762abe6cf2bfedaff85" +- name = "github.com/yudai/golcs" +- packages = ["."] +- pruneopts = "" +- revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68" +- +-[[projects]] +- branch = "master" +- digest = "1:525776d99293affd2c61dfb573007ff9f22863068c20c220ef3f58620758c341" +- name = "github.com/yuin/gopher-lua" +- packages = [ +- ".", +- "ast", +- "parse", +- "pm", +- ] +- pruneopts = "" +- revision = "732aa6820ec4fb93d60c4057dd574c33db8ad4e7" +- +-[[projects]] +- branch = "master" +- digest = "1:2ea6df0f542cc95a5e374e9cdd81eaa599ed0d55366eef92d2f6b9efa2795c07" +- name = "golang.org/x/crypto" +- packages = [ +- "bcrypt", +- "blowfish", +- "cast5", +- "curve25519", +- "ed25519", +- "ed25519/internal/edwards25519", +- "internal/chacha20", +- "openpgp", +- "openpgp/armor", +- "openpgp/elgamal", +- "openpgp/errors", +- "openpgp/packet", +- "openpgp/s2k", +- "poly1305", +- "ssh", +- "ssh/agent", +- "ssh/knownhosts", +- "ssh/terminal", +- ] +- pruneopts = "" +- revision = "432090b8f568c018896cd8a0fb0345872bbac6ce" +- +-[[projects]] +- branch = "master" +- digest = "1:b4ba046df563f56fe42b6270b20039107a37e1ab47c97aa47a16f848aa5b6d9a" +- name = "golang.org/x/net" +- packages = [ +- "context", +- "context/ctxhttp", +- "http2", +- "http2/hpack", +- "idna", +- "internal/timeseries", +- "lex/httplex", +- "trace", +- ] +- pruneopts = "" +- revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb" +- +-[[projects]] +- digest = "1:8a58c605e58272e3d280181a24749b07499cf98968da6f7c1d19c8d5649c6b1b" +- name = "golang.org/x/oauth2" +- packages = [ +- ".", +- "google", +- "internal", +- "jws", +- "jwt", +- ] +- pruneopts = "" +- revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6" +- +-[[projects]] +- branch = "master" +- digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1" +- name = "golang.org/x/sync" +- packages = [ +- "errgroup", +- "semaphore", +- ] +- pruneopts = "" +- revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca" +- +-[[projects]] +- branch = "master" +- digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e" +- name = "golang.org/x/sys" +- packages = [ +- "unix", +- "windows", +- ] +- pruneopts = "" +- revision = "d0be0721c37eeb5299f245a996a483160fc36940" +- +-[[projects]] +- branch = "master" +- digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb" +- name = "golang.org/x/text" +- packages = [ +- "collate", +- "collate/build", +- "encoding", +- "encoding/internal", +- "encoding/internal/identifier", +- "encoding/unicode", +- "internal/colltab", +- "internal/gen", +- "internal/tag", +- "internal/triegen", +- "internal/ucd", +- "internal/utf8internal", +- "language", +- "runes", +- "secure/bidirule", +- "transform", +- "unicode/bidi", +- "unicode/cldr", +- "unicode/norm", +- "unicode/rangetable", +- "width", +- ] +- pruneopts = "" +- revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1" +- +-[[projects]] +- branch = "master" +- digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa" +- name = "golang.org/x/time" +- packages = ["rate"] +- pruneopts = "" +- revision = "fbb02b2291d28baffd63558aa44b4b56f178d650" +- +-[[projects]] +- branch = "master" +- digest = "1:77e1d6ed91936b206979806b0aacbf817ec54b840803d8f8cd7a1de5bfbf92a4" +- name = "golang.org/x/tools" +- packages = [ +- "go/ast/astutil", +- "imports", +- ] +- pruneopts = "" +- revision = "5e776fee60db37e560cee3fb46db699d2f095386" +- +-[[projects]] +- branch = "master" +- digest = "1:e9e4b928898842a138bc345d42aae33741baa6d64f3ca69b0931f9c7a4fd0437" +- name = "gonum.org/v1/gonum" +- packages = [ +- "blas", +- "blas/blas64", +- "blas/cblas128", +- "blas/gonum", +- "floats", +- "graph", +- "graph/internal/linear", +- "graph/internal/ordered", +- "graph/internal/set", +- "graph/internal/uid", +- "graph/iterator", +- "graph/simple", +- "graph/topo", +- "graph/traverse", +- "internal/asm/c128", +- "internal/asm/c64", +- "internal/asm/f32", +- "internal/asm/f64", +- "internal/cmplx64", +- "internal/math32", +- "lapack", +- "lapack/gonum", +- "lapack/lapack64", +- "mat", +- ] +- pruneopts = "" +- revision = "90b7154515874cee6c33cf56b29e257403a09a69" +- +-[[projects]] +- digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f" +- name = "google.golang.org/appengine" +- packages = [ +- ".", +- "datastore", +- "internal", +- "internal/app_identity", +- "internal/base", +- "internal/datastore", +- "internal/log", +- "internal/modules", +- "internal/remote_api", +- "internal/urlfetch", +- "urlfetch", +- ] +- pruneopts = "" +- revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" +- version = "v1.0.0" +- +-[[projects]] +- branch = "master" +- digest = "1:2d833b53e432cd69645da559b822661ebc5c0a13c571dee1c1f80fb1a0241330" +- name = "google.golang.org/genproto" +- packages = [ +- "googleapis/api/annotations", +- "googleapis/rpc/status", +- ] +- pruneopts = "" +- revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7" +- +-[[projects]] +- digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309" +- name = "google.golang.org/grpc" +- packages = [ +- ".", +- "balancer", +- "balancer/base", +- "balancer/roundrobin", +- "codes", +- "connectivity", +- "credentials", +- "encoding", +- "encoding/proto", +- "grpclog", +- "internal", +- "internal/backoff", +- "internal/channelz", +- "internal/envconfig", +- "internal/grpcrand", +- "internal/transport", +- "keepalive", +- "metadata", +- "naming", +- "peer", +- "reflection", +- "reflection/grpc_reflection_v1alpha", +- "resolver", +- "resolver/dns", +- "resolver/passthrough", +- "stats", +- "status", +- "tap", +- ] +- pruneopts = "" +- revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1" +- version = "v1.15.0" +- +-[[projects]] +- digest = "1:adf5b0ae3467c3182757ecb86fbfe819939473bb870a42789dc1a3e7729397cd" +- name = "gopkg.in/go-playground/webhooks.v5" +- packages = [ +- "bitbucket", +- "bitbucket-server", +- "github", +- "gitlab", +- "gogs", +- ] +- pruneopts = "" +- revision = "175186584584a83966dc9a7b8ec6c3d3a4ce6110" +- version = "v5.11.0" +- +-[[projects]] +- digest = "1:e5d1fb981765b6f7513f793a3fcaac7158408cca77f75f7311ac82cc88e9c445" +- name = "gopkg.in/inf.v0" +- packages = ["."] +- pruneopts = "" +- revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" +- version = "v0.9.0" +- +-[[projects]] +- branch = "v2" +- digest = "1:c80894778314c7fb90d94a5ab925214900e1341afeddc953cda7398b8cdcd006" +- name = "gopkg.in/mgo.v2" +- packages = [ +- "bson", +- "internal/json", +- ] +- pruneopts = "" +- revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" +- +-[[projects]] +- digest = "1:de0ec5755ee1a5e61f079c8855cf2073b5a5f614ae3b51db65f2c4e1044455fd" +- name = "gopkg.in/square/go-jose.v2" +- packages = [ +- ".", +- "cipher", +- "json", +- ] +- pruneopts = "" +- revision = "76dd09796242edb5b897103a75df2645c028c960" +- version = "v2.1.6" +- +-[[projects]] +- digest = "1:c8f3ff1edaf7208bf7633e5952ffb8d697552343f8010aee12427400b434ae63" +- name = "gopkg.in/src-d/go-billy.v4" +- packages = [ +- ".", +- "helper/chroot", +- "helper/polyfill", +- "osfs", +- "util", +- ] +- pruneopts = "" +- revision = "59952543636f55de3f860b477b615093d5c2c3e4" +- version = "v4.2.1" +- +-[[projects]] +- digest = "1:a72d911e18578e34367f4b849340501c7e6a2787a3a05651b3d53c6cb96990f4" +- name = "gopkg.in/src-d/go-git.v4" +- packages = [ +- ".", +- "config", +- "internal/revision", +- "plumbing", +- "plumbing/cache", +- "plumbing/filemode", +- "plumbing/format/config", +- "plumbing/format/diff", +- "plumbing/format/gitignore", +- "plumbing/format/idxfile", +- "plumbing/format/index", +- "plumbing/format/objfile", +- "plumbing/format/packfile", +- "plumbing/format/pktline", +- "plumbing/object", +- "plumbing/protocol/packp", +- "plumbing/protocol/packp/capability", +- "plumbing/protocol/packp/sideband", +- "plumbing/revlist", +- "plumbing/storer", +- "plumbing/transport", +- "plumbing/transport/client", +- "plumbing/transport/file", +- "plumbing/transport/git", +- "plumbing/transport/http", +- "plumbing/transport/internal/common", +- "plumbing/transport/server", +- "plumbing/transport/ssh", +- "storage", +- "storage/filesystem", +- "storage/filesystem/dotgit", +- "storage/memory", +- "utils/binary", +- "utils/diff", +- "utils/ioutil", +- "utils/merkletrie", +- "utils/merkletrie/filesystem", +- "utils/merkletrie/index", +- "utils/merkletrie/internal/frame", +- "utils/merkletrie/noder", +- ] +- pruneopts = "" +- revision = "a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2" +- version = "v4.9.1" +- +-[[projects]] +- digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac" +- name = "gopkg.in/warnings.v0" +- packages = ["."] +- pruneopts = "" +- revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b" +- version = "v0.1.2" +- +-[[projects]] +- digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d" +- name = "gopkg.in/yaml.v2" +- packages = ["."] +- pruneopts = "" +- revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" +- version = "v2.2.2" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:5e5cfbab57ea5444c1eb295a39fdc403f097f5ace592c829db7b3e0e3ea66903" +- name = "k8s.io/api" +- packages = [ +- "admission/v1", +- "admission/v1beta1", +- "admissionregistration/v1", +- "admissionregistration/v1beta1", +- "apps/v1", +- "apps/v1beta1", +- "apps/v1beta2", +- "auditregistration/v1alpha1", +- "authentication/v1", +- "authentication/v1beta1", +- "authorization/v1", +- "authorization/v1beta1", +- "autoscaling/v1", +- "autoscaling/v2beta1", +- "autoscaling/v2beta2", +- "batch/v1", +- "batch/v1beta1", +- "batch/v2alpha1", +- "certificates/v1beta1", +- "coordination/v1", +- "coordination/v1beta1", +- "core/v1", +- "discovery/v1alpha1", +- "events/v1beta1", +- "extensions/v1beta1", +- "imagepolicy/v1alpha1", +- "networking/v1", +- "networking/v1beta1", +- "node/v1alpha1", +- "node/v1beta1", +- "policy/v1beta1", +- "rbac/v1", +- "rbac/v1alpha1", +- "rbac/v1beta1", +- "scheduling/v1", +- "scheduling/v1alpha1", +- "scheduling/v1beta1", +- "settings/v1alpha1", +- "storage/v1", +- "storage/v1alpha1", +- "storage/v1beta1", +- ] +- pruneopts = "" +- revision = "195af9ec35214c6d98662c5791364285bf2e2cf2" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:7f29d62c07c68767171cf2ed8598e0cb862b99584bb8beb93189e2ed00ac520e" +- name = "k8s.io/apiextensions-apiserver" +- packages = [ +- "pkg/apis/apiextensions", +- "pkg/apis/apiextensions/v1", +- "pkg/apis/apiextensions/v1beta1", +- "pkg/client/clientset/clientset", +- "pkg/client/clientset/clientset/scheme", +- "pkg/client/clientset/clientset/typed/apiextensions/v1", +- "pkg/client/clientset/clientset/typed/apiextensions/v1beta1", +- "pkg/features", +- ] +- pruneopts = "" +- revision = "07afe84a85e43cf2503133660c424a0b594b21db" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:36db89a45a8cb3d565f7ebfd67dafd42c9c0bbb80d6bbd4991629b39b02a4c64" +- name = "k8s.io/apimachinery" +- packages = [ +- "pkg/api/equality", +- "pkg/api/errors", +- "pkg/api/meta", +- "pkg/api/resource", +- "pkg/api/validation", +- "pkg/api/validation/path", +- "pkg/apis/meta/internalversion", +- "pkg/apis/meta/v1", +- "pkg/apis/meta/v1/unstructured", +- "pkg/apis/meta/v1/unstructured/unstructuredscheme", +- "pkg/apis/meta/v1/validation", +- "pkg/apis/meta/v1beta1", +- "pkg/conversion", +- "pkg/conversion/queryparams", +- "pkg/fields", +- "pkg/labels", +- "pkg/runtime", +- "pkg/runtime/schema", +- "pkg/runtime/serializer", +- "pkg/runtime/serializer/json", +- "pkg/runtime/serializer/protobuf", +- "pkg/runtime/serializer/recognizer", +- "pkg/runtime/serializer/streaming", +- "pkg/runtime/serializer/versioning", +- "pkg/selection", +- "pkg/types", +- "pkg/util/cache", +- "pkg/util/clock", +- "pkg/util/diff", +- "pkg/util/duration", +- "pkg/util/errors", +- "pkg/util/framer", +- "pkg/util/httpstream", +- "pkg/util/httpstream/spdy", +- "pkg/util/intstr", +- "pkg/util/json", +- "pkg/util/jsonmergepatch", +- "pkg/util/mergepatch", +- "pkg/util/naming", +- "pkg/util/net", +- "pkg/util/remotecommand", +- "pkg/util/runtime", +- "pkg/util/sets", +- "pkg/util/strategicpatch", +- "pkg/util/validation", +- "pkg/util/validation/field", +- "pkg/util/wait", +- "pkg/util/yaml", +- "pkg/version", +- "pkg/watch", +- "third_party/forked/golang/json", +- "third_party/forked/golang/netutil", +- "third_party/forked/golang/reflect", +- ] +- pruneopts = "" +- revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:4e236f3f94cfc5f005ceb143948ad39a4b2ad10373f394b232838f797bddd6ef" +- name = "k8s.io/apiserver" +- packages = [ +- "pkg/apis/audit", +- "pkg/authentication/serviceaccount", +- "pkg/authentication/user", +- "pkg/endpoints/request", +- "pkg/features", +- "pkg/util/feature", +- ] +- pruneopts = "" +- revision = "ebfe712c1fff40c4800d779470515e6025eda218" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:b46a88b317c3187b6fa7c5351eca48b35aad182eee371168677747430ff955bb" +- name = "k8s.io/cli-runtime" +- packages = [ +- "pkg/genericclioptions", +- "pkg/kustomize", +- "pkg/kustomize/k8sdeps", +- "pkg/kustomize/k8sdeps/configmapandsecret", +- "pkg/kustomize/k8sdeps/kunstruct", +- "pkg/kustomize/k8sdeps/kv", +- "pkg/kustomize/k8sdeps/transformer", +- "pkg/kustomize/k8sdeps/transformer/hash", +- "pkg/kustomize/k8sdeps/transformer/patch", +- "pkg/kustomize/k8sdeps/validator", +- "pkg/printers", +- "pkg/resource", +- ] +- pruneopts = "" +- revision = "6bff60de437070d7e8644b7a930837d5de512240" +- +-[[projects]] +- branch = "release-13.0" +- digest = "1:84f90f6a3b5b16f2c57164c5281d302b2647da8f77aa9cb14d5ebeb17fccc25e" +- name = "k8s.io/client-go" +- packages = [ +- "discovery", +- "discovery/cached/disk", +- "discovery/fake", +- "dynamic", +- "dynamic/fake", +- "informers/core/v1", +- "informers/internalinterfaces", +- "kubernetes", +- "kubernetes/fake", +- "kubernetes/scheme", +- "kubernetes/typed/admissionregistration/v1", +- "kubernetes/typed/admissionregistration/v1/fake", +- "kubernetes/typed/admissionregistration/v1beta1", +- "kubernetes/typed/admissionregistration/v1beta1/fake", +- "kubernetes/typed/apps/v1", +- "kubernetes/typed/apps/v1/fake", +- "kubernetes/typed/apps/v1beta1", +- "kubernetes/typed/apps/v1beta1/fake", +- "kubernetes/typed/apps/v1beta2", +- "kubernetes/typed/apps/v1beta2/fake", +- "kubernetes/typed/auditregistration/v1alpha1", +- "kubernetes/typed/auditregistration/v1alpha1/fake", +- "kubernetes/typed/authentication/v1", +- "kubernetes/typed/authentication/v1/fake", +- "kubernetes/typed/authentication/v1beta1", +- "kubernetes/typed/authentication/v1beta1/fake", +- "kubernetes/typed/authorization/v1", +- "kubernetes/typed/authorization/v1/fake", +- "kubernetes/typed/authorization/v1beta1", +- "kubernetes/typed/authorization/v1beta1/fake", +- "kubernetes/typed/autoscaling/v1", +- "kubernetes/typed/autoscaling/v1/fake", +- "kubernetes/typed/autoscaling/v2beta1", +- "kubernetes/typed/autoscaling/v2beta1/fake", +- "kubernetes/typed/autoscaling/v2beta2", +- "kubernetes/typed/autoscaling/v2beta2/fake", +- "kubernetes/typed/batch/v1", +- "kubernetes/typed/batch/v1/fake", +- "kubernetes/typed/batch/v1beta1", +- "kubernetes/typed/batch/v1beta1/fake", +- "kubernetes/typed/batch/v2alpha1", +- "kubernetes/typed/batch/v2alpha1/fake", +- "kubernetes/typed/certificates/v1beta1", +- "kubernetes/typed/certificates/v1beta1/fake", +- "kubernetes/typed/coordination/v1", +- "kubernetes/typed/coordination/v1/fake", +- "kubernetes/typed/coordination/v1beta1", +- "kubernetes/typed/coordination/v1beta1/fake", +- "kubernetes/typed/core/v1", +- "kubernetes/typed/core/v1/fake", +- "kubernetes/typed/discovery/v1alpha1", +- "kubernetes/typed/discovery/v1alpha1/fake", +- "kubernetes/typed/events/v1beta1", +- "kubernetes/typed/events/v1beta1/fake", +- "kubernetes/typed/extensions/v1beta1", +- "kubernetes/typed/extensions/v1beta1/fake", +- "kubernetes/typed/networking/v1", +- "kubernetes/typed/networking/v1/fake", +- "kubernetes/typed/networking/v1beta1", +- "kubernetes/typed/networking/v1beta1/fake", +- "kubernetes/typed/node/v1alpha1", +- "kubernetes/typed/node/v1alpha1/fake", +- "kubernetes/typed/node/v1beta1", +- "kubernetes/typed/node/v1beta1/fake", +- "kubernetes/typed/policy/v1beta1", +- "kubernetes/typed/policy/v1beta1/fake", +- "kubernetes/typed/rbac/v1", +- "kubernetes/typed/rbac/v1/fake", +- "kubernetes/typed/rbac/v1alpha1", +- "kubernetes/typed/rbac/v1alpha1/fake", +- "kubernetes/typed/rbac/v1beta1", +- "kubernetes/typed/rbac/v1beta1/fake", +- "kubernetes/typed/scheduling/v1", +- "kubernetes/typed/scheduling/v1/fake", +- "kubernetes/typed/scheduling/v1alpha1", +- "kubernetes/typed/scheduling/v1alpha1/fake", +- "kubernetes/typed/scheduling/v1beta1", +- "kubernetes/typed/scheduling/v1beta1/fake", +- "kubernetes/typed/settings/v1alpha1", +- "kubernetes/typed/settings/v1alpha1/fake", +- "kubernetes/typed/storage/v1", +- "kubernetes/typed/storage/v1/fake", +- "kubernetes/typed/storage/v1alpha1", +- "kubernetes/typed/storage/v1alpha1/fake", +- "kubernetes/typed/storage/v1beta1", +- "kubernetes/typed/storage/v1beta1/fake", +- "listers/core/v1", +- "pkg/apis/clientauthentication", +- "pkg/apis/clientauthentication/v1alpha1", +- "pkg/apis/clientauthentication/v1beta1", +- "pkg/version", +- "plugin/pkg/client/auth/exec", +- "plugin/pkg/client/auth/gcp", +- "plugin/pkg/client/auth/oidc", +- "rest", +- "rest/watch", +- "restmapper", +- "scale", +- "scale/scheme", +- "scale/scheme/appsint", +- "scale/scheme/appsv1beta1", +- "scale/scheme/appsv1beta2", +- "scale/scheme/autoscalingv1", +- "scale/scheme/extensionsint", +- "scale/scheme/extensionsv1beta1", +- "testing", +- "third_party/forked/golang/template", +- "tools/auth", +- "tools/cache", +- "tools/clientcmd", +- "tools/clientcmd/api", +- "tools/clientcmd/api/latest", +- "tools/clientcmd/api/v1", +- "tools/metrics", +- "tools/pager", +- "tools/portforward", +- "tools/reference", +- "tools/remotecommand", +- "tools/watch", +- "transport", +- "transport/spdy", +- "util/cert", +- "util/connrotation", +- "util/exec", +- "util/flowcontrol", +- "util/homedir", +- "util/jsonpath", +- "util/keyutil", +- "util/retry", +- "util/workqueue", +- ] +- pruneopts = "" +- revision = "85029d69edeae82e97dd1a0de3b24668cee9a15d" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:254da4cb69b3776686b730a206e081e6f8898bb64760619d1895c25c407e718f" +- name = "k8s.io/code-generator" +- packages = [ +- "cmd/go-to-protobuf", +- "cmd/go-to-protobuf/protobuf", +- "pkg/util", +- "third_party/forked/golang/reflect", +- ] +- pruneopts = "" +- revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0" +- +-[[projects]] +- branch = "master" +- digest = "1:06c18e328063f3612dfda3c4c5e5b8becda1eabceca689335c8d98704dffe70a" +- name = "k8s.io/component-base" +- packages = ["featuregate"] +- pruneopts = "" +- revision = "435ce712a6949916fa293dc4d3d49429962043d8" +- +-[[projects]] +- branch = "master" +- digest = "1:6a2a63e09a59caff3fd2d36d69b7b92c2fe7cf783390f0b7349fb330820f9a8e" +- name = "k8s.io/gengo" +- packages = [ +- "args", +- "examples/set-gen/sets", +- "generator", +- "namer", +- "parser", +- "types", +- ] +- pruneopts = "" +- revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" +- +-[[projects]] +- digest = "1:9eaf86f4f6fb4a8f177220d488ef1e3255d06a691cca95f14ef085d4cd1cef3c" +- name = "k8s.io/klog" +- packages = ["."] +- pruneopts = "" +- revision = "d98d8acdac006fb39831f1b25640813fef9c314f" +- version = "v0.3.3" +- +-[[projects]] +- branch = "master" +- digest = "1:0d737d598e9db0a38d6ef6cba514c358b9fe7e1bc6b1128d02b2622700c75f2a" +- name = "k8s.io/kube-aggregator" +- packages = [ +- "pkg/apis/apiregistration", +- "pkg/apis/apiregistration/v1", +- "pkg/apis/apiregistration/v1beta1", +- ] +- pruneopts = "" +- revision = "e80910364765199a4baebd4dec54c885fe52b680" +- +-[[projects]] +- digest = "1:16a343bd9d820ae320de4d1eaa8acc7a214aac4b38fb21d03255d3a457d861df" +- name = "k8s.io/kube-openapi" +- packages = [ +- "cmd/openapi-gen", +- "cmd/openapi-gen/args", +- "pkg/common", +- "pkg/generators", +- "pkg/generators/rules", +- "pkg/util/proto", +- "pkg/util/proto/validation", +- "pkg/util/sets", +- ] +- pruneopts = "" +- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:687af22932f9b53ff2e6755b2eefe160f076d522794abb980f0ddb187bcefacd" +- name = "k8s.io/kubectl" +- packages = [ +- "pkg/cmd/apply", +- "pkg/cmd/delete", +- "pkg/cmd/util", +- "pkg/cmd/util/editor", +- "pkg/cmd/util/editor/crlf", +- "pkg/cmd/wait", +- "pkg/describe", +- "pkg/describe/versioned", +- "pkg/generated", +- "pkg/rawhttp", +- "pkg/scheme", +- "pkg/util", +- "pkg/util/certificate", +- "pkg/util/deployment", +- "pkg/util/event", +- "pkg/util/fieldpath", +- "pkg/util/i18n", +- "pkg/util/interrupt", +- "pkg/util/openapi", +- "pkg/util/openapi/validation", +- "pkg/util/printers", +- "pkg/util/qos", +- "pkg/util/rbac", +- "pkg/util/resource", +- "pkg/util/slice", +- "pkg/util/storage", +- "pkg/util/templates", +- "pkg/util/term", +- "pkg/validation", +- "pkg/version", +- ] +- pruneopts = "" +- revision = "14647fd13a8b4cffc5a8f327b0018e037f72e4e8" +- +-[[projects]] +- branch = "release-1.16" +- digest = "1:02241e5570c239d31e52955b1a8e6d603a35fd6542d14e98882fb6c3c4ef3d56" +- name = "k8s.io/kubernetes" +- packages = [ +- "pkg/api/legacyscheme", +- "pkg/api/v1/pod", +- "pkg/apis/apps", +- "pkg/apis/apps/install", +- "pkg/apis/apps/v1", +- "pkg/apis/apps/v1beta1", +- "pkg/apis/apps/v1beta2", +- "pkg/apis/authentication", +- "pkg/apis/authentication/install", +- "pkg/apis/authentication/v1", +- "pkg/apis/authentication/v1beta1", +- "pkg/apis/authorization", +- "pkg/apis/authorization/install", +- "pkg/apis/authorization/v1", +- "pkg/apis/authorization/v1beta1", +- "pkg/apis/autoscaling", +- "pkg/apis/autoscaling/install", +- "pkg/apis/autoscaling/v1", +- "pkg/apis/autoscaling/v2beta1", +- "pkg/apis/autoscaling/v2beta2", +- "pkg/apis/batch", +- "pkg/apis/batch/install", +- "pkg/apis/batch/v1", +- "pkg/apis/batch/v1beta1", +- "pkg/apis/batch/v2alpha1", +- "pkg/apis/certificates", +- "pkg/apis/certificates/install", +- "pkg/apis/certificates/v1beta1", +- "pkg/apis/coordination", +- "pkg/apis/coordination/install", +- "pkg/apis/coordination/v1", +- "pkg/apis/coordination/v1beta1", +- "pkg/apis/core", +- "pkg/apis/core/install", +- "pkg/apis/core/v1", +- "pkg/apis/events", +- "pkg/apis/events/install", +- "pkg/apis/events/v1beta1", +- "pkg/apis/extensions", +- "pkg/apis/extensions/install", +- "pkg/apis/extensions/v1beta1", +- "pkg/apis/networking", +- "pkg/apis/policy", +- "pkg/apis/policy/install", +- "pkg/apis/policy/v1beta1", +- "pkg/apis/rbac", +- "pkg/apis/rbac/install", +- "pkg/apis/rbac/v1", +- "pkg/apis/rbac/v1alpha1", +- "pkg/apis/rbac/v1beta1", +- "pkg/apis/scheduling", +- "pkg/apis/scheduling/install", +- "pkg/apis/scheduling/v1", +- "pkg/apis/scheduling/v1alpha1", +- "pkg/apis/scheduling/v1beta1", +- "pkg/apis/settings", +- "pkg/apis/settings/install", +- "pkg/apis/settings/v1alpha1", +- "pkg/apis/storage", +- "pkg/apis/storage/install", +- "pkg/apis/storage/v1", +- "pkg/apis/storage/v1alpha1", +- "pkg/apis/storage/v1beta1", +- "pkg/features", +- "pkg/kubectl/cmd/auth", +- "pkg/registry/rbac/reconciliation", +- "pkg/registry/rbac/validation", +- "pkg/util/node", +- "pkg/util/parsers", +- "pkg/util/slice", +- "pkg/util/workqueue/prometheus", +- ] +- pruneopts = "" +- revision = "bfafae8f1c2fdf3c3cfef04674db028531a7c098" +- +-[[projects]] +- branch = "master" +- digest = "1:a8a2e6bbef691323b833d0eb11bb0e570e7eb9619ac76f7b11265530e1cac922" +- name = "k8s.io/utils" +- packages = [ +- "buffer", +- "exec", +- "integer", +- "net", +- "pointer", +- "trace", +- ] +- pruneopts = "" +- revision = "6ca3b61696b65b0e81f1a39b4937fc2d2994ed6a" +- +-[[projects]] +- branch = "master" +- digest = "1:9b9f12f4c13ca4a4f4b4554c00ba46cb2910ff4079825d96d520b03c447e6da5" +- name = "layeh.com/gopher-json" +- packages = ["."] +- pruneopts = "" +- revision = "97fed8db84274c421dbfffbb28ec859901556b97" +- +-[[projects]] +- digest = "1:0b2daace3dcced8712072529b621360cf520f3c2ead92d755f35a0ec8dca2714" +- name = "sigs.k8s.io/kustomize" +- packages = [ +- "pkg/commands/build", +- "pkg/constants", +- "pkg/expansion", +- "pkg/factory", +- "pkg/fs", +- "pkg/git", +- "pkg/gvk", +- "pkg/ifc", +- "pkg/ifc/transformer", +- "pkg/image", +- "pkg/internal/error", +- "pkg/loader", +- "pkg/patch", +- "pkg/patch/transformer", +- "pkg/resid", +- "pkg/resmap", +- "pkg/resource", +- "pkg/target", +- "pkg/transformers", +- "pkg/transformers/config", +- "pkg/transformers/config/defaultconfig", +- "pkg/types", +- ] +- pruneopts = "" +- revision = "a6f65144121d1955266b0cd836ce954c04122dc8" +- version = "v2.0.3" +- +-[[projects]] +- digest = "1:321081b4a44256715f2b68411d8eda9a17f17ebfe6f0cc61d2cc52d11c08acfa" +- name = "sigs.k8s.io/yaml" +- packages = ["."] +- pruneopts = "" +- revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" +- version = "v1.1.0" +- +-[solve-meta] +- analyzer-name = "dep" +- analyzer-version = 1 +- input-imports = [ +- "bou.ke/monkey", +- "github.com/Masterminds/semver", +- "github.com/TomOnTime/utfutil", +- "github.com/argoproj/pkg/errors", +- "github.com/argoproj/pkg/exec", +- "github.com/argoproj/pkg/time", +- "github.com/casbin/casbin", +- "github.com/casbin/casbin/model", +- "github.com/coreos/go-oidc", +- "github.com/dgrijalva/jwt-go", +- "github.com/dustin/go-humanize", +- "github.com/evanphx/json-patch", +- "github.com/ghodss/yaml", +- "github.com/go-openapi/loads", +- "github.com/go-openapi/runtime/middleware", +- "github.com/go-openapi/spec", +- "github.com/go-redis/cache", +- "github.com/go-redis/redis", +- "github.com/gobuffalo/packr", +- "github.com/gobwas/glob", +- "github.com/gogits/go-gogs-client", +- "github.com/gogo/protobuf/gogoproto", +- "github.com/gogo/protobuf/proto", +- "github.com/gogo/protobuf/protoc-gen-gofast", +- "github.com/gogo/protobuf/protoc-gen-gogofast", +- "github.com/gogo/protobuf/sortkeys", +- "github.com/golang/protobuf/proto", +- "github.com/golang/protobuf/protoc-gen-go", +- "github.com/golang/protobuf/ptypes/empty", +- "github.com/google/go-jsonnet", +- "github.com/google/shlex", +- "github.com/grpc-ecosystem/go-grpc-middleware", +- "github.com/grpc-ecosystem/go-grpc-middleware/auth", +- "github.com/grpc-ecosystem/go-grpc-middleware/logging", +- "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus", +- "github.com/grpc-ecosystem/go-grpc-middleware/retry", +- "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus", +- "github.com/grpc-ecosystem/go-grpc-prometheus", +- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", +- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", +- "github.com/grpc-ecosystem/grpc-gateway/runtime", +- "github.com/grpc-ecosystem/grpc-gateway/utilities", +- "github.com/improbable-eng/grpc-web/go/grpcweb", +- "github.com/kballard/go-shellquote", +- "github.com/patrickmn/go-cache", +- "github.com/pkg/errors", +- "github.com/prometheus/client_golang/prometheus", +- "github.com/prometheus/client_golang/prometheus/promhttp", +- "github.com/robfig/cron", +- "github.com/sirupsen/logrus", +- "github.com/sirupsen/logrus/hooks/test", +- "github.com/skratchdot/open-golang/open", +- "github.com/soheilhy/cmux", +- "github.com/spf13/cobra", +- "github.com/spf13/pflag", +- "github.com/stretchr/testify/assert", +- "github.com/stretchr/testify/mock", +- "github.com/vmihailenco/msgpack", +- "github.com/yudai/gojsondiff", +- "github.com/yudai/gojsondiff/formatter", +- "github.com/yuin/gopher-lua", +- "golang.org/x/crypto/bcrypt", +- "golang.org/x/crypto/ssh", +- "golang.org/x/crypto/ssh/knownhosts", +- "golang.org/x/crypto/ssh/terminal", +- "golang.org/x/net/context", +- "golang.org/x/oauth2", +- "golang.org/x/sync/errgroup", +- "golang.org/x/sync/semaphore", +- "google.golang.org/genproto/googleapis/api/annotations", +- "google.golang.org/grpc", +- "google.golang.org/grpc/codes", +- "google.golang.org/grpc/credentials", +- "google.golang.org/grpc/grpclog", +- "google.golang.org/grpc/metadata", +- "google.golang.org/grpc/reflection", +- "google.golang.org/grpc/status", +- "gopkg.in/go-playground/webhooks.v5/bitbucket", +- "gopkg.in/go-playground/webhooks.v5/bitbucket-server", +- "gopkg.in/go-playground/webhooks.v5/github", +- "gopkg.in/go-playground/webhooks.v5/gitlab", +- "gopkg.in/go-playground/webhooks.v5/gogs", +- "gopkg.in/src-d/go-git.v4", +- "gopkg.in/src-d/go-git.v4/config", +- "gopkg.in/src-d/go-git.v4/plumbing", +- "gopkg.in/src-d/go-git.v4/plumbing/transport", +- "gopkg.in/src-d/go-git.v4/plumbing/transport/client", +- "gopkg.in/src-d/go-git.v4/plumbing/transport/http", +- "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh", +- "gopkg.in/src-d/go-git.v4/storage/memory", +- "gopkg.in/src-d/go-git.v4/utils/ioutil", +- "gopkg.in/yaml.v2", +- "k8s.io/api/apps/v1", +- "k8s.io/api/batch/v1", +- "k8s.io/api/core/v1", +- "k8s.io/api/extensions/v1beta1", +- "k8s.io/api/networking/v1beta1", +- "k8s.io/api/rbac/v1", +- "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", +- "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", +- "k8s.io/apimachinery/pkg/api/equality", +- "k8s.io/apimachinery/pkg/api/errors", +- "k8s.io/apimachinery/pkg/apis/meta/v1", +- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", +- "k8s.io/apimachinery/pkg/fields", +- "k8s.io/apimachinery/pkg/labels", +- "k8s.io/apimachinery/pkg/runtime", +- "k8s.io/apimachinery/pkg/runtime/schema", +- "k8s.io/apimachinery/pkg/runtime/serializer", +- "k8s.io/apimachinery/pkg/selection", +- "k8s.io/apimachinery/pkg/types", +- "k8s.io/apimachinery/pkg/util/intstr", +- "k8s.io/apimachinery/pkg/util/jsonmergepatch", +- "k8s.io/apimachinery/pkg/util/runtime", +- "k8s.io/apimachinery/pkg/util/strategicpatch", +- "k8s.io/apimachinery/pkg/util/wait", +- "k8s.io/apimachinery/pkg/watch", +- "k8s.io/cli-runtime/pkg/genericclioptions", +- "k8s.io/cli-runtime/pkg/printers", +- "k8s.io/client-go/discovery", +- "k8s.io/client-go/discovery/fake", +- "k8s.io/client-go/dynamic", +- "k8s.io/client-go/dynamic/fake", +- "k8s.io/client-go/informers/core/v1", +- "k8s.io/client-go/kubernetes", +- "k8s.io/client-go/kubernetes/fake", +- "k8s.io/client-go/kubernetes/scheme", +- "k8s.io/client-go/listers/core/v1", +- "k8s.io/client-go/plugin/pkg/client/auth/gcp", +- "k8s.io/client-go/plugin/pkg/client/auth/oidc", +- "k8s.io/client-go/rest", +- "k8s.io/client-go/testing", +- "k8s.io/client-go/tools/cache", +- "k8s.io/client-go/tools/clientcmd", +- "k8s.io/client-go/tools/clientcmd/api", +- "k8s.io/client-go/tools/portforward", +- "k8s.io/client-go/transport/spdy", +- "k8s.io/client-go/util/flowcontrol", +- "k8s.io/client-go/util/workqueue", +- "k8s.io/code-generator/cmd/go-to-protobuf", +- "k8s.io/klog", +- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1", +- "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1", +- "k8s.io/kube-openapi/cmd/openapi-gen", +- "k8s.io/kube-openapi/pkg/common", +- "k8s.io/kubectl/pkg/cmd/apply", +- "k8s.io/kubectl/pkg/cmd/util", +- "k8s.io/kubectl/pkg/scheme", +- "k8s.io/kubectl/pkg/util/term", +- "k8s.io/kubernetes/pkg/api/legacyscheme", +- "k8s.io/kubernetes/pkg/api/v1/pod", +- "k8s.io/kubernetes/pkg/apis/apps/install", +- "k8s.io/kubernetes/pkg/apis/authentication/install", +- "k8s.io/kubernetes/pkg/apis/authorization/install", +- "k8s.io/kubernetes/pkg/apis/autoscaling/install", +- "k8s.io/kubernetes/pkg/apis/batch/install", +- "k8s.io/kubernetes/pkg/apis/certificates/install", +- "k8s.io/kubernetes/pkg/apis/coordination/install", +- "k8s.io/kubernetes/pkg/apis/core", +- "k8s.io/kubernetes/pkg/apis/core/install", +- "k8s.io/kubernetes/pkg/apis/events/install", +- "k8s.io/kubernetes/pkg/apis/extensions/install", +- "k8s.io/kubernetes/pkg/apis/policy/install", +- "k8s.io/kubernetes/pkg/apis/rbac/install", +- "k8s.io/kubernetes/pkg/apis/scheduling/install", +- "k8s.io/kubernetes/pkg/apis/settings/install", +- "k8s.io/kubernetes/pkg/apis/storage/install", +- "k8s.io/kubernetes/pkg/kubectl/cmd/auth", +- "k8s.io/kubernetes/pkg/util/node", +- "k8s.io/kubernetes/pkg/util/slice", +- "k8s.io/kubernetes/pkg/util/workqueue/prometheus", +- "k8s.io/utils/pointer", +- "layeh.com/gopher-json", +- ] +- solver-name = "gps-cdcl" +- solver-version = 1 +diff --git a/Gopkg.toml b/Gopkg.toml +deleted file mode 100644 +index 2fa04ee4..00000000 +--- a/Gopkg.toml ++++ /dev/null +@@ -1,117 +0,0 @@ +-# Packages should only be added to the following list when we use them *outside* of our go code. +-# (e.g. we want to build the binary to invoke as part of the build process, such as in +-# generate-proto.sh). Normal use of golang packages should be added via `dep ensure`, and pinned +-# with a [[constraint]] or [[override]] when version is important. +-required = [ +- "github.com/golang/protobuf/protoc-gen-go", +- "github.com/gogo/protobuf/protoc-gen-gofast", +- "github.com/gogo/protobuf/protoc-gen-gogofast", +- "k8s.io/code-generator/cmd/go-to-protobuf", +- "k8s.io/kube-openapi/cmd/openapi-gen", +- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway", +- "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger", +- "golang.org/x/sync/errgroup", +-] +- +-[[constraint]] +- name = "google.golang.org/grpc" +- version = "1.15.0" +- +-[[constraint]] +- name = "github.com/gogo/protobuf" +- version = "1.3.1" +- +-# override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master +-[[override]] +- name = "github.com/golang/protobuf" +- version = "1.2.0" +- +-[[constraint]] +- name = "github.com/grpc-ecosystem/grpc-gateway" +- version = "v1.3.1" +- +-# prometheus does not believe in semversioning yet +-[[constraint]] +- name = "github.com/prometheus/client_golang" +- revision = "7858729281ec582767b20e0d696b6041d995d5e0" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/api" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/kubernetes" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/code-generator" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/apimachinery" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/apiextensions-apiserver" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/apiserver" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/kubectl" +- +-[[override]] +- branch = "release-1.16" +- name = "k8s.io/cli-runtime" +- +-[[override]] +- version = "2.0.3" +- name = "sigs.k8s.io/kustomize" +- +-# ASCIIRenderer does not implement blackfriday.Renderer +-[[override]] +- name = "github.com/russross/blackfriday" +- version = "1.5.2" +- +-[[override]] +- branch = "release-13.0" +- name = "k8s.io/client-go" +- +-[[override]] +- name = "github.com/casbin/casbin" +- version = "1.9.1" +- +-[[constraint]] +- name = "github.com/stretchr/testify" +- version = "1.2.2" +- +-[[constraint]] +- name = "github.com/gobuffalo/packr" +- version = "v1.11.0" +- +-[[constraint]] +- branch = "master" +- name = "github.com/argoproj/pkg" +- +-[[constraint]] +- branch = "master" +- name = "github.com/yudai/gojsondiff" +- +-# Fixes: Could not introduce sigs.k8s.io/kustomize@v2.0.3, as it has a dependency on github.com/spf13/cobra with constraint ^0.0.2, which has no overlap with existing constraint 0.0.5 from (root) +-[[override]] +- name = "github.com/spf13/cobra" +- revision = "0.0.5" +- +-# TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation +-# (override argoproj/argo contraint on master) +-[[override]] +- revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1" +- name = "k8s.io/kube-openapi" +- +-# jsonpatch replace operation does not apply: doc is missing key: /metadata/annotations +-[[override]] +- name = "github.com/evanphx/json-patch" +- version = "v4.1.0" +diff --git a/go.mod b/go.mod +new file mode 100644 +index 00000000..2e741ab3 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,114 @@ ++module github.com/argoproj/argo-cd ++ ++go 1.12 ++ ++require ( ++ bou.ke/monkey v1.0.1 ++ github.com/Masterminds/semver v1.4.2 ++ github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d ++ github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 ++ github.com/casbin/casbin v1.9.1 ++ github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect ++ github.com/coreos/go-oidc v2.1.0+incompatible ++ github.com/dgrijalva/jwt-go v3.2.0+incompatible ++ github.com/docker/docker v1.6.0-rc5 // indirect ++ github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect ++ github.com/dustin/go-humanize v1.0.0 ++ github.com/evanphx/json-patch v4.5.0+incompatible ++ github.com/ghodss/yaml v1.0.0 ++ github.com/go-openapi/loads v0.19.2 ++ github.com/go-openapi/runtime v0.19.0 ++ github.com/go-openapi/spec v0.19.2 ++ github.com/go-redis/cache v6.3.5+incompatible ++ github.com/go-redis/redis v6.15.1+incompatible ++ github.com/gobuffalo/packr v1.11.0 ++ github.com/gobwas/glob v0.2.3 ++ github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 ++ github.com/gogo/protobuf v1.3.1 ++ github.com/golang/protobuf v1.3.1 ++ github.com/google/btree v1.0.0 // indirect ++ github.com/google/go-cmp v0.3.1 // indirect ++ github.com/google/go-jsonnet v0.10.0 ++ github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf ++ github.com/googleapis/gnostic v0.1.0 // indirect ++ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect ++ github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 ++ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 ++ github.com/grpc-ecosystem/grpc-gateway v1.3.1 ++ github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a ++ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect ++ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 ++ github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 // indirect ++ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect ++ github.com/patrickmn/go-cache v2.1.0+incompatible ++ github.com/pkg/errors v0.8.1 ++ github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect ++ github.com/prometheus/client_golang v0.9.2 ++ github.com/robfig/cron v1.1.0 ++ github.com/rs/cors v1.6.0 // indirect ++ github.com/sirupsen/logrus v1.4.2 ++ github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c ++ github.com/soheilhy/cmux v0.1.4 ++ github.com/spf13/cobra v0.0.5 ++ github.com/spf13/pflag v1.0.5 ++ github.com/stretchr/testify v1.3.0 ++ github.com/vmihailenco/msgpack v3.3.1+incompatible ++ github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c ++ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect ++ github.com/yudai/pp v2.0.1+incompatible // indirect ++ github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 ++ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 ++ golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 ++ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 ++ golang.org/x/sync v0.0.0-20190423024810-112230192c58 ++ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 ++ google.golang.org/grpc v1.23.0 ++ gopkg.in/go-playground/webhooks.v5 v5.11.0 ++ gopkg.in/src-d/go-git.v4 v4.9.1 ++ gopkg.in/yaml.v2 v2.2.8 ++ k8s.io/api v0.0.0 ++ k8s.io/apiextensions-apiserver v0.0.0 ++ k8s.io/apimachinery v0.16.5-beta.1 ++ k8s.io/cli-runtime v0.0.0 ++ k8s.io/client-go v0.0.0 ++ k8s.io/klog v1.0.0 ++ k8s.io/kube-aggregator v0.0.0 ++ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a ++ k8s.io/kubectl v0.0.0 ++ k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f ++ k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 ++ layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 ++) ++ ++replace ( ++ k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4 ++ k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e ++ k8s.io/apimachinery => k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 ++ k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 ++ k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 ++ k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48 ++ k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb ++ k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18 ++ k8s.io/code-generator => k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0 ++ k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd ++ k8s.io/cri-api => k8s.io/cri-api v0.16.8-beta.0 ++ k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3 ++ k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505 ++ k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 ++ k8s.io/klog => k8s.io/klog v0.4.0 ++ k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 ++ k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d ++ k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf ++ k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f ++ k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863 ++ k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f ++ k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4 ++ k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3 ++ k8s.io/metrics => k8s.io/metrics v0.0.0-20200131120008-5c623d74062d ++ k8s.io/node-api => k8s.io/node-api v0.0.0-20200131122255-04077c800298 ++ k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3 ++ k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173 ++ k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200131120425-dca0863cb511 ++ k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200131115407-2b45fb79af22 ++ k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1 ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 00000000..3d39244f +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,700 @@ ++bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= ++bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U= ++bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg= ++cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= ++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= ++github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= ++github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= ++github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= ++github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= ++github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= ++github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= ++github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= ++github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= ++github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= ++github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= ++github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= ++github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= ++github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= ++github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= ++github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= ++github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= ++github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= ++github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= ++github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= ++github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= ++github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= ++github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= ++github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= ++github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= ++github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= ++github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= ++github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= ++github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= ++github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= ++github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= ++github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= ++github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d h1:WtAMR0fPCOfK7TPGZ8ZpLLY18HRvL7XJ3xcs0wnREgo= ++github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d/go.mod h1:WML6KOYjeU8N6YyusMjj2qRvaPNUEvrQvaxuFcMRFJY= ++github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= ++github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= ++github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= ++github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= ++github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 h1:ykGEoo3WuCNoqO+rnaa0j/RdYfXZFp5Aqim+CjzdBaQ= ++github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM= ++github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= ++github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= ++github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= ++github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= ++github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= ++github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM= ++github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= ++github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us= ++github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU= ++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= ++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= ++github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU= ++github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= ++github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= ++github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E= ++github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM= ++github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog= ++github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= ++github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= ++github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= ++github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U= ++github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= ++github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho= ++github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= ++github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= ++github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= ++github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= ++github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= ++github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= ++github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= ++github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= ++github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= ++github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= ++github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= ++github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E= ++github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= ++github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= ++github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM= ++github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= ++github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= ++github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U= ++github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= ++github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= ++github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++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/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= ++github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= ++github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= ++github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= ++github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= ++github.com/docker/docker v1.6.0-rc5 h1:8dnqiCOcZf2QXwR4LNnG7AK9hXeeT6adGmtjicsVswc= ++github.com/docker/docker v1.6.0-rc5/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= ++github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= ++github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= ++github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= ++github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= ++github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= ++github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= ++github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= ++github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= ++github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M= ++github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= ++github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= ++github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= ++github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= ++github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo= ++github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= ++github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= ++github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= ++github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M= ++github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= ++github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= ++github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= ++github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= ++github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= ++github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= ++github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= ++github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= ++github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= ++github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= ++github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= ++github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw= ++github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= ++github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= ++github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is= ++github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= ++github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= ++github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= ++github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= ++github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= ++github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= ++github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= ++github.com/go-openapi/analysis v0.19.2 h1:ophLETFestFZHk3ji7niPEL4d466QjW+0Tdg5VyDq7E= ++github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= ++github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= ++github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= ++github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= ++github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= ++github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= ++github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= ++github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= ++github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= ++github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= ++github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= ++github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= ++github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= ++github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= ++github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w= ++github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= ++github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= ++github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= ++github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= ++github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI= ++github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= ++github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= ++github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE= ++github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= ++github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= ++github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= ++github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= ++github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE= ++github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= ++github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= ++github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= ++github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk= ++github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= ++github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= ++github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= ++github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= ++github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= ++github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= ++github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= ++github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= ++github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js= ++github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= ++github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= ++github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs= ++github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4= ++github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew= ++github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= ++github.com/gobuffalo/packr v1.11.0 h1:lxysfHcxVCWGNMHzKABP7ZEL3A7iIVYfkev/D7AR0aM= ++github.com/gobuffalo/packr v1.11.0/go.mod h1:rYwMLC6NXbAbkKb+9j3NTKbxSswkKLlelZYccr4HYVw= ++github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= ++github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= ++github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= ++github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4= ++github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0= ++github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= ++github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= ++github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= ++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= ++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= ++github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= ++github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= ++github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= ++github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= ++github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= ++github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= ++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= ++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= ++github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= ++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= ++github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= ++github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= ++github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= ++github.com/google/go-jsonnet v0.10.0 h1:NzmG/5DRTYDjNnsL/OmX6wT+ByeKbSoRoV6VxOy+QdM= ++github.com/google/go-jsonnet v0.10.0/go.mod h1:gVu3UVSfOt5fRFq+dh9duBqXa5905QY8S1QvMNcEIVs= ++github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= ++github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= ++github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= ++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= ++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= ++github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg= ++github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE= ++github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= ++github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= ++github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= ++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= ++github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= ++github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= ++github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= ++github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= ++github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= ++github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= ++github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= ++github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= ++github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= ++github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= ++github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= ++github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE= ++github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= ++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= ++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= ++github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= ++github.com/grpc-ecosystem/grpc-gateway v1.3.1 h1:k2neygAEBYavP90THffKBVlkASdxu4XiI8cAWuL3MG0= ++github.com/grpc-ecosystem/grpc-gateway v1.3.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= ++github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= ++github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= ++github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= ++github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= ++github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI= ++github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= ++github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s= ++github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= ++github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= ++github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= ++github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= ++github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo= ++github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= ++github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= ++github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= ++github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= ++github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= ++github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= ++github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= ++github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= ++github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= ++github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= ++github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= ++github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= ++github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= ++github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= ++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= ++github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= ++github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= ++github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= ++github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= ++github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= ++github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= ++github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= ++github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= ++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= ++github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= ++github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= ++github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= ++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= ++github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= ++github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= ++github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= ++github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= ++github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= ++github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04= ++github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk= ++github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao= ++github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= ++github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= ++github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= ++github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= ++github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= ++github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= ++github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= ++github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 h1:A6SLdFpRzUUF5v9F/7T1fu3DERmOCgTwwP6x54eyFfU= ++github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8/go.mod h1:UtpLyb/EupVKXF/N0b4NRe1DNg+QYJsnsHQ038romhM= ++github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= ++github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= ++github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= ++github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= ++github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= ++github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= ++github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= ++github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= ++github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= ++github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= ++github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= ++github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= ++github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= ++github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= ++github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= ++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= ++github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= ++github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= ++github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= ++github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= ++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= ++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= ++github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= ++github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= ++github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= ++github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= ++github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= ++github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= ++github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= ++github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= ++github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= ++github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= ++github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= ++github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= ++github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= ++github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= ++github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= ++github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= ++github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= ++github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= ++github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= ++github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= ++github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= ++github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= ++github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= ++github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= ++github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= ++github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= ++github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= ++github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs= ++github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= ++github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= ++github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= ++github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= ++github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= ++github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= ++github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= ++github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= ++github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= ++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= ++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++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/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= ++github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d h1:7gXyC293Lsm2YWgQ+0uaAFFFDO82ruiQSwc3ua+Vtlc= ++github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= ++github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= ++github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= ++github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= ++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8= ++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= ++github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8= ++github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= ++github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE= ++github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= ++github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= ++github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= ++github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY= ++github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= ++github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= ++github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= ++github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= ++github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= ++github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= ++github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= ++github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= ++github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= ++github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= ++github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= ++github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= ++github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= ++github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= ++github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= ++github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI= ++github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= ++github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= ++github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= ++github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= ++github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= ++github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= ++github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= ++github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= ++github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= ++github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= ++github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= ++github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= ++github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= ++github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= ++github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= ++github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= ++github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= ++github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= ++github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= ++github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= ++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= ++github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= ++github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= ++github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= ++github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= ++github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= ++github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= ++github.com/vmihailenco/msgpack v3.3.1+incompatible h1:ibe+d1lqocBmxbJ+gwcDO8LpAHFr3PGDYovoURuTVGk= ++github.com/vmihailenco/msgpack v3.3.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= ++github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= ++github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro= ++github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8= ++github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= ++github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= ++github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= ++github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c h1:/8Xb/f8s2/ZZpzMzBkFwW2Jvj7Pglk+AW8m8FFqOoIQ= ++github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= ++github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= ++github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= ++github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= ++github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= ++github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco= ++github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac= ++go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= ++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= ++go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= ++go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= ++go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= ++golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= ++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= ++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= ++golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= ++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= ++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= ++golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI= ++golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= ++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= ++golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= ++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= ++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= ++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= ++golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= ++golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= ++gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= ++gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= ++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= ++google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= ++google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= ++google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= ++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= ++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= ++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= ++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= ++google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= ++google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= ++gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= ++gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= ++gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= ++gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= ++gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= ++gopkg.in/go-playground/webhooks.v5 v5.11.0 h1:V3vej+ZXrVvO2EmBTKlhClEbpTqXH44K5OyLUMOkHMg= ++gopkg.in/go-playground/webhooks.v5 v5.11.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ= ++gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= ++gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= ++gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U= ++gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= ++gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= ++gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= ++gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo= ++gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= ++gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs= ++gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= ++gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4= ++gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk= ++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= ++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= ++gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= ++gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= ++gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= ++gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= ++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= ++gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= ++gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= ++honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= ++k8s.io/api v0.0.0-20200131112707-d64dbec685a4 h1:7kA/ATNKWB1TVM0pwxzl/JONybbBVROCxqndoCd57fU= ++k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc= ++k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e h1:L/XqOouONrybm+3jyUJZPo5JIMARb5qFNfmmUqy81Eg= ++k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e/go.mod h1:YzEcimsSKeVDDQnLTI9Qf8uws94WpMl4qut8Rbx4dVk= ++k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 h1:pusQlPC9d40F13jjdYyJDFDwnUjCTDN5P/y5WteLVkA= ++k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE= ++k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 h1:kgU/Yr5/GsGK3GAaFgmSp+y0IMLu+FoZK+wnKlgzIrQ= ++k8s.io/apiserver v0.0.0-20200208192130-2d005a048922/go.mod h1:kcWyL8/bV2c1b/FeWrxbO08zraTaYuhR7leZ4l9iOmo= ++k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 h1:gHF/ZIm6hTWAuN/rKdH1IO/iJfKPjn0d1kdeIMbPiDg= ++k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442/go.mod h1:sL3otDuOz8AlMrzsrBeB/ektmi6qYAE4a9Gid/pxtSo= ++k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU= ++k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU= ++k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb/go.mod h1:hb9XI7OCOFjqueeUaUYHbEuGG/nSq0UZtydmOu83p6M= ++k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18/go.mod h1:2U3dLDmef+EIuACENgQ1f8jQV//Z+aX/bp9DsglDXK0= ++k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ= ++k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd h1:W0AuOSSgValfdhcR68oayHewqFJh/nMA+JDPQbXGrkg= ++k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY= ++k8s.io/cri-api v0.16.8-beta.0/go.mod h1:W6aMMPN5fmxcRGaHnb6BEfoTeS82OsJcsUJyKf+EWYc= ++k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3/go.mod h1:2NVc4Xw5CEBgQj3/GtHOKPs5M68nhbszaFFuoB+xGUE= ++k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= ++k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= ++k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= ++k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= ++k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 h1:PqWgdqcu7/ZAno0sqGoqo3eC/qhwnz+XTotZfG+84ic= ++k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007/go.mod h1:u6psj4FzpmwlJuQKReXypLOIhIF2UxzZRBThWtnjIDU= ++k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d/go.mod h1:rlvqwtZiupLrqd54U19Th2a0sMf0PNbGA1J3zPTwFAc= ++k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= ++k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= ++k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f/go.mod h1:3/a8cJm4V50vBnkRwRhpgdIdsTH+4cj/kV66oxybGxc= ++k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863/go.mod h1:1xme9q7fNwDPtgIELmyOFGQErlOzFlQ1XHjTPUz1GYc= ++k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f h1:7764TWFJ+UYY6TX1Vq3jCo/3BkORLtywarY8SEdQh18= ++k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f/go.mod h1:d78MZ7MR2Q5xMwSrGvbJARH13CsOo5mSoDZWfjIe1TQ= ++k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4/go.mod h1:VkwV80jJy9GciSRBPFduby5qJxI5v5lV3D6WMMCveek= ++k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f h1:bGmDtZ96ysKXeBFw0+9cw9twoCQjrPRkkpSQqhxEXVs= ++k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f/go.mod h1:OdJXH1Q9L+NDVj158Zo8f6R3NSaOx1ewLUcaJv8hSRE= ++k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3/go.mod h1:Egd+aHCesdnzDDtUaaWnAhnyt5/dgQIfM4UL5z2WJxg= ++k8s.io/metrics v0.0.0-20200131120008-5c623d74062d/go.mod h1:18pR44uxuhPU05LZpHhJiPPzQvGoFmCf2UlTp2EhSM8= ++k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ= ++k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173/go.mod h1:Bnw1dM0HuYH49aVse0I8cV6KeyOFPBaWxnhsU7uR2UA= ++k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE= ++k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= ++layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0= ++layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc= ++modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= ++modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= ++modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= ++modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= ++modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= ++sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= ++sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= ++sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= ++sigs.k8s.io/structured-merge-diff v1.0.2/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= ++sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= ++sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= ++vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index f4d6fce3545..dd5deff294a 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 9bf801ee93d..31184bd68ff 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -14,6 +14,9 @@ buildRustPackage rec { sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0"; buildInputs = [ libsodium libarchive openssl ]; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index e3b82152e6f..595cfae2e69 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -67,7 +67,7 @@ in rec { }; kops_1_15 = mkKops { - version = "1.15.1"; - sha256 = "0iq2bqq6zv6sk2psar33c3smnz79rk5v623qx4kr5h47wnqvrfvj"; + version = "1.15.2"; + sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; }; } diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh index cf7318ecb27..1e2840017b3 100644 --- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh +++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh @@ -4,7 +4,7 @@ header "fetching Apache Mesos maven repo" function fetchArtifact { repoPath="$1" echo "Fetching $repoPath" - url="http://repo.maven.apache.org/maven2/$repoPath" + url="https://repo.maven.apache.org/maven2/$repoPath" mkdir -p $(dirname $out/$repoPath) curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath" } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index ddeb5851037..49f55370bc4 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "terragrunt"; - version = "0.17.4"; + version = "0.21.11"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a"; + sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn"; }; goDeps = ./deps.nix; @@ -18,6 +18,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preBuild = '' + find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 8432a8366b7..51cb455ce7c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,129 +1,453 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) [ { - goPackagePath = "github.com/aws/aws-sdk-go"; + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61"; + sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl"; + }; + } + { + goPackagePath = "github.com/agext/levenshtein"; + fetch = { + type = "git"; + url = "https://github.com/agext/levenshtein"; + rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; + sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-cidr"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-cidr"; + rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; + sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; + }; + } + { + goPackagePath = "github.com/apparentlymart/go-textseg"; + fetch = { + type = "git"; + url = "https://github.com/apparentlymart/go-textseg"; + rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; + sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a"; - sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m"; + rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; + sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; }; } { - goPackagePath = "github.com/bgentry/go-netrc"; + goPackagePath = "github.com/bgentry/go-netrc"; fetch = { type = "git"; url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; }; } { - goPackagePath = "github.com/go-errors/errors"; + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "2437321e1473408f122a95f65df3d8841fec4fba"; + sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; + }; + } + { + goPackagePath = "github.com/creack/pty"; + fetch = { + type = "git"; + url = "https://github.com/creack/pty"; + rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; + sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; fetch = { type = "git"; url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; + rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; }; } { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + }; + } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; + sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; + }; + } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; + rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; + sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; }; } { - goPackagePath = "github.com/hashicorp/go-getter"; + goPackagePath = "github.com/hashicorp/go-getter"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec"; - sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms"; + rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; + sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-safetemp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-safetemp"; + rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; + sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; }; } { - goPackagePath = "github.com/hashicorp/go-version"; + goPackagePath = "github.com/hashicorp/go-version"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-version"; - rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"; - sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7"; + rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; }; } { - goPackagePath = "github.com/hashicorp/hcl"; + goPackagePath = "github.com/hashicorp/hcl2"; fetch = { type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda"; - sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx"; + url = "https://github.com/hashicorp/hcl2"; + rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; + sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; }; } { - goPackagePath = "github.com/mattn/go-zglob"; + goPackagePath = "github.com/hashicorp/terraform"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/terraform"; + rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; + sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; + }; + } + { + 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 = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "4959821b481786922ac53e7ef25c61ae19fb7c36"; - sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449"; + rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; + sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { - goPackagePath = "github.com/mitchellh/go-testing-interface"; + goPackagePath = "github.com/mitchellh/go-testing-interface"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-testing-interface"; - rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28"; - sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx"; + rev = "6d0b8010fcc857872e42fc6c931227569016843c"; + sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; }; } { - goPackagePath = "github.com/mitchellh/mapstructure"; + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; - sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69"; - sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691"; + rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; }; } { - goPackagePath = "github.com/ulikunitz/xz"; + goPackagePath = "github.com/ulikunitz/xz"; fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { - goPackagePath = "github.com/urfave/cli"; + goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff"; - sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i"; + rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty"; + rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; + sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; + }; + } + { + goPackagePath = "github.com/zclconf/go-cty-yaml"; + fetch = { + type = "git"; + url = "https://github.com/zclconf/go-cty-yaml"; + rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; + sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "9c377598961b706d1542bd2d84d538b5094d596e"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; + sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; + sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; + sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "890e5eb51fe205e56dc55eb68d63e82039730816"; + sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; + sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "501c41df7f472c740d0674ff27122f3f48c80ce7"; + sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38"; }; } -] +] \ No newline at end of file diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index 640421bef8f..e5b3e1d52f4 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -12,6 +12,9 @@ buildRustPackage rec { sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9"; buildInputs = [ makeWrapper openssl ]; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index e01e4c4fc44..f567dabf5a6 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp"; postPatch = '' diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a509d9be329..4361679fc88 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.21"; + version = "3.1.26"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e"; + sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee"; }; postPatch = '' diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix index b0f21f6f7e0..59274f4105b 100644 --- a/pkgs/applications/networking/hpmyroom/default.nix +++ b/pkgs/applications/networking/hpmyroom/default.nix @@ -4,11 +4,11 @@ }: mkDerivation rec { pname = "hpmyroom"; - version = "11.1.0.0508"; + version = "12.0.0.0220"; src = fetchurl { url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm"; - sha256 = "1j7mzvf349yxb42m8syh73gpvil01hy1a2wrr0rdzb2ijfnkxyaa"; + sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8928814e967..9cf0032cf49 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,7 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup, libgee, utillinux, libselinux, libsepol, libpsl, brotli +, libnotify, libsoup, libgee , librsvg, libsignal-protocol-c , libgcrypt , epoxy @@ -52,18 +52,12 @@ stdenv.mkDerivation rec { pcre xorg.libxcb xorg.libpthreadstubs - xorg.libXtst libXdmcp libxkbcommon epoxy at-spi2-core dbus icu - utillinux - libselinux - libsepol - libpsl - brotli libsignal-protocol-c librsvg ]; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 052a626531b..896ca4f38a6 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r"; }; - cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv"; + cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9"; nativeBuildInputs = [ cargo diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix new file mode 100644 index 00000000000..2fcf65dfc1c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder, + attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, + prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, + + pytest, faker, pytest-aiohttp, aioresponses, + + enableDbusUi ? true +}: + +buildPythonApplication rec { + pname = "pantalaimon"; + version = "0.4"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1canj9w72wh1rcw6fivrvaahpxy13gb6gh1k8nss6bgixalvnq9m"; + }; + + propagatedBuildInputs = [ + aiohttp + appdirs + attrs + click + janus + keyring + Logbook + matrix-nio + peewee + prompt_toolkit + ] ++ lib.optional enableDbusUi [ + dbus-python + notify2 + pygobject3 + pydbus + ]; + + checkInputs = [ + pytest + faker + pytest-aiohttp + aioresponses + ]; + + # darwin has difficulty communicating with server, fails some integration tests + doCheck = !stdenv.isDarwin; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "An end-to-end encryption aware Matrix reverse proxy daemon."; + homepage = "https://github.com/matrix-org/pantalaimon"; + license = licenses.asl20; + maintainers = with maintainers; [ valodim ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 8281e3b606a..f6c1aa14e0f 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -22,13 +22,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "profanity"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf"; + sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8"; }; patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index c49934b96f7..11e2cf5c7e4 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.6", + "version": "1.5.9", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 9b6f591bd42..bf0feda4278 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.5.6"; + version = "1.5.9"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk"; + sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m"; }; in mkYarnPackage rec { @@ -29,7 +29,6 @@ in mkYarnPackage rec { # resources mkdir -p "$out/share/riot" ln -s '${riot-web}' "$out/share/riot/webapp" - cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" cp -r './deps/riot-web' "$out/share/riot/electron" cp -r './deps/riot-web/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2156214db6b..ee86ba65891 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -1,27 +1,30 @@ -{ lib, stdenv, fetchurl, writeText, conf ? null }: +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: # Note for maintainers: # Versions of `riot-web` and `riot-desktop` should be kept in sync. -stdenv.mkDerivation rec { +let + noPhoningHome = { + disable_guests = true; # disable automatic guest account registration at matrix.org + piwik = false; # disable analytics + }; + configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf)); + +in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.8"; + version = "1.5.10"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx"; + sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn"; }; - installPhase = let - configFile = if (conf != null) - then writeText "riot-config.json" conf - else "$out/config.sample.json"; - in '' + installPhase = '' runHook preInstall mkdir -p $out/ cp -R . $out/ - ln -s ${configFile} $out/config.json + ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = http://riot.im/; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ]; + maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index be1fe96526c..c5921e645f0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.30.1"; # Please backport all updates to the stable channel. + version = "1.31.0"; # 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: @@ -33,7 +33,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 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6"; + sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9"; }; nativeBuildInputs = [ @@ -80,6 +80,7 @@ in stdenv.mkDerivation rec { runtimeDependencies = [ systemd.lib + libnotify ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index f4ade076726..ec7e4e68312 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook -, qtbase, qtimageformats, gtk3, libappindicator-gtk3, enchant2, lz4, xxHash +, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, tl-expected, microsoft_gsl # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -18,17 +19,15 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.9"; + version = "1.9.13"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6"; + sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7"; }; postPatch = '' - substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \ - --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ @@ -42,8 +41,9 @@ mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; buildInputs = [ - qtbase qtimageformats gtk3 libappindicator-gtk3 enchant2 lz4 xxHash + qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 + tl-expected microsoft_gsl # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -58,6 +58,7 @@ mkDerivation rec { "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF" "-DDESKTOP_APP_USE_PACKAGED=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" + "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON" @@ -80,6 +81,7 @@ mkDerivation rec { # - upstream: https://github.com/grishka/libtgvoip # Both of these packages are included in this PR (kotatogram-desktop): # https://github.com/NixOS/nixpkgs/pull/75210 + # TODO: Package mapbox-variant postFixup = '' # This is necessary to run Telegram in a pure environment. diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 0378f50a9c0..b6f0b87dc84 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -47,10 +47,16 @@ mkDerivation rec { ]; patches = [ - (fetchurl { # https://github.com/LubosD/twinkle/pull/152 patch for bcg729 1.0.2+ + # patch for bcg729 1.0.2+ + (fetchurl { # https://github.com/LubosD/twinkle/pull/152 url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch"; sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2"; }) + # patch manual link to not link to old url, which now points to NSFW page + (fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07 + url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff"; + sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0"; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index cc19bbd7156..d22c1cefc2f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -5,7 +5,7 @@ , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel, qtwebengine # Runtime -, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l +, coreutils, libjpeg_turbo, pciutils, procps, utillinux , pulseaudioSupport ? true, libpulseaudio ? null }: @@ -101,7 +101,6 @@ in mkDerivation { 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 diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 7967bdcc9c4..4fbbbfd140f 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec { sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index ff6a7d94741..845dd928766 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,20 +1,34 @@ -{ buildPythonPackage, stdenv, python, fetchFromGitHub, - pyopenssl, webcolors, future, atomicwrites, - attrs, Logbook, pygments, cachetools, matrix-nio }: +{ buildPythonPackage +, stdenv +, python +, fetchFromGitHub +, pyopenssl +, webcolors +, future +, atomicwrites +, attrs +, Logbook +, pygments +, matrix-nio +, aiohttp +, requests +}: let - matrixUploadPython = python.withPackages (ps: with ps; [ - magic + scriptPython = python.withPackages (ps: with ps; [ + aiohttp + requests + python_magic ]); in buildPythonPackage { pname = "weechat-matrix"; - version = "unstable-2019-11-10"; + version = "unstable-2020-01-21"; src = fetchFromGitHub { owner = "poljar"; repo = "weechat-matrix"; - rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365"; - sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c"; + rev = "46640df3e0bfb058e97d8abe723bb88fdf4e5177"; + sha256 = "1j3l43j741csfxsp1nsc74y6wj2wm86c45iraf167g6p0sdzcq8z"; }; propagatedBuildInputs = [ @@ -25,8 +39,9 @@ in buildPythonPackage { attrs Logbook pygments - cachetools matrix-nio + aiohttp + requests ]; passthru.scripts = [ "matrix.py" ]; @@ -38,10 +53,18 @@ in buildPythonPackage { mkdir -p $out/share $out/bin cp $src/main.py $out/share/matrix.py - cp $src/contrib/matrix_upload $out/bin/ + cp \ + $src/contrib/matrix_upload \ + $src/contrib/matrix_decrypt \ + $src/contrib/matrix_sso_helper \ + $out/bin/ substituteInPlace $out/bin/matrix_upload \ - --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u' - + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_sso_helper \ + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_decrypt \ + --replace '/usr/bin/env python3' '${scriptPython}/bin/python' + mkdir -p $out/${python.sitePackages} cp -r $src/matrix $out/${python.sitePackages}/matrix ''; @@ -53,6 +76,6 @@ in buildPythonPackage { homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; platforms = platforms.linux; - maintainers = [ maintainers.tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; }; } diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index b7bf5eb329c..143153d4d9f 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.3"; + version = "1.13.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0y3ks10mc7m8c7pd4c4j8pj7n5rqcvzrjs8mzldv7z7jnlb30hkq"; + sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 13f201eaea1..f8d8c2627fe 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.4.2"; + version = "68.5.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ar/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ar/thunderbird-68.5.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "6dcb7cf023c6b6e1d663eb99280aa8245c658a6faed7933be8d8340b33e47f2082d548e6d9fc4394a74ddf8b05c9a7b3a57f691504cb4095d41787ebb564b86b"; + sha512 = "dc71109c963e9b8e162437e33feec002268b392cba9ebbfb37714aa79e834143641b92488c3c923256b1d0058c92e6502caf4f022b17145d8e0f67fa7d77b7c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ast/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ast/thunderbird-68.5.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "89592d5c44742b75d8125e4f360f6ef1a719f6a573c72ca3b88fe971be699d74d4326af7385f36e67c0d4ab09a23d7d8f62c8cfac27c9249f84f520b8ff46ab8"; + sha512 = "2768582e13905d162eacb051209a3ff5c7f704ff95efa3339cf8ecdfce3f892e76e79e65d11c4638a8f4529177a7b2efb12d7c6ac308c1d02b93da361bb9cd23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/be/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/be/thunderbird-68.5.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "5cd617c16a448f79335a1df7e7028eadbcf35b6221678da4c31e5cb5a014ccb9ff6020fa271488312853a5b08ae1e29102f470e9bed193f2de2e0b70cbee4752"; + sha512 = "dfb0806383acb8bbe817be30c4ad1ed34f21e68dea71e249226b07fdf4d1226c88690962f228b6d3f5d0205501be2dddf985b9f99b8eae37400362f1a0be1979"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/bg/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/bg/thunderbird-68.5.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "85221ff6c56119b603b291febacab6c92cad2d4e2f56415a778f9f06495dbc0c52380fba7dc2153853a689e804c7ef731ae762b0cee9a9ec92ead2184a7ce987"; + sha512 = "194b1f645ca3b1607283d176e28e07e204abec90a96a85e9f2aeef0c1af8011c7dea3f0dfdc37402719380b26899c83800ecb79da194730e9c3fcfce1685778b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/br/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/br/thunderbird-68.5.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e42c6569be589c543b1b3d23062733e61317ce2efb83b224f94571564c881c329b96d49a7c4be9a553d1eb656595212f839f8b4119b382782be6f1e55048cde0"; + sha512 = "1b5513ea62c766d8dc7839fb9708dc63ab01e297a146a351d670aff3d6e7d6a842289da5da753fe649ff08a751b0fd0abee7a1fc71f7d0eebef375b72e929973"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ca/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ca/thunderbird-68.5.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "31f8a8bddbf1f3be169c15cdd94d11cea472ff10abafee33619d0d53d51fbc862d8cf143d2924733cb8ee39751f1145ec7cad299b0d634d2269901d9a6a5f7f8"; + sha512 = "460c3b39881ab764fd7bedb10c27a2df5da6a907058010204d8849b87da42ce48f0038b05d0910b2c7df8339952dd781ea167687706494b92de2d0deebba8b81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cak/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cak/thunderbird-68.5.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "b8ad08b7abe314a4d1ba6a92bd5a3e1d43310738493ed130eb11549d0179f38ea435d0b246513ecd10a701c0fe65578fbf21ce3c47d9ad067a3a25a82ae590ec"; + sha512 = "f35ea0852f598285d86445d80839db0dac799760607bd83db528196ebaf3a77abf9f185a2b2f1044a7d5c0fd07383e8c0e020dcc7251817d6d3299d6cae63137"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cs/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cs/thunderbird-68.5.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5228af6fd773622fbd846993f1b48f480a2f0da4fde2a49c9b1663c9f72c8821d51093a121175bf57130670ba96aabc44d92fbdc895d1f5508e6301d148ae137"; + sha512 = "baac0a55a175fa4e9512c7ff2a82d986af049eadbde9e1136216ce1d5b384c4db3891ab8b5af420dc4a0635ba50a9d4908baed0f3a9f1ca0076596d20d5e15a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cy/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cy/thunderbird-68.5.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6559e40814619edd5c943e0dea738c8237adce53483640d7b9a946ffb0c5050c9e0909009c83af5ca0c3163e15c876cfe1b28b2dcbe5409061bd4644ee31495d"; + sha512 = "ef0b065b9d322772ec002d994140b2c9510f80d993c9c00aaa65d3314b9b4b7352ffdda6b84a916326deebfc8a12696d60a62d69f5aa13bbbacfbf9a5ccbe443"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/da/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/da/thunderbird-68.5.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "570aeb036129543af13be385d3be6efd30b22fa34af650b8fb0770d48c6537cb44613c33535e2efafad89a0c632e7acbeb569658f515f4910daecbf2212c960a"; + sha512 = "1a9e3396d278cf9a02bb0bdc226036fd3cd6c86f47a4d9d00f4ca1031491a068b56c0b501799f75e385295ee50b013753376183b2bba73f0e95ae801507e0232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/de/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/de/thunderbird-68.5.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e48e9b6652016693338555104866b9c155ad8919f1d48ed7dac3ee6fa1ca4e484403a3d77f17b7b2a862e2590e41a043de94a097ef9e4faade63b063291f344d"; + sha512 = "7b292fe10c09831c1b21141168aa136da9a2d78750bb5094633d2f58f85f3b4df69b6b638e00f097a1490050cf92f4bcc53cd4bef9a5539bb96cd2812971318d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/dsb/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/dsb/thunderbird-68.5.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "135c321f899b2a8fd75fbe15f589ec618911252cf66a004c3c3aeb5d98fcc65754e38a9dbdbaa914418e2bc3175603d04713269c0b22a54e5b70ad6402253cee"; + sha512 = "3f26f768e5f400dc19d4069cb034878a3e0df059a5ec90cb70b06f138585ed976f58efb14ec54a3c0aac1e2fb8561c8e198f7a5822a40b37eff93a8e1c9ef3f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/el/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/el/thunderbird-68.5.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "896251287bb17eea6681313c5f15b2babb108d760b2a09b09ce3d3507177054e9e2479bbcfe5afc4016de36018f8c7d25e5147a4a214f855c16e602fc386c664"; + sha512 = "c6847200d45a169ef8a3bae3e2b7d45592d31429a205222e03f9d5365104e92be54dc4b07227b23c07abd425ee5383b5917d34362d4f37667b6f5addc9197514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-GB/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-GB/thunderbird-68.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "b4fec6505a563c8730f113a29b4893890c798d2427672f8d10d588c9bd4ec5a97e7438ce27d53d93f7b043f90485055b04f4b1be792db552561864cf1600ec56"; + sha512 = "bcc10a9daed5c4e68eb4a582cbfc8aa1c30b0d4cb92a714adbc695bba410e23d2f65e1194c0ed580976cda51d61fb95784b6296be95952aec1a2b51e711434d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-US/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-US/thunderbird-68.5.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e5643659593e404d2317f3620d2c2b48bc45ffc4d707b02243e342f28ce1b81260ab7b05541ecea47e03583d8b6968c964c16dbf36fc1fb10a4e00b235c55318"; + sha512 = "9500d9a22bb42a04fd2d7d24ff8fb7a69b205d6f889ab3b301405a22a51da731452fd18ce33c492f0733d72bddf6aa37b4d8899db4418e8e0155f2bb93af6b06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-AR/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-AR/thunderbird-68.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "102acc6c5d5178f3f8e2f39cff5e5f9e1ecbaa4c62d4311277fe06b123c2d9b8270d423bfd68d6e9d86e666f219ef1ddfebd439e85ae53340589fe6e41439bdf"; + sha512 = "b193048a9c1a0d4c08c08cd12ae41c7a9cdfc8dba47c645d593675e08ac68f8158a578e645c8db32b862b0bb7174627534340a62aefa8ab9e38489b8b7687234"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-ES/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-ES/thunderbird-68.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "302c83a0726cb3893a8eab156c1613bb9722c340633e3201e259c619c53066318cb57b751be9dcbe9788b52d901b0c605584211e183d9fcb62edd340d87a23f9"; + sha512 = "c1c5cd0b49e388260cc781e4bc7bc46530791467d4241defc31dae35c0ced85d8cc9e63734b0b8898eb23216065f388930d36227bd1484279ce135b20a70f041"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/et/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/et/thunderbird-68.5.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d8d2b1bd1214b2ff4641e53edd3d6ef662cd9e7bf116cb8c8ff468a9ec179f7a83a7489cb756271c82e36201e082bd2da5d804ebb26fd1019a299f3afcad3d60"; + sha512 = "9cb03aa0214d8e8a0c0786b95d5716a761bb9b2f1fb430b552f09ad3942a277e0117d7b2d95cabc01fb63dfc7956aeabbc522d38515371af7e3a52b8514a32d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/eu/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/eu/thunderbird-68.5.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "94bdea45e3693d404cf97e93bdfe46a4593efd6fe0a5fc0bac78ea047cd58f7998140350730706ccc05db2a105414e44e473a472ff9f57a170895dab81a62e90"; + sha512 = "3c1da2c13f0b5ed58a1b11fcac24bb3ded8f1fd5dbb23fb8eaac529e5595bcca6adcfee0effa4c4e8a78e85d53b062113022e8e34ca936dc99cda5720a859b39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fi/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fi/thunderbird-68.5.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "f1071ca2ae7e6d03880a96dd968ee993b99e2c34c904392d5a0757b53deefd7c15c4cd643679a232de2e404999d1e5c990b052ef0f598c57d8f099cb1b1c9cbe"; + sha512 = "1d04c56fd080a52dc2c399339369ab54a7650ddd9d4f473b6ae40445c2889e05eb25c635d7add28e779df3c851fc9826c416419be22691c3424bd8ad01ab23d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fr/thunderbird-68.5.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b7b051a5b4cb139de840b33240f1f8ddb25703d8dbfc66f0a028a2b26f0f6eea5d594e740018aaa093d68ac7bc648ce983a996ad4feee398854aeb160f9fc316"; + sha512 = "a64c2a4c2f7da481995be93d03b6442a79c6a8ebeae3c2e1bd0efd8256f400bec3a416348ebee1753edd8a5911a80aa81843651e39a718607b3085494589210e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fy-NL/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fy-NL/thunderbird-68.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a967b9ecdf596e603fb56dd50b20853bfdebc57aec69a0b6abebc0bcb2c9ab62e1890517bf70205749980a37835bc711fcda9ccb6d60f6e6d467fc28c7ef1475"; + sha512 = "4e51df5766540356dc86414063c98f47aaca94a57d2449c05c677513ce4477533638eb34b234696431b8beb4d241b0eb97db08cf9e27da891e95965c16ef21a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ga-IE/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ga-IE/thunderbird-68.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "7c09306024ea7147c68a9279fc391ce7cdcfe49d4fe60650bdce3fa2a5233623934f7c1f8877feda8388f24b1b1eebeeb2c006265d973cc83339b1220f61e8a1"; + sha512 = "ec4f2667daeff8305feb8ac64304f42fbcda6b4c93a8bdfb1f4b45f1fc40163049f6a887f7208b41c49a21a5d94f06adf2f4446e784b8e2822c9f997d783eff2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gd/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gd/thunderbird-68.5.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d820ff2c6bf09aa3dc19c8c679197f207cac505c5e2e5cacfcd5873d4607593d2efe15cf2483f62eda18bc8f7150c4f0f039a80ead07548aa69e5458b6c487df"; + sha512 = "09076ac19ec28a790b84c584856ffb60cbcb0db11fe52f1bd307515762fccf79e158a8805c6743eff287a4b25978f94c8ffcaf655b414fd267cd9db321ccbc41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gl/thunderbird-68.5.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e193400689f5d3ecf4a72ee138355dad2c719120e9780be7406dca617faffc750107c8642e35719565f124fdba7a39fac9aed79fbd8923389f14dec54e128d11"; + sha512 = "ad697320ba8f4e5a04a4e201e04490398cc09152b1cb1a31e325c06a30d8ca6f7209c35c9d9263e6087db41b4502e69c9ad6c35183872312dcde215ab1ba3e90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/he/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/he/thunderbird-68.5.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "20098de7a90c1d783466a56a7ea6946153729274c4b8d8663b42f957c7c6da4e2d3465293fe1f33ee884de41bb4e2d0ae83d67b4dd06d5afd09d09c732805c3c"; + sha512 = "7b367bd45c876e20a22e71b276d9ae9b7aec5fc58574647a5b8f99bdb52602eb41541f3397eea54a7395c5374a26277f1a312edb49c95eedfdc9ae06a6f5b9d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hr/thunderbird-68.5.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "df359b429f9a9e7954391e3f64b056d0f6c0fbeb8ba7b024d71f7d211594496fe5aa2f3d3ef56bb1e048ce928dc6da77b1ded84cce0904f5fafc6d3d22bfeff1"; + sha512 = "8f8fc6fab45e45ee426426a28fd00deb52110f68f2aa29037db120fa81afd802681aabb1f390ab62e2f067ac178eaf7f2b1d4f0c4ac70492ce45ef1cd2545a92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hsb/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hsb/thunderbird-68.5.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a0bdff2fc50ef13742098eb43e4c627cadbf363026ae9c6d49b3e3c4a48bc747739344fa90030a4fddb5843a4e6fc5f39b6c862e745dab31d41ab4b22e4d35fb"; + sha512 = "870c925b327ff575b1cb6819864c5bb70b5531871e04a69ec3a456f83cd207bb2cd45defb4722f03586bb5e6569fe3d7e2c6e7937127269e9018a41039b6d83a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hu/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hu/thunderbird-68.5.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a4d0106ecf554b8b18cab2e417e5ca5d4a3384c6f1f87b8f8cefba3c3addb60dedbbd3bdc5268c6d20fdf4e6bc2c06f17a6baf266cc3b7356e885339cf7ee711"; + sha512 = "3bacd70e1bf4c07d1c625e835296d52d353546950178a92ad4ff1d29168b78928f985b3db99c7b5587aeb5a51e54c9f4cb5f0cf354df3ea853e8147ff969c288"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hy-AM/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hy-AM/thunderbird-68.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9038e461596d473905a8390aa9967ef8e6bb013e85258294374bbf910f31d1a1e7fe582886c280add6071d856c484599bc8571bd21f02a63cd313605b1c35325"; + sha512 = "46b9728709dd7866d6233e20c949dacccde3f62fce1558d2baadb87b94438833faf4d93e9449b0a5cddfbef8c3c9967258c606445c1fbf13aa74d776f61d844f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/id/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/id/thunderbird-68.5.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "9507df025dc4bcfe5ef11c929b9ce7d3b5e4b8459f7aeb1a2c30bb50b8e987bb016b8750bf8399720b1cf3bad54eb330c88e990438494f0557ee63a9e4077742"; + sha512 = "11889847cd84dec9132eaa768251fe41dfcb7cb4682cb5c34160142791f75512b74b79d1caa2ce8cf205e521a244b168f89760782dcf1b453793122414903428"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/is/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/is/thunderbird-68.5.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "448696428b3c5f39c845ac82c0c4ff2079dca1ce19639e4403571bf9723074f3f9fdac533f36ff3fbb852931a49a2def2bd727c93dfcf70809c1d8caa1ab46b9"; + sha512 = "e68fa0a96283013df42afa1fc7889d9dbfc906e508399d7dab6131b885ac73e5558c7acab1a5e8c13c6252e1612d43a1bc503b570c6f978c0460b121f2f37112"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/it/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/it/thunderbird-68.5.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3948b06ffb8749ebcb444de60fff6f713ab72a859d0804a56310ec4ec3951ef6ae6309403e454051147404015fd22deb3fa7d5f6e82ae69018fca55562a583e4"; + sha512 = "a55f5664274caabc43d64ac1abaf04f159c2b76c8389ecc00dcd213430d8c80836fe149bf4449cccc53184f2ded1ebcb85f8347de099aee47c32c899c5184a6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ja/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ja/thunderbird-68.5.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "fba5fdf22fb3154cfd052e7a7883fc4fe593c49a166e6b088fb1d15acf07edbdff0fc8b8622018c05036cade7048a2cc8ba438c4cf44fd308e62d3634a144618"; + sha512 = "b3fb1bfaeb1509ee3392b11e18a2f80b6a84165e6f01c6caeb47f4b1e9dd8733d88ef724497f603352119412d9b5f88d7d37b21ccb1802e4f3930c6f499363e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ka/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ka/thunderbird-68.5.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8da3bed471a03eb8634d804d06cb6ed631212e168ecbce76c4147b40d082434d658a48a2df5dd2b84fc1361ca83a58ecbd8edc913e63a12828a90d87142965d0"; + sha512 = "1cf0b21bd0c1742a018675b8af830be7de163e567a2691b5c95cf91af9753b23d431ad5b67738d690220d1d8a57da7990cb01f89917f7c8ddad80b4ab056a83a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kab/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kab/thunderbird-68.5.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "cc190d979f8a01f95f02b9fbb8dd0433b14427c724f0ccd95b213a18fc5c46edd91363971b4cf5919f965fa012316667fba24e821929741c9a4fcc82fe62f8fa"; + sha512 = "8decdb91a1241f4d9495202965986d78598f5e8be603ed9c28bbd2a8cb405ce96a1206f1ade35a11e2f161bffbd8a034fd13b15abd16f4ec5a05442a6194fd1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kk/thunderbird-68.5.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "426f0b90e951b8377088e83b6c32b0c500134b2bae56938fd2f1c44ee652ddb1d6356cea48e52e7c9f88ad0184aa8deaa0141f21ae227ae876bddf1eb1814aac"; + sha512 = "7a7e4d2c6dca6455c81456bb5a8eb3c8a085458ed9253c4a91b22a8cde9892fbba624be89c7ab1fea5875d902fa1198cf796bb309c3b6bd597bc05013d3f4687"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ko/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ko/thunderbird-68.5.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "6dfc70115784b79adb6ea4fa1f1854fae15b961fd310c55efc67eba03b65057776a163fdf45043c142126ba67fd1212f5ed46a0acaca061fee74ad7e5b905b85"; + sha512 = "cb037d1ab8dde1fcd61dfd446aa7587c7dcb24d239485e3b3c63db49097eb91bdc59fa9048b8871ce17da6b33bb0490e9f7a8f29f5f59a623f4eca522a04c287"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/lt/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/lt/thunderbird-68.5.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a2bcac9f00ac050b3526d59a75f5943b5874929df195ad2fbae984b38c637c2b186528e2926b66fe13fead86ff19efd508a969b18fbe5898bf6a95005ffe782d"; + sha512 = "898ad8b33435bafc361861a19887fa423eb2000acff87862543e4051722e1e1b4d6606eae057647bf7bee366296bfe5567ac1e7002fd62d28515a4d57c2466ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ms/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ms/thunderbird-68.5.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8692a23434d0b0f833346b23bcda716be2c14800fe26892ae6ad8c01a01b4574174ad11a61940b3b8f13c88b4fc890d7992c32e0081d7afb0a290babe32fdf85"; + sha512 = "c08d8ec6ff837eb03dc41fa5e8d9e7d8a142df489f47698f372808c0ddea88d1313abef999c00a0d4aaa6e0d5d4564845b001454d85ea8990cec072fea689e28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nb-NO/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nb-NO/thunderbird-68.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "b415dbd4ec148544d800c86c39cc8006591770aa34bc9dd341bada216abbec2118dc672ad78aa0f9e628937ae996bd79a2ec1c8d7e11cb43182bd0d98b2ec8d2"; + sha512 = "9e34bea73e2514f2c76a08a79752977d12c42726408be0d5d39405c2edd56f826ad453fdb1e20c4f8840070715fc0eb1211135e8c9b1f3ecac6c0e99ec0be029"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nl/thunderbird-68.5.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c51b1665262313140898ad3e46adb56a566a454b5f39e6afd56c5681bf55cfbc8838d6c16fe1a04f555ddfe0f166f275f2bfafb7e2f9452ef082f1e0238d431b"; + sha512 = "3bd89bc0528d49a79ca93dcc6842f06102fd0799164d717ef7aeb15f283b44a7236148bd7a746ea7d713cf41b2bed7a5b7e66017b46b3398e4b6f035c7933a14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nn-NO/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nn-NO/thunderbird-68.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6c4a13b6f2f8540c0411db998fce53e346e28b89ffdda42d9f1b0cf214cacca7ee93de8a9c5eac056a609ecb108e3cd46260821597d4b89e5bc76c5f961ce982"; + sha512 = "0cc4b9ac7dab3e879f6a691546fb414c4b43de166c5deb018634fe8d6583bff378d60937be4c8c30a1ffe68f5d715bb67414fa7359e061c766426666bdbbabc9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pl/thunderbird-68.5.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "b44c28d828171c6cb8c783606d8aa311c4234f623533fc2072b78a7435b261ae444297e8d01abca28a5a952a5f7dff380f250a11ce4a357bf3e0cc294d2c47db"; + sha512 = "48ceb0fe27e9dff3c09aaf05276aaa7c9c0d2d643236bf69af03974cd514bdd0d3bc816151887d3247907bb67853ed840e486e6f1bc721ac7283ea193152b723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-BR/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-BR/thunderbird-68.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "77e8efb89679f744891c419bdc6ee649d379c023ce181448b84da88c8fb9ae780eb762a01f547d6b662a59c8d5fb172d4b5582e6eba45d8e3c2927667e3c2141"; + sha512 = "77a272f0553e2981d156b5c928a159ef754ca2220e8e48a06a6bd53bc67b6965a202e06ee98d15bd8d2f5fabc9768ea744eed8d88009f194b8a3f0097eb2b194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-PT/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-PT/thunderbird-68.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5e2ba598257d9c7efc793c2126e6564d8e2b92ff03a3df64d5147fbea199912bec44ae54cb3a878f9ff84921fb403dcdb58d05fbd55730e7c4c9d988ece21250"; + sha512 = "bdbc148ab52ea519e2e5dc07655ffb687154a93420ac3d9b320349102436214ee26e558d94f4c8bcad1a94d611e7222f28c660e425385f3598c369332710066d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/rm/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/rm/thunderbird-68.5.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "e00c35d5f354f48491420e75191ca5776e365a46d37c68ff69618d2620be6e203ad2b81a7fc2483e4251a5a9815d5eccb1d12bb60e73d039160e156bab627d70"; + sha512 = "de01b86deacf5af7b44112147cbb13057137a70c77e4f3f0fd7b6f2286da3cfff14d11bed3d2e2501db51dae336e3fdeea0fca60b5af92b13de78d9dee98d46e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ro/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ro/thunderbird-68.5.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2cdf5dd8acc3a8834bb4f48fc58c6a5ebdddcfd94810d32848b98712b63d11a5e41afffa7555871343c90f817fd75f8bab090db0a0417a4b32e736fb67f0471f"; + sha512 = "03a9eae26c2b1d989d8f74b8bbe5237265f89c6632568be7282e1e9253fad3062502e1d64402f3fb57b1755a2b52be0fad65c0a099aa55affd623b594083f303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ru/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ru/thunderbird-68.5.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "6bb10e60e32dea4f809e358ae7be703e368674e74ffcfa27cde2fbb344bc938b8d3a1c4b5a2a966857058cfff4865e0cdb11ed1829c5b53ac97fb79bb60c65e7"; + sha512 = "a80a5cf3d34eb4e231c67182a17401783c75c5ccb0911fcc61a1cac8e007fca4e67004de02d9d10c5442dc2ad90837b6da562f37468dfbb84eef45981a6520aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/si/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/si/thunderbird-68.5.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c6989e4b4ee2f23c7d8a577305c9239c20de8754b46222ff86e0debc31fac8372f9a7b6c49a04742456c5bdd2326024180901070bc1015798f6ac28c17ab06dc"; + sha512 = "8cfaa054258a2b83fd140702bc59c3723495ff090f2dda06830d70548c425d47522cf574bbc9328887ba7621e3bb55e17bedcd314e54d5787d6ab9d00fd836ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sk/thunderbird-68.5.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "1001fce0276a38faf011ca3136961fda7f58a7f1b21401c0769443d9b3726ee67e6809732a1f3015b65d9bf2e54edc5a9ced5a65d5fa3dc556972d05340162af"; + sha512 = "c625263588f5b83e844c549aa182b996e7f99f3a2838c558d5a88ebfcb1cca966233c6f8f843c44651c001236d147d16b6ed3e26470c4d5c1b0b24c89472a46d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sl/thunderbird-68.5.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3179e9cb041080a0be5248c7454fbf5f26f939aed8ba79ea4552f2873731b7c8f371c066c34564b614b86be77918d234c4386de7a6fb7ad4960f416788d5d10e"; + sha512 = "9654edc706571afe5e1ccc54b1ca0a0b7d9dd800278d0ddeaebfd483334353d87e1b2ee99da0e6242fa81e4778d3d10573db48462d8f681dc9ae68814c4e7be8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sq/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sq/thunderbird-68.5.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "07fb5ba6aced0ce735144c6bcdf81a154ffdf1f56ca8ac6299a64d170c6a4c1308b92e7829fa402586ea8232ebdaa078d2438136aeebe585f374f43560e51553"; + sha512 = "d994da857c1e7c40c9df313f8135583885e728e93b80e0cdb0090bec49ddcf681b318a69dd553404f36c6ada6ecd4c70f4b7325ba092d700b60697941e855535"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sr/thunderbird-68.5.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5c77c8a00dcff96f4c59be212a118bbe427bb8a418d904d6e24f81f30add2f1cf6987f4b7b78660c9eaf636101518646c78d0addc93f9b8409b58a3d5fc8ca1c"; + sha512 = "d45178698af58c9496340739b658c3974c4f8ff1386c862bc5032598f7079193321a0752d01e8da74890069ed549285925529fbf84f10738c870ba6d0d1c6f19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sv-SE/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sv-SE/thunderbird-68.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "32c0be98bdd1392fdf42eb7d84ee5927b57ab0a1af8600349b2e51627e0b4fa4cf1f9782e4d16041d7c465a3126a18a11fc60dc15b214ee8c11babe9b3ab9c33"; + sha512 = "c79f1beb35445674b5c73914aa6379e415af42f90ae15afed18a748f5d7867be2ff6ade3e7ebee639954e65e5cc3d0abce158cf5cc0bf8740367f84067890751"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/tr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/tr/thunderbird-68.5.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7c143cc6e9cfdfa0d2db25ae37dc7878f97f193f3b611d07d343738c3dc61af1e09a4718391173c85df08365f9733666ca7b3711df2e8155aab8f960e1642bc5"; + sha512 = "a8d294506c9b255a6af29aa6df09bc87242db91b7d9e415a4f173564dc65f22cb3cc093a2e5b7c9b519aaacfdff99d855c00963bf3370cc8c4c8f0f8bc6b0328"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uk/thunderbird-68.5.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "db7b6115a26c6488f0019da6d7b8b944d415accbccc96b6ae475a06a35b610e4bea0474c89b6b618b2257b224beb0442fc96d40a2650da05970af94c2ac32d78"; + sha512 = "4c889e12d7855c5e57c01d894708577485d2ec0a50634160a682e517823780efe45968e1f2bfbc72f60fa5c690aad9d9bf9ff14686cff7f4696ca5704565f20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uz/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uz/thunderbird-68.5.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "bbbeb6f795439c0dcbc518c682bd22e76579313b6616edbd245d41459f6130a36d562d159fbaada3091cd4a0617efd2a787da147d79b8ee65dc4f14cdb9a3632"; + sha512 = "6a8253b9c1d9f07d932bf097c12d106c8b5993eacc4560ea3e7c55d58b754cc7ea09c0e86ce8937d14b400d6a095cd26c6794633243c4b53d7ece8bf9c1118f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/vi/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/vi/thunderbird-68.5.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "fc171feca694a222b8c18cbc56279a467e006e12a2bae9d342543ea110a4f3d6942ebe826aedcc1ee1b0820572b938cf56a7248c946b55376955bdab76d5f0e7"; + sha512 = "ae4e2c35bc0a31422b5a2befa3b8bcd4835c535f6690a4ea11b21f0b3c33e38c2ff707ab70ac5aaec5153c4b38d44e67375aaf66b27af3b0316af35b9b5fa22b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-CN/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-CN/thunderbird-68.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ffe6cedf7ab39695473274eb0a56bdb4264f3236b82377de57de9d17536353fbd9d311492aa5c3f91fecc007cc7f70a37611e52e44aa29b324af265a4f42b0e4"; + sha512 = "da4aa6e899ac51ffb94674248d11d7ce072c27b9bd1aa4a5bf79c48e16d5b437b838f2b7f709e56fceba338ad9172252ae82c283bb88bb41a73fec1f876fc24a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-TW/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-TW/thunderbird-68.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2c463698c7c540a6c0b87feaf12afea2a053157268a9e9a50b8cf222fb7b60ed4b2b8338da9d5ff6504d78b13e644020f82f9e45cdbe60f2d022bd8301ebbb31"; + sha512 = "47244d490e02d5d784e81b3641126b38307128d4d95096fce05717c8535318a0cd1567f20bd19b13922cf6c89ba3042350a8870360a25003a87d6ba6e3e0bccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ar/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ar/thunderbird-68.5.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "40e5955aa4cf8816f9b1f6b0b35b2a2a315c64165dbecff1a5467c59b1eba773becaa6e36369b984e133b3f24b26b95ff30b586172a187ceb63341bb1b88310c"; + sha512 = "6c9adce3d5e14ba5748dd8f60bafd72c5d910926de91810da7fbddb7054da822b79a79679b72125c483889383f19aa8a928d949de8785972a7067b0d23921072"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ast/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ast/thunderbird-68.5.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c9fa685b0545b4344867590504765e5bab29efcb1f4535b5955955a0454e67d48b8cec3f806b016389640e49849e6e45f49605680d80ae68d5a49da25aa6eb17"; + sha512 = "ff0090a6370069ff7668d650d16f3d9d24fa2325c46aecf9a3b8fc536e1138793e751fc524b63a5dec3e07c10aa77dcf09d066d9137aed1f35dcce1eb9c368e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/be/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/be/thunderbird-68.5.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "582cb49b43c878bff242e46efe8bcee8798c19ddf69021c5e27b7ff874a64004643c01be06083426968d3e0a690c095ef902fa8f89959bcddd88e76a11e1a00e"; + sha512 = "751527c55d73080fec112af6cd3f6161d848979b9b9f12f8cae4f4e28c2906f7aba5f6f2b02ad192f67f7b3b8713fbcaeba8960c53bc5bf1a9259e33f555fb94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/bg/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/bg/thunderbird-68.5.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "6cd97d683813e413fc57bcfd0edeb36fc6679474f7459b9a83156d546c2841d9947d9ea2304a1f02bc97a7dd030657a706756ab0e07f0ef0545a0d63c671b080"; + sha512 = "8b10b496a27a6bbe22e443213f69b0e3fdcb9bfd7fecbd509fc771ef1a22a66586febca2b303cb1a526b739ab303283086f14b314cd545fdd5f13bedb6d23fcb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/br/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/br/thunderbird-68.5.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "d1c604a702bfe245de5b8b577081677a643828eeee377da3c630e886ba7e71d513e012064ba426104d73943596ff7a551af982c0513d44b2e80f5b3ec7ae1b67"; + sha512 = "46ffb59df042c028366ae64c58c41a65c92d7aa4e50c24ebabe8141b2e78fdc6dbb5634574c7759ff0fd067cfe0ac7c9570bcd006d4c828a7dbdd00555178647"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ca/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ca/thunderbird-68.5.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "900608dc77fd43f7a4a8a08e7bedfdd0ad9fea6df3cc2a23697141a0240c3a186103c9f91dc730e8d79462413d3449cee14f64f73b54b563ef20daca99f4aec1"; + sha512 = "98bcdfdec73eba43ac67c571ecdda4622040b300b560f227ced55a197384d3462b89e844dca1fd310da7c326099fc072eb42adcc14d9519b8bb6b44647abd70c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cak/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cak/thunderbird-68.5.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fc58f312b7da60f8234bd7c53b22ba3835664fb187c66d556c32dbeabf30550ab612c89c36b86ea7eee6b4bbc03b6750b5fd35173115a85f90af417c09b1e54b"; + sha512 = "ca042a34871f95c82011e36ee700ebc60a3594229093ea2a38b28e6eeb6751c143227b9fc2dedac62608f42ffafe96aba4c600cd1e599794f2215adfa07e0270"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cs/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cs/thunderbird-68.5.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5262f6f39b7001eb921f405fc665bf13507b9dac57d3dc30fcfa2379442937bcdb0a693821d09a36585047b394e719217f4eb923ff386782276bf0786d35d078"; + sha512 = "ab121a73e77c9976e1cc4373340fce96abd419d387775e31da07bb9b4293e70fb6b753cf9904f3ab44f330b911664327e0d5d187dad8e2b46f702b112737bc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cy/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cy/thunderbird-68.5.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "ab29ef67b069b97c53dffe8b444fa2ae0b49aa894ef072a5bc95f43e2cbb1fa2bf2c84d0a734445d9af27fafcc50efc7a96c95d43cd01cc1c23433a748d48a16"; + sha512 = "8c82689dfd9602a05b3daed5c778a29b755ac09d191765961c1e113f65dc398400bea7e32b8cdbf83b4ec02f13f473dcca759591a508d7f8d5c642db334cce33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/da/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/da/thunderbird-68.5.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d4b0e640bc98ef085d79244a9a3120d55b39c621aadb0aed3973fa97baec0db11f906b2a08b88b98b114bb28831c77fea9e20a93ed9a3ae66f910a3425c553ef"; + sha512 = "9d23be92c0574ae9dbbf27058fac97a92657bebff46ed9889c7987469e9a376c4800027aa371a039e294ad5be29d650b4d11e64c0130476638d87638e4db57ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/de/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/de/thunderbird-68.5.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "bc82a9c40bb551852db0829dea239a133d78287e47edbd31df6053c36336f0a483f608deb5e095654e37cd9ecc234f9007ccb46cf08ba45f5e53335c040f4bda"; + sha512 = "1f7d247455dd540e81fa15d201491415e691ea6b66df9cf36716316625decb541d2046ac8aef5efd5435d5be4e1c44bc3dc8db9eb2023b5cff1446d678a764fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/dsb/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/dsb/thunderbird-68.5.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "63bc8569d8c4c7c77933838b53d58b23da35692d6e64229742abe78593e8bc26d21d81d275f2c2ac4531c498143c756768a1d2e830ed3ceb0586739fa1aabdc0"; + sha512 = "350b7378ba5b732e52af1234ce005c0ca0a5ffb286d4599c0f931dcf2c912740ea81bf6aa20c14960485be1360d1b9825ccb63c261836b389ac96088f3f77344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/el/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/el/thunderbird-68.5.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f41852a1ebf44ee534c43ceb054613775d33391563460fbf97f8fcd01a530d8738d5199690ff8aee48840b2ac5d2b79335ea4262c575441aacffb8ae54034c8d"; + sha512 = "510ff7b9d4549b9daefd69f25ad92d97ae516f5f2d0bddf459d11c260ba11d6c4cb2574bf81c08cb4d8c720c7c8164355fc1c3bf5055e99ec31ea85cfb677f0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-GB/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-GB/thunderbird-68.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "9324413cfbaf370b69d1addbdce63f8fac8668fb0354533b48993b78116c4b531f8bc73291b8764440d47808a582f8bdce64b3147660b8130392b14010895323"; + sha512 = "71cd61ffb1546dd8085c976d77c51d6231ad39afe9844d69ed697aa76e4c515780c264fdf2cc3644c9a22156054cbfad355b936f891465723ced665b14460604"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-US/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-US/thunderbird-68.5.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "163b78b9333435abf8bd0efc60451076b304269e13d95cc5ca3566d2fbde178317d6c66619353ab3576e8411e0752d1157400e3f0857d7dee8279877585ba5f9"; + sha512 = "dd2dbad0087646a87faac120d616d4b7a07f30fbbd95f657cf5ce4c08714c013522a1e05a55fb0a4f23302b02b63935b06e15e4c05f83fee18a0f482bccfaf79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-AR/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-AR/thunderbird-68.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4a96f59e3d9d3ee8675a4346a0997ff0170cb8202bbefcf60d1bf57f491eafbea5e56510310560f5e94688bede7e1767d9423b95f10724e42c3ef5cd49d54c7a"; + sha512 = "dff461bfcf287a7fa38826a2b8f629913b1816d631b122042673677eed1636370ff50112ba0316047af0be4ffa869924c842ec17155ee422d52d40d2f7769184"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-ES/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-ES/thunderbird-68.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "f7eaae51d0b8f0573e73eb434ebd1ac8f1b65421ad0b50a9f59fc4f329efec11aef40e8914ed4b97bdd9189bcc14777cdf6718b2c677515e4463804166460670"; + sha512 = "381f9d0aa2695a0acca17bfde5e3845a59ce233736ea49d24e7cdeecd557b6d7ca4544b709f80f6454bd518132f9d7bd0b85cd76d053107f6dd4eeb4fa30b4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/et/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/et/thunderbird-68.5.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e0489ddc529f1d898c373667e8abfa1e1443d2816e7981660310538b6433ac8ce108eb154541d390db59810b3cdfa43ab599f2aecdd7723c15c9410751542a48"; + sha512 = "976f673e2ca991204df9134c8b3b1bbac00470b6bb5c20bb6ae5f886d611d250a509162f332e33523ef0cb103b70461dde8137449cf565d1be0f2ff0c08075a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/eu/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/eu/thunderbird-68.5.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c36cf8f192319c7bce325d7c2f382e291863d9c4380afe776adb914e85fcbf74f09469f8a0e7880f2b7bc75897870245c0617fb92c811325b115a1269bf2ac5e"; + sha512 = "8ecc9b36630e67dd2a7505103c2f2574fa1e27f6e7719d4b47e06359b8a41f2b7d97c88adc47acb6ce67205d15ec292570fb580166d963b1dd4a5bb0934c18eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fi/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fi/thunderbird-68.5.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "acc72ed030d25404508d1f1cc1adaca4f5e202144effa5f8fa3d45aff72c534ab001d6f973dd9f8ff87b03ade9cbfe862d9b611dae6797ac1a0ee3c765ce86c6"; + sha512 = "54ef27d97d3712dab4616fa8a5d14392f39962bcf5113718d6de2f0fb8c6f801100c4e9d48f3129675ebbe7dc213486181ba28b96db56d4a23cc4e56ae68e276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fr/thunderbird-68.5.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b953148ef8402effc648843b6496986889e35595c5def7aa7c6e563a73f79bed65bad28569aaa2ea73afbe0ce3476d8a7f7fea7f547c13ef39bdb8e75c37ca87"; + sha512 = "becdddb3c175a2930bafb48a47227d8046c330ac22540662cc310bd734f89d09a693e1f355d49d00837ec9af43755c1eb7ea206e87cf550c25786086d1af5b1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fy-NL/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fy-NL/thunderbird-68.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d361f67487163acb0e6be8729777e7c37678287e5edd5303ee300f36bfcb62b2bb709c5a4677135ef347f6864985a9d4f9a7b986a7e0ce2987d2f650748b13e2"; + sha512 = "dc6d3c3ce455b315fdfc1dda46b79f9ae506af0c17d46b2d2d54a7e0f1f5281619acc861b73bd6caa23e2eedef88f0e7e9c279931584e3f4a1ddb1ba87c9d3d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ga-IE/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ga-IE/thunderbird-68.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5c2e87a6770cd71002e4d7518e23bbc6a2c498ea53487088a0015f8382b3348d170e44731fc3a6c05de585531f05db971c70a7fdb4dae64e8a7cc37da8487353"; + sha512 = "875529e87597870478e2552f06677cbff98226efdac4fc3de007662e7c0b1d575888f2bb3f23d5f5b14191793f54361d8950c041b2b82ddea5a0283b7c98b26e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gd/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gd/thunderbird-68.5.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "adf0cb3660d024853a683b2ba76a40db53e9ddefa0c8faaa250c30bf0ba4235981bf33a34e538b0a68a466645280824f51904ff2365994c8bb81493f42d5199f"; + sha512 = "47b7f5aea26aedaa3ba0ca52f53f86a339b51520d4f9150711cb37c72e6dbd2f1e0872d3eae8a9ddf821d3102025f82bdea7da5a9b077e817a80b31d345ed8b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gl/thunderbird-68.5.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0f34e45513ee591a303fcb3478518b66a58782e93dcf7ae717a24947cb7280e29631050aaaaaa388c9908fef9abf51f50c2d5f624375c762dd5eb76b5cabe45f"; + sha512 = "22e9ab419e7a80e498c459a89ac3cf39451dc95fda545ec9a0c74067d971b9f66457a6948918fb2cfd3e43a471b0f23e54bc880298813111f4cc77c5a99708fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/he/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/he/thunderbird-68.5.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1cf9cecce376aa8b1858546ff41418c26c126b00ce8d78eed82ce1504119173e8b2205fd27df7753b41d2fcffa9137bf8d89d79d74c106119be1ec7758aca115"; + sha512 = "7494ec5b2315748379a4b476add35cd6ce7f4afdd90a8503efd41188af189aa06b01345f21e5808720e2aeadc6729f7e65d4c5e16b5f301f04cf2646373a4712"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hr/thunderbird-68.5.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "3840bf39881b0ca61c37ff81cd5bd3e26ee9e033979e6ae3293c56bf08e328bae598de56abd54a75ca5f2f9af577b766066177108fb654b99410a4850dac8c84"; + sha512 = "e586ff015da79b357f5b3218a65ad13e861d5e73c32f6cf990aa100ca76c2f3519feb6592826271a9ffed3f3d51f40db373c2931c2dae169454710c7b5e36c07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hsb/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hsb/thunderbird-68.5.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "4c6fe533a358f1a49754dee7a7d0185f4c8595f92b3458db52511d29f0c24f5af4c4e9578394d337852c82f1d2c7be27240ef7b630462fd111c1e81fc52b5cc0"; + sha512 = "261970ba0021e09d4356284e52a8336db7448269a76714448ab5dc4f77dc91be8f2f8185915f4e1392912ca0464f4f699c754fdc2fe8080b1f68a3d210d085d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hu/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hu/thunderbird-68.5.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2077728c1d4978424cc8350fabfea488966c3ecae734ac2a1ec3a328ca05ed6e229f01d07b8c37123edb2b005a4f0ea57be8ce4d8e79269a8f94975d08583fd1"; + sha512 = "ce329a1900b7ce6093e06d522e141b228090f20f3917e9c154a4ee95611316bc1117224f2bfe5fd0add40a5b31ba39fc87fccba4d28edea83d0be05df7b87e70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hy-AM/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hy-AM/thunderbird-68.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "893d6c30af0873df0002efb3821bc515de446d785e0bbd03890b1e04033f09845961365666344f1c5a85a8698ee464c454e848296d50b82da5092821e8836751"; + sha512 = "756d4675e03753d1b3398b665247301997200e5f53215f9eabd17acb7502f282a1a5be3ea098ef8db4941ce7fd1a57165344c3036b786d3857b08b6613ba4088"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/id/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/id/thunderbird-68.5.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "32709627f0f046ae00a1adbbb99b6bf10f1d2358a8c8fd5a07646a7aa05cd9a89fd20a20b0fb286f28fb65fe87ff7f1ecce7a25fbc93f54ab3ac0712cd99a6e7"; + sha512 = "61538042a75ab0d987fc9289fa1f6e7bc74ab67cda7c78ab34ed72894f6bf3cb3cd05e0a5519b44348d050319c137113508d6f8b4845d0fcc668560acea74eb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/is/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/is/thunderbird-68.5.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "cb6b69787a6258d18733413a91e74071f003e7c920463535f22862d2a381bdfbaee658c19eb5ee6affeabec80bf9c8756d83bce8e3d59528ced62687b61febc6"; + sha512 = "c292cf7d04f84f6819950115f4d821f0212d87b6a8587468bb4c3c8978a98decf7dcf6e00d8db6bc557cd5e3e0621814caad65d5b86c645d82e670929d2da525"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/it/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/it/thunderbird-68.5.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b4cb0e7fc8cc0f462183ace8b0924e545baa233f97192f62083e323fb50f9156bcafe2a9822371b6b13ff3cdebce78e134cb855524b4b0e7979d6edcd0cac7d4"; + sha512 = "950f886bd49b8b90e8c26dd52352e13020ae752c0581d15666a512265270c39a406b2421832e3eb25eede3ff5a6129287f9c7f6849a99ba907190f257615a79c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ja/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ja/thunderbird-68.5.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "60eda8ddff44d4bad3bdfaf3e8a06b0f77b0a8de151eb76f47e376317b36ad9d240fe04a267fa8a202e56e82a1fb456a9f7954235de3ff8f6a2eb2f4f51f9730"; + sha512 = "9902c298bf470ef71d1d00372caf3d99a16ca61ca4ae448c838c936e6ddee674a2ca6359989c852d6de41ab550a7fdca9db829951740324eeda8dbb84fb51705"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ka/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ka/thunderbird-68.5.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "686318185f32947f60d451d01ccfddb8203997d077080da2bcb79a44eacdc59d688e8cc5c80fd46aab4b31bee7e13d0122fef169874403111186befddd0bdfe3"; + sha512 = "123cead4f30751e8422821690a436796d1b915e38c1b03aac8c2bb339df7f2d69d6794f4261971f73595add6db6a9887d0e5d4f0699459baeeec46cc687f1efa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kab/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kab/thunderbird-68.5.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9c278760cf0707045f02525c9320946d3c844b868550bc434f1bdda27eb52b6cc1d1c719aded4d741eb2a413899cd2c0627194febae09b39fa30a1f8fe56c880"; + sha512 = "c9d3a9d368b8db85f7c6c83ff64bb5b3ab37faab2b2cdf29d23b444dc42ef394a951d3dc4c164eed3c5c278f12c9d42ef8a5f7abcc320ed6b6e181ec540873d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kk/thunderbird-68.5.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e0ef017074e515d04bddda0d9720723d903f2ebe50c51b14c220adb06e4346fb49e2dab14d91e33099965bd6fd93547fbe591c34539cbb061f74f98a11d85421"; + sha512 = "2f3ba44e31fcacadf517de3d7e3c108335a75de4d54023de296d9329bba8cbb90d5989093e2d6afdfc8c7d2ce71db9e4bdfd72ff57d13bae281406cdb31a5670"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ko/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ko/thunderbird-68.5.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0aa2dcfb8f76250642a2c50dde421e99f881561c05028f7b167eb79226843b51a33cef56ee64b18cc5c4c1231a28b6747adc5aaaad46b228705f8459e5ae9ec5"; + sha512 = "8a8bf9ad7f9f2d7132d8f8635ef9e924c1f488ca9963157ab2b40230a63c48de9223cd3076489a7249894c2bb9a369dc7b80a09c05387fbb93906a562868a96e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/lt/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/lt/thunderbird-68.5.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ef95d5727f64da1013a0de99fae05d49b04cb8a78e9059231e609544106e9c1df45c34188cf879849028de40a35b488d6d00df4c11b81452de0353e5c224e724"; + sha512 = "79967b8b49ba9cc63fe379fa16395962e9fee3704c9513222934ff7bc6f89e3ea2dcae37f1f74c30bef962ddda450cac5fb9f9d0d6fdf65492aa8246f0334a02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ms/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ms/thunderbird-68.5.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "f3176d9cb1c2c3689fd70b9beb62c54ef8ff794724b57b074fbeac72ba575aa49675cca53960f588da01fddf9921be0b606baab6234ccdd930a9916805b08135"; + sha512 = "5f4c7d1a015aee2ab55a7387a621a793bd8c006740e2e97b2a0237c6947841cfe5cdc13a184614df58a082b0ab90fc581d84a31f98f0ef8c782a61326f027b1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nb-NO/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nb-NO/thunderbird-68.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ae78f3dba2009e70c9f9aa2449555ae4d854ffd22d83b9a41df41f62ebc090a255cd3ad60cf47938137625c7c726fd8dcb26f4136dc1732b22d2e3823967ab8f"; + sha512 = "60679df9cc0898513b343955d8e99362ea106599f98ddf238c694c7b35e4a260b3fa3b8a80a438d3a9891bfe4f1fee504d868e293f9c9eadf8d9042c280d7f08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nl/thunderbird-68.5.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8e52c3bedf7715a063e0f94ca9b1b927eeac872917f5b5fbbec90cb4a87b0aa73b28a809fc30f3a99169b2bff4ffb3b85234f5fbf5e97230eb2a099cee775715"; + sha512 = "ddc26e850a055a532107f7f6d329fc4385b0fbd68eea382574b8a3f2510d0b4c75587696b1994adc710ce286ddf41bc44f80cb42c8011171dcf813a4e3a992f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nn-NO/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nn-NO/thunderbird-68.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "3c51c7436e4b37d9b8df40543db1506aea856b99e10cb06805da4c3e45fcb67350222c90e5b6ebdeaa0318ac57357872e7d7932f910462466abd70f364bd8b72"; + sha512 = "0ebef3051ad541cb042ca3512c145bf46b5807990b3643d42d3d21f4c9c01fdb69872967381ce9790c70e59948dd991d83286bf41404312e62074d814d70a1fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pl/thunderbird-68.5.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "4996a28f8e7a6dbf351f93339abf3b30a85ee2311db7234c516c8994a90059169538b5c49d789195818ba7449ed308f7c4c7f8d54ce910aa10f0c5103fcbd992"; + sha512 = "3fab9ea4cf7c2e9ae5bb30059a2cd96c9cab281c87600927dba3b7a932e434f56c7359cc05e8f5c568232d53ba68fcf7d0164b59021a9ac2e502415129abc38e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-BR/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-BR/thunderbird-68.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "03f16be0561a16d943dcbd2fe898839060683a3dc16773647169b8da71d0c2ce235aeeb3021b474b4beb00b41bb56d486bccb870321adfafffe4aa2522d8cf39"; + sha512 = "7e5c5e2a1d5e8c940cdbb43fc394c75b97b5c1a3898e93647473b2dc751ac020225ba14ae812ddc1b0585fd4f6df747053d443d6538b21f96c7f8aab38521f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-PT/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-PT/thunderbird-68.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "03225c1bc7352c79c457f6be6149bba18b7682bc1e66fd6745613b80701b9138ba3fa4d1016b7cd2a0cb4fb804a9a5329a3768f9c9e53529e9279f64ddb4765c"; + sha512 = "a02fe6bad1dc6479df27ebe62a13ef2dc0a8f52bead42e65bee89e76bfa117c975fe1db612d0a577f7d8de84bb3ee82f27a3af247675721e4cb2e54467ff300a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/rm/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/rm/thunderbird-68.5.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f0d42c9add6b6ca9e3bd768ef56f320f57a8e62eaf0eec8f8d6d544bcf95c3549990940ce5b8b04e91998a012bae20d92f186c1f42273e5f7d1fed8e504ab082"; + sha512 = "56967ecc02e1cfa91d9c942d31e5ce1c3f16319732344aee385acd0f0f40882e65f02e2134bd53483c5459039982eb261b8d0b97aed5388fdb2754f58d2eb80f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ro/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ro/thunderbird-68.5.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "63bed7e8e38dc7dbc468fd668d8fac6ac8ee4502a035c881fc09176f2868c184712282bb9c3787da07fef0a27af3ec1f01e70f39711f90b4694ecd31be5173dc"; + sha512 = "20b6bc1e4fd8a595e42e468d94216aa0502aadb7de9cecd1a6da1fb14fc6008976551467ceb1e258fc87f98f4cfc485d91697817525a9a4ddb65626ccf6d989c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ru/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ru/thunderbird-68.5.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0f694746bdfc5e69fb82c57f401bca6b33661205c3cd0d94857d80432711d8396fbee8dfcd91c86022fdb693bbb1d096e5802077b49b98de008cea0c6fadc9cb"; + sha512 = "325649a3cb72ac2c3d8ef01caaf00123a2ffd5772ced16271cef8c08408e8828c9d96ca8ea81ca594f669b936b68f941d35adc1f00268447c782efca186a4a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/si/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/si/thunderbird-68.5.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ec2f4ca4a03ade9225307d3a7272cf8ccc6616612c3ac5ccdfa13219d33bb3e7d86dbe724d500b907a450d4a7cc1066cfc13a64e679486f8557016ed17d3f73d"; + sha512 = "164e0588d563b49a5652a97f21eaf513cbbf9af7ff97f93446f7ab99800d0cbcb61714e72e53feccb407992386a02715413c26c70ca46c45dd15ca7357e185a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sk/thunderbird-68.5.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "95e700d67d831f7ebc505ffd699a58641bd5ffd5d0f92ac09472d1fa7f24310c90551821149fde4782357c551487cc8dc999f5e94c8c55e8fbd24508e9c9edaa"; + sha512 = "fc2e7881caed0943f773a687653e2fc301ace20f59e7afb1074350cda33a1f18998789410c10d1f0aa9cb4ceae7268ab251efd7b5ca02a6949da6b613cd88780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sl/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sl/thunderbird-68.5.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "9be4327cf8696a8324c37ae80f0537322c1a2601db32e1a601155a25207b41db8d2b028d8da7b43b97986465b425689474fbb660eda97abf450216d50ae059c6"; + sha512 = "4dd57628b1d8c4518b889424f457c8f3b83bfbf6aca2cb9be403fe97020c25d4ef95e5d473c5d2be67a9caf184aa657c6c13a549cc3b7a2e5e29199c990cda8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sq/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sq/thunderbird-68.5.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "bdc02096793ea114f6e44532d6e998fc36ec4ff7df2dc21df1225241cdd24ddf6f4b4d005563f698b53c743b0abf0a6cdc276efac6cff6d4803df2a84f5c61f7"; + sha512 = "3cda84132453a2802738145fe38c9a36db162842bda1a1c2a125a1f8c4cfc6af2bbd4c629804e539f260af8964c34f5af77965d755ea0f327f7765cb43c525d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sr/thunderbird-68.5.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "a9ffbe1c59b0171fc8ed611f61e923c6f3d260ecac226c122f7d10bd858607b963fd1d89a896db0eb1754c3f75b18cbbe66c579c8da994490e04380c907c8fee"; + sha512 = "6d1a2da487b616716c680619528f9b70fc5ca9c4c34e3e66841ace9254cddae6fa63396bcb8dec6d961a29f0dc14aefc660e96f90a82c7801a1acb7b21275fe1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sv-SE/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sv-SE/thunderbird-68.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "86f3c1330fd0a7a920d9cb93f6387cdde69873c2b60bb9c71ff8fe3c3c6cb0cede8cb399d16a7d876708c3bf4142ae0188a1a7b0cd2dfa7a271fdee363a4ce4e"; + sha512 = "c2b3901a02f01123460816c566f62374ee954e18c411868059211d97d88b8d59c2452eb0fe1ecc940473b68f983dfb64f276a1f167178fba0d79a03235ac2758"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/tr/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/tr/thunderbird-68.5.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "4b6086ee5bc0925d790b552d9c812d8bc02e5cb2579cca9cdd94475c4dc3ed390c989b0f9f7b22d119caa64f76f45f8aee06c100a131874d86c03692e6979750"; + sha512 = "bdcfc20888bd896abdb2dd52ae5d4497a5a9706c01ae0193548707d326b74eb5af448db5d0e9e647c976024560e091305bc6d074ca8181886e27a2e201446204"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uk/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uk/thunderbird-68.5.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "27dccd517995446bff809c74b79900488694d2a999fdba38b39225bc38d212c2c394c0256c6146b9485af67da27c8dfe3a31e7e380e2e07d19abd1a8a086e44d"; + sha512 = "e71a965b6d3c7f90b97361435027af0b0fe194233500f127b2b9c75fbc2cd2c4ecf4228b537081a8ef61131e97e09b348198d3f59db7587a2e40a75b0e90686e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uz/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uz/thunderbird-68.5.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "344e0311945f8139be8be3413bbd0106ae4197f78d809ce729634ec888e50ea2153b13ddf14f5680224a5be049080d540a9db93f22c3ef141932ed0b4d769dd0"; + sha512 = "305c74f94e10565923073d157dbc6c62d03e6c1f5291cad5a0fcddf5cd158e99f8fd88b84c4c0e4a352139339398c80f84abebf486503030fa5a0dd4ac1d02ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/vi/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/vi/thunderbird-68.5.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b023e8afab96756e67b589d912d27de880fad51b9160645a3320ebd8d1af9a13c036d09fed7dd60bcf57876a93056cfa5f780c505b03bbd2825158e7c65aeb93"; + sha512 = "5578e325a16c94acae412ba403abbd7920b2b78e8e469c16175d27e44bebcd257dcf9c5e4454276422ebbc7797049f927e0a131be54aa11ceac1878fa1ac6c13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-CN/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-CN/thunderbird-68.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "52553bee4e8954ec54b3bc79f02149359d4a96b07a94a7f175abeba1795fc0c92e734631870b141fe4c9d094425d9e555b473bdbc1088a9845bbd49aaaebc181"; + sha512 = "a8f2a25bac4b312d2c61bf3e6a7fae6a98fb6ed43682005881157809083dbb1939afd6200b67236b3087148622978f5616d554202f586ffd60b5dadb65dad433"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-TW/thunderbird-68.4.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-TW/thunderbird-68.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3f792f3529d85eba88a76b7bb87f207ba3fefc91c7a6447554572c7e2666d19d41a5f65f811a60173a584ecfc192f9a38580a8861bd87cd5bb71adc582c4d825"; + sha512 = "9b463179ef67102ba10d440071b10a7e075c586c72cc352b2af05db9b048b46819a913547f5d0e0ca3a5c2e26110515d4a87db36f9765b59f64fd58f76662785"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 2011c35f1a7..8d4fa98ef72 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.4.2"; + version = "68.5.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "30k0qwg8vb6gj8j8kc198n3v0lzd6bj5khdcdhyw7wrsz0802k2lnai836p9ji5kybf9v8vs5n8g4ml1yl88sxvbg0692ijz8xmkbix"; + "15hi1193z6gp05dx6pqakxydyrxzls4xhfpvrk5qg458gxhdfj4qbgb33mcf944g7vf2hk5mk6nbgmdxlb9svw1n72ym2adyaca6n5v"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 4ec37dc5b54..d673c75764a 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.10"; + version = "2020.2"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq"; + sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 86ef850e291..da7c5d4af74 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -19,7 +19,9 @@ let pname = overrides.type; version = source.version; - patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; + patches = (source.patches or []) + ++ optional jackSupport ./mumble-jack-support.patch + ++ [ ./fix-rnnoise-argument.patch ]; nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch new file mode 100644 index 00000000000..78e8ed24d58 --- /dev/null +++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch @@ -0,0 +1,16 @@ +nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise +changed the argument rnnoise_create[1], + +[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f + +--- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 ++++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 +@@ -106,7 +106,7 @@ + #endif + + #ifdef USE_RNNOISE +- denoiseState = rnnoise_create(); ++ denoiseState = rnnoise_create(NULL); + #endif + + qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index c362de2daa3..53d073caee4 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39"; + sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8"; }; patches = [ diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index f3c7f8ccf18..65cf21c1611 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a"; }; - cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h"; + cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 077e4157ef5..6fe77790b74 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 = "15.1.3937"; + version = "15.2.2756"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "0v7733g795b15l2fya26sq710p0mg3wqhkahrg4w84y69p9zz2pf"; + sha256 = "1g6a7yadvc6gc660m62yibj2hrj7bwy26z5ww0gk6rwqlz048i97"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix index 00edcd411fd..fb2020f0d3a 100644 --- a/pkgs/applications/networking/sync/rclone/browser.nix +++ b/pkgs/applications/networking/sync/rclone/browser.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, cmake, qtbase }: +{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: stdenv.mkDerivation rec { pname = "rclone-browser"; - version = "1.2"; + version = "1.8.0"; src = fetchFromGitHub { - owner = "mmozeiko"; + owner = "kapitainsky"; repo = "RcloneBrowser"; rev = version; - sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7"; + sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 021eadb6476..88da2442ecf 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "9.1.0"; + version = "9.1.1"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k"; + sha256 = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index cb8cf76b998..85b688b0c4d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "grisbi"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha1 = "1159c5491967fa7afd251783013579ffb45b891b"; + sha1 = "crv3bga72v6fw07wad0nkrgdg4war66j"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 683cddde5ec..3cda543eda1 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.3.1"; + name = "homebank-5.3.2"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv"; + sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8bb58d2921..a7d8f4c7d40 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -57,23 +57,11 @@ 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"; + NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal" + + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; 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"; @@ -235,7 +223,6 @@ in (stdenv.mkDerivation rec { 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" @@ -296,7 +283,6 @@ in (stdenv.mkDerivation rec { "--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" @@ -310,8 +296,6 @@ in (stdenv.mkDerivation rec { "--with-system-openldap" "--with-system-coinmp" - "--with-alloc=system" - # Without these, configure does not finish "--without-junit" @@ -349,6 +333,7 @@ in (stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-qrcodegen" "--without-system-xmlsec" ]; @@ -390,4 +375,4 @@ in (stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") args) +}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 4df8ce1059b..bc329e5a8f8 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -336,11 +336,11 @@ md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-2.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; - sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; + name = "harfbuzz-2.6.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"; + sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966"; md5 = ""; - md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; + md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -364,18 +364,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-63_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"; - sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d"; + name = "icu4c-65_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"; + sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948"; md5 = ""; - md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz"; + md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz"; } { - name = "icu4c-63_1-data.zip"; - url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"; - sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c"; + name = "icu4c-65_1-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"; + sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6"; md5 = ""; - md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip"; + md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -511,6 +511,13 @@ md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { + name = "libffi-3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"; + sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"; + md5 = ""; + md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz"; + } + { name = "libgpg-error-1.27.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; @@ -546,18 +553,18 @@ md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +588,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.4.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"; - sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81"; + name = "mdds-1.5.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"; + sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d"; md5 = ""; - md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2"; + md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -623,11 +630,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,18 +665,18 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { - name = "liborcus-0.14.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"; - sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f"; + name = "liborcus-0.15.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"; + sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2"; md5 = ""; - md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz"; + md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; @@ -686,11 +693,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3794.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; - sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; + name = "pdfium-3963.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"; + sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895"; md5 = ""; - md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; + md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +714,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +728,18 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.7.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; + sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; + md5 = ""; + md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + } + { + name = "QR-Code-generator-1.4.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"; + sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +819,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix index 464965121d9..60e08735d2e 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -1,4 +1,10 @@ -{ stdenv, ... }: -attrs: { - NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma"; +{ stdenv, kdeIntegration, ... }: +attrs: +{ + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + ''; + configureFlags = attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kf5") + ]; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 28bf127c398..ec7f9e52bbb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -7,9 +7,9 @@ rec { }; major = "6"; - minor = "3"; - patch = "0"; - tweak = "4"; + minor = "4"; + patch = "1"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,19 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; + sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; + sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; + sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; }; } diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index b5a721b5679..78482326be2 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -1,10 +1,10 @@ [ { - name = "libabw-0.1.2.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; - sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; + name = "libabw-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; md5 = ""; - md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -147,11 +147,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; - sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + name = "expat-2.2.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; + sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; md5 = ""; - md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; + md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -462,11 +462,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2019-04-03.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2"; - sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d"; + name = "language-subtag-registry-2019-09-16.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2"; + sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a"; md5 = ""; - md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2"; + md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -539,25 +539,25 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { - name = "libxml2-2.9.9.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz"; - sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871"; + name = "libxml2-2.9.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; + sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; md5 = ""; - md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz"; + md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; } { - name = "libxslt-1.1.33.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz"; - sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"; + name = "libxslt-1.1.34.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"; + sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"; md5 = ""; - md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz"; + md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.45-with-nspr-4.21.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; - sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; + name = "nss-3.47.1-with-nspr-4.23.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"; + sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64"; md5 = ""; - md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; + md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2r.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; - sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; + name = "openssl-1.0.2t.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"; + sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc"; md5 = ""; - md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; + md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -707,11 +707,11 @@ md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz"; } { - name = "poppler-0.74.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz"; - sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f"; + name = "poppler-0.82.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"; + sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df"; md5 = ""; - md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz"; + md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz"; } { name = "postgresql-9.2.24.tar.bz2"; @@ -721,11 +721,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.5.7.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz"; - sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc"; + name = "Python-3.5.9.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"; + sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049"; md5 = ""; - md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz"; + md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -805,11 +805,11 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; - sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; + name = "libvisio-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; md5 = ""; - md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; } { name = "libwpd-0.10.3.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix index 7192af01949..c0880aa3ecb 100644 --- a/pkgs/applications/office/libreoffice/src-still/override.nix +++ b/pkgs/applications/office/libreoffice/src-still/override.nix @@ -1,6 +1,12 @@ -{ stdenv, ... }: +{ stdenv, kdeIntegration, ... }: attrs: { - configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags; + postConfigure = attrs.postConfigure + '' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx' + ''; + configureFlags = stdenv.lib.remove "--without-system-qrcodegen" + (attrs.configureFlags ++ [ + (stdenv.lib.enableFeature kdeIntegration "kde5") + ]); 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 index a27087a1b05..d3da7d09b70 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -7,8 +7,8 @@ rec { }; major = "6"; - minor = "2"; - patch = "6"; + minor = "3"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,18 +17,19 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq"; + sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz"; }; + # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh"; + sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz"; + sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6"; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 30569512129..fa2c67709fb 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.12.15"; + version = "20.2.5"; 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 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 + sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 73a7d9bd35b..ed4903d6474 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "972"; + version = "974"; edition = "2018"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1"; + sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn"; }; archive = "office${edition}.tar.lzma"; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 28548091f6e..ee494092884 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.38.2"; + version = "0.39.4"; in { @@ -30,7 +30,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa"; + sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9"; }; # Fetch from source repo, no longer included in release. @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61"; + sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index e8241ede96c..ecb9403be36 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ "0x4A6F" ]; + maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index dcbf3522e39..f88687b076e 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20191221"; + version = "20200213"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "1f4h45cbaq3rssl95xax8gn2bm1slnsbgds479db46czgq6y1qhy"; + sha256 = "189kg3425wggib1cggcj49bk01pq3j4b8mks7najpp1rjsl5f2i1"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 48c53ccc59f..b7705cff026 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.08.51"; + version = "4.1.09"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0wki9d19q8rkjxcd3dz3k0a395gmbnji4fxlhw6dpcyqpfw88fcs"; + sha256 = "1pdwm8na2yq6wj76057sbfxr5cb5avnm26if8spsp5fkfw9yylwp"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index ef4bd6129a8..a205cec714d 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,16 +1,18 @@ -{ stdenv +{ lib +, mkDerivation , fetchFromGitHub , pkgconfig , cmake , boost , fftwFloat -, qt5 , gnuradio , liquid-dsp +, qtbase }: -stdenv.mkDerivation { - name = "inspectrum-unstable-2017-05-31"; +mkDerivation { + pname = "inspectrum"; + version = "unstable-2017-05-31"; src = fetchFromGitHub { owner = "miek"; @@ -19,19 +21,18 @@ stdenv.mkDerivation { sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - cmake - qt5.qtbase fftwFloat boost gnuradio liquid-dsp + qtbase ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Tool for analysing captured signals from sdr receivers"; - homepage = https://github.com/miek/inspectrum; + homepage = "https://github.com/miek/inspectrum"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index bfdf5a1bb17..a6c45f8aa44 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -1,16 +1,25 @@ -{ stdenv, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: +{ stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }: -stdenv.mkDerivation rec { +let + htslibPatch = fetchpatch { + url = "https://github.com/dellytools/delly/commit/0e5c710b0c5ea790bb39699d4cbd49cf4fb86f14.diff"; + sha256 = "09bz1qqvzhdzm99hf9zgrv80kq9jlr1m2mdvx96p2hk5lpnbdl7y"; + excludes = [ "src/htslib" ]; + }; + +in stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "18gm86j1g1k4z1cjv2m5v9rsl1xqs2w3dhwcsnzx2mhkrvmlc4i1"; + sha256 = "14bkmixz7737xj192ww96s3a20zc7xs7r04db8avw3ggi3i1s1cs"; }; + patches = [ htslibPatch ]; + buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; EBROOTHTSLIB = htslib; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 1a6555e0d63..5a1bb187886 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.46.1"; + version = "0.46.2"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z"; + sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb"; }; nativeBuildInputs = [ autoconf cmake ]; buildInputs = [ hdf5 zlib ]; + cmakeFlags = [ "-DUSE_HDF5=ON" ]; + # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160 enableParallelBuilding = false; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index c9e546dc2ce..b47ce6ac3a9 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1045"; + version = "1047"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0x2wrm52ca935n3yc486m8yy59ap34w1x9h3csjca3jab5agnjkc"; + sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 033f78609e9..4c8b768a56a 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, + libminc, libjpeg, nifticlib, zlib }: stdenv.mkDerivation rec { - pname = "minc-tools"; - name = "${pname}-2017-09-11"; + pname = "minc-tools"; + version = "unstable-2019-12-04"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "5b7c40425cd4f67a018055cb85c0157ee50a3056"; - sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7"; + rev = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94"; + sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng"; }; + patches = [ ./fix-netcdf-header.patch ]; + nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ libminc libjpeg zlib ]; - propagatedBuildInputs = with perlPackages; [ perl TextFormat ]; + propagatedBuildInputs = [ perl TextFormat ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ]; + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" + "-DZNZ_INCLUDE_DIR=${nifticlib}/include/" + "-DZNZ_LIBRARY=${nifticlib}/lib/libznz.a" + "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti/" + "-DNIFTI_LIBRARY=${nifticlib}/lib/libniftiio.a" ]; postFixup = '' for prog in minccomplete minchistory mincpik; do diff --git a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch new file mode 100644 index 00000000000..89c7564f8b6 --- /dev/null +++ b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch @@ -0,0 +1,12 @@ +diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h +index 14c95cd..117ab26 100644 +--- a/progs/mincdump/mincdump.h ++++ b/progs/mincdump/mincdump.h +@@ -3,6 +3,7 @@ + * See netcdf/COPYRIGHT file for copying and redistribution conditions. + * $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $ + *********************************************************************/ ++#include <netcdf_meta.h> + + + /* error checking macro */ diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index ba20695ec44..b27af67c974 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 = "20.3.0"; + version = "20.4.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1y2vh1n80mrrbxqbhxfag8h4lisarbw8h3labmh3ajrfan7bmhql"; + sha256 = "12kygxq24in7hbp7shkx1baqig8rwmzvv0d3kc3ld9sj9hb0a2n1"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -45,4 +45,4 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 0b627dbb23a..a60f8db388a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -35,8 +35,8 @@ let python = python3; wxPython = python3Packages.wxPython_4_0; - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; - kicad-base = callPackage ./base.nix { + libraries = callPackages ./libraries.nix versionConfig.libVersion; + base = callPackage ./base.nix { pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { inherit pname; version = versions.${baseName}.kicadVersion.version; - src = kicad-base; + src = base; dontUnpack = true; dontConfigure = true; dontBuild = true; @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = optionals (scriptingSupport) [ pythonPackages.wrapPython ]; - # wrapGAppsHook added the equivalent to ${kicad-base}/share + # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it makeWrapperArgs = [ - "--prefix XDG_DATA_DIRS : ${kicad-base}/share" + "--prefix XDG_DATA_DIRS : ${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}" @@ -73,13 +73,13 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--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" + "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${kicad-libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 @@ -88,30 +88,30 @@ stdenv.mkDerivation rec { # 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 + # not sure if anything has to be done with the other stuff in base/bin # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${kicad-base} $pythonPath" + optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" '' + - '' makeWrapper ${kicad-base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' + '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' + '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' + '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' + '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' + '' makeWrapper ${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 '' + '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' + - '' makeWrapper ${kicad-base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' + '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" '' ; diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index b4f744c47ef..7dc0b008b6c 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -5,13 +5,12 @@ # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping -# if you get something like "tar: no space left on device" -# you may need a bigger tmpfs, this can be set as such -# services.logind.extraConfig = "RuntimeDirectorySize=8G"; -# this is most likely only needed for the packages3d -# this can be checked without that config by manual TOFU -# copy the generated items from ,versions.nix to versions.nix -# then nix-build and see what it actually gets +# by default nix-prefetch-url uses XDG_RUNTIME_DIR as tmp +# which is /run/user/1000, which defaults to 10% of your RAM +# unless you have over 64GB of ram that'll be insufficient +# resulting in "tar: no space left on device" for packages3d +# hence: +export TMPDIR=/tmp # if something goes unrepairably wrong, run 'update.sh all clean' @@ -19,7 +18,8 @@ # support parallel instances for each pname # currently risks reusing old data # no getting around manually checking if the build product works... -# if there is, default to commiting +# if there is, default to commiting? +# won't work when running in parallel? # remove items left in /nix/store? # get the latest tag that isn't an RC or *.99 diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index ac273a1265c..6b9a981a87c 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-01-08"; + version = "2020-02-10"; src = { - rev = "ca34ade00c554157f106fde97af5f08a202808ef"; - sha256 = "0xx5qkc5pi3qdrdikgq3902ws8zilv2476fb4bbgh95d9wpgr35v"; + rev = "1190e60dd426d246661e478db3287f266ec6cda2"; + sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; }; }; libVersion = { - version = "2020-01-08"; + version = "2020-02-10"; libSources = { - i18n.rev = "e7439fd76f27cfc26e269c4e6c4d56245345c28b"; - i18n.sha256 = "1nqm1kx5b4f7s0f9q8bg4rdhqnp0128yp6bgnrkia1kwmfnf5gmy"; - symbols.rev = "ad58768b88d564fd188c6667841adec436da53f2"; - symbols.sha256 = "1rdplf04bff0hmgjwr81fbcr9nkqi21n0n88nzs5fdp73mqiywcy"; + i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; + i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; + symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; + symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "973867de7f33f202e9fd1b3455bd1f7e7fe4a074"; - footprints.sha256 = "0yvidpnqbfxjdwaiscl5bdchsg0l4d769vp456dc8h0f3802mibi"; - packages3d.rev = "c2b92a411adc93ddeeed74b36b542e1057f81a2a"; - packages3d.sha256 = "05znc6y2lc31iafspg308cxdda94zg6c7mwslmys76npih1pb8qc"; + footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; + footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; + packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; + packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; }; }; }; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index c47d055a32b..7163c201dbf 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.026"; + version = "4.028"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1b4zxwgd780yxql11r2333qhl7ki5jxh9jxlyhv9xqml9aq8myva"; + sha256 = "1rl92jnayhc1j47gjxdz2zf1by9vzlawbyw9mf1d7d2y22dqak1l"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index e9ef16b2392..2ac7c208a5f 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -4,6 +4,9 @@ rustPlatform.buildRustPackage rec { pname = "elan"; version = "0.7.5"; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 9bf54a5f094..726bac5c50e 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { - owner = "leanprover"; + owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0zpnfg6kyg120rrdr336i1lymmzz4xgcqpn96iavhzhlaanmx55l"; + sha256 = "0m7knf1hfbn2v6p6kmqxlx8c40p5nzv8d975w2xwljaccc42j1yp"; }; nativeBuildInputs = [ cmake ]; @@ -27,3 +27,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thoughtpolice gebner ]; }; } + diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index f91b091439f..5e770cec13b 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.17.3"; + version = "1.17.5"; pname = "clp"; src = fetchurl { url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0ws515f73vq2p4nzyq0fbnm4zp9a7mjg54szdzvkql5dj51gafx1"; + sha256 = "0y5wg4lfffy5vh8gc20v68pmmv241ndi2jgm9pgvk39b00bzkaa9"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a08c0ee3403..de84d35c2e8 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-570-0"; + version = "5-0-573-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 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37"; + sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index dad1d245b10..4c759308a5c 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { }; cargoPatches = [ ./cargo-lock.patch ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0q2g1hkqyzq9lsas4fhsbpk3jn5hikchh6i1jf9c08ca2xm136c2"; buildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 81b779f0206..fd4c9793d38 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.50"; + version = "1.51"; 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.50.tar.gz"; - sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk"; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz"; + sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix new file mode 100644 index 00000000000..69b44625f95 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: + +buildPythonApplication rec { + pname = "bump2version"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "c4urself"; + repo = "${pname}"; + rev = "refs/tags/v${version}"; + sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; + }; + + checkInputs = [ pytest testfixtures ]; + # X's in pytest are git tests which won't run in sandbox + checkPhase = '' + pytest tests/ -k 'not usage_string_fork' + ''; + + meta = with stdenv.lib; { + description = "Version-bump your software with a single command"; + longDescription = '' + A small command line tool to simplify releasing software by updating + all version strings in your source code by the correct increment. + ''; + homepage = "https://github.com/c4urself/bump2version"; + license = licenses.mit; + maintainers = with maintainers; [ jefflabonte ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fc3af0a933b..0f6dea75c6f 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -22,6 +22,8 @@ let bitbucket-server-cli = callPackage ./bitbucket-server-cli { }; + bump2version = pkgs.python37Packages.callPackage ./bump2version { }; + darcsToGit = callPackage ./darcs-to-git { }; delta = callPackage ./delta { }; @@ -42,6 +44,10 @@ let git-fame = callPackage ./git-fame {}; + git-filter-repo = callPackage ./git-filter-repo { + pythonPackages = python3Packages; + }; + gita = python3Packages.callPackage ./gita {}; # The full-featured Git. @@ -192,6 +198,8 @@ let transcrypt = callPackage ./transcrypt { }; + ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; + } // lib.optionalAttrs (config.allowAliases or true) (with self; { # aliases gitAnnex = git-annex; 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 df2ca22132e..36ce0a484b3 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2"; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 02f830a3f07..19f97e8994c 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a"; + sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc"; }; modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h"; @@ -29,7 +29,7 @@ buildGoModule rec { meta = with lib; { description = "GitHub CLI tool"; - homepage = "https://github.com/cli/cli"; + homepage = "https://cli.github.com/"; license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 169315d1e2e..f07e05e23e2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd"; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix index 418cf2e5866..635393b1deb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix @@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9"; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 77fc0428115..571125ee113 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -26,6 +26,9 @@ buildRustPackage rec { sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy"; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix new file mode 100644 index 00000000000..af21296cffa --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + pname = "git-filter-repo"; + version = "2.25.0"; + + src = fetchurl { + url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a"; + }; + + buildInputs = [ pythonPackages.python ]; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t $out/bin git-filter-repo + install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/newren/git-filter-repo"; + description = "Quickly rewrite git repository history (filter-branch replacement)"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} 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 61852684387..54f7e935ea3 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 @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2"; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 99be85e09b1..e50efb5c6b7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -13,6 +13,9 @@ buildRustPackage rec { sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 7635a96eca5..1e343cdb180 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk"; buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index ff0f702269c..4e6e450657d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "git-remote-gcrypt"; - version = "1.2"; + version = "1.3"; rev = version; src = fetchFromGitHub { inherit rev; owner = "spwhitton"; repo = "git-remote-gcrypt"; - sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy"; + sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 2ceac55bf5c..b93163e239a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -15,9 +15,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; }; - cargoSha256 = "0jbsz7r9n3jcgb9sd6pdjwzjf1b35qpfqw8ba8fjjmzfvs9qn6ld"; - - verifyCargoDeps = true; + cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; buildInputs = with stdenv; lib.optional isDarwin Security; 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 c9775f14081..a7f13905e7c 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -145,6 +145,12 @@ stdenv.mkDerivation { ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ + mkdir -p $out/share/zsh/site-functions + ln -s $out/share/git/contrib/completion/git-completion.zsh $out/share/zsh/site-functions/_git + + # Patch the zsh completion script so it can find the Bash completion script. + sed -i -e "/locations=(/a \${"\t\t"}'$out/share/git/contrib/completion/git-completion.bash'" \ + $out/share/git/contrib/completion/git-completion.zsh # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ @@ -228,6 +234,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ + -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk 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 45b427341a2..92d7fd4e3da 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 @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.16"; + version = "1.0.17"; in stdenv.mkDerivation { pname = "svn-all-fast-export"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l"; + sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index 9d05fb83031..51ae994b43b 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 642afa350c6..7af3e70f211 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "1.13.9.4"; + version = "2.3"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0kkb3s472zvmz5xign25rgv7amdzhjb1wvchqxaf80g4913rw583"; + sha256 = "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 6e83e5d2566..e7e73d4c48a 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,9 +1,9 @@ { - "version": "12.7.5", - "repo_hash": "0jlhaakpg6bycajbhm3100gs2ka9f6iv529dvj3y1k6gysd2dpvs", + "version": "12.7.6", + "repo_hash": "092c6n2jg8himmcc23gh3gvmx0y272kwk00cj1s2k4b92dlzvm18", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.7.5-ee", + "rev": "v12.7.6-ee", "passthru": { "GITALY_SERVER_VERSION": "1.83.0", "GITLAB_PAGES_VERSION": "1.12.0", diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 8853dded8f2..f710523103f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1319,8 +1319,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; }; } { diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 5342a0697ab..be1e8ff841d 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.20.1"; + version = "3.20.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55"; + sha256 = "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 6b9ada0ebb0..3edfe399434 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.2.2"; + version = "5.3"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "0fy00q0k4f0q64jjlnb7cl6m0sglivq9jgdddsp5sywc913zzigz"; + sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; }; format = "other"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 32222c12c7c..c6c0f0a52f4 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec { sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q"; }; + cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v"; + + # N.B. The cargo depfile checker expects us to have unpacked the src tarball + # into the standard dirname "source". + cargoDepsHook = '' + ln -s ${pname}-${version} source + ''; + + # TODO: Delete once pijul fixes upstream: + # https://nest.pijul.com/pijul_org/pijul/discussions/447 postPatch = '' - pushd ../${pname}-${version}-vendor/thrussh/ + pushd ../${pname}-${version}-vendor.tar.gz/thrussh/ patch -p1 < ${./thrussh-build-fix.patch} substituteInPlace .cargo-checksum.json --replace \ 9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \ @@ -45,8 +55,6 @@ in rustPlatform.buildRustPackage rec { doCheck = false; - cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k"; - meta = with stdenv.lib; { description = "A distributed version control system"; homepage = https://pijul.org; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index a225c23ceeb..0a1f4c72da6 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { export HOME=$(mktemp -d) ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528"; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 76edc1b3e64..07935336c1e 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,14 +4,14 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.48.0"; + version = "0.52.5"; buildWorker = src: buildGoModule { inherit src version; pname = "builds-sr-ht-worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; - modSha256 = "1jm259ncw8dgqp0fqbjn30c4y3v3vwqj41gfh99jx30bwlmpgfax"; + modSha256 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424"; }; in buildPythonPackage rec { inherit version; @@ -20,7 +20,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "1z5bxsn67cqffixqsrnska86mw0a6494650wbi6dbp10z03870bs"; + sha256 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 67486bd28f3..8a6c3e6feb4 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,24 +1,24 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests -, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic +, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic , importlib-metadata , sassc, nodejs , writeText }: buildPythonPackage rec { pname = "srht"; - version = "0.54.4"; + version = "0.57.2"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "0flxvn178hqd8ljz89ddis80zfnmzgimv4506w4dg2flbwzywy7z"; + sha256 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf"; }; node_modules = fetchNodeModules { src = "${src}/srht"; nodejs = nodejs; - sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; + sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1"; }; patches = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { pygments requests sqlalchemy - flask_login + cryptography beautifulsoup4 sqlalchemy-utils @@ -57,17 +57,7 @@ buildPythonPackage rec { cp -r ${node_modules} srht/node_modules ''; - preCheck = let - config = writeText "config.ini" '' - [webhooks] - private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI= - - [meta.sr.ht] - origin=http://meta.sr.ht.local - ''; - in '' - cp -f ${config} config.ini - ''; + dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { homepage = https://git.sr.ht/~sircmpwn/srht; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index a61f35b9ee1..a078c5acb4f 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, buildPythonPackage , python -, srht, pyyaml, PyGithub, cryptography }: +, srht, pyyaml, PyGithub }: buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.12.3"; + version = "0.13.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; rev = version; - sha256 = "0lpc8jpyz1rg3g98546wlhr27b15g32lds77hl42aixv5f5b8lc9"; + sha256 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10"; }; patches = [ @@ -22,7 +22,6 @@ buildPythonPackage rec { srht pyyaml PyGithub - cryptography ]; preBuild = '' diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index b580e89c747..93ab499e14e 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -4,23 +4,39 @@ , srht, pygit2, scmsrht }: let - version = "0.35.6"; + version = "0.43.3"; buildShell = src: buildGoModule { inherit src version; - pname = "git-srht-shell"; + pname = "gitsrht-shell"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell"; - modSha256 = "1v4npijqgv09ssrxf1y1b3syb2fs7smy7k9rcj3ynsfrn9xgfd9y"; + modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv"; }; buildDispatcher = src: buildGoModule { inherit src version; - pname = "git-srht-dispatcher"; + pname = "gitsrht-dispatcher"; goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch"; modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1"; }; + + buildKeys = src: buildGoModule { + inherit src version; + pname = "gitsrht-keys"; + goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys"; + + modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f"; + }; + + buildUpdateHook = src: buildGoModule { + inherit src version; + pname = "gitsrht-update-hook"; + goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook"; + + modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp"; + }; in buildPythonPackage rec { inherit version; pname = "gitsrht"; @@ -28,7 +44,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "0j8caqbzdqkgc1bdhzz4k5hgh8lhsghfgwf46d19ryf83d8ggxqc"; + sha256 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w"; }; patches = [ @@ -52,6 +68,8 @@ in buildPythonPackage rec { mkdir -p $out/bin cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch + cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys + cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index fd5c3145db0..2d57012d071 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.16.2"; + version = "0.21.1"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "02bzy31zplnlqg8rcls5n65q1h920lhy6f51w89w1kskdw7r2mhy"; + sha256 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index d050895ca23..a7915a917ba 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,15 +1,15 @@ { stdenv, fetchgit, buildPythonPackage , python -, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }: +, srht, asyncpg, aiosmtpd, pygit2, emailthreads }: buildPythonPackage rec { pname = "listssrht"; - version = "0.38.3"; + version = "0.40.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "020s6kglm7620pjn2j7fxvaqd5lpz7y7x0wf014jsrm71l6w0rla"; + sha256 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags"; }; patches = [ @@ -22,7 +22,6 @@ buildPythonPackage rec { srht pygit2 asyncpg - unidiff aiosmtpd emailthreads ]; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index df4e62a7ac2..7ed4c6a5a24 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.13.5"; + version = "0.14.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; rev = version; - sha256 = "1hfxhczppn8yng6m3kdzj9rn6zjhwpm6dq3pzaiaii92b3d4cyh3"; + sha256 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index a5458b0b864..17b4c91446f 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "metasrht"; - version = "0.37.0"; + version = "0.41.10"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "1jf3h2v27cbam8bwiw3x35319pzp0r651p8mfhw150jvskyvmkmr"; + sha256 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p"; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index 4e397c649f9..b629ca9bca3 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.7.3"; + version = "0.9.2"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "15689gk37djcwdjb636d97k0il2zpdpksb95l9l4d43wipd7x5qi"; + sha256 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4"; }; patches = [ diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index c5209cee46b..add791da284 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.16.0"; + version = "0.18.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "0jny8ihn49n7bpw5nhdrfha78yzpxp277l50y1lj142r59kwmh22"; + sha256 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134"; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -25,22 +25,7 @@ buildPythonPackage rec { export PKGVER=${version} ''; - # No actual? tests but seems like it needs this anyway - preCheck = let - config = writeText "config.ini" '' - [webhooks] - private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI= - - [builds.sr.ht] - origin=http://builds.sr.ht.local - oauth-client-id= - - [meta.sr.ht] - origin=http://meta.sr.ht.local - ''; - in '' - cp -f ${config} config.ini - ''; + dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index a7703bd0729..572c2919b16 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.51.13"; + version = "0.55.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; rev = version; - sha256 = "19gywq5j7wlpk7j2whm2ivz0z0i3j50n7k7bx29pghndl7l43c18"; + sha256 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5"; }; patches = [ @@ -31,33 +31,13 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + # pytest tests fail checkInputs = [ pytest factory_boy ]; - installCheckPhase = let - config = writeText "config.ini" '' - [webhooks] - private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI= - - [todo.sr.ht] - origin=http://todo.sr.ht.local - oauth-client-id= - oauth-client-secret= - - [todo.sr.ht::mail] - posting-domain= - - [meta.sr.ht] - origin=http://meta.sr.ht.local - ''; - in '' - cp -f ${config} config.ini - - # pytest tests fail - # pytest tests/ - ''; + dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f3ddf8059b2..aab47ed1327 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.3.0"; in +let version = "2.4.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0"; + sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; }; dontConfigure = true; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 64b9613363c..c3f5d7d796d 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: +{ mkDerivation, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "bino"; version = "1.6.7"; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 1f2b2535931..027c156be35 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "catt"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "0n6aa2vvbq0z3vcg4cylhpqxch783cxvxk234647knklgg9vdf1r"; + sha256 = "08rjimcy9n7nvh4dz9693gjmkq6kaq5pq1nmjjsdrb7vb89yl53i"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix new file mode 100644 index 00000000000..82774ada09e --- /dev/null +++ b/pkgs/applications/video/jftui/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, fetchpatch, clang, + pkg-config, curl, mpv, yajl }: + +stdenv.mkDerivation rec { + pname = "jftui"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "Aanok"; + repo = pname; + rev = "v${version}"; + sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + }; + + patches = [ + # Remove this patch with next version + (fetchpatch { + name = "curl-capability-check-fix"; + url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; + sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; + }) + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + clang + curl + mpv + yajl + ]; + + installPhase = '' + install -Dm555 build/jftui $out/bin/jftui + ''; + + meta = with stdenv.lib; { + description = "Jellyfin Terminal User Interface "; + homepage = "https://github.com/Aanok/jftui"; + license = licenses.unlicense; + maintainers = [ maintainers.nyanloutre ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix new file mode 100644 index 00000000000..0d263f402b3 --- /dev/null +++ b/pkgs/applications/video/manim/default.nix @@ -0,0 +1,64 @@ +{ lib, buildPythonApplication, fetchFromGitHub, pythonOlder, file, fetchpatch +, cairo, ffmpeg, sox, xdg_utils, texlive +, colour, numpy, pillow, progressbar, scipy, tqdm, opencv , pycairo, pydub +, pbr, fetchPypi +}: +buildPythonApplication rec { + pname = "manim"; + version = "0.1.10"; + + src = fetchPypi { + pname = "manimlib"; + inherit version; + sha256 = "0vg9b3rwypq5zir74pi0pmj47yqlcg7hrvscwrpjzjbqq2yihn49"; + }; + + patches = [ ./remove-dependency-constraints.patch ]; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + colour + numpy + pillow + progressbar + scipy + tqdm + opencv + pycairo + pydub + + cairo sox ffmpeg xdg_utils + ]; + + # Test with texlive to see whether it works but don't propagate + # because it's huge and optional + # TODO: Use smaller TexLive distribution + # Doesn't need everything but it's hard to figure out what it needs + checkInputs = [ cairo sox ffmpeg xdg_utils texlive.combined.scheme-full ]; + + # Simple test and complex test with LaTeX + checkPhase = '' + for scene in SquareToCircle OpeningManimExample + do + python3 manim.py example_scenes.py $scene -l + tail -n 20 files/Tex/*.log # Print potential LaTeX erorrs + ${file}/bin/file videos/example_scenes/480p15/$scene.mp4 \ + | tee | grep -F "ISO Media, MP4 Base Media v1 [IS0 14496-12:2003]" + done + ''; + + disabled = pythonOlder "3.7"; + + meta = { + description = "Animation engine for explanatory math videos"; + longDescription = '' + Manim is an animation engine for explanatory math videos. It's used to + create precise animations programmatically, as seen in the videos of + 3Blue1Brown on YouTube. + ''; + homepage = https://github.com/3b1b/manim; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ johnazoidberg ]; + }; +} diff --git a/pkgs/applications/video/manim/remove-dependency-constraints.patch b/pkgs/applications/video/manim/remove-dependency-constraints.patch new file mode 100644 index 00000000000..4a7da45d0f5 --- /dev/null +++ b/pkgs/applications/video/manim/remove-dependency-constraints.patch @@ -0,0 +1,26 @@ +diff --git i/requirements.txt w/requirements.txt +index 556122ad..11fd49d5 100644 +--- i/requirements.txt ++++ w/requirements.txt +@@ -1,11 +1,10 @@ +-argparse==1.4.0 +-colour==0.1.5 +-numpy==1.15.0 +-Pillow==5.2.0 +-progressbar==2.5 +-scipy==1.1.0 +-tqdm==4.24.0 +-opencv-python==3.4.2.17 +-pycairo==1.17.1; sys_platform == 'linux' +-pycairo>=1.18.0; sys_platform == 'win32' +-pydub==0.23.0 ++colour ++numpy ++Pillow ++progressbar ++scipy ++tqdm ++pycairo ++pycairo>=1.18.1; sys_platform == 'win32' ++pydub ++pyreadline==2.1; sys_platform == 'win32' diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index f7ac5ef58cd..f1713fe29d4 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,8 @@ { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs -, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin +, nv-codec-headers, lua, libuchardet, libiconv ? null +, CoreFoundation, Cocoa, CoreAudio, MediaPlayer , waylandSupport ? stdenv.isLinux , wayland ? null @@ -38,11 +39,12 @@ , libpngSupport ? true, libpng ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null -, screenSaverSupport ? true, libXScrnSaver ? null , sambaSupport ? stdenv.isLinux, samba ? null +, screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null , speexSupport ? true, speex ? null +, swiftSupport ? false, swift ? null , theoraSupport ? true, libtheora ? null , vaapiSupport ? stdenv.isLinux, libva ? null , vdpauSupport ? true, libvdpau ? null @@ -119,7 +121,6 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity - "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") (enableFeature cddaSupport "cdda") (enableFeature dvdnavSupport "dvdnav") @@ -130,11 +131,13 @@ in stdenv.mkDerivation rec { (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") - ]; + ] # Disable whilst Swift isn't supported + ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which - ]; + ] + ++ optional swiftSupport swift; buildInputs = [ ffmpeg_4 freetype libass libpthreadstubs @@ -171,9 +174,7 @@ in stdenv.mkDerivation rec { ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] ++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation Cocoa CoreAudio - ]); + ++ optionals stdenv.isDarwin [ CoreFoundation Cocoa CoreAudio MediaPlayer ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 698f6df0673..f046e0e44b2 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; - cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; + cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz"; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index f6e78f364c2..274468334ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,9 +1,9 @@ { flavor ? "" -, ldflags ? "" , stdenv , btrfs-progs , buildGoPackage , fetchFromGitHub +, git , glibc , gpgme , libapparmor @@ -13,13 +13,14 @@ , libselinux , lvm2 , pkgconfig +, which }: let buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; in buildGoPackage rec { project = "cri-o"; - version = "1.16.1"; + version = "1.17.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -28,11 +29,11 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p"; + sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j"; }; outputs = [ "bin" "out" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ git pkgconfig which ]; buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; @@ -40,27 +41,15 @@ in buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} - # Build pause - make -C pause - - # Build the crio binaries - function build() { - go build \ - -tags "${buildTags}" \ - -o bin/"$1" \ - -buildmode=pie \ - -ldflags '-s -w ${ldflags}' \ - ${goPackagePath}/cmd/"$1" - } - build crio - build crio-status + make BUILDTAGS='${buildTags}' \ + bin/crio \ + bin/crio-status \ + bin/pinns ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} - - mkdir -p $bin/libexec/crio - install -Dm755 bin/pause $bin/libexec/crio/pause${flavor} + install -Dm755 bin/pinns $bin/bin/pinns${flavor} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index f976ede79c4..9eaf2d6c5c2 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "crun"; - version = "0.12.1"; + version = "0.12.2.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s"; + sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix new file mode 100644 index 00000000000..6004898f08e --- /dev/null +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +, makeWrapper +}: + +let + + version = "1.26.1"; + rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1"; + +in buildGoPackage rec { + pname = "docker-slim"; + inherit version; + + goPackagePath = "github.com/docker-slim/docker-slim"; + + src = fetchFromGitHub { + owner = "docker-slim"; + repo = "docker-slim"; + inherit rev; + # fetchzip yields a different hash on Darwin because `use-case-hack` + sha256 = + if stdenv.isDarwin + then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf" + else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh"; + }; + + subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + # docker-slim vendorized logrus files in different directories, which + # conflicts on case-sensitive filesystems + preBuild = stdenv.lib.optionalString stdenv.isLinux '' + mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \ + go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/ + ''; + + buildFlagsArray = + let + ldflags = "-ldflags=-s -w " + + "-X ${goPackagePath}/pkg/version.appVersionTag=${version} " + + "-X ${goPackagePath}/pkg/version.appVersionRev=${rev}"; + in + [ ldflags ]; + + # docker-slim tries to create its state dir next to the binary (inside the nix + # store), so we set it to use the working directory at the time of invocation + postInstall = '' + wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + ''; + + meta = with stdenv.lib; { + description = "Minify and secure Docker containers"; + homepage = "https://dockersl.im/"; + license = licenses.asl20; + maintainers = with maintainers; [ filalex77 marsam mbrgm ]; + # internal/app/sensor/monitors/ptrace/monitor.go:151:16: undefined: + # system.CallNumber + # internal/app/sensor/monitors/ptrace/monitor.go:161:15: undefined: + # system.CallReturnValue + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f6fc999269e..2154daa2a2c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -206,13 +206,13 @@ rec { }; docker_19_03 = makeOverridable dockerGen { - version = "19.03.5"; - rev = "633a0ea838f10e000b7c6d6eed1623e6e988b5bc"; - sha256 = "1cs38ffh5xn8c40rln4pvd53iahvi4kys9an6kpclvvciqfc2cxs"; - runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657"; - runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj"; - containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339"; - containerdSha256 = "1kddhkd93wkrimk0yjcqiavdrqc818nd39rf3wrgxyilx1mfnrwb"; + version = "19.03.6"; + rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97"; + sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0"; + runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; + runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; + containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021"; + containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap"; tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 67aa36b7827..203ee1c7cc0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,6 +84,37 @@ stdenv.mkDerivation rec { stripLen = 1; extraPrefix = "slirp/"; }) + # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7039 + (fetchpatch { + name = "CVE-2020-7039-1.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=2655fffed7a9e765bcb4701dd876e9dab975f289"; + sha256 = "1jh0k3lg3553c2x1kq1kl3967jabhba5gm584wjpmr5mjqk3lnz1"; + stripLen = 1; + extraPrefix = "slirp/"; + excludes = ["slirp/CHANGELOG.md"]; + }) + (fetchpatch { + name = "CVE-2020-7039-2.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=82ebe9c370a0e2970fb5695aa19aa5214a6a1c80"; + sha256 = "08ccxcmrhzknnzd1a1q2brszv3a7h02n26r73kpli10b0hn12r2l"; + stripLen = 1; + extraPrefix = "slirp/"; + }) + (fetchpatch { + name = "CVE-2020-7039-3.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=ce131029d6d4a405cb7d3ac6716d03e58fb4a5d9"; + sha256 = "18ypj9an2jmsmdn58853rbz42r10587h7cz5fdws2x4635778ibd"; + stripLen = 1; + extraPrefix = "slirp/"; + }) + # patches listed at: https://nvd.nist.gov/vuln/detail/CVE-2020-7211 + (fetchpatch { + name = "CVE-2020-7211.patch"; + url = "https://git.qemu.org/?p=libslirp.git;a=patch;h=14ec36e107a8c9af7d0a80c3571fe39b291ff1d4"; + sha256 = "1lc8zabqs580iqrsr5k7zwgkx6qjmja7apwfbc36lkvnrxwfzmrc"; + stripLen = 1; + extraPrefix = "slirp/"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index bce25406142..8dd3c270b23 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a"; buildInputs = [ libseccomp ]; diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 53489eca3a0..0e57643c64d 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; - maintainers = with maintainers; [ "0x4A6F" mkf ]; + maintainers = with maintainers; [ maintainers."0x4A6F" mkf ]; license = licenses.isc; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index ecd792f74e7..9507ada4011 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; postInstall = lib.optionalString (bins != []) '' diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index e5c478987df..731555ce9f8 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.17.1"; + version = "4.18"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh"; + sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 208764c0adc..1899be9a038 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix index b0012c587f6..677108e2163 100644 --- a/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/pkgs/applications/window-managers/i3/wmfocus.nix @@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf"; nativeBuildInputs = [ python3 pkgconfig ]; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 29e33bca914..25a219c2be4 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}" ''; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6"; # patch wrong version in Cargo.lock diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix index 36ca00b776b..febe16dd349 100644 --- a/pkgs/applications/window-managers/wtftw/default.nix +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -9,6 +9,9 @@ rustPlatform.buildRustPackage { sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl"; }; + # Delete this on next update; see #79975 for details + legacyCargoFetcher = true; + cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk"; nativeBuildInputs = [ pkgconfig ]; |