diff options
Diffstat (limited to 'nixpkgs/pkgs/applications')
240 files changed, 4244 insertions, 2844 deletions
diff --git a/nixpkgs/pkgs/applications/audio/adlplug/default.nix b/nixpkgs/pkgs/applications/audio/adlplug/default.nix index 9b0fe1d80ff3..a501cd0a1d88 100644 --- a/nixpkgs/pkgs/applications/audio/adlplug/default.nix +++ b/nixpkgs/pkgs/applications/audio/adlplug/default.nix @@ -1,19 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjack2, alsa-lib -, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, fetchpatch, fmt -, adlplugChip ? "-DADLplug_CHIP=OPL3" -, pname ? "ADLplug" }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, fmt +, liblo +, alsa-lib +, freetype +, libX11 +, libXrandr +, libXinerama +, libXext +, libXcursor +, libobjc +, Cocoa +, CoreServices +, WebKit +, DiscRecording + # Enabling JACK requires a JACK server at runtime, no fallback mechanism +, withJack ? false, jack + +, type ? "ADL" +}: + +assert lib.assertOneOf "type" type [ "ADL" "OPN" ]; +let + chip = { + ADL = "OPL3"; + OPN = "OPN2"; + }.${type}; + mainProgram = "${type}plug"; +in stdenv.mkDerivation rec { - inherit pname; + pname = "${lib.strings.toLower type}plug"; version = "1.0.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; fetchSubmodules = true; + sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; }; patches = [ @@ -25,19 +54,52 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; + cmakeFlags = [ + "-DADLplug_CHIP=${chip}" + "-DADLplug_USE_SYSTEM_FMT=ON" + "-DADLplug_Jack=${if withJack then "ON" else "OFF"}" + ]; + + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ + "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers" + ]); + + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ - libjack2 alsa-lib freetype libX11 libXrandr libXinerama libXext + fmt + liblo + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + freetype + libX11 + libXrandr + libXinerama + libXext libXcursor - ]; - nativeBuildInputs = [ cmake pkg-config fmt ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libobjc + Cocoa + CoreServices + WebKit + DiscRecording + ] ++ lib.optional withJack jack; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/${mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + ''; meta = with lib; { - description = "OPL3 and OPN2 FM Chip Synthesizer"; + inherit mainProgram; + description = "${chip} FM Chip Synthesizer"; homepage = src.meta.homepage; license = licenses.boost; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index 91d5d3c216d7..ec09e62b0944 100644 --- a/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.6"; + version = "1.10.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-iCDAIV2p1OkZxOMo8A6zBrOGd49FXAGqLZWk0Kbvgec="; + sha256 = "sha256-F2J9TBONluhBuoEnpff3tLZEHFDbmllILqbZvu+PGGI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index b041d7e19102..6b272a408ab0 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { ldLibraryPath = lib.strings.makeLibraryPath buildInputs; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -r opt/bitwig-studio $out/libexec ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { substitute usr/share/applications/bitwig-studio.desktop \ $out/share/applications/bitwig-studio.desktop \ --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + + runHook postInstall ''; postFixup = '' @@ -57,7 +61,7 @@ stdenv.mkDerivation rec { wrapProgram $f \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : "${binPath}" \ - --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" + --suffix LD_LIBRARY_PATH : "${ldLibraryPath}" done ''; diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 995618af4ce5..c1d351fa53e1 100644 --- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -178,6 +178,12 @@ let # export parts of the build environment for script in "$out"/bin/*; do + # e.g. NIX_CC_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu + nix_cc_wrapper_target_host="$(printenv | grep ^NIX_CC_WRAPPER_TARGET_HOST | sed 's/=.*//')" + + # e.g. NIX_BINTOOLS_WRAPPER_TARGET_HOST_x86_64_unknown_linux_gnu + nix_bintools_wrapper_target_host="$(printenv | grep ^NIX_BINTOOLS_WRAPPER_TARGET_HOST | sed 's/=.*//')" + wrapProgram "$script" \ --set FAUSTLDDIR "${faust}/lib" \ --set FAUSTLIB "${faust}/share/faust" \ @@ -187,7 +193,9 @@ let --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \ - --prefix LIBRARY_PATH $libPath + --set "$nix_cc_wrapper_target_host" "''${!nix_cc_wrapper_target_host}" \ + --set "$nix_bintools_wrapper_target_host" "''${!nix_bintools_wrapper_target_host}" \ + --prefix LIBRARY_PATH "$libPath" done ''; }); diff --git a/nixpkgs/pkgs/applications/audio/gbsplay/default.nix b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix index 7cee125f6e7d..3d280ca72abd 100644 --- a/nixpkgs/pkgs/applications/audio/gbsplay/default.nix +++ b/nixpkgs/pkgs/applications/audio/gbsplay/default.nix @@ -1,28 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, libpulseaudio }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, libpulseaudio, nas }: -stdenv.mkDerivation { - name = "gbsplay-2016-12-17"; +stdenv.mkDerivation rec { + pname = "gbsplay"; + version = "0.0.94"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; - rev = "2c4486e17fd4f4cdea8c3fd79ae898c892616b70"; - sha256 = "1214j67sr87zfhvym41cw2g823fmqh4hr451r7y1s9ql3jpjqhpz"; + rev = version; + sha256 = "VpaXbjotmc/Ref1geiKkBX9UhbPxfAGkFAdKVxP8Uxo="; }; - buildInputs = [ libpulseaudio ]; + configureFlags = [ + "--without-test" # See mmitch/gbsplay#62 + "--without-contrib" + ]; - configureFlags = - [ "--without-test" "--without-contrib" "--disable-devdsp" - "--enable-pulse" "--disable-alsa" "--disable-midi" - "--disable-nas" "--disable-dsound" "--disable-i18n" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ libpulseaudio nas ]; - makeFlags = [ "tests=" ]; + postInstall = '' + installShellCompletion --bash --name gbsplay contrib/gbsplay.bashcompletion + ''; meta = with lib; { - description = "gameboy sound player"; + description = "Gameboy sound player"; license = licenses.gpl1; - platforms = ["i686-linux" "x86_64-linux"]; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ dasuxullebt ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/helvum/default.nix b/nixpkgs/pkgs/applications/audio/helvum/default.nix index 1ecf9c56e861..cc98e9fb359c 100644 --- a/nixpkgs/pkgs/applications/audio/helvum/default.nix +++ b/nixpkgs/pkgs/applications/audio/helvum/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "helvum"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ryuukyu"; repo = pname; rev = version; - sha256 = "sha256-sQ4epL3QNOLHuR/dr/amHgiaxV/1SWeb3eijnjAAR3w="; + sha256 = "sha256-ZnpdGXK8N8c/s4qC2NXcn0Pdqrqr47iOWvVwXD9pn1A="; }; - cargoSha256 = "sha256-uNTSU06Fz/ud04K40e98rb7o/uAht0DsiJOXeHX72vw="; + cargoSha256 = "sha256-2v2L20rUWftXdhhuE3wiRrDIuSg6VFxfpWYMRaMUyTU="; nativeBuildInputs = [ clang copyDesktopItems pkg-config ]; buildInputs = [ glib gtk4 pipewire ]; diff --git a/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix b/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix new file mode 100644 index 000000000000..2551c610c573 --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -0,0 +1,91 @@ +{ mkDerivation +, alsa-lib +, autoPatchelfHook +, fetchurl +, flac +, lib +, libmicrohttpd +, llvmPackages_10 +, qtcharts +, qtdeclarative +, qtquickcontrols2 +, qtwebengine +, qtwebview +, rpmextract +, wavpack +}: + +mkDerivation rec { + pname = "hqplayer-desktop"; + version = "4.12.1-35"; + + src = fetchurl { + # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs + # c.f. https://github.com/NixOS/nixpkgs/pull/111616 + url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm"; + sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8="; + }; + + unpackPhase = '' + ${rpmextract}/bin/rpmextract $src + ''; + + nativeBuildInputs = [ autoPatchelfHook rpmextract ]; + + buildInputs = [ + alsa-lib + flac + libmicrohttpd + llvmPackages_10.openmp + qtquickcontrols2 + qtcharts + qtdeclarative + qtwebengine + qtwebview + wavpack + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # main executable + mkdir -p $out/bin + cp ./usr/bin/* $out/bin + + # desktop files + mkdir -p $out/share/applications + cp ./usr/share/applications/* $out/share/applications + + # documentation + mkdir -p $out/share/doc/${pname} + cp ./usr/share/doc/hqplayer4desktop/* $out/share/doc/${pname} + + # pixmaps + mkdir -p $out/share/pixmaps + cp ./usr/share/pixmaps/* $out/share/pixmaps + + runHook postInstall + ''; + + postInstall = '' + for desktopFile in $out/share/applications/*; do + substituteInPlace "$desktopFile" \ + --replace /usr/bin/ $out/bin/ \ + --replace /usr/share/doc/ $out/share/doc/ + done + ''; + + postFixup = '' + patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer4desktop-wrapped + ''; + + meta = with lib; { + homepage = "https://www.signalyst.com/custom.html"; + description = "High-end upsampling multichannel software HD-audio player"; + license = licenses.unfree; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/nixpkgs/pkgs/applications/audio/mousai/default.nix b/nixpkgs/pkgs/applications/audio/mousai/default.nix index 687546624b0a..2f45a3fea92f 100644 --- a/nixpkgs/pkgs/applications/audio/mousai/default.nix +++ b/nixpkgs/pkgs/applications/audio/mousai/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , appstream-glib , desktop-file-utils , gettext @@ -29,6 +30,14 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; }; + patches = [ + (fetchpatch { + name = "fix-ABI-breakage-from-libadwaita.patch"; + url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; + sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; + }) + ]; + postPatch = '' patchShebangs build-aux/meson ''; diff --git a/nixpkgs/pkgs/applications/audio/munt/default.nix b/nixpkgs/pkgs/applications/audio/munt/default.nix index 773a9178c0bc..191612700f41 100644 --- a/nixpkgs/pkgs/applications/audio/munt/default.nix +++ b/nixpkgs/pkgs/applications/audio/munt/default.nix @@ -1,38 +1,51 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, alsa-lib, makeDesktopItem, libjack2 }: +{ lib +, mkDerivation +, stdenv +, fetchFromGitHub +, makeDesktopItem +, cmake +, pkg-config +, qtbase +, glib +, alsa-lib +, withJack ? stdenv.hostPlatform.isUnix, jack +}: let - desktopItem = makeDesktopItem rec { - name = "Munt"; - exec = "mt32emu-qt"; - desktopName = name; - genericName = "Munt synthesiser"; - categories = "Audio;AudioVideo;"; - }; -in mkDerivation rec { - version = "2.4.1"; + mainProgram = "mt32emu-qt"; +in +mkDerivation rec { pname = "munt"; + version = "2.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = with lib.versions; "libmt32emu_${major version}_${minor version}_${patch version}"; - sha256 = "0bszhkbz24hhx32f973l6h5lkyn4lxhqrckiwmv765d1sba8n5bk"; + rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}"; + sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn"; }; - postInstall = '' - ln -s ${desktopItem}/share/applications $out/share - ''; - dontFixCmake = true; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase alsa-lib libjack2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ qtbase glib ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optional withJack jack; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/${mainProgram}.app $out/Applications/ + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + ''; meta = with lib; { + inherit mainProgram; description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; license = with licenses; [ lgpl21 gpl3 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix index 6f63bf542f41..05e17bf7c98a 100644 --- a/nixpkgs/pkgs/applications/audio/noisetorch/default.nix +++ b/nixpkgs/pkgs/applications/audio/noisetorch/default.nix @@ -1,42 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub, rnnoise-plugin }: +{ lib, buildGoModule, fetchFromGitHub, copyDesktopItems }: buildGoModule rec { pname = "NoiseTorch"; - version = "0.10.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; + sha256 = "0rjs6hbi7dvd179lzjmvqy4rv4pbc9amgzb8jfky4yc0zh8xf5z5"; }; - patches = [ - # Get version from environment instead of git tags - ./version.patch - ]; - vendorSha256 = null; doCheck = false; - subPackages = [ "." ]; + ldflags = [ "-X main.version=${version}" "-X main.distribution=nix" ]; - buildInputs = [ rnnoise-plugin ]; + subPackages = [ "." ]; - postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'"; + nativeBuildInputs = [ copyDesktopItems ]; preBuild = '' - export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - go generate; + make -C c/ladspa/ + go generate rm ./scripts/* ''; postInstall = '' - mkdir -p $out/share/icons/hicolor/256x256/apps/ - cp assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/ - mkdir -p $out/share/applications/ - cp assets/noisetorch.desktop $out/share/applications/ + install -D ./assets/icon/noisetorch.png $out/share/icons/hicolor/256x256/apps/noisetorch.png + copyDesktopItems assets/noisetorch.desktop $out/share/applications/ ''; meta = with lib; { @@ -44,6 +37,6 @@ buildGoModule rec { homepage = "https://github.com/lawl/NoiseTorch"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ panaeon ]; + maintainers = with maintainers; [ panaeon legendofmiracles ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/noisetorch/version.patch b/nixpkgs/pkgs/applications/audio/noisetorch/version.patch deleted file mode 100644 index 20c51863744a..000000000000 --- a/nixpkgs/pkgs/applications/audio/noisetorch/version.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/scripts/embedversion.go b/scripts/embedversion.go -index ce0a756..60e7a5e 100644 ---- a/scripts/embedversion.go -+++ b/scripts/embedversion.go -@@ -1,24 +1,18 @@ - package main - - import ( -- "os" -- "os/exec" -- "strings" -+ "os" -+ "strings" - ) - - func main() { -- cmd := exec.Command("git", "describe", "--tags") -- ret, err := cmd.Output() - -- if err != nil { -- panic("Couldn't read git tags to embed version number") -- } -- version := strings.TrimSpace(string(ret)) -+ version := strings.TrimSpace(string(os.Getenv("version"))) - -- out, _ := os.Create("version.go") -- defer out.Close() -+ out, _ := os.Create("version.go") -+ defer out.Close() - -- out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) -- out.Write([]byte(version)) -- out.Write([]byte("\"\n")) -+ out.Write([]byte("package main\n\n//THIS FILE IS AUTOMATICALLY GENERATED BY `go generate` DO NOT EDIT!\n\nvar version=\"")) -+ out.Write([]byte(version)) -+ out.Write([]byte("\"\n")) - } diff --git a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix index a5ea91141c39..5d1888895166 100644 --- a/nixpkgs/pkgs/applications/audio/openmpt123/default.nix +++ b/nixpkgs/pkgs/applications/audio/openmpt123/default.nix @@ -1,19 +1,16 @@ { config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: -let - version = "0.5.8"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openmpt123"; - inherit version; + version = "0.5.9"; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "sha256-KeLCEXS3P2fyul7naAjWLxgrEw5PcE7i2a6Cg5gtis0="; + sha256 = "0h86p8mnpm98vc4v6jbvrmm02fch7dnn332i26fg3a2s1738m04d"; }; enableParallelBuilding = true; - doCheck = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib mpg123 libogg libvorbis portaudio libsndfile flac ] @@ -21,11 +18,13 @@ in stdenv.mkDerivation { configureFlags = lib.optional (!usePulseAudio) "--without-pulseaudio"; + doCheck = true; + meta = with lib; { description = "A cross-platform command-line based module file player"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/nixpkgs/pkgs/applications/audio/ptcollab/default.nix index f5752dd96f4a..c5b9f2b804e8 100644 --- a/nixpkgs/pkgs/applications/audio/ptcollab/default.nix +++ b/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , nix-update-script , qmake +, pkg-config , qtbase , qtmultimedia , libvorbis @@ -12,21 +13,16 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "1yfnf47saxxj17x0vyxihr343kp7gz3fashzky79j80sqlm6ng85"; + sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w="; }; - postPatch = '' - substituteInPlace src/editor.pro \ - --replace '/usr/include/rtmidi' '${rtmidi}/include/rtmidi' - ''; - - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtmultimedia libvorbis rtmidi ]; diff --git a/nixpkgs/pkgs/applications/audio/reaper/default.nix b/nixpkgs/pkgs/applications/audio/reaper/default.nix index 705685811ff2..773560c83cad 100644 --- a/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -17,11 +17,12 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.28"; + version = "6.29"; src = fetchurl { - url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - hash = "sha256-38HSjR+rQWPzMOjq1abLn/MP3DCz5YzBg0v2kBsQmR4="; + url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.targetPlatform.qemuArch}.tar.xz"; + hash = if stdenv.isx86_64 then "sha256-DOul6J2Y7szy4+Q4SeO0uG6PSuU+MELE7ky8W3mSpTQ=" + else "sha256-67iTi6bFlbQtyCjnPIjK8K/3aV+zaCsWBRCWmgYonM4="; }; nativeBuildInputs = [ @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { description = "Digital audio workstation"; homepage = "https://www.reaper.fm/"; license = licenses.unfree; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ jfrankenau ilian ]; }; } diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index 4f7e43ca004b..b27593626efb 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, nix-update-script , autoreconfHook , perl , pkg-config @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "0s3xmg3yzfqbsnlh2y46w7b5jim5zq7mshs6hx03q8wdr75cvwh4"; + sha256 = "sha256-hN7225lhuYyo4wPDiiEc9FaPg90pZ13mLw93V8tb/P0="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; @@ -37,6 +38,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A SID player using libsidplayfp"; homepage = "https://github.com/libsidplayfp/sidplayfp"; diff --git a/nixpkgs/pkgs/applications/audio/songrec/default.nix b/nixpkgs/pkgs/applications/audio/songrec/default.nix index 2928771b3ec7..ccedb4c069ec 100644 --- a/nixpkgs/pkgs/applications/audio/songrec/default.nix +++ b/nixpkgs/pkgs/applications/audio/songrec/default.nix @@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; + postInstall = '' + mv packaging/rootfs/usr/share $out/share + ''; + meta = with lib; { description = "An open-source Shazam client for Linux, written in Rust"; homepage = "https://github.com/marin-m/SongRec"; diff --git a/nixpkgs/pkgs/applications/audio/uade123/default.nix b/nixpkgs/pkgs/applications/audio/uade123/default.nix index 271f9f912ea8..8191fd381a4b 100644 --- a/nixpkgs/pkgs/applications/audio/uade123/default.nix +++ b/nixpkgs/pkgs/applications/audio/uade123/default.nix @@ -1,25 +1,74 @@ -{ lib, stdenv, fetchurl, which, libao, pkg-config }: +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, which +, makeWrapper +, libao +, libbencodetools +, sox +, lame +, flac +, vorbis-tools +}: -let - version = "2.13"; -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "uade123"; - inherit version; - src = fetchurl { - url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; - sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; + version = "unstable-2021-05-21"; + + src = fetchFromGitLab { + owner = "uade-music-player"; + repo = "uade"; + rev = "7169a46e777d19957cd7ff8ac31843203e725ddc"; + sha256 = "1dm7c924fy79y3wkb0qi71m1k6yw1x6j3whw7d0w4ka9hv6za03b"; }; - nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ libao ]; + + postPatch = '' + patchShebangs . + substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \ + --replace '-e stat' '-n stat' \ + --replace '/usr/local' "$out" + ''; + + nativeBuildInputs = [ + pkg-config + which + makeWrapper + ]; + + buildInputs = [ + libao + libbencodetools + sox + lame + flac + vorbis-tools + ]; + + configureFlags = [ + "--bencode-tools-prefix=${libbencodetools}" + ]; enableParallelBuilding = true; + hardeningDisable = [ "format" ]; + postInstall = '' + wrapProgram $out/bin/mod2ogg2.sh \ + --prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]} + # This is an old script, don't break expectations by renaming it + ln -s $out/bin/mod2ogg2{.sh,} + ''; + meta = with lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; - homepage = "http://zakalwe.fi/uade/"; - license = licenses.gpl2; - maintainers = [ ]; + homepage = "https://zakalwe.fi/uade/"; + # It's a mix of licenses. "GPL", Public Domain, "LGPL", GPL2+, BSD, LGPL21+ and source code with unknown licenses. E.g. + # - hippel-coso player is "[not] under any Open Source certified license" + # - infogrames player is disassembled from Andi Silvas player, unknown license + # Let's make it easy and flag the whole package as unfree. + license = licenses.unfree; + maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/audio/vgmstream/default.nix b/nixpkgs/pkgs/applications/audio/vgmstream/default.nix new file mode 100644 index 000000000000..a3518f23984b --- /dev/null +++ b/nixpkgs/pkgs/applications/audio/vgmstream/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config +, mpg123, ffmpeg, libvorbis, libao, jansson +}: +stdenv.mkDerivation rec { + pname = "vgmstream"; + version = "r1050-3448-g77cc431b"; + + src = fetchFromGitHub { + owner = "vgmstream"; + repo = "vgmstream"; + rev = version; + sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + + # There's no nice way to build the audacious plugin without a circular dependency + cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + + preConfigure = '' + echo "#define VERSION \"${version}\"" > cli/version.h + ''; + + meta = with lib; { + description = "A library for playback of various streamed audio formats used in video games"; + homepage = "https://vgmstream.org"; + maintainers = with maintainers; [ zane ]; + license = with licenses; isc; + platforms = with platforms; unix; + }; +} diff --git a/nixpkgs/pkgs/applications/backup/vorta/default.nix b/nixpkgs/pkgs/applications/backup/vorta/default.nix index fc56d6c54001..347a0de0503f 100644 --- a/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "vorta"; - version = "0.7.5"; + version = "0.7.7"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-qPO8qmXYDDFwV+8hAUyfF4Ins0vkwEJbw4JPguUSYOw="; + sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix index 3707b0741b6f..a3341a25b144 100644 --- a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "1m1ic69aj2vlnjlp4ckan8n67r01nfysvq4w6nny32wjkr0zvphr"; + sha256 = "0npn45qbbsbzj5qy9kwx662hml1y610ysmfl89sda02l6wf1sp3y"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/nixpkgs/pkgs/applications/blockchains/chia/default.nix index 22bb3d445ada..7b85a242effa 100644 --- a/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "chia"; @@ -14,6 +18,12 @@ python3Packages.buildPythonApplication rec { patches = [ # tweak version requirements to what's available in Nixpkgs ./dependencies.patch + # Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304 + (fetchpatch { + name = "later-websockets.patch"; + url = "https://github.com/Chia-Network/chia-blockchain/commit/a188f161bf15a30e8e2efc5eec824e53e2a98a5b.patch"; + sha256 = "1s5qjhd4kmi28z6ni7pc5n09czxvh8qnbwmnqsmms7cpw700g78s"; + }) ]; nativeBuildInputs = [ @@ -47,8 +57,8 @@ python3Packages.buildPythonApplication rec { websockets ]; - checkInputs = [ - python3Packages.pytestCheckHook + checkInputs = with python3Packages; [ + pytestCheckHook ]; disabledTests = [ diff --git a/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 4f61be7dcee5..8b8ff3f48ba4 100644 --- a/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.11"; + version = "4.0.12"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-GzpYwytkWZBEIVmsOmK5RTJ7lPUfDeC1204FbK4O+XQ="; + sha256 = "sha256-cIMaCouzuI7UQ6UY4caGcTzA+Xp7vLdoOwIfGG+ahsU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/blockchains/faraday/default.nix b/nixpkgs/pkgs/applications/blockchains/faraday/default.nix index 90d76e29b6b6..76e91f2bbe55 100644 --- a/nixpkgs/pkgs/applications/blockchains/faraday/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/faraday/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "faraday"; - version = "0.2.3-alpha"; + version = "0.2.5-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "faraday"; rev = "v${version}"; - sha256 = "16cqaslsbwda23b5n0sfppybd3ma4ch545100ydxrwac4zhrq4kq"; + sha256 = "16mz333a6awii6g46gr597j31jmgws4285s693q0b87fl1ggj2zz"; }; - vendorSha256 = "1hh99nfprlmhkc36arg3w1kxby59i2l7n258cp40niv7bjn37hrq"; + vendorSha256 = "1nclmvypxp5436q6qaagp1k5bfmaia7hsykw47va0pijlsvsbmck"; subPackages = [ "cmd/frcli" "cmd/faraday" ]; @@ -22,6 +22,6 @@ buildGoModule rec { description = "LND Channel Management Tools"; homepage = "https://github.com/lightninglabs/faraday"; license = licenses.mit; - maintainers = with maintainers; [ proofofkeags ]; + maintainers = with maintainers; [ proofofkeags prusnak ]; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 4310f809bacd..05bc2b824fc3 100644 --- a/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -4,21 +4,22 @@ let # A list of binaries to put into separate outputs bins = [ "geth" + "clef" ]; in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-85aUR7MvaPeRilC+4oj6XW2IEUvxRUsVz63tQ/Jc7xw="; + sha256 = "sha256-DRlIiO3iXUsQnmOf5T9uk3560tVbS+Hrs8QtVkmllAI="; }; runVend = true; - vendorSha256 = "sha256-8zhVQ8FUdzog7h9RBfuq8uBp0zjulXbDOLAPljp4deA="; + vendorSha256 = "sha256-a/vY9iyqSM9QPs7lGFF6E7e2cMjIerVkNf5KwiWdyr0="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix new file mode 100644 index 000000000000..851a1b1d0400 --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "lightning-loop"; + version = "0.14.1-beta"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "loop"; + rev = "v${version}"; + sha256 = "0fnbf0cryrw9yk3z1g7innv1rxxk7h2lhfakdj994l5a0pgzghmy"; + }; + + vendorSha256 = "1i7mmf4ab4a6h08df6zlyjdnmvn44i2y3fc05hq6g1ln1bzdrz40"; + + subPackages = [ "cmd/loop" "cmd/loopd" ]; + + meta = with lib; { + description = "Lightning Loop Client"; + homepage = "https://github.com/lightninglabs/loop"; + license = licenses.mit; + maintainers = with maintainers; [ proofofkeags prusnak ]; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix b/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix new file mode 100644 index 000000000000..978509cc2379 --- /dev/null +++ b/nixpkgs/pkgs/applications/blockchains/lightning-pool/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "lightning-pool"; + version = "0.5.0-alpha"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = "pool"; + rev = "v${version}"; + sha256 = "0i8qkxnrx3a89aw3v0mx7przlldl8kc0ng6g1m435366y6nzdarb"; + }; + + vendorSha256 = "04v2788w8l734n5xz6fwjbwkqlbk8q77nwncjpn7890mw75yd3rn"; + + subPackages = [ "cmd/pool" "cmd/poold" ]; + + meta = with lib; { + description = "Lightning Pool Client"; + homepage = "https://github.com/lightninglabs/pool"; + license = licenses.mit; + maintainers = with maintainers; [ proofofkeags prusnak ]; + }; +} diff --git a/nixpkgs/pkgs/applications/blockchains/lnd.nix b/nixpkgs/pkgs/applications/blockchains/lnd.nix index 147d826dfa6f..e8c6d14b3db8 100644 --- a/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.12.1-beta"; + version = "0.13.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0ly6909cg0qzdsp9idp1g7zqd6liw7f142d7n7vga64s1ksvv6lx"; + sha256 = "0fwidjkfzzd7k891x5z7jrx2arl0kwj6vm9z2acsyy7riv4zfjbq"; }; - vendorSha256 = "00q8dydskzg4rhxnnpzpbmmvc3q4wzm8z3dps2bv0nx3fk0fmrl3"; + vendorSha256 = "19myr9f5zh05y6lagd9pra60y8df7pz837310cbpq9a6zzwpdxk2"; subPackages = ["cmd/lncli" "cmd/lnd"]; diff --git a/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix b/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix index b4b5d13f1407..be2373941b32 100644 --- a/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/openethereum/default.nix @@ -10,18 +10,18 @@ , darwin }: -rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { +rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.5"; + version = "3.2.6"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "1g48fkznvr9fs3j9zy2d9pcwnahmyghxg2b9bsn2mxpyczmfqrki"; + sha256 = "0lxps3cyg8dzb9qr1kg91s9jc3mnm6hxybwcbhva38pcq4yc40xc"; }; - cargoSha256 = "02nlm5ariv4dr6b3rckzs7hw1xrl83yvhimrzb0g5l0j0sxh1nhc"; + cargoSha256 = "08yrpls3szmw6vy2c4d6b1k907ga0809ylvyx0zb6f8mp8z7ahl2"; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 105686777db2..a80d7dd91ffe 100644 --- a/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-BxBrgcAJm6KM6ha494xlwiLYOSAr71gDFgqlH5RPqMM="; + sha256 = "sha256-fe6iCSp4TxKKsVVBrvbSMROXqigTfxFCOLN1gAqRTv0="; }; - cargoSha256 = "131fkdazcspblzblmd9nhkymwn7qh6lhaqvi1jqnsq4951l9f4ms"; + cargoSha256 = "18pg09v14991aqq7cjg0w5x36526y6sx1hvxlqb20zvrgmv722cq"; nativeBuildInputs = [ clang ]; diff --git a/nixpkgs/pkgs/applications/blockchains/stellar-core.nix b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix index 197453599b28..6ecc4e241cb4 100644 --- a/nixpkgs/pkgs/applications/blockchains/stellar-core.nix +++ b/nixpkgs/pkgs/applications/blockchains/stellar-core.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.stellar.org/"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ chris-martin ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 585f01290bba..bd9e26ae73ab 100644 --- a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.5.1"; + version = "21.6.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-nqwfonWySc+wBSJjC8BW9vm+v5zHbKqbbrTTRmoZdEYBJg2SthMtTULNLVpXaX9NHxr6guZnOWdBlzVk2dQkfQ=="; - x86_64-linux = "sha512-tfvdNXsjMe8YXJwTuujz4tKTdfsCuR/9VECF8EkcRP95YM7vuDV8dumru1jKtdiv0gaS1GT3SPEeAfmczY5jGg=="; + aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; + x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -57,6 +57,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "Trezor Suite - Desktop App for managing crypto"; homepage = "https://suite.trezor.io"; + changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/editors/emacs/27.nix b/nixpkgs/pkgs/applications/editors/emacs/27.nix index b629c2d21207..e0e41a78b9ce 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/27.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/27.nix @@ -1,7 +1,12 @@ import ./generic.nix (rec { version = "27.2"; sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; - patches = [ + patches = fetchpatch: [ ./tramp-detect-wrapped-gvfsd.patch + (fetchpatch { + name = "fix-aarch64-darwin-triplet.patch"; + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; + sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg="; + }) ]; }) diff --git a/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 1bae0a0c9702..bcd55258a49d 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -10,7 +10,7 @@ , Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf -, jansson, harfbuzz +, sigtool, jansson, harfbuzz , dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null @@ -46,10 +46,10 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; -} // lib.optionalAttrs stdenv.isDarwin { - CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; } // { - inherit pname version patches; + inherit pname version; + + patches = patches fetchpatch; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; @@ -118,8 +118,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional (withX && withMotif) motif ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] - ++ lib.optionals nativeComp [ libgccjit ] - ; + ++ lib.optionals stdenv.isDarwin [ sigtool ] + ++ lib.optionals nativeComp [ libgccjit ]; hardeningDisable = [ "format" ]; @@ -138,7 +138,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional withXwidgets "--with-xwidgets" ++ lib.optional nativeComp "--with-native-compilation" ++ lib.optional withImageMagick "--with-imagemagick" - ; + ; installTargets = [ "tags" "install" ]; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/common.nix b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix index 635a8dbf46f7..dcbaa136795a 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/common.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/common.nix @@ -3,13 +3,13 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }: +{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [] }@args: with lib; let loName = toLower product; hiName = toUpper product; - execName = concatStringsSep "-" (init (splitString "-" name)); + mainProgram = concatStringsSep "-" (init (splitString "-" name)); vmoptsName = loName + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) then "" @@ -18,15 +18,17 @@ let loName = toLower product; in with stdenv; lib.makeOverridable mkDerivation rec { - inherit name src meta; + inherit name src; + meta = args.meta // { inherit mainProgram; }; + desktopItem = makeDesktopItem { - name = execName; - exec = execName; + name = mainProgram; + exec = mainProgram; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; categories = "Development;"; - icon = execName; + icon = mainProgram; extraEntries = '' StartupWMClass=${wmClass} ''; @@ -64,13 +66,13 @@ with stdenv; lib.makeOverridable mkDerivation rec { installPhase = '' mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png + ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png mv bin/fsnotifier* $out/libexec/${name}/. jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ + makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index e72d2df43a93..38ea3054a60d 100644 --- a/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -307,12 +307,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.3.3"; /* updated by script */ + version = "2021.1"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; - sha256 = "0sb50f7d4272dzx84njc326xvhbqn3xwrphvdq4zl3pk3wl8f4nz"; /* updated by script */ + url = "https://download.jetbrains.com/mps/${version}/MPS-${version}.tar.gz"; + sha256 = "0fdh8lzsi2zryi0xs961vrf3l8kqk5imlj56dhifywi7xkhs3vwn"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "02s75fqd9hfh302zha4jw6qynpgm9nkrlq7s78nk3fc3d3hw8v5y"; /* updated by script */ + sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04bs9sz872b0h1zzax23irvj6q5wxnzp6fl4f177j94kh4116cqh"; /* updated by script */ + sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wc9j7nilakmm7scf7a71zb3k9vixgih05ni3n3pp4iznvwb3nxg"; /* updated by script */ + sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.1.1"; /* updated by script */ + version = "2021.1.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "05sfjf5523idsl7byc7400r4xqv1d65gpmkh5x0lbgf1k3bx2wlm"; /* updated by script */ + sha256 = "0r80y8y38rdxgc9sim0q2p7bmgxlp4pdxydr0w9gjikwnjxnvz51"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; diff --git a/nixpkgs/pkgs/applications/editors/jetbrains/update.pl b/nixpkgs/pkgs/applications/editors/jetbrains/update.pl index 6f0a451849a0..cd3d2193a283 100755 --- a/nixpkgs/pkgs/applications/editors/jetbrains/update.pl +++ b/nixpkgs/pkgs/applications/editors/jetbrains/update.pl @@ -61,8 +61,9 @@ sub update_nix_block { # try to interpret some nix my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; $name =~ s/\$\{version\}/$latest_versions{$channel}/; - $url =~ s/\$\{name\}/$name/; - $url =~ s/\$\{version\}/$latest_versions{$channel}/; + # Some url paattern contain variables more than once + $url =~ s/\$\{name\}/$name/g; + $url =~ s/\$\{version\}/$latest_versions{$channel}/g; die "$url still has some interpolation" if $url =~ /\$/; my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; my $version_string = $latest_versions{$channel}; diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix new file mode 100644 index 000000000000..9db38d144489 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, callPackage +, runCommand +, makeWrapper +, octave +, imagemagick +, python3 +}: + +# To test: +# $(nix-build -E 'with import <nixpkgs> {}; jupyter.override { definitions = { octave = octave-kernel.definition; }; }')/bin/jupyter-notebook + +let + kernel = callPackage ./kernel.nix { + python3Packages = python3.pkgs; + }; + +in + +rec { + launcher = runCommand "octave-kernel-launcher" { + inherit octave; + python = python3.withPackages (ps: [ ps.traitlets ps.jupyter_core ps.ipykernel ps.metakernel kernel ]); + buildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + + makeWrapper $python/bin/python $out/bin/octave-kernel \ + --add-flags "-m octave_kernel" \ + --suffix PATH : $octave/bin + ''; + + sizedLogo = size: stdenv.mkDerivation { + name = ''octave-logo-${octave.version}-${size}x${size}.png''; + + src = octave.src; + + buildInputs = [ imagemagick ]; + + dontConfigure = true; + dontInstall = true; + + buildPhase = '' + convert ./libgui/src/icons/logo.png -resize ${size}x${size} $out + ''; + }; + + definition = { + displayName = "Octave"; + argv = [ + "${launcher}/bin/octave-kernel" + "-f" + "{connection_file}" + ]; + language = "octave"; + logo32 = sizedLogo "32"; + logo64 = sizedLogo "64"; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix b/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix new file mode 100644 index 000000000000..9ebb4257784b --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/kernel.nix @@ -0,0 +1,30 @@ +{ lib, octave, python3Packages }: + +with python3Packages; + +buildPythonPackage rec { + pname = "octave-kernel"; + version = "0.32.0"; + + src = fetchPypi { + pname = "octave_kernel"; + inherit version; + sha256 = "0dfbxfcf3bz4jswnpkibnjwlkgy0y4j563nrhaqxv3nfa65bksif"; + }; + + propagatedBuildInputs = [ metakernel ipykernel ]; + + # Tests require jupyter_kernel_test to run, but it hasn't seen a + # release since 2017 and seems slightly abandoned. + # Doing fetchPypi on it doesn't work, even though it exists here: + # https://pypi.org/project/jupyter_kernel_test/. + doCheck = false; + + meta = with lib; { + description = "A Jupyter kernel for Octave."; + homepage = "https://github.com/Calysto/octave_kernel"; + license = licenses.bsd3; + maintainers = with maintainers; [ thomasjm ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/mg/default.nix b/nixpkgs/pkgs/applications/editors/mg/default.nix index ea5e162fdde7..bd7774b50510 100644 --- a/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "6.8.1"; + version = "6.9"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; - rev = "mg-6.8.1"; - sha256 = "0fyqyi5sag13jx8bc22bvkgybddvsr0wdili9ikxnpnqg2w84fx7"; + rev = "mg-${version}"; + sha256 = "1w49yb9v1657rv1w5w7rc9ih1d2vzv6ym3mzhf2wgmh04pdm6hid"; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/editors/mindforger/default.nix b/nixpkgs/pkgs/applications/editors/mindforger/default.nix index 512e0f124411..6b93153ec041 100644 --- a/nixpkgs/pkgs/applications/editors/mindforger/default.nix +++ b/nixpkgs/pkgs/applications/editors/mindforger/default.nix @@ -1,14 +1,16 @@ -{ mkDerivation +{ lib +, stdenv , cmark-gfm , fetchurl +, fetchpatch , qmake , qtbase -, qtwebkit -, lib +, qtwebengine , wrapGAppsHook +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mindforger"; version = "1.52.0"; @@ -17,19 +19,41 @@ mkDerivation rec { sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake wrapGAppsHook ] ; - buildInputs = [ qtbase qtwebkit cmark-gfm ] ; + nativeBuildInputs = [ qmake wrapGAppsHook wrapQtAppsHook ]; + buildInputs = [ qtbase qtwebengine cmark-gfm ]; doCheck = true; - patches = [ ./build.patch ] ; + patches = [ + # this makes the package relocatable - removes hardcoded references to /usr + ./paths.patch + # this fixes compilation with QtWebEngine - referencing a commit trying to upstream the change - see https://github.com/dvorka/mindforger/pull/1357 + (fetchpatch { + url = "https://github.com/dvorka/mindforger/commit/d28e2bade0278af1b5249953202810540969026a.diff"; + sha256 = "sha256-qHKQQNGSc3F9seaOHV0gzBQFFqcTXk91LpKrojjpAUw="; + }) + ]; postPatch = '' substituteInPlace lib/src/install/installer.cpp --replace /usr "$out" substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" + for f in app/app.pro lib/lib.pro; do + substituteInPlace "$f" --replace "QMAKE_CXX = g++" "" + done ''; - qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; + qmakeFlags = [ + "-r" + "mindforger.pro" + "CONFIG+=mfnoccache" + "CONFIG+=mfwebengine" + ]; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir "$out"/Applications + mv app/mindforger.app "$out"/Applications/ + wrapQtApp "$out"/Applications/mindforger.app/Contents/MacOS/mindforger + ''; meta = with lib; { description = "Thinking Notebook & Markdown IDE"; diff --git a/nixpkgs/pkgs/applications/editors/mindforger/build.patch b/nixpkgs/pkgs/applications/editors/mindforger/paths.patch index e9b9244f8dbd..e9b9244f8dbd 100644 --- a/nixpkgs/pkgs/applications/editors/mindforger/build.patch +++ b/nixpkgs/pkgs/applications/editors/mindforger/paths.patch diff --git a/nixpkgs/pkgs/applications/editors/nano/default.nix b/nixpkgs/pkgs/applications/editors/nano/default.nix index 1a92ca3decbb..bd61933b38d7 100644 --- a/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1ynarilx0ca0a5h6hl5bf276cymyy8s9wr5l24vyy7f15v683cfl"; + sha256 = "133nhxg4xfxisjzi85rn2l575hdbvcax1s13l4m6wcvq5zdn6fz4"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/nixpkgs/pkgs/applications/editors/poke/default.nix b/nixpkgs/pkgs/applications/editors/poke/default.nix index f0b8c43546d8..a24666741e14 100644 --- a/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-9hz42ltkwBoTWTc3JarRyiV/NcHJJp5NUN0GZBg932I="; + hash = "sha256-unhjA0obCABLDuj4i9qUFgcH6aeB1VVvVVtQdYPPDxs="; }; postPatch = '' @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { ] ++ lib.optional guiSupport makeWrapper; buildInputs = [ boehmgc readline ] - ++ lib.optional guiSupport tk + ++ lib.optionals guiSupport [ tk tcl.tclPackageHook tcllib ] ++ lib.optional miSupport json_c ++ lib.optional nbdSupport libnbd ++ lib.optional textStylingSupport gettext @@ -57,11 +57,6 @@ in stdenv.mkDerivation rec { doCheck = !isCross; checkInputs = lib.optionals (!isCross) [ dejagnu ]; - postFixup = lib.optionalString guiSupport '' - wrapProgram "$out/bin/poke-gui" \ - --prefix TCLLIBPATH ' ' ${tcllib}/lib/tcllib${tcllib.version} - ''; - meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; diff --git a/nixpkgs/pkgs/applications/editors/tiled/default.nix b/nixpkgs/pkgs/applications/editors/tiled/default.nix index 4fbbacf8f1eb..fe32da4a42fa 100644 --- a/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pf9nA5DUAJ+PPNG+oP7RO4/TD8fy4ADsyq625a6cbFk="; + sha256 = "sha256-XVIkyf9cQZXjFuGGCliCSY22X8EkoPEl1EpGCrMTsgY="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 4215b20180e3..5e1d9dc9cb8b 100644 --- a/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -175,7 +175,8 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + lib.optionalString wrapPythonDrv '' - wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" + wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \ + --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}" '' + lib.optionalString (guiSupport == "gtk3") '' rewrap () { diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index fd1cb7153ebf..1a4b3e6c0616 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,16 +13,16 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "08qrag9nzmngzzvs2cgbmc4zzxlb9kwn183v8caj6dvcrjvfqgbv"; - x86_64-darwin = "0rlyr08lla3xadlh373xqcks8a9akk3x2cmakgn17q2b16988fmq"; - aarch64-linux = "1m277940xsasqac4i88s05xrqsab99jhl3ka0zzfbixrgr2dj8q1"; - armv7l-linux = "1qm4cggjj50vdnrx848x810gz3ahh0hndra22lsvcjdbsw8g35rk"; + x86_64-linux = "0cklp0mp7qylzrqnfbvzs308q0bzpswlqw5n98qhl1jb5783svx1"; + x86_64-darwin = "04yyv0wpkzdjfiy9kj2jslhv7nc5i6nw2207vfnbzysgs55l3x63"; + aarch64-linux = "1ygk51902g0q7x3r6kd3s7gi2gx86x10svpvbipl494qcyfngqzs"; + armv7l-linux = "0z5rg1nl8lz7zsvml6dfz093dbyrkr4zvvfssqiyarw4n24d2mim"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.2"; + version = "1.57.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 7dadd02a4476..849f435eb368 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1gw2273ab0gdyav6mz7wk7d6g6cwcdvx0xaghvm610m1pvkbvxkz"; - x86_64-darwin = "1zfzsr8gybmpmxc3jlfj6sx3m6ny6hc3dxvpgffni7k5zgv651df"; - aarch64-linux = "079bp48h0qfpsbyir2qg3w1f43dc68ngmxqdqb3jnkx721affjzs"; - armv7l-linux = "1d9243hk07xawv44909lk6y6bnvy0wjhy8xl13n3a11pg3djn5bm"; + x86_64-linux = "16s3hznyrz9w0cns8fk3pzk9ai5dj9y5p4n1rf3hrpg5hi9yxi5j"; + x86_64-darwin = "133p032c8gv3hx4x7kxdfhz4xvkpjmjnvy02sf05dxqv5nly4xx4"; + aarch64-linux = "183f674qyrlz0wqx6x48z6jhl8z30zmwsj8021hqi8px5ny99l1f"; + armv7l-linux = "0rf3ybha861r5pfp6rvh21abfagaiwqlsbxm7fhphrc5382lmxbs"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.2"; + version = "1.57.1"; pname = "vscodium"; executableName = "codium"; diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index e8a882493688..d0f5ecf4115e 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-12"; + version = "6.9.12-15"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-yqMYuayQjPlTqi3+CtwP5CdsAGud/fHR0I2LwUPIq00="; + sha256 = "sha256-bel4p45eQfQPIp5/sawhTYTfyuYRQ5nFuGh4qqt1zDs="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 27c3e31b28c7..d7840a78bb48 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-9"; + version = "7.0.11-12"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-eL9zFrgkLb3pS8/UlQB5+p50UG8j3Q7TNDwcO/3BuXo="; + sha256 = "sha256-vTCfpHcja0z/aplcunUDlg/90EbfrR/xQ9bzdG0n2RY="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 657ea55da60d..4d273d187ca2 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.14.0"; + version = "4.14.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-BDW87UVN1Jub0sJFvtkZr5ssz835Yf2CNn5kHCn70cE="; + sha256 = "sha256-OXSxfNCwbZ1RjjoxDlsREtKtbzlQcuPylvD1/ehfgsI="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/nixpkgs/pkgs/applications/graphics/imv/default.nix b/nixpkgs/pkgs/applications/graphics/imv/default.nix index 3f6a27cbc76a..e9488b845f22 100644 --- a/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -5,7 +5,6 @@ , cmocka , docbook_xsl , libxslt -, fontconfig , meson , ninja , pkg-config @@ -90,6 +89,12 @@ stdenv.mkDerivation rec { ] ++ windowSystems."${withWindowSystem}" ++ builtins.map (b: backends."${b}") withBackends; + postInstall = '' + # fix the executable path and install the desktop item + substituteInPlace ../files/imv.desktop --replace "imv %F" "$out/bin/imv %F" + install -Dm644 ../files/imv.desktop $out/share/applications/ + ''; + postFixup = lib.optionalString (withWindowSystem == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -104,7 +109,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line image viewer for tiling window managers"; homepage = "https://github.com/eXeC64/imv"; - license = licenses.gpl2; + license = licenses.mit; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix index 0c5a0fe6e3da..fc6c1d55e706 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.3"; + version = "4.4.5"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; + sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg="; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/veusz/default.nix b/nixpkgs/pkgs/applications/graphics/veusz/default.nix new file mode 100644 index 000000000000..5c5b1c91709a --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/veusz/default.nix @@ -0,0 +1,71 @@ +{ python3Packages +, qtbase +, ghostscript +, wrapQtAppsHook +, lib +}: + +python3Packages.buildPythonApplication rec { + pname = "veusz"; + version = "3.3.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "4ClgYwiU21wHDve2q9cItSAVb9hbR2F+fJc8znGI8OA="; + }; + + nativeBuildInputs = [ wrapQtAppsHook python3Packages.sip ]; + + buildInputs = [ qtbase ]; + + # veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap + # it automatically -> we have to do it explicitly + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/bin/veusz" + ''; + + # For some reason, if sip5 is found on the PATH, the option --sip-dir is + # ignored in setupPyBuildFlags, see + # https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L292 + postPatch = '' + substituteInPlace pyqtdistutils.py \ + --replace "'-I', pyqt5_include_dir," "'-I', '${python3Packages.pyqt5}/share/sip/PyQt5'," + patchShebangs tests/runselftest.py + ''; + + # you can find these options at + # https://github.com/veusz/veusz/blob/53b99dffa999f2bc41fdc5335d7797ae857c761f/pyqtdistutils.py#L71 + setupPyBuildFlags = [ + # --sip-dir does nothing here, but it should be the correct way to set the + # sip_dir, so I'm leaving it here for future versions + "--sip-dir=${python3Packages.pyqt5}/share/sip" + "--qt-include-dir=${qtbase.dev}/include" + # veusz tries to find a libinfix and fails without one + # but we simply don't need a libinfix, so set it to empty here + "--qt-libinfix=" + ]; + + propagatedBuildInputs = with python3Packages; [ + numpy + pyqt5 + # optional requirements: + dbus-python + h5py + # astropy -- fails to build on master + # optional TODO: add iminuit, pyemf and sampy + ]; + + installCheckPhase = '' + wrapQtApp "tests/runselftest.py" + QT_QPA_PLATFORM=minimal tests/runselftest.py + ''; + + meta = with lib; { + description = "A scientific plotting and graphing program with a GUI"; + homepage = "https://veusz.github.io/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ laikq ]; + }; +} diff --git a/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/nixpkgs/pkgs/applications/kde/kdenlive/default.nix index 3beaa4427d79..8ec2d2a81b04 100644 --- a/nixpkgs/pkgs/applications/kde/kdenlive/default.nix +++ b/nixpkgs/pkgs/applications/kde/kdenlive/default.nix @@ -102,5 +102,6 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2Plus ]; + maintainers = with lib.maintainers; [ turion ]; }; } diff --git a/nixpkgs/pkgs/applications/kde/kmail.nix b/nixpkgs/pkgs/applications/kde/kmail.nix index d5d61694e632..1a33eb2fe203 100644 --- a/nixpkgs/pkgs/applications/kde/kmail.nix +++ b/nixpkgs/pkgs/applications/kde/kmail.nix @@ -1,14 +1,53 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig, - kconfigwidgets, kcoreaddons, libkdepim, - kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap, - kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, - kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, - kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, - messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi, kdepim-addons, - qtkeychain, libsecret +{ mkDerivation +, lib +, akonadi +, akonadi-import-wizard +, akonadi-search +, extra-cmake-modules +, kaddressbook +, kbookmarks +, kcalutils +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdepim-addons +, kdepim-runtime +, kdepimTeam +, kdoctools +, kguiaddons +, ki18n +, kiconthemes +, kinit +, kio +, kldap +, kleopatra +, kmail-account-wizard +, kmailtransport +, knotifications +, knotifyconfig +, kontactinterface +, kparts +, kpty +, kservice +, ktextwidgets +, ktnef +, kwallet +, kwidgetsaddons +, kwindowsystem +, kxmlgui +, libgravatar +, libkdepim +, libksieve +, libsecret +, mailcommon +, messagelib +, pim-data-exporter +, pim-sieve-editor +, qtkeychain +, qtscript +, qtwebengine }: mkDerivation { @@ -19,13 +58,53 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kguiaddons ki18n - kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim - knotifications knotifyconfig kontactinterface kparts kpty kservice - ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar - libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine - kdepim-addons qtkeychain libsecret + akonadi-search + kbookmarks + kcalutils + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdepim-addons + kguiaddons + ki18n + kiconthemes + kinit + kio + kldap + kmail-account-wizard + kmailtransport + knotifications + knotifyconfig + kontactinterface + kparts + kpty + kservice + ktextwidgets + ktnef + kwidgetsaddons + kwindowsystem + kxmlgui + libgravatar + libkdepim + libksieve + libsecret + mailcommon + messagelib + pim-sieve-editor + qtkeychain + qtscript + qtwebengine + akonadi-import-wizard + kaddressbook + kleopatra + pim-data-exporter ]; + outputs = [ "out" "doc" ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; + postFixup = '' + wrapProgram "$out/bin/kmail" \ + --prefix PATH : "${lib.makeBinPath [ akonadi akonadi-import-wizard kaddressbook kleopatra kmail-account-wizard pim-data-exporter ]}" + ''; } diff --git a/nixpkgs/pkgs/applications/misc/anup/default.nix b/nixpkgs/pkgs/applications/misc/anup/default.nix new file mode 100644 index 000000000000..9c99c84eabee --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/anup/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}: + +rustPlatform.buildRustPackage rec { + pname = "anup"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Acizza"; + repo = "anup"; + rev = version; + sha256 = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; + }; + + buildInputs = [ + sqlite + xdg-utils + ]; + + cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM="; + + meta = with lib; { + homepage = "https://github.com/Acizza/anup"; + description = "An anime tracker for AniList featuring a TUI"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ natto1784 ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/authenticator/default.nix b/nixpkgs/pkgs/applications/misc/authenticator/default.nix index 46b61720d0a3..ffa34d041e9c 100644 --- a/nixpkgs/pkgs/applications/misc/authenticator/default.nix +++ b/nixpkgs/pkgs/applications/misc/authenticator/default.nix @@ -91,6 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { + broken = true; # https://gitlab.gnome.org/World/Authenticator/-/issues/271 description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/nixpkgs/pkgs/applications/misc/bemenu/default.nix index eaad132de927..371bb3a3ef92 100644 --- a/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-UdsfIXlKfXmsrFwrerX1wfne4mdtd69WXnXu3EmxCBY="; + sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/nixpkgs/pkgs/applications/misc/cheat/default.nix b/nixpkgs/pkgs/applications/misc/cheat/default.nix index 9c8f060f1691..f7a56a48fc72 100644 --- a/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-wH0MTTwUmi/QZXo3vWgRYmlPxMxgfhghrTIZAwdVjQ0="; + sha256 = "sha256-YKGCZm0BaFLi+kujl04B4IU1qay15XNfvelxfUkCP8o="; }; subPackages = [ "cmd/cheat" ]; diff --git a/nixpkgs/pkgs/applications/misc/electrum/default.nix b/nixpkgs/pkgs/applications/misc/electrum/default.nix index 676efb2aa042..4197c1af040b 100644 --- a/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.2"; + version = "4.1.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0zvv8nmjzw5pchykz5p28483nby4lp4ah7iqr08pv36gy89l51v5"; + sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk"; + sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; }; postUnpack = '' diff --git a/nixpkgs/pkgs/applications/misc/free42/default.nix b/nixpkgs/pkgs/applications/misc/free42/default.nix index 16344d975fea..feadf1590921 100644 --- a/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2TOYvZBI2EW9xjbjA4Bh+TgjbyEXRzOByalLYBW8Ba8="; + sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 854b8a5f9b36..ac33025b727e 100644 --- a/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.4"; + version = "1.17.5"; src = fetchPypi { inherit pname version; - sha256 = "4df80fd923b03b2413a3d1c50e32c3006d100ed5acc1400ace69d8dc2162d293"; + sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 2f2a0a22126e..4a368e92ec33 100644 --- a/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.27"; + version = "1.0.28"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "1sw56aqghfxh88mfchf0nvqld0x7w22jfwx13pd24slxv1iag1nb"; + sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME="; }; - vendorSha256 = "0d64gkkzfm6hbgqaibj26fpaqnjs50p1675ycrshdhn6blb5mbxg"; + vendorSha256 = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix index f291ab898e3d..1bc22b6613d4 100644 --- a/nixpkgs/pkgs/applications/misc/hubstaff/default.nix +++ b/nixpkgs/pkgs/applications/misc/hubstaff/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE , libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 -, curl }: +, curl, writeShellScript, common-updater-scripts }: let - - data = builtins.fromJSON (builtins.readFile ./revision.json); - - inherit (data) version url sha256; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.19-9e79d1da/Hubstaff-1.5.19-9e79d1da.sh"; + version = "1.5.19-9e79d1da"; + sha256 = "1l4sq8cblpl1kclkx5pgy0ldfmqa3n8bvdl5qml0n78r0lpk382j"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft @@ -56,6 +55,18 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; + updateScript = writeShellScript "hubstaff-updater" '' + set -eu -o pipefail + + installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) + + version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') + + sha256=$(nix-prefetch-url "$installation_script_url") + + ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "$sha256" "$installation_script_url" + ''; + meta = with lib; { description = "Time tracking software"; homepage = "https://hubstaff.com/"; diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json b/nixpkgs/pkgs/applications/misc/hubstaff/revision.json deleted file mode 100644 index 9b0ffe67f0cd..000000000000 --- a/nixpkgs/pkgs/applications/misc/hubstaff/revision.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh", - "version": "1.5.15-28673d1c", - "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2" -} diff --git a/nixpkgs/pkgs/applications/misc/hubstaff/update.sh b/nixpkgs/pkgs/applications/misc/hubstaff/update.sh deleted file mode 100755 index c4c1caf55db4..000000000000 --- a/nixpkgs/pkgs/applications/misc/hubstaff/update.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch-git curl - -SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") - -installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) - -version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') - -sha256=$(nix-prefetch-url "$installation_script_url") - -cat <<EOT > $SCRIPT_DIR/revision.json -{ - "url": "$installation_script_url", - "version": "$version", - "sha256": "$sha256" -} -EOT diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index b8ea6b83b907..9834e91309da 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.83.1"; + version = "0.84.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c9T3a6J78uLumBTy/DgE4gbxCmEXVGKd9JyF9dyrL6g="; + sha256 = "sha256-BRp4iboiaoB6zFwleFSJ7oVAd3o6OiR5BB4VRQilExc="; }; - vendorSha256 = "sha256-ddCyMmZ5RIZWzT2RYNnSW795oR7PIRudl3QTjsXtBGk="; + vendorSha256 = "sha256-jY/g92ON5OxjuZzPHJNduXYMgPU8/0ioAYvp4iqjGnU="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 9c559a364ef9..2d9a2ca59045 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.7.11"; + version = "1.8.5"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "11vjipvhfvf6wxldcg743anma005j8dbbngqk6sq9hlf677ahxii"; - x86_64-darwin = "1l7m86jlf1m066n6rwmh5fkpx2pj3wj5h9ncxdd24v0zll6ki8vs"; + x86_64-linux = "11csbr72i5kac2bk7wpa877lay2z1n58s0yildkfnjy552ihdxny"; + x86_64-darwin = "1n0ni3ixml99ag83bcn5wg6f0kldjhwkkddd9km37ykr8vxxl952"; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/jquake/default.nix b/nixpkgs/pkgs/applications/misc/jquake/default.nix new file mode 100644 index 000000000000..eccd8b4c1896 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/jquake/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchurl, copyDesktopItems, makeDesktopItem, unzip, jre8 }: + +stdenv.mkDerivation rec { + pname = "jquake"; + version = "1.6.1"; + + src = fetchurl { + url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; + sha256 = "0nw6xjc3i1b8rk15arc5d0ji2bycc40rz044qd03vzxvh0h8yvgl"; + }; + + nativeBuildInputs = [ unzip copyDesktopItems ]; + + sourceRoot = "."; + + postPatch = '' + # JQuake emits a lot of debug-like messages in console, but I + # don't think it's in our interest to void them by default. Log them at + # the appropriate level. + sed -i "/^java/ s/$/\ | logger -p user.debug/" JQuake.sh + + # By default, an 'errors.log' file is created in the current directory. + # cd into a temporary directory and let it be created there. + substituteInPlace JQuake.sh \ + --replace "java -jar " "exec ${jre8.outPath}/bin/java -jar $out/lib/" \ + --replace "[JAR FOLDER]" "\$(mktemp -p /tmp -d jquake-errlog-XXX)" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + chmod +x JQuake.sh + + mkdir -p $out/{bin,lib} + mv JQuake.sh $out/bin/JQuake + mv {JQuake.jar,JQuake_lib} $out/lib + mv sounds $out/lib + + mkdir -p $out/share/licenses/jquake + mv LICENSE* $out/share/licenses/jquake + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "JQuake"; + desktopName = "JQuake"; + exec = "JQuake"; + comment = "Real-time earthquake map of Japan"; + }) + ]; + + meta = with lib; { + description = "Real-time earthquake map of Japan"; + homepage = "http://jquake.net"; + downloadPage = "https://jquake.net/?down"; + changelog = "https://jquake.net/?docu"; + maintainers = with maintainers; [ nessdoor ]; + license = licenses.unfree; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/nixpkgs/pkgs/applications/misc/keepassx/community.nix index fe09345349e5..b4beab05acd1 100644 --- a/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake -, makeWrapper , qttools , darwin @@ -43,13 +41,13 @@ with lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "02ajfkw818cmalvkl0kqvza85rgdgs59kw2v7b3c4v8kv00c41j3"; + sha256 = "15rm3avdmc2x2n92zq6w1zbcranak4j6dds2sxmgdqi1ffc0a3ci"; }; NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ @@ -92,10 +90,9 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ cmake wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ]; buildInputs = [ - asciidoctor curl glibcLocales libXi diff --git a/nixpkgs/pkgs/applications/misc/logseq/default.nix b/nixpkgs/pkgs/applications/misc/logseq/default.nix index 1900b92e3bbe..83356b9550a0 100644 --- a/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.1.3"; + version = "0.1.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "1akg3xjbh01nb7l06qpvz3xsjj64kf042xjnapn60jlgg5y34vbm"; + sha256 = "0q8lci72rzzc04wnfqry31zav07srw0iymjlq5mxygsq4h9bcq01"; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix new file mode 100644 index 000000000000..045f0db42fe8 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "neo4j-desktop"; + version = "1.4.5"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; + sha256 = "sha256-TCkjYhvGhgqgrDEMvC4Ww/sDxRhHC70YgfDlCIFitMo"; + }; + + appimageContents = appimageTools.extract { inherit src; name = pname; }; +in appimageTools.wrapType2 { + inherit name src; + + extraPkgs = pkgs: with pkgs; [ libsecret ]; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A GUI front-end for Neo4j"; + homepage = "https://neo4j.com/"; + license = licenses.unfree; + maintainers = [ maintainers.bobvanderlinden ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix new file mode 100644 index 000000000000..5c4b508bb6bd --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -0,0 +1,48 @@ +{ lib, fetchFromGitHub +, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection +, gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk +}: + +buildGoModule rec { + pname = "nwg-menu"; + version = "unstable-2021-06-12"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-menu"; + rev = "b0746e26514a047ed9c6b975a71b7263aa39bd56"; + hash = "sha256-rxyf3CfpfWnRAlIR/pl+s7LGAZbZjdtNWPPK7BecdhQ="; + }; + + vendorSha256 = "sha256-nN5iBleK12SKY9PBiDA+tM4B8FiVGZLXbtJM2+YrEfA="; + + runVend = true; + + doCheck = false; + + buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + + prePatch = '' + for file in main.go tools.go; do + substituteInPlace $file --replace '/usr/share/nwg-menu' $out/share + done + ''; + + postInstall = '' + mkdir -p $out/share/ + cp menu-start.css $out/share/ + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share") + ''; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/nwg-menu"; + description = "MenuStart plugin for nwg-panel"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ berbiche ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/nixpkgs/pkgs/applications/misc/octoprint/default.nix index af42466d0ead..0c0dae0da42e 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -33,6 +33,22 @@ let (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") (mkOverride "sarge" "0.1.5.post0" "1c1ll7pys9vra5cfi8jxlgrgaql6c27l6inpy15aprgqhc4ck36s") + # Requires websocket-client <1.0, >=0.57. Cannot do mkOverride b/c differing underscore/hyphen in pypi source name + ( + self: super: { + websocket-client = super.websocket-client.overridePythonAttrs ( + oldAttrs: rec { + version = "0.58.0"; + src = oldAttrs.src.override { + pname = "websocket_client"; + inherit version; + sha256 = "63509b41d158ae5b7f67eb4ad20fecbb4eee99434e73e140354dc3ff8e09716f"; + }; + } + ); + } + ) + # Octoprint needs zeroconf >=0.24 <0.25. While this should be done in # the mkOverride aboves, this package also has broken tests, so we need # a proper override. @@ -134,7 +150,7 @@ let tornado unidecode watchdog - websocket_client + websocket-client werkzeug wrapt zeroconf diff --git a/nixpkgs/pkgs/applications/misc/printrun/default.nix b/nixpkgs/pkgs/applications/misc/printrun/default.nix index 631609551306..7ae8662e2c19 100644 --- a/nixpkgs/pkgs/applications/misc/printrun/default.nix +++ b/nixpkgs/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "printrun"; @@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec { sha256 = "179x8lwrw2h7cxnkq7izny6qcb4nhjnd8zx893i77zfhzsa6kx81"; }; + nativeBuildInputs = [ glib wrapGAppsHook ]; + propagatedBuildInputs = with python3Packages; [ appdirs cython dbus-python numpy six wxPython_4_0 psutil pyglet pyopengl pyserial ]; @@ -29,6 +31,14 @@ python3Packages.buildPythonApplication rec { done ''; + dontWrapGApps = true; + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; homepage = "https://github.com/kliment/Printrun"; diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 4175cb2b2220..2bf28aa892f5 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.2.54.2"; + version = "2.3.56.5"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; override = super: { @@ -10,20 +10,19 @@ let src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-ThmsxFXI1uReK+JwpHrIWzHpBdIOP77kDjv+QaK+Azk="; + sha256 = "sha256-Gg+LT1YKyUGNJE9XvWE1LSlIQ6Vq5GfVBTUw/A7Qx7E="; rev = version; + fetchSubmodules = true; }; + # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. + postInstall = null; + # See https://github.com/supermerill/SuperSlicer/issues/432 cmakeFlags = super.cmakeFlags ++ [ "-DSLIC3R_BUILD_TESTS=0" ]; - postInstall = '' - mkdir -p "$out/share/pixmaps/" - ln -s "$out/share/SuperSlicer/icons/Slic3r.png" "$out/share/pixmaps/${appname}.png" - ''; - desktopItems = [ (makeDesktopItem { name = appname; diff --git a/nixpkgs/pkgs/applications/misc/robo3t/default.nix b/nixpkgs/pkgs/applications/misc/robo3t/default.nix index 1b19d9ab9cc0..41f3475a645f 100644 --- a/nixpkgs/pkgs/applications/misc/robo3t/default.nix +++ b/nixpkgs/pkgs/applications/misc/robo3t/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchurl, curl, zlib, glib, xorg, dbus, fontconfig, libGL, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: +{ lib +, stdenv +, fetchurl +, curl +, zlib +, glib +, xorg +, dbus +, fontconfig +, libGL +, freetype +, xkeyboard_config +, makeDesktopItem +, makeWrapper +}: let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; @@ -30,7 +43,7 @@ stdenv.mkDerivation rec { categories = "Development;IDE;"; }; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [ makeWrapper ]; ldLibraryPath = lib.makeLibraryPath [ stdenv.cc.cc @@ -51,6 +64,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + BASEDIR=$out/lib/robo3t mkdir -p $BASEDIR/bin @@ -72,13 +87,15 @@ stdenv.mkDerivation rec { makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb + + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; + description = "Query GUI for mongodb. Formerly called Robomongo"; platforms = [ "x86_64-linux" ]; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ eperuffo ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/robomongo/default.nix b/nixpkgs/pkgs/applications/misc/robomongo/default.nix deleted file mode 100644 index af5285909c6c..000000000000 --- a/nixpkgs/pkgs/applications/misc/robomongo/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, - freetype, xkeyboard_config, makeDesktopItem, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "robomongo"; - version = "0.9.0"; - - src = fetchurl { - url = "https://download.robomongo.org/${version}/linux/robomongo-${version}-linux-x86_64-0786489.tar.gz"; - sha256 = "1q8ahdz3afcw002p8dl2pybzkq4srk6bnikrz216yx1gswivdcad"; - }; - - icon = fetchurl { - url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png"; - sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2"; - }; - - desktopItem = makeDesktopItem { - name = "robomongo"; - exec = "robomongo"; - icon = icon; - comment = "Query GUI for mongodb"; - desktopName = "Robomongo"; - genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; - }; - - nativeBuildInputs = [makeWrapper]; - - ldLibraryPath = lib.makeLibraryPath [ - stdenv.cc.cc - zlib - glib - xorg.libXi - xorg.libxcb - xorg.libXrender - xorg.libX11 - xorg.libSM - xorg.libICE - xorg.libXext - dbus - fontconfig - freetype - ]; - - installPhase = '' - BASEDIR=$out/lib/robomongo - - mkdir -p $BASEDIR/bin - cp bin/* $BASEDIR/bin - - mkdir -p $BASEDIR/lib - cp -r lib/* $BASEDIR/lib - - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications - - mkdir -p $out/share/icons - cp ${icon} $out/share/icons/robomongo.png - - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robomongo - - mkdir $out/bin - - makeWrapper $BASEDIR/bin/robomongo $out/bin/robomongo \ - --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \ - --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb - ''; - - meta = { - homepage = "https://robomongo.org/"; - description = "Query GUI for mongodb"; - platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86_64; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.eperuffo ]; - }; -} diff --git a/nixpkgs/pkgs/applications/misc/rofi/default.nix b/nixpkgs/pkgs/applications/misc/rofi/default.nix index 33a37e326127..d47d1fe26a61 100644 --- a/nixpkgs/pkgs/applications/misc/rofi/default.nix +++ b/nixpkgs/pkgs/applications/misc/rofi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ mbakke ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index a67d79f9bf90..0daaad2f2655 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, wrapGAppsHook, python3Packages }: +{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -11,7 +11,15 @@ python3Packages.buildPythonApplication rec { sha256 = "0l2c4qngv58j6zkp0va6m96zksx8gqn3mjc3isqybfnhjr6nd3v9"; }; - buildInputs = [ gobject-introspection gtk3 gtksourceview3 ]; + buildInputs = [ + gobject-introspection + gtk3 + gtksourceview3 + # webkitgkt is used for rendering interactive statistics graph which + # can be seen by opening a ROM, entering Pokemon section, selecting + # any Pokemon, and clicking Stats and Moves tab. + webkitgtk + ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ natsort diff --git a/nixpkgs/pkgs/applications/misc/slides/default.nix b/nixpkgs/pkgs/applications/misc/slides/default.nix new file mode 100644 index 000000000000..ce5987d6c186 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub, bash, go, python3, ruby }: + +buildGoModule rec { + pname = "slides"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "slides"; + rev = "v${version}"; + sha256 = "0vwpisyvsgmvrzp26hapghgqmm3fhrzrvdnmws00xc2q3fsij9qx"; + }; + + checkInputs = [ + bash + go + python3 + ruby + ]; + + vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; + + ldflags = [ + "-s" "-w" + "-X=main.Version=${version}" + ]; + + meta = with lib; { + description = "Terminal based presentation tool"; + homepage = "https://github.com/maaslalani/slides"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 62a6d4785f12..e20b95922f9a 100644 --- a/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "1.2.1"; + version = "2.2.6"; src = fetchFromGitHub { owner = "khanhas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HASFaPqm/A1QQ4nkd2hgeyqWplwE1RTrWA937rJA5Oo="; + sha256 = "sha256-9g6rkSDjE7x/YprPX0dkzqgpjgED5qBpUUQoVv6fGkk="; }; vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs="; diff --git a/nixpkgs/pkgs/applications/misc/subsurface/default.nix b/nixpkgs/pkgs/applications/misc/subsurface/default.nix index 19fdd4640e40..7420267aa7d2 100644 --- a/nixpkgs/pkgs/applications/misc/subsurface/default.nix +++ b/nixpkgs/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "4.9.10"; + version = "5.0.1"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "12ndhjplz3cwndwzhfc959dc0i6rm2qf3v2d8n9kba8nj63iblfs"; + sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; fetchSubmodules = true; }); @@ -40,13 +40,13 @@ let googlemaps = stdenv.mkDerivation rec { pname = "googlemaps"; - version = "2018-06-02"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "vladest"; repo = "googlemaps"; - rev = "54a357f9590d9cf011bf1713589f66bad65e00eb"; - sha256 = "159kslp6rj0qznzxijppwvv8jnswlfgf2pw4x8ladi8vp6bzxnzi"; + rev = "8f7def10c203fd3faa5ef96c5010a7294dca0759"; + sha256 = "1irz398g45hk6xizwzd07qcx1ln8f7l6bhjh15f56yc20waqpx1x"; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/applications/misc/survex/default.nix b/nixpkgs/pkgs/applications/misc/survex/default.nix new file mode 100644 index 000000000000..f6865f877d7d --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/survex/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchgit +, autoreconfHook +, pkg-config +, wxGTK30-gtk3 +, wxmac +, ffmpeg +, proj +, perl532 +, unscii +, python +, libGL +, libGLU +, xlibsWrapper +, docbook2x +, docbook5 +, Carbon +, Cocoa +}: + +let + perlenv = perl532.withPackages (perlPackages: with perlPackages; [ LocalePO ] ); +in +stdenv.mkDerivation rec { + pname = "survex"; + version = "1.2.44"; + + nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ]; + + buildInputs = [ + libGL libGLU ffmpeg proj + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + wxmac Carbon Cocoa + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + wxGTK30-gtk3 xlibsWrapper + ]; + + src = fetchgit { + url = "git://git.survex.com/survex"; + rev = version; + sha256 = "11gaqmabrf3av665jy3mr0m8hg76fmvnd0g3rghzmyh8d8v6xk34"; + }; + + enableParallelBuilding = true; + + # Docs rely on sgmltools-lite, a package that would be quite complex to + # provide as it is quite old. So this preConfigure hook effectively disables + # the doc generation. An example of packaging sgmltools-lite from Gentoo can + # be found here: + # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild?id=0b8b716331049599ea3299981e3a9ea6e258c5e0 + + postPatch = '' + patchShebangs . + echo "" > doc/Makefile.am + # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged. + for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do + substituteInPlace src/Makefile.am \ + --replace "$perltool" "${perlenv}/bin/perl $perltool" + done + substituteInPlace lib/Makefile.am \ + --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font' + substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex + ''; + + meta = with lib; { + description = "Free Software/Open Source software package for mapping caves"; + longDescription = '' + Survex is a Free Software/Open Source software package for mapping caves, + licensed under the GPL. It is designed to be portable and can be run on a + variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. + ''; + homepage = "https://survex.com/"; + changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.matthewcroughan ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/ticker/default.nix b/nixpkgs/pkgs/applications/misc/ticker/default.nix index fd37a692d841..a3e2dc11c6f7 100644 --- a/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.0.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YVpspFBwao/7M2nTVMw+ANc0roL0vBO4DpNUb7Thp3Q="; + sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8="; }; - vendorSha256 = "sha256-nidOIjrTL4llV5GORebXOOPGeL6TxkurDY82cIc7+mU="; + vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X github.com/achannarasappa/ticker/cmd.Version=v${version}") diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index ebfaaa1db51d..6d9d9deefa20 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { python-Levenshtein pyxdg requests - websocket_client + websocket-client ]; checkInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/misc/usql/default.nix b/nixpkgs/pkgs/applications/misc/usql/default.nix new file mode 100644 index 000000000000..7a83ec05c10a --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -0,0 +1,56 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, unixODBC +, icu +}: + +buildGoModule rec { + pname = "usql"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "xo"; + repo = "usql"; + rev = "v${version}"; + sha256 = "sha256-fcKn4kHIRvMdgGFKDNQg49YxLc0Y5j/8VwKoDLiXbEU="; + }; + + vendorSha256 = "sha256-uAV8NLnqXjIDILfnbbkVr2BOIucQ8vX89KI5yIkVtus="; + + buildInputs = [ unixODBC icu ]; + + # These tags and flags are copied from build-release.sh + buildFlags = [ "-tags" ]; + buildFlagsArray = [ + "most" + "sqlite_app_armor" + "sqlite_fts5" + "sqlite_introspect" + "sqlite_json1" + "sqlite_stat4" + "sqlite_userauth" + "sqlite_vtable" + "sqlite_icu" + "no_adodb" + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/xo/usql/text.CommandVersion=${version}" + ]; + + # All the checks currently require docker instances to run the databases. + doCheck = false; + + meta = with lib; { + description = "Universal command-line interface for SQL databases"; + homepage = "https://github.com/xo/usql"; + license = licenses.mit; + maintainers = with maintainers; [ georgyo ]; + # usql does not build on ARM. + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/misc/variety/default.nix b/nixpkgs/pkgs/applications/misc/variety/default.nix index 2366d04b9ca1..5e7765a16fde 100644 --- a/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -10,6 +10,7 @@ , hicolor-icon-theme , librsvg , wrapGAppsHook +, makeWrapper }: with python37Packages; @@ -27,10 +28,14 @@ buildPythonApplication rec { nativeBuildInputs = [ intltool wrapGAppsHook ]; - buildInputs = [ distutils_extra ]; + buildInputs = [ makeWrapper distutils_extra ]; doCheck = false; + postInstall = '' + wrapProgram $out/bin/variety --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ + ''; + prePatch = '' substituteInPlace variety_lib/varietyconfig.py \ --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\"" @@ -76,7 +81,7 @@ buildPythonApplication rec { blur, as well as options to layer quotes and a clock onto the background. ''; license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix index 5e5fda23d442..33d0da5c93a4 100644 --- a/nixpkgs/pkgs/applications/misc/veracrypt/default.nix +++ b/nixpkgs/pkgs/applications/misc/veracrypt/default.nix @@ -1,29 +1,39 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, makeself +, yasm +, fuse +, wxGTK +, lvm2 +, substituteAll +, e2fsprogs +, exfat +, ntfs3g +, btrfs-progs +}: with lib; stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.24-Hotfix1"; + version = "1.24-Update7"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "8b40ece805b216843d7a71b1a30069c4057931341b030bf65caace59263c5c8c"; + sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc"; }; - patches = [ - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/afe6b2f45b15393026a1159e5f3d165ac7d0b94a.patch"; - sha256 = "1xm9cl6zinlr0vah5xr9bvh0y9gw4331zl7d2n5xvqrcdxw3ww1y"; - stripLen = 1; - }) - # https://github.com/veracrypt/VeraCrypt/issues/529 - fix build on non-x86 - (fetchpatch { - url = "https://github.com/veracrypt/VeraCrypt/commit/3fa636d477119fff6e372074568edb42d038f508.patch"; - sha256 = "0qsccilip0ksnlzxina38a052gb533r4s422lxhrj3wv9zgpp7l3"; - stripLen = 1; + (substituteAll { + src = ./fix-paths.patch; + ext2 = "${e2fsprogs}/bin/mkfs.ext2"; + ext3 = "${e2fsprogs}/bin/mkfs.ext3"; + ext4 = "${e2fsprogs}/bin/mkfs.ext4"; + exfat = "${exfat}/bin/mkfs.exfat"; + ntfs = "${ntfs3g}/bin/mkfs.ntfs"; + btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; }) ]; diff --git a/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch b/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch new file mode 100644 index 000000000000..56b4fc483804 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/veracrypt/fix-paths.patch @@ -0,0 +1,22 @@ +diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h +--- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300 ++++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300 +@@ -77,12 +77,12 @@ + switch (fsType) + { + #if defined (TC_LINUX) +- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2"; +- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3"; +- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4"; +- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs"; +- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat"; +- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs"; ++ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@"; ++ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@"; ++ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@"; ++ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@"; ++ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@"; ++ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@"; + #elif defined (TC_MACOSX) + case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs"; + case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat"; diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index ad49a1b291e2..9663d09304f8 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -1,17 +1,26 @@ -{ buildPythonApplication +{ stdenv , lib +, buildPythonApplication , fetchFromGitHub , dateutil -, pyyaml +, pandas +, requests +, lxml , openpyxl , xlrd , h5py -, fonttools -, lxml -, pandas +, psycopg2 , pyshp +, fonttools +, pyyaml +, pdfminer +, vobject +, tabulate +, wcwidth +, zstandard , setuptools -, withPcap ? true, dpkt ? null, dnslib ? null +, git +, withPcap ? true, dpkt, dnslib }: buildPythonApplication rec { pname = "visidata"; @@ -25,19 +34,62 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ + # from visidata/requirements.txt + # packages not (yet) present in nixpkgs are commented dateutil - pyyaml + pandas + requests + lxml openpyxl xlrd h5py - fonttools - lxml - pandas + psycopg2 pyshp + #mapbox-vector-tile + #pypng + fonttools + #sas7bdat + #xport + #savReaderWriter + pyyaml + #namestand + #datapackage + pdfminer + #tabula + vobject + tabulate + wcwidth + zstandard setuptools ] ++ lib.optionals withPcap [ dpkt dnslib ]; - doCheck = false; + checkInputs = [ + git + ]; + + # check phase uses the output bin, which is not possible when cross-compiling + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + + checkPhase = '' + # disable some tests which require access to the network + rm tests/load-http.vd # http + rm tests/graph-cursor-nosave.vd # http + rm tests/messenger-nosave.vd # dns + + # disable some tests which expect Python == 3.6 (not our current version) + # see https://github.com/saulpw/visidata/issues/1014 + rm tests/describe.vd + rm tests/describe-error.vd + rm tests/edit-type.vd + + # tests use git to compare outputs to references + git init -b "test-reference" + git config user.name "nobody"; git config user.email "no@where" + git add .; git commit -m "test reference" + + substituteInPlace dev/test.sh --replace "bin/vd" "$out/bin/vd" + bash dev/test.sh + ''; meta = { inherit version; diff --git a/nixpkgs/pkgs/applications/misc/xplr/default.nix b/nixpkgs/pkgs/applications/misc/xplr/default.nix index fbd48287e32a..5d3f2ee4df7e 100644 --- a/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.14.0"; + version = "0.14.2"; src = fetchCrate { inherit pname version; - sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q"; + sha256 = "1bgylz2x44rjxpd6dvd44pr57f18di0nj5sbqh4my8lkanr7isli"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a"; + cargoSha256 = "07rlmz4rkgdcvr0dvbrz56s5vacxcvy09rgz70kr692xlpym4jvq"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 2f52a432f4be..5977b86d0930 100644 --- a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -99,11 +99,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.4.0"; + version = "5.4.2"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-2DzZ5JnFGBeaHtDf7CAXb/qv6kVI+sYMW5Nc25E3eNA="; + sha256 = "sha256-wAhcTRO/Cd4MG1lfPNDq92yGcu3NOfymucddy92VaXo="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix b/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix index 7fb2703199a7..391993617da2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix @@ -20,17 +20,17 @@ mkDerivation rec { pname = "angelfish"; - version = "21.05"; + version = "21.06"; src = fetchurl { url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; - sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; + sha256 = "sha256-iHgmG/DeaUPnRXlVIU8P/oUcYINienYmR2zI9Q4Yd3s="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g"; + sha256 = "0zh0kli7kav18v9znq2f5jklhf3m1kyb41jzmivjx70g9xyfzlwk"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix index 5794bce31f05..b07c526c0d51 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 7d666f5ba9f0..8b3cee86fdfd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.25.68"; + version = "1.25.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "OBf42L6pctflNLjtcbnw2wKo7TisRSMF3SriDPFlB6I="; + sha256 = "mSK3hT0Rp03Bq0k+NCYo6S5w+eA9SXXxO3Lo7QWrc9U="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 156932aa13f1..d036f086b038 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -92,9 +92,10 @@ let }; defaultDependencies = [ + (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy - libpng libcap + libcap xdg-utils minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 @@ -174,6 +175,12 @@ let sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; revert = true; }) + # To fix building from a release tarball (which we do): + (githubPatch { + # Revert back to generating chromium_git_revision.h via version.py + commit = "bd524d08f8465364d12d32a84fd1aa983aecc502"; + sha256 = "1jsxidg5jzwkrcpx3lylx4gyg56zjyd7sc957kaaqqc853bn83b4"; + }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index be7a84576b3e..e904409a1783 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "91.0.4472.77", - "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5", - "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad", + "version": "91.0.4472.114", + "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", + "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", "deps": { "gn": { "version": "2021-04-06", @@ -12,15 +12,15 @@ } }, "chromedriver": { - "version": "91.0.4472.19", - "sha256_linux": "0pg9y55644i87qxa0983lvfizbmfiak9bg9249xhifl5kykghrb2", - "sha256_darwin": "07v5k07100vrzsbm6r59xg8j80ffzs3gnnf2kcfgqrzprx284gf2" + "version": "91.0.4472.101", + "sha256_linux": "0dzx565z2rd0y4i57rv5kd7dsm69sffza96y3c773hqaghm4y1ng", + "sha256_darwin": "0nff1jmmrn6a4clfvhyzrhfp8hx85z72563jwk28apflqmnm0k68" } }, "beta": { - "version": "92.0.4515.40", - "sha256": "1v0vmnzdqq7d2rqp1sam8nk7z20xg5l9lnlpqjxj30y8k37gzh8p", - "sha256bin64": "0i3plysx51n2gsm5vbf9666rz73pqbbns7v09wznbbncvw9zngrf", + "version": "92.0.4515.59", + "sha256": "0lpmd4sybr9qxqj7ab25xjliaw2dk9njnik51gdffrrwphv9qdxb", + "sha256bin64": "0qq9a3pzyn5d6bagx3py86ksl8n488lmlrmadgam2gb7421jq71a", "deps": { "gn": { "version": "2021-05-07", @@ -31,22 +31,22 @@ } }, "dev": { - "version": "93.0.4535.3", - "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18", - "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r", + "version": "93.0.4542.2", + "sha256": "0sfyi52kaxg5mllcvn61285fjnj72vglv9fjf36ri93v6gh34rgw", + "sha256bin64": "0hk31b9nk834gykv977dv7f1hyl7jp527bx5ldxhwcy27333h1hr", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-06-11", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "e0c476ffc83dc10897cb90b45c03ae2539352c5c", + "sha256": "01p5w57kksihzg9nb5096a74cw2rp8zzgdjcjm1pgrqvd1mxpjm4" } } }, "ungoogled-chromium": { - "version": "91.0.4472.77", - "sha256": "0c8vj3gq3nmb7ssiwj6875g0a8hcprss1a4gqw9h7llqywza9ma5", - "sha256bin64": "0caf47xam5igdnbhipal1iyicnxxvadhi61k199rwysrvyv5sdad", + "version": "91.0.4472.114", + "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", + "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", "deps": { "gn": { "version": "2021-04-06", @@ -55,8 +55,8 @@ "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "91.0.4472.77-1", - "sha256": "1jfmmkw1y4rcjfgsm7b4v2lrgd3sks5qpajvq0djflbhkpsqxfk0" + "rev": "91.0.4472.114-1", + "sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h" } } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 6d29a7bda9d6..d14d5b3215b9 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,975 @@ { - version = "85.0b6"; + version = "90.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e6583b946d35db5b8d94bd33e183e397b85c6549a94961ec2cc395b30ba21b6b"; + sha256 = "07c06ddfe0b2d3f4acc89a8bd5de963ae8fb90aedb7710272adbccac178af867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f69bf9371454796ef6cc9469bf1ba6d6c7317a3e559fefafacb3c4d215eaa73"; + sha256 = "b01b6f591d815e2dd3c0bb129952a4a5dbfc7f93d9eed2d61b8c387135768462"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "02ce58a9be06d2632e87daeb0e832d18e896c0ae376171d0d265d108530bf8ed"; + sha256 = "aebbf9e5edce5aa4a01b3dea5342d2335dadca261124f9557d727a2f03c5a123"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "04021d925774cfb01141f34a28800e339339f1b056255721d2c4aa4268156986"; + sha256 = "842c29a5aa563d1f386ed74820ba2cce763e86f8d86a943295b959a51bd8bf27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a85bc2a3c859b9b6e005c1cc5767f1519d255fac011208563c530d28bcec8935"; + sha256 = "8fe01d2193b4d60ce2134ebc5848abf6621cc49bc76d08890ce7588ac2d81311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d84113f01e450d76eccb1f464a3e6a44c3b5fd604c74891d175f0f7565c3b911"; + sha256 = "e5a929e0eb95a09ec408aa831853b1a5859bb0b1f3b133677568f18bc7ba5a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a2826a554577a666b337d95f2c46b292fbb228152282799f295994cb9f6b6563"; + sha256 = "32533dc55222e7e407b386f46d55ae78dc61581ec7653bbe9f8e9859b4d191ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c88db099ee75755d0e60cb8230731be9fafbf5ca3c0a6d0be232cfe1f93523eb"; + sha256 = "2d561a690d625cfff4fe163dda26eac5424e89b74bd6385543238c9e85abf39b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "625377e2bb881aeac0659600def64039bbc1c8518c99acd102f9e47dc956af0d"; + sha256 = "3cec173b9c23137d935221d715bfeb87353bc87bd316a219c8063b5977422bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5fd3c63066e098dc87337c6e4fb53aede9c9d817e1bc06b1fe11597d68f60f3a"; + sha256 = "ab9bd15850209de8d7ad1ef33f50c132babc2c6e70b4ceddee84081f2707b6ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "85745ac8ae54b559592430744ce3a08566c1b20a078b961988870e570dba6eba"; + sha256 = "9f9c87c0bf0a08c23dc30b29bcfb79634a52dccfa945a4593451f6230e373686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5ddd2c3244311bb975e510cefeb1c5e16f92de2d82ef7fd3f6cb6bc064fd70ef"; + sha256 = "21900bc7c61ebbf34f45da1b4740a722e00d6c0d27042a89e006fd99485e7b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e1d4f0ee1a72ea956966b07c3c48fcd089f5540ea1bf02857f41f125a9ab8762"; + sha256 = "6ccec2ac83ab36fb72a8db9293622d7b1c6fe55d1fb8ec6421a64e1210e7e0a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "519c50b7994b0d2bb3c162812424188958a51bdfe40d382db2e83912fb893484"; + sha256 = "7610d94fa66da37689abd3fa79e0703d77f68457c77287e5e61e66169baf7473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "37aeebb7dcd6240721c7377368751f2c48b3492846ef72d09e3fb5146db0cf5f"; + sha256 = "6241b68e5618b474b86529222f5a646f426983eb9e39b2a4d7c3d261cd26f4e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5902520410a45eacf141c9f8c414994298ec108ed0d97096f34156001373dccb"; + sha256 = "b981946aec3128a3e7da3ca76f7815373dc8963ed01d495ee02941954ca42fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "787a26c9f978643e6afaf9dadd88f7adbc18f6d8f6b5814da4752c21faac4078"; + sha256 = "c59f28aef1af64d1cf83e0e5e9ba4bd15be593da27e88e6ea7edaed80a3a64b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "09f5f3edfca2b082ad6f96ecf7b97d336d81c3d63bf1588bc2f38ff91e2d641c"; + sha256 = "b9cd59a9b7ca024f6931d8e25962349346d8c279d3c7983f1a76681784c38efc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "eef50a2a7b0109b62202922041dea12beea346e98fcd8d93f402ba7f08546dff"; + sha256 = "e185f4b874beeacca38bfde59958eb277ce83fcf47eee4cc16065e350707e52d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5ed270355c3fca3d8ce2ba15e2b9a322fa503339ef46c935851442523f91c277"; + sha256 = "ed323fc4a677afa40b1073640dc3fe9e5f49906842684677694a1c85d042c988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6343b55fa02570c7ed4c7eb47b6a8d6b0cbfb5cecb0199282b4cf58e5f344419"; + sha256 = "3c495c341ab226b13cca26fb4d1e79ba8a763c2944374f417b0d1d1e3afb6e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "863e118d3b6c0bf9e25bdef819ec0bb9d027802a99216640a4ee01650486ec8e"; + sha256 = "00d888cf643780473aa480c0a0ded49ad22b76ee0b902062cf014f140ddd2530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c5e58bb173cdaaf9ec09085e47d69c7601966ece7ef5aba85cffced211952e77"; + sha256 = "4421542a7a8d968b4e705852ca76ec4bed857c57df0d10afab17f27b701712e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "a03057a3d852dbd8956aee7253e1a3b6550c843d8755d5c01fe2d72042c80c79"; + sha256 = "db89780192cd14f0fb43ac2974c7c8a72e1896ddcf2db7ff3f6eea9f2788051a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f705f2e633f30fe83a2546847e0dcf6da76e2b9c7edb1a1cbb104c56d45610a6"; + sha256 = "60cd22340342b689e12cabf13ae33a2af3a5ecc6dad5b5e15851fcec0405652b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1b04e80d0666900dba8356d761059bc99e39636b859059d34e79dca73bc6c97e"; + sha256 = "7524fa67ed3246fac49622fb360ddb9ca5b91cc0bdb7eb64d881bf9851dd9128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "078b7cbd04e73f2a62c60ceaeb73edf1dce4ffd656e523acc901e234eb6ff972"; + sha256 = "641c8f48694184ff77db1b7825317f623deae42acafccce35cf7b8b95d38d45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "7131fe554e6b1eaff8af3bd62a565d4db746eb5f65cc9eebe9d6a20921eae0e3"; + sha256 = "e0c808695678e844efe04926bab17168fef0a97f8b125e724c4ebc606a5fc513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "131340d0124292055a8a3f6a7ad86e7f1d4648c47f18bcac37db0fb48b3150cb"; + sha256 = "64fc3ac8c3614cb128f7174802dc101b5c36a92fee5cd6dbd826f505e85c149d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a3c9eff230311f0b449f977f0304eb664614ad683467b165ee6f656530df9caf"; + sha256 = "e7bb62c4f6d4a00b0837fb720c08923f057610267ef97b0090ae8767c26e6867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "69a84d5384d13c486c0cb9bea45ee78662d30fe12f1e46a582f55b3129be6093"; + sha256 = "038a1f723017141ae12ec15a6fec3fc6a49cbdd6244d237c18cd36c70ea6e6d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e25dd52c7241b2df8d1866c118233af0cefd99d4d15011faf5a2b0429c01675a"; + sha256 = "e2c1d68ee029e3f1064277dc6c3844bdbbe3eb28b0492c1299ed6f8a9351ab56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1530c0d16b164a936d6b98d3ecdae44b8484d776767b307322f87f901b6c131a"; + sha256 = "c5e4dff35094ff645272bf402e4c56908b6df7b5c7d6b6925e86528d3ced89af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "7589a12da470306b5212d669d5f2c527a400b4659d8a06f1e49a0a62f33f49ab"; + sha256 = "502f35f69f5f04477678f183e40f8958aa095724e65254cbbdaa9c72c1a40ed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f8a80894596182d66cf6ba9c2073619263f5262a187080e75eb2a3ce93095cb4"; + sha256 = "e353afc86a7b6c452870587b13fa093883e7680f2e44a14c94563d12d50de622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "97cf7abeaeb857fe20f0e31964eef346e4d4d9803af6b6c24bf26d436b4e42c4"; + sha256 = "10cb0a4ee3c42035a06e509a74e632dc269c407efb8dbad40bc4dfc2b2d6b9d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "76a580744c26419c15862729ba1525dc2c5216b221dd74af80d1e09cfb1ffb25"; + sha256 = "8cc1603bd589fb910df22b47a8d7e3611cff371deea4eb634127b68a523221df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "6b818eee14d5e4dd857a53982de224fadb454397c7efb18123c224baf513b222"; + sha256 = "b4867bf6406854f80dd402ab3f1ad1e20b7acae7e93587831913144e690cc84f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "68dfc0c439e815242333fdc8bd9752dfeaa1d6583acdfa5cc4c7092eca637b49"; + sha256 = "555a76d9915a471f134d8f3986e7afca341d201bcad73d90d5751d8ec86c17c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "b529c00e2c0520b6e7362b21e9fa045838837660ebe5ba46b755164ed7e434d4"; + sha256 = "c72f1b40d5a9fbe689b76b3a0010ee1838b8b7fd7126dccb2a7c8907a87db0a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "43d273ca9f65bf3584ecc98f5f2409a916957d0d70fb296aa504cbebdfe5ed75"; + sha256 = "e63f1e83785b777dbf9c69982c314684937dc22456b19eb1e8e83c87af511938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ffeae00deb60a0db7c977dc1541ab90e948b206a59717d60271eb0f6a166ebef"; + sha256 = "41e02c58459a2b2e4dfee5ba4d8dce6fda51fd85ddcf7a4d18426d25b9049aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "f81a32c1bf88acc3e5b26e61ac6c153f1b9bbc7cde1685f8c0a366a4c4808dd4"; + sha256 = "5b4122ac4367a88de9d8551498633d396630ac4fbaa7012408382e8e7dbfd27f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "87e1a2cbdcbe4a7f2aff0537ad991ad39a8b992f38b6b2a0e2c4b2f65fd6c9d0"; + sha256 = "ec1d030b1980e747c415d6238cc5868c24ff6393cce6489f4775926e00fe55e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "88f171d4f84e3f89d7c433d793ae0032572444b322d72fa19abacdd0481c5df7"; + sha256 = "214f1dc79bd09d1f5e4dbba1311ebfbfd47ac4a418da2f6adb6c8c6285bfc4b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f88e6eb48e2ddc8c8a11d92fd82884fb487958cb8c54fa5268f15076774e7e4a"; + sha256 = "fddc2c4c13595e480696924cea10e5caeea81fb775d01a91e7b13a6701a1cd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "0286e665df8b07339cb2a6f609623defaf489883b8865781aa7ba238d3c19f4e"; + sha256 = "39402ff53caddb69cb6248afbcc37814536fc0cd4767a2096923089168f48a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e71c9712d22a1d573b12a5d4274ac5fa8a91a1ce98bad9f4922f7f11c0770707"; + sha256 = "d2143e50a0f6bb19ce038e5fcc83530bbd5c781bb104da3a29d870f00acd2001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b61060e1f2aa2423cd9c2d9b79f8476927fa171abadd3d32885b7deeebf781ad"; + sha256 = "e2b035ece9d2911d131fb40eee6bd8f9c40506cc812978bce0bcf317ea9c8ef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6a2e987c69e384431cea1beff69059f0bf4259a80b318e8736c420cedf125187"; + sha256 = "a2c3ddfeba658b8c58b77e6abd6aaf2c4141c73b0ee6363e391f08f5a94e8ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "109736b666fbbb54ed5bfd1755092834f9c2670362ad272802643d5a98fb80bd"; + sha256 = "ea7c40e0d00a1d8d72d7cd397bbe7533959e1e715a2a7df8a205ce6e98d26fca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4b1249e8634b130b6fc9021f570e375bc2c1bf74d50f1789b3a1325c0fd771ae"; + sha256 = "24c62141ec5bddfc431690bd21428bbf8ad07d7fecc9acdc242565a2dfe5fe91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a12af8d38c868d1af24d7a23faec32b79412768bf7438d3c2548d06676bb5d92"; + sha256 = "de40edc25528e7cff904d14feac97dd282067e27793a4d2a85311c260be4262c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "d844763e5f8475d9b2a81bc217b0b4840fc6fb18a037921266fe3ab4c835367a"; + sha256 = "a4daf7b8c77661f2dc211c6e4a4432de8c57e34be48556b707f167f7333f0a25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "bd2216fb6c24932738935ee9d5ae73816cf70def1dee3b3317c99faf67496cd3"; + sha256 = "6d4a3eb396871b35e4d880c98e48dd5dfd92e66b09a80066c20543f95ab3cfbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8a49b992da59ac781246bd8e7318a815659556c29279182cac6328fbbfcd3f35"; + sha256 = "ff5e9d651cb9224dde03d207042c5ee4312359d9b111839269eaadff49d2efb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c8a81f06e4dbcfbac2a6a065faab9981dc2503025918ee363d8b908ea6732b82"; + sha256 = "3433149001e07215dcce9f3b934edf5f188b8e88725a01372fb1e831f0dc00f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4c0c223829b974f26d3e34bf17b15112afba6709d7654a05e7ccc1a582d8cff4"; + sha256 = "79434cc64d0acbed593f3c859ef15623333239d2868d0b797e6e51252778466c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "07ad6f6accaa6246e23832e8cfb69f498ddb219d43787ac29688c99b9b359720"; + sha256 = "efb3302005785dc6fd7aa464c591978f11637e89aca3a6f41d4d855970fe68d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ac9f4ffc8cdb4ee8f3d0602b0ed9de4005dded584b6896c0cf0053d9951a637c"; + sha256 = "7940ac6685d94144e758f703511946aa422f7a9303f6e8461d29b65178068d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "a320b67f4b15d2fb5dc8ffd3dab13266810af06e0385f51b60d4ba5223ba4bbd"; + sha256 = "adfc49b40832942760d996da4e659c672def298159de535b03daf5064ebbb049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "3dade192f5234bad52a08d380d4ef8119eef5211152a1755b6c6e5fd72eee3cb"; + sha256 = "1212c04fb5b1a114b49562534e65c4983bfade7ae9290290e1b51f999476fdbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "77d4d9c8b5c6d308fca3f3519dfead9f75751ba93dfc1b2d5ef9ea880a1e2111"; + sha256 = "4172e9dd98806535b22162c2a4b50b1912936ac6d94ee99fc2315fc8e93e7fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "25de0c8c747c3fd4093517efea1df8fb101b3a48612070f2d93c70901dee7792"; + sha256 = "4c65a755594a5e03611c0add1b506760853efcfc057b9c04c0237968d972960e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "96b31f76121bdb26840c693e2b3d70ad0ef0e0c7f194f650f9c683e92d5a85e8"; + sha256 = "7b82b581badc7d5ddcc02e008bb1b968a1ddccd42e4acc3f75863114ef00459b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "32ce40ffe03dd2695a50b43135c4fb22f06cf10b19c2067c80b962409ee1a0d1"; + sha256 = "db25e60614b1f31049886d17b5d9f7aa45f51a1230e5829d513d449752d4cad4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "672bd93968e0a3cf3b280afdd52fbfe62a1bad524dceebe2e9fc953f4509aae2"; + sha256 = "d0208622ac503716edd14383f9b3391064b0e5167ebeb6e349819253ab12cadd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d003ab51d0531ba6f47aefbfa2f0b81fa815b378fefe318351b52a798a48e24"; + sha256 = "3e9eb15f215120151572feb8ae621cd9e07617962fd1797edbecd79f7176f950"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6264b95a26189ba3e7f2490f5a122f9f42bca19cd31e6d3084b3bf2a1ea5e91f"; + sha256 = "db49b53e15f96dd4668e0224019f4413c3e41c5e696de137faa44ac547ad2560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "987fe7b39bc597e5bf2389f6d595fbe054dd3aff7febc48da19dcc2606454f5f"; + sha256 = "9b05c58c61c25b584dd32cd9973d42aed887b22e07feb8a64f20e8288a1ccbcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6c163f9876d53f5607867de871dad27e236c6bf0a2a46ed24425190724554579"; + sha256 = "bdcd745a9270d9fa34b070cd260285381f41481a2735bcde9cb73ffd038c924c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "71ed7be34b05652463232c449de558e9fcc4be0583516d5ab8a0fc0ae334f419"; + sha256 = "05ce159ae923326132d656b94b7ed78590109b14ce5436d65f262c00f7b70235"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f1ecd7e990896d3471ffaddd1997b598b8fc3482caa3b6446a750a963ae71f10"; + sha256 = "1829442b517f425fa85feab5691ec63e2375473655d00a25618f21f4c3ff6797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "adcad49f775b592ab65080b8310d27ed26424f4aa547736dc100655586f263a4"; + sha256 = "5ea7bfa88a46b4d3409ab953537fcc87a5a8a95dfc314a9f7b4b991886be10dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "accd50a10d75fd234b38e50908d10fef5df4e6fc1873683f15656d695ccced9e"; + sha256 = "896c0a79ccebd764d4718342bd142d1cfdc172a666b2db2beafc3f1883b69edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "88b2f2176d8a739a639fb52eb8d0423343e5780e79f7986f066437ac33c74aa7"; + sha256 = "6c4f2da35945c331de90f292e35314ffd51c693f01ad69268062bbcad0e2a617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "c2337b0a041926adc3d82d986fdbe1dbbea22046ec149614712e806873f4b46b"; + sha256 = "095abb133991ec166dd0d6bc86de71f6367bd338a21480577f2fc2210f42d69f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bd67822eb7aa7253fec770b39cc7e4389fa19373cc01d3a3b9e0568584cbef41"; + sha256 = "549d6fe7bb33d99a2e4a22438defeb5d5b090069f67d58063efdcc458edcaf9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "bb4c64f6e1a2f6b721e51ee26398a4f86cb67782eba15e9c8cfed472ff3ec597"; + sha256 = "5c7138c3ccefcfea898c00e428fb166b0c8883ebaa4980eb9f75507acd15f01b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a55a33a184131c74da3fc2dad0dad7bb7c1230a1740d71c19ff3752ac53c7c5"; + sha256 = "a4cdf6b8a865b818301fa23a2ed3626f4e220b02cdc46475d1e39bc9e5245735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "72e8271aef0c4d38d577c04d3927f325b13bddab57d115b553ba4015a2b5a12f"; + sha256 = "69d42b943be2a848b5a28aadf240540f9cb7e527ea312d83e1ac559a361ccfdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5c1bba66c4e173c9e531dd14d746a96fb4ee393db9d815cf6de8c0ff2304036e"; + sha256 = "8b14c6a508f0c5676de085050cac2732a6852047356d28d6257dcf80691df0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1decd5cef4fcc9faaa05a261686101338e45a0da6485144455c49c3df142d2d5"; + sha256 = "b145606546bac77e3e45b98a23bdeebd23b752b5a1045a72312e1cb6c6927fc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "212ff7d8d8addec767ce38d81a4a92103d9ee905f01387df9975bbf557795a8d"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "6a259dad0ded91cd4544f45def61570e8c06de5adeaba5b19fd3136c6f52f4f3"; + sha256 = "334684039f1350871356e58e0c467b2d93c6d56b00973601e24728a65ebf45fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "7096e5bf97b3392543ad75c685b2a6df2796a56e59237493aa869027c06213f3"; + sha256 = "96a9a309a869fa11effce362fd6f781e9c0067639a49b372170e0bc85eb11706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "52fc1ee59288de354e4dc4c1b46848651b4e462839a44157e2de101b4a538282"; + sha256 = "3bce10cbab2b6e913af910160c4935e814d2fe862428be78448b6c3b872df53f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "bf36d8e31638ed4332d442fa5e5f020ce8282be5afa608a4ff51c7c84443a378"; + sha256 = "96879338880bc4c632d31d2b096966a957c85de649a047a9ecd5f8e0eaaa43e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "09bcb9b641a43272e4ce2f991e48b8665425763261bbc13e8a4e7d905797ca0f"; + sha256 = "ab592b0b45491be0c573e604344a74291df2d7aa41604ae7961dd78e64987f49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e146a0e6906d34958989ad0ebdef6e6c42c2844027951fe2a8aa163c8e10ff98"; + sha256 = "d75e1569466425349d64c57836517a20be7f6e036bfa837815f6e60c9b1f4f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ece3fb7b2f211331838d7980810a40c1b2c39dcac1bea22069ce9a303f0fdb3"; + sha256 = "5a35497e2e07cd5552f05a130c4ca161929e0643cf106e3bd6fd46fca71e2309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6fb0c5ad50d6002d00ece754309a1fb3074896fb5bdae482ca5170d928a1c9cf"; + sha256 = "504a498350b1399662a68ef1b5371e3d5bd9313c844a9389e862ebc74b28f073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "769b217f7540a2a58cfb38d323dcd1647645f0e80e522ef9370dd553a2e36ae5"; + sha256 = "46c4b1f8403f0fb645878b5cf2867871bfd74382d33963ddc3240ebd0222971f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ce69530fe87da4c2b8afe2e465709a19ae88a418e559896da7ea3958cab91808"; + sha256 = "909f7fbdd6d669f46bb3fdd7fdc929c4fccae59f3b6fcbce4fb6668e26661dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3c759f6a630200221b4bd96ddbfa363e46ec8a244c4fae1c66a6f8d66ffa4aa5"; + sha256 = "98114043b1b79dd9a151de04b2654fdc12885649e06a45c05818c1d66229a818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2d9620f5b4e34e5a9809898d739b94f9ecc0141e3a67e70da11aff8af19598ee"; + sha256 = "b2a0f7e1a18f77cbc33183a48a70f6459adde67329b7c2522d95622ac474f2f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2fe6f83d79aa66aee1d5503a6ba6bfc37aa6e950ebfb570524c4a9ac254f4047"; + sha256 = "3999a0a4f297acfa0e5e8e464df86774676c07f7df9cdf3a9ade243b17d91424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "74822d1537a9b3fbc1fbf413339161b6b89a2bd127ebfcd7bdfca87fac82de29"; + sha256 = "1557576b37ef31b8ac98f2663afab1e589acc071a489c415594b2b7880ae15b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1bf48b9bfae83d997ec1adfe04bdec7bd4e3f5f6a47e5a6e6400d08ab3b78058"; + sha256 = "1ee162319eb90015d06165d4e6fb4ba6071cfddc54dbb17e3b84ee6c5f9bb72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3c5baf233f01c519b053f3ad788d49d62f6dbf60746b0b31af2720fe2ac3bc23"; + sha256 = "bb117ca51ff004a4320f58593f5aa45042e1ad9336989fee60810aa13b051ec7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a1886b0394a417ac8bb840cde03b42d4fbd231e51155f7297d52eb7fefff2d3f"; + sha256 = "d204482d09bb66f08562dc57a7151230d02994ed7515443c2a8ae1cdb35e1533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "54b7736cf05c9ba024b4df5d6403364210416279fd708326022828b799514809"; + sha256 = "412812c1b9df963039f72652d24785f4401f414d4953c8a249c9bb8bb94e2f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1d363e82907335bde45f82e2314c3624a9fd590a49ee63421d05b0fdf7f2e582"; + sha256 = "3e2fe0a600137fdda9ed538dbc9292c8da03654d071c44651fae7a0917fd1428"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "4602c533fc123382a208986694ddd00453c0eba6a15bc40c206a48121365325b"; + sha256 = "5d845562839f60c2c7b6b142411bb43764b67dbab604ea27852f2b61bf77bf22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb44d9b866c1913cd39bbd84b6157e40ae3012c48fb7b9b8274a538fb746b57d"; + sha256 = "642f79d32cb8ffa869527dc394b316a95caa3b3c30b1e61303d49ef4becc7ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "07ae6203f29a8655c756469595ed25b586d20d73bee940fab2a036ded9a143c2"; + sha256 = "aef7ab7858de026b357f9af8d00c32759031e77aef42d6ce9338cdffb1b120dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a7b0b6f2c8bb7f8b33e8a8547ee1c1f2964947b3ed2bac05eb2a7f390475deee"; + sha256 = "856d428fc9cd62369b1b6834fbf577c94807ce4f958eb3c70accb45d4f86445e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "5dfc013f318e2c9decf3b1782cc772509bfffdd351fdda8adc06eb3fe8a32e5e"; + sha256 = "8557c44af4b52dc6c72279b1b3b31a41c87c5cd9b1c23284e2e503362ba81ff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "89dcf9884269c4b50203f5eef9aaf40531bb607553c953f5bc353388ef5c0d18"; + sha256 = "0fc37342f7539431522dd60f1eb319ade594efa494810416843a58a1291fbe40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "481d6542181678e22b0a2a8e36b1c1f8b3bd19b1e899a240b7b84aa625cf858f"; + sha256 = "e5577a0cfec17c2dc83c46570a1351363ec7bffc3bbca59390d3866459bcd33c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8e158be85c9103c3013581d897d631dd4e62198756eb107a02fdf106cedea92a"; + sha256 = "e4ea2fa2c4d15152d21fa1843a5d14d76c12aaaa0ea8326c8db29f219f877f88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f834b4e3085f7428b511a6d8ccaf2708a003136541de45842e387aaa2d1a0137"; + sha256 = "43d9d42a10ad996f8a447f932068a0366557d542c1f2a3be626703b2f09735d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "bf9d259767516e6f919c723217a83be34a2e4e390f67f3fb44c20d6f8152b62f"; + sha256 = "0c79fc024f1714d4267d3483c33e5ef75a0415fc487b0689d600ac5a9a8b8c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4aa90c940c08f68a8b0e63eea0a4e4e52f2a50f81edc900b0efc22f3adcd33f0"; + sha256 = "df9e037da8af21c5a22c26f326389d8c171fdc3218e2df2b37795a2ea0af4987"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "e1d19e22368146eb9afbfa7535c60843583a538cd808bad2189b23f5a57d84e1"; + sha256 = "1e85bb05709e2efdbb48d5b788a0210a5ed83b52c709be06d4cae6d7a94ea9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9a29e70939026b71eef2e3ca00d785a26d2668e5d7c0d329bc49fe6a35f9fc51"; + sha256 = "1074ee2af33d208875197e7f6434596b9d9bcbe6aa5ae911e11adb3606a8f06d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f3172deaa2b65bd3fe4cdd62a7fd4e81c936899cd83495c4f5e54d63fc8ba2e3"; + sha256 = "c2378d2924f99e3c8600d6d23023cb524ada34884645917e1adfd810583fa1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "009768d282619a145489ba9ddb4ac5d47eb0f686e41875d6cdfa97b7102df4b8"; + sha256 = "8f3f4c41c324d7b8b6e518f370899cef2aa58d311e2edea50be22991e0f0c865"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "4ab6d704389c53da46890471f8bb0a57ba488f78ee0f87c96da9f931931992c8"; + sha256 = "a702f5cc3d5cc80b189ab4e50579a4a0dd5a3b969497c0f17f22296ccd6aaeac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "afcf3c95a99fac0fd4fd6a6c2b1cfaf717b41cd5673d5016f10dbe6f5b79fb3e"; + sha256 = "628dce1cf52e132019eb538d260c692e360d33ba18067c5696b665118f1756c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "8106ce5dcb41ed97a3deb4d98b5af23eead4651046e758ffb6ae9eeb96f05944"; + sha256 = "bea0b89ddeaf47d79d40ffd152c14846e7ece9d5cd62c3e11b3d8a47db26018e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1178b1975b132f0c524941d46e7cd357c0aa20b7ea4f4a87e6e9991b0761c7d"; + sha256 = "79703843c31b39f48198e7477c1047c246c2bbf6ae23736483a1a3c68a3acee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "923187af4eff228d5b3b99f21ae14101f1956fdf6fd2c0de80e1196333ff8baf"; + sha256 = "a1defb47b1e0deca525e474790fbb75ab48825b59a996f8e2af6d8bb3fd04da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "99725d0085afcf7c6afd28090b75b3605d99df52d1d06c377ca50a6d6621fc4b"; + sha256 = "cc0b63ac061cc573a16ef419a856417242cb52f4f39525eaf4a03fe084659e87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "24f5b9a87604b82907a56071518649c535568e4ef0b5d045763459badff766c3"; + sha256 = "9f0ccc88d783b2b5dcefa19c0761517ec4aa29ebd45e09d36f3b52d4c0d4841e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aac17f4409ef25d6c4edceba79d446bb22b654016b0ac50ba069ddcfd023355f"; + sha256 = "f08eb49146b4ff68ad82c92accf80956c9b5e203d384021475cbc51abd1be67e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fcdca8bc26eed4d49bb93007b49024d192be06508e5957fc1e3e42ef3c3b372e"; + sha256 = "982cce3566baf096f37a3d9b4ab09324c0b0edd8bd1b31e711a269e2284fe5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9bf51b0df9d3cb62ec9a8675344aeedd2b4466854cebb000abd02d7c97da3777"; + sha256 = "8fcc7329ca0fd874e6b36d830bc6195d43387332b28bd2fdfbe09fad0a17c65f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "647f628344b3951a8cc3e857ae02da89a818a6f8dcfec61de006d9f5b90d51d7"; + sha256 = "efb096d2e43e54f9ed0e18ed898db646839287f55996c86610a463c1d6b92cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "1c49d3fd8a909c74abffb2221cd9811e15125651ca42d333d4ef5d8f322b8535"; + sha256 = "8c3715c8063cbe7d7df698fa4e4380be1fd06d4e5c7976578f46fa3d40539417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "3be80ec1f775ed8c78c703ee064cfedc20aa57f948a8c732008a58ae45e946a0"; + sha256 = "57077171b350b88ccfaceb8c0eb3ad1990748d80b2f40dbc3d761c1d0a73d6eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5331c0de8436a7cf1117c92249066160930b3902ce3d157a0cca53d74a85cfdf"; + sha256 = "14f24328d0e33a18ce6e3d67fbc95cecc61554d07035884181806a25391ab6b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "90b6957c43d85e223ef19496208e3df53ff82f5944bcf5c6152f83d76b744a7a"; + sha256 = "27a8b7fdb93b98f36aee3a5442564421436df91f17a68d58961238108992542a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "5398cb9d6672b35b72162dfca4f5e612a813dcfbcb547bc028d6e1c6da06c199"; + sha256 = "2319b00f9b2bb0073045b08d170af666d217b2e4667611fbd8b9628c52680200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "775e8e385654b779a7be837e0de813e23ba9a3cbf6fa8748853684601d8a898d"; + sha256 = "65782353f01ad909dec1b473a6642b0a0e6733070df5c98f0a262b28aa536e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "209ae5fe213270d765ec71875db6e1ae3c78ab2f704cd9077e2bdce4160db6fc"; + sha256 = "e6cea933b4b1948f0eb84918df5b401968f6e449caae9a5a57ab765a8726eb89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "633ccd3a605887259b5a1d229c8661c4c83948e42e51ac87231457591c945efb"; + sha256 = "5702b1f19f7b99781447290abf32bbcf97c4ab889549ae5b9d73b20d49b0ecb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "09f6069395ee4f8b7efbc8efe8311abbdd247af624dc045aa00e795e0b9e74a7"; + sha256 = "599e8f6d6972a7d9c33ebd92527eb30abe7ea5098c0dc0ad91171818d2ea1ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "9f99c34b11f0630ff93275810d686fcdd9f22ba4db6c173f6c748926d365c7cc"; + sha256 = "d8303c9148c008e556dbe754eba46f2c056a93167e90088ce06fb1bcf425c27e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b79dd9c64d5b57082a22a2b0c98adf1b095c9e157622054e1ea51c876beadf07"; + sha256 = "da8034b67d159a267b5a1e0d1d816c2030e52d1828fea29e46b8241486854e0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ac1c63c2f27e2eefab8d4fd0f5d928d2f6e3511fe6ce42a05b91f93c5cf5b782"; + sha256 = "7b7fa736a29a08108f6e3b5bb47aa768e3ee6c9dc58dae866dd70ab3ec6b04bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "401d74cb12c26412e7d5c31059deec4f8fd4494363f42d0c686a0711442d7c4f"; + sha256 = "7152458a1742f65ca69341d3762c0adec354acd7402c35213ac07ea2264107d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ce726dae6c56bf8745037a2a303aa12d4196587562342d570914d9ac45ec3227"; + sha256 = "362b5c4c2764f69c3cc175025cf3b0de054cc39e5a47bced76a67e8578d17a2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7846e0c8330669416025f2a80bdde899fb18662eaa319518b9ad125dad40a4bb"; + sha256 = "a19ec522293833dbb48a20e0da510d67825f2dc7892c6c7c9e66d844f74a62f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9d16ff95e831721b146f7922bff50867e29268b52142ebf7524f85c0743677dc"; + sha256 = "cc0819e2c416b2473ef52eb1ee91dec88b38af97c420723562d90dab16f30952"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8e26a368ae652752873a7c1989d1d2dcb7376012b576f43b126dde9f074f01c2"; + sha256 = "f24905a22e4a664af3cfffc859ce6ec453a1b40309c2756b45a74b999e056769"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8a853b8fbaf02016103ab15a44081fd0893908371813d94d2e92393009e17684"; + sha256 = "e9813624c07dac6b9615f18baed1d24cbb1e34a2347e3d31034ba4718dba90b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "2d82c8260f92225c4138abe5bbb547ee132f24624de51ac8546fc8cc2d1c247c"; + sha256 = "e8670c1edbff38ee9400bcfc9bc9893ff036af337fcfcceb8d8f76c854474b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "84a767c016dcce5e425d905a67e2244d1257c77d0e17da69c4c3c1ab85feafb1"; + sha256 = "bb9243d36cf8c4e62258be1b692366243056d51164a183c7e10fcb3206e22902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c4d217ecc85d4f3c5ac5fbacbc6d37e19885d2959126465f01f45f2026db5d2a"; + sha256 = "7e57fa6e4da39014b4c7c53bf8b7e5b4f7868ba7e5c80726a3e03bf2d283baca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c2556486729ab7918eabd3fb917c71d3081e7926880712c6f78b847c868abfc0"; + sha256 = "acf4d5d11aa323659ef6c6ea0754104d642501cdc68e734d75bde77b662e207b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "30a9d1df4d121c02a3c1bb0d3c1ba2ac0674586ea56870cf9b259041334b7545"; + sha256 = "ab268fc166a3cf2b27df64472835d2ea487bf4860662db807a0700ac21ccfa0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "740a09e9152df1770ead58c1b4cbd5be307479edd29f0a14a96a3d578f90852b"; + sha256 = "478ea687157dc0922712a61652ad6884972551ed8ce4d01127a80c1efc106e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "eef655c31840dda8f5d972a1009deb7db42fef9a85f6d94fb8d7bb1080492b14"; + sha256 = "111876d47dd316c11e77439e076df41af384d3daed166f6f5d30b68bd0be4d52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6d5ac3729f737a0ecf115c4ba730ec12c43be59e00d9ff3e3df25eb95fa18920"; + sha256 = "0810c419383c606ff14d2bbac487368d2122599ee3a5684a288416069b52fac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "da9a98bf577c1402ac07023fd2957fdf83385238dc6914403b3d3473fdc84608"; + sha256 = "79ab57756a0d232407752eecd621f13567e43592f84ce2995b13bf73513022b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "cbf2d767419494583b5a4393f4955ac5248a9f370c87006b9ff5a0b9ef2d46d6"; + sha256 = "856608639af7990122fa2fce426ef126d35dbc3525fc7515b5f26c93203aadb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8c203265e7424c68617f24b0c254846ca3c9f795f59dec2b1ee90bd2e9e24fbb"; + sha256 = "ddd8dfa8a85754d96b83ef24ae5f0b3748b084cc1fbc87670dfe576d7c65c012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "2527688b01ade72c23c8a166bc3fe71ab6ebbefa53f95431ad748172c757fc32"; + sha256 = "52f5327fe808e4273830ae5b71077d6419dff4c763c9e4fd9e64ac8c49b67f14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "54345ecf9bac43aeb9dc5bcce2f6ab95873c30d167c9f0e25276260236349ac2"; + sha256 = "0242eedfe6b5259738175f83686db3bfdd6d42db66173f7632c6ad9b064cdd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "7d55f9c3b0372e8df4f1efed73e7904d6ca76d42384e1d69297209aee89eb538"; + sha256 = "706c6525e5f6859b5d19a5c49ad787577064b1c12ad5088cff3e923d4fb3304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7323cac2c5cc65cf6717c8e93c81cd8aa1e42c4dc26a8fafdb01e909d0d03627"; + sha256 = "6a3aca1232dbf5a018be45fc5411ca82a45f4be7ecb91fc052a429b9716ec8d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5aa7399107c721555b840632c724f0ba8ea410561b36ba278304ae2672674d13"; + sha256 = "ee10040074f9eb053a83308b104f84deabb2183bf7b1b9dbf349adfd3e25f523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "134e77e589dde44918e383dd3e08489ba855d9e15d542283f26c465bd84a1677"; + sha256 = "3bbd3358f8a6d84ae3183f8f67941f3653d70595feb4d74f9c3d287caa698932"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ee6da6a70f8565cade938fadb6d3b25c8edf860dc4210e26a1b93034adcb57da"; + sha256 = "61f21fef0fb76e40099f2264aae4969d1cd798f58dbf75db81c6366ddfe48335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9fdd1fe265330c1b070d523e1af0d6dbde077583cb1e585b718112e49d044039"; + sha256 = "0edac08c5d0f400df2f2c7d26c410b2eb3b2a467a167d17fd57b50352b9ff079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b7fc81bc71c30f48c40ec5fb4f8318973122523515c523ddcd98126c7c3750ed"; + sha256 = "c036f77e862df5454e3be5f913448e1732585f19b3f4cd968824c139f82d8790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "09b877af3b15dad1e25f7c04a7e94990cd6e20705a26e3cf715a30626fa10646"; + sha256 = "927a08479433999af0808538ea3df289d3595ff0c88dc311c71d061875ada19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "81db09ed98266347740569c02cf0993ffb532dcf9e5c814496cb3e4b23133b35"; + sha256 = "fd7ec7834104629773481d47cf3c36deb1147326661788403c5ad676e18dc1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "94bc77310c90876b2f787c1c004212947572fc45864758a7f59d2e2ee9488a16"; + sha256 = "b5125d265997ed75a68a9b9c8348efb1127da8c7e07233ee403bbc1c1c1d551a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "71ad541e5c119f05cea1ef6a730f860025d105112907f8dc6ba2a4d33f8efcd9"; + sha256 = "9a77df59be3a58f7ba75951f38461ac366afeb22a936c01562a01d509792ecbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d699396c833a48bab753a76456e653d90e62a0585a9c9ee9ffdc6b30d8958778"; + sha256 = "baf15728a07ba2ce73213edbc486cd060a95e9722867e129b4dcaa5b7dbdc20e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6bc991fd34ec649da0e85e5959197db7e92e2b52cd9b5b3abc3d631ec5cf5bd2"; + sha256 = "201bfd1905918fde0134abff649e4153639d42beefca8e5cf695db13305c4869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "11de780455b3cca25ab64a58f3da00062fc29ef43973ab0d34435bb99463c23d"; + sha256 = "9a8b35abf95cedd5bd8c777e45dc412df76c5ab135fdffce1136f4d5400c4b5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "773964f567fd6df114795d3f362e553664d028f5d6ef7bed5852397852f5412e"; + sha256 = "371fc35135170674b3560a7472b479473c5f989d041c87cd030f8798861f1c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "284f486353dc7dd57f3dcdcc82314cb491f7a37d8aee04b2d35982f0bf9bbb0f"; + sha256 = "77df5a99a9577a3a07bb0f034a99f96afa85cb4b05200f56c41a3da2283a93f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "e1ca542f40f91b69743ce53ba001e6b10b55a57701ad6354f025f0f6a2a66727"; + sha256 = "5b72f4757d23c78e2f6ed33ba7afc99b09478d434b6d85b453f980d6a183fabb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8796aa6b9641a33558f4aa2c55cd425fcc9fe7e7c08fa7de2bb68341e337944f"; + sha256 = "f44f53326face336bebe48657abec77444fbeaf90c82ea57a596465f0fa2e87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a4aa9131f1cd1aadb550f6ca312e490142c4caaeb6cf9d3f2e81699bd9050f0d"; + sha256 = "5a284e9d3afc91691a2f4cc9454f8f113a2385db8e93cf243717e18755a066ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "995863c51f9f91f3667f3927b7135e995d47b2ebf5bb4d8ccab28b0825af41be"; + sha256 = "b2abb070d7d89d0fff19b9ba293961d863547da558804c9ee853ba280cab5524"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "a6a8233e17ecdc236c6741286272fb79148d30b86876d348097f93733937bfcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "e0318bf4e87f2bafa43939fe3931b626501fbb5bbb91db5b50b71d946332a66d"; + sha256 = "723d94602a9914c1d572f85635ceb2622960b09bfdc99d4ae010efd1f65e4792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "0c1420ce0e3c4abdfe2ccbdacd1632c619438e84faa2cf29efead3a74ab437c4"; + sha256 = "78e0ed7271171c5eaed2831ed56afb98b525f8ae4cd9db78f6e5b2c6830b5c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "db256f39058d8e6e8d8301ac0ee435ff41b1c547b9357f99c91c8de325da9298"; + sha256 = "4d06b6cf8b81e39875f6b749286cc52d89d8c172e8a8af54f920906326404346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "fa02d3cc5fdd6512b84e04a27e0af95b01986403f16abc04484dbfe873fce537"; + sha256 = "9880b5fb724522d823fdbad3aea4c9b1376e9d97543ad47071a7438aef164b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3a936bfe9b169dbb4f02f5984df1ccd0c37f19c7f83c05a56fbdb8ed3b6009eb"; + sha256 = "b198c6491a3618c0dc437cfef06c4564a8b70700b399013072201bbf003b2b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b995caf1c8128d8b6b60819d0ddcc3016f4247cf83cebe8c3aa2d1747f6520f5"; + sha256 = "f35c3b4a04742ad4e500fd60a5d6f80147e19b60d6ba1464c7df62707a8dcc19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e4f53e17928fdaa1d85c8272079e5717fb9c443dc2659ac08d95524703883e2a"; + sha256 = "d3c2b7e536438e8d212c66463bb201475c1df143a040617aaeb08cc14e6962eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "84e7d6e01a570df7ef4b616e075cb93d1fc7fcd5da0a3adec179e99363ee5f92"; + sha256 = "c708a6886f3a22ec5ef66d9c3d26e051d153fea4ff01fceb65ac41cf090173e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "15bb01ebaab8ed4f022829b9bf7f16e2fb5fe90e5ca47e300e2cb2ccd66d922d"; + sha256 = "e26ab71962c17774721bc54bb612f963c61b3b5fb83f5c1473a84157c73c28bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a8fc45cc1ffc151414621d8e4f36ead409582e298f7e86bc2943ed6f20dd7f90"; + sha256 = "fc8d824190bec7889618e14cc439f6b96e878acec171ef270e54980000cb60d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ac0089e7ce04b218eae0ce40245a75626523035218cdc7ca2551a9af8a18d33b"; + sha256 = "ef932683f2b7eb51b043ac7c2b9dc1ffef3e048f3a92a5abc65550743e95440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "eacf3a23fde07908effacbba3cc346d1e9af088ffde81711e3ab3e087bd86e6b"; + sha256 = "9e2695711d611ace940d8f6dcce037646bd96f0d0a533d551b73eb1adaa31b98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "e31a9683560465fa6bc97edc46c42071431d62ba4a55f5f066d58ea60613990e"; + sha256 = "dbb0f78780deef67bfed9c1a126ec296657f327ce3a72beabcea0bbb9a033be3"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a3c60e257833..619b6186b49c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,975 @@ { - version = "85.0b6"; + version = "90.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "eed87dd1f8683805d13f5d42f8d376ccc760c6c96b7b049ac6d5514e00122722"; + sha256 = "20c33b145287c4477e6516837c7bd763f0895750e40400e82ddb6f196b072b23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "233e9d412982933e2880d2c9b790d56cfdf15b1d55e8ee1f0819ec445faca451"; + sha256 = "edebcfa2f2c8a7af69d8d98ec4890d6ce8404f93d8e21a7d643458d769056286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d0bfab4288fe0fb53e0e0087d68d79699774900dd79b5eb32b36d33d757043b2"; + sha256 = "59a8423486afdf3860bd03c5ed2df595c5706f2d048f14d27acf50bc659da119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d1181d7ea7d3e27f0ff531a3e3d547611f391e5ba0bbf0de4e3df6334b4b3e75"; + sha256 = "0c2f57d48e42602109bc30574f12843c09f68f84e810e3f7860d3185999bf7cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b9b08b7b267bb59b59e310b430298267d1b5ed89086b2dbe51f6f6550324e904"; + sha256 = "d505465fa32dd6e0a324955ca950cbef5826f3136b5d2deff3e5a42b8063e69a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "cfdfdf835966e03a3ca036dba3fc175282c0a8ea8c8db9ab0391837e50507e7a"; + sha256 = "fd87877ec1d0978b4f83451360d1eb4f2ff7c0e3fec9a9346b38f34545b89418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f32addb95c794a87ec44ac1a575ea0b9279c6f8b4bbd72b02793a289743f5028"; + sha256 = "a193474f5b728559acbabbfb5d746930909db38e83c2607c38d48a8b62376bb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "511ecef8b5cefcdb6f7c0cfd257c156097af8f59e130b6b1d74340437014abc9"; + sha256 = "b0ed4a45bb9ec405b4795d2e73eccd56e89555eaa40c4c72c64c0b5d7731bad0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e76dd71557d5655e1fe13081511a6bb84cbfdad9bfdc7b44379c0d0dc8f38dd8"; + sha256 = "1d7deb7f6bed82fe73e795677b4e60192dee7bc52e2a870c1ef53dc3a23e7390"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3d941653521853e57c2db3a1abeb5fadc81b11050ca69811b010d5fc63936bd6"; + sha256 = "379304d81c8ca21b41e63802394d30892572dc3a740d5fc701512ca482e2a649"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "47059e2a4a5174357be3a1e23cc8a97a0c2fa4cee6e58f437d45502ecd329197"; + sha256 = "8b54063ef6a1c015f2fac84426b6309df89e013dc8e7deeb862ca6ef54512a7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "47da19182c2ca2c8dc25acbba971cec2500097e20a977387c326036c9f4da527"; + sha256 = "80ca50a92ff6a46d140609558265efb422759ce320f5e7480a270b16fcaf486d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "248fb9f284fa482307be01ac59f082b84475ab550d5d8e53168e239c74cd5892"; + sha256 = "00c027ca3c56aea456d0187a0a664d34d5ad704af5220d508e7dfe29ef66a4fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "933e6a5f026eb2e50e8d40a90fde7db56325f7abe59caa99d2edc34bcad16f37"; + sha256 = "7126556936ac97989719922c4123f48508bf946ea51af05ce30182a8c5c798ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7d0943dcf8716eca125409310e821b87805b036cf01a9bf7ec06400b4e97b3e9"; + sha256 = "3f40d14e92fd79cf695b36c0c6357503bf08ffdf3e2105ea30b38919a0c40442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d523417a57911df738d07fe6c899b95897686f8ea94e27cc778a02a21a417990"; + sha256 = "be85ba66f9d92f27fadc5bef7220b794ad1425c09424ff7c1ffea905f1495222"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dd7c7acfe40232ac66cb60ee6b3bc6a1dd84d2930f507898d74ddef8e6a60355"; + sha256 = "a69fb1355b2b0fb710954d2982750d9a11a80be924c4e8ca8664d97a77676f7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "51b8b9b772c901fd8b3bb61eebec4a0fd8541c51b9011be57cdb83311035e2bc"; + sha256 = "9142b0b44f4f375f2b426f3ed7af11646367b2a21db8cc3afb704d847552569b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b5175eb5e72644c3e7ed6dcbb1015716f923c50c59ce8e6ff3fea49195d08478"; + sha256 = "42f04094c7d3eaeff3e8bebb073c140870a94e7de29f367950c47ea963fd8ee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abfe077998a5f3bb2e1b4f2b69b84ca5af72e0d18dcb584bb0feae2e0023e299"; + sha256 = "17a234d289679e507f9bfe67d2b65d7a89dcb4b603e0b154b9faebb9044d320b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c8b8b4d9619348c9f97f03e222035eaef9d933d46526607ab2c42db7c4a5f21a"; + sha256 = "5c5e9ef0526aaccf67f6f0bd1bbd5415c2086c0ea8c9d9e614cdd053c5e3e9c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9dd9aeb143c9ac871e6c1cbe16b993f765d84b7fcdf50877e4cd89bb7281948a"; + sha256 = "61a4dd2a80d54c79436c2f3f62c4b56bb2d6449c0475cd938a4bc5c3c91a41fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "df2d745d5353ad3d91d5c62c00ebabb17209e91aad52c240efeffe002e6696d6"; + sha256 = "0ab2b7121ff045df76e043e165cffd3a4cf33f4a5d76f80d880e4135b3ac8e87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "7fd5df96fcc3a4ca2e960e83674e3120143eadd47c5b0360f11f573540d4f59c"; + sha256 = "20282abb72dc7bbc2db8898d6c18b2d877a6905449a221d4044bb2984594782a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d22f3d4b6a2f3b18b375b2592d78cb06c7c92318c6cd4a5e8c70942300bfad94"; + sha256 = "3bfdb83b8ec6ea8c2e95e4a7e50348370617135057053e89ccf9e61ae26710bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a3f267296b829f6fd2344b3bc652abeba7780e0dc455f6f23fd2d7b66efdd846"; + sha256 = "b78b75d2832c240c764409d0130f7f70081c66ddfc6a4a710acb329325df3f36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ffc5f413b90025e5452e57b07795721456aa37e4bbb2a6784e732e8a57232e9f"; + sha256 = "28821baefc20114bd7785c04ddcf4aec363151f0c1ebb850d364b337a5141fbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c170fdce52b35551ae49d2cd330df761f0d0efc5628708edfa72aa513e89c99d"; + sha256 = "853620bc46a74bd425554e83a5866bc5bdec79e9f8129c83f0ba147c47ceec35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d256ade3513817ffa8d79ac652fd51578ca5a9c53043898e7f3520ffe6365829"; + sha256 = "570cc2cf48702b16384029ee8831e3ba4db39a50b1b02576a0c82d51beb03779"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0720a63b02f38ce97c902cc221a85e41ae0e2d36ecaac47f5f661d4be89b6abc"; + sha256 = "44f3cb224da4c0df900737ca5d4d80ce41f404f1d3aa36f6f470d6eb13d7c9bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "78a4aa339dd5e56b4458ca2096b538bc27d272b953d207e44a41c8ab19de68b5"; + sha256 = "24ac71b7d28b286fe026b1cea49777876eff5146bd47463071142524d4f18fb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "2de463eeb3f70f4d16ab677a6980c5fe229a69c1b0846804dcc58388b8679a7e"; + sha256 = "1a795decfbef4c7689eeb931f07d8b036943856239ffdd550882267a14395dc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ba880a3ff4e45c5d30d813a16e9fc088995a9c2fd2a32fda4d53c1e2ce74368f"; + sha256 = "807a38d68d0a5010c6309e2e725d210e3254de5c5b7375fbd209b864053ad25b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "820cf6d9813048f95719d6599a9a4cae1862a6677dca3172b87339a0735ac37b"; + sha256 = "6be1e617b3dcd59ec82607a8a1f8b5f145ca6c1cea7020ee678021ea5524d902"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b2cbbac775d1b4a1d7e6930427198123e82f4959f3a65e38913d2238d6f3ad1b"; + sha256 = "48d4de4cc60ebc53acdcc4f8fea5b483b546f06527f24bf90340db141f1a043a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "256cded01f746ed016894e7491af075b0d1ab08302ce76dc62e71b4a27e6c390"; + sha256 = "4924bab4100d18fa65b1309a091f0e6042f34aa342508923dd8c3ca559dc9628"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "080ebf615b64afa8ae51fd198e5fcbe8bd8a9843ef5101c631c51ff880b2d46d"; + sha256 = "b2dcd37bc4c9ed6015321216040cbc27909061c668d8cc053f3385920ad9b18a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "27b6a7f9d52f3fa96ec69d99ef18faacf856561c7df187ba2fb568654afb2e50"; + sha256 = "bb50a6514aeed37e4fd96295c0e97ef026bc6fca8c62b7ce6bfdbc227b69b0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "2ad562144f3daa93ac986821b56ac8229fd89ce2820186d5d318759f4f863d17"; + sha256 = "a038dd8daa01675758acb4adf50cb93b204f3573ee204f97cf170a16f300906a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "aaba5d2786dfe9cf2e5ef3f134a4f011deaf25f9e213c5295d905286881b4062"; + sha256 = "a2b385578b11bc12c3bd7230b3a22d03f08a260d26e8f287efb2756b0fd3f9e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fee5b30ca488d1eca1551fc645319f47af658a80a0bcb4c68509cfc5aa398784"; + sha256 = "6025d34743157cc0869d12aa5921d9951cffa660244804b092ce0f79ebe9abae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ace82312d206cf07d54ba722ab0ed30717f8ef0c0fbe881123ce87a94f16b67b"; + sha256 = "0c83746e1212350945277a65e0219e7bd871bf3bd01fd2e91194dd0e44e377c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a017dd9dd83217affcd89d7493c91e605fee0e238ff03d3d45d10466df9a5ba4"; + sha256 = "03675af908ee739dbe8f426fe7c4647f4b9073128544e990fd3e167020ba3a88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0d3f105a01e1f17f7ae0c95772d39a134f6435aacddc0eb5b4949a923df7b4e4"; + sha256 = "9cf3dc5faebef0342f2b165189312fb1d76b5882b0767241a8240a440fc33bc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "51807ec5741e07265b090804d7ec3b4cd93c8f459ef956372981d9e150eb4eec"; + sha256 = "b30deb7e51005523457e7f31428356178c1fd546440df2cb12f9420d89374c08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6955245256ec8ff28b0222cfd63cc9d77c2b9d4b379ef1e58293da7de0b579b0"; + sha256 = "b51db297071b1bcec3416e7904bc1340d1dcf3bc5fea5016e3311911782ae813"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "3d982431b0ef12cc6cc4010d4d1bc613184968a44c1f3f6ad08d8d52bcf1ef77"; + sha256 = "1e946e4c6893583836874e9ed951969a605b5f8de222d152d79ca003904af86b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8fa2ac22a1c9a1074390cf49215198a49ad781129040eb5b17fac0d0d49f816c"; + sha256 = "6fb1006d097e353401e032090f08bf1911247b4c3923d2490a7f46cae3f69376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e39e23190108c37bf146cdd9e1c913aafce616f89946904669f7485c806c7f4f"; + sha256 = "a0de49c85a0726fd56038058acb6e1ab31e5100bbb759a6c5cc89191908fe402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3c5ec976abc93fc4b0cd2ee24babde515e92d9beb8d058ae6fd0007980210600"; + sha256 = "386c1b25b9f78b91b0474e512091b6907a598555a8e146ed61226332e3c04e22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6e9ecc227336f2e5b193678666f02eb8d82bfc13bbace4bac7a7045a691af358"; + sha256 = "185964b4ba62e93ce54004e28a8d6da65c9b5c657f191e4ef924528c92bf5fcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0550b02dc3ad2c2e4db998b7ccb90d7add1c1562b33fed34e0aebcb0c6157a4e"; + sha256 = "ff14f1d6c4ee8438cc471c151fea840cc81336de06e244b6e2c8ca193d97e490"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5d2e3692c9791a29820d424af3e219e48a9fb766544c3f658bbf779f92e3dd06"; + sha256 = "36d9058cb4c0bd804f640665bfd05804a787ec59632010d682ea132f12660b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c5949dfe7f7050b807b43b7050270c2bd748e688a6f54c7549859fc7f7b4b22b"; + sha256 = "da31f2928efa27843afe07872ecd9b6e286bac90a101c14e1dd1e806e3bdeb65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c3e1e899942db90fe8cf2accea2c6de703ddf1e1871b842d59ee5e69b0a37441"; + sha256 = "7a8a1aaf9d78f7b1373374e70017252004c3d49de9c0b97e705fc5df7790834d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9da71516f7ac05965ee5045c957b1d2384a9e331a41db0c8ca648cce1c0bd40f"; + sha256 = "8641fa391ff8ac3cc25236ee6d19c043c39d651c674cca2badafee685b47eeef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3be5d104b4d9744911ed8a16b9186d3f0b2a83acee05cb1943e7e13bd14ed84f"; + sha256 = "7a676b767215a1d5d6537975fbe9e7e16156d21032901365c24b8b0dd1adb21f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "02dc5a6fca7fbafd2096f452324356e271496601b0ce78f9d64436bf96d8c234"; + sha256 = "3d5b3e6f04d7a617870a034a4c1b213246d48408eb4849cfaa8872f1aa8c8f13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0b719e71748e0c31f016fd56ec0940491a950b6bd02de3b96d66106b60574931"; + sha256 = "6534871a9a4414a59c3b885d7fa7d7637c9e1f220aa82afcb89e629795c61562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8d2400f28ecf500bd132a809219b5c1d5c9a469006c965754cff1b792ff9330a"; + sha256 = "c2b3cb52ea74f0d62b28e54f87662863b801d4f8fc357c088ecb690d042fe8f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "839aeb33e727f73e80cda1e1c025b969cd876a21ee56481afe9120bf0391898f"; + sha256 = "2a30d42025663aad7cf6f3039c0e4b8a1fe642dcf97b9d616e6a70c5f2ff0e82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ce978edb70a7137e70d8635cb874838b613dcf2f5fcb52d88e0a55177671c91d"; + sha256 = "43f244482732b43c39f206fecbf1080c8a154e78707be98931549e0f6809b56f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "69e4b20678c3fca5e0f9be238ddbdde264478a5d7e772299d5d2f489bb1e260e"; + sha256 = "46b3273f508889c48d611568f0e927eac7e612c2fdafb3546c47f080ee928db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4d9f58323d15af78ba5f4d168097f20a59836ba4a0d7517a617eaa2959f6214f"; + sha256 = "ea355f78f80ec11c44a5735838c5b48b6b915951872abfd8a935f8991010840c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b22cd9999df9160ff518f8a178b8795566e3e66cc3633199526790f91f2081cb"; + sha256 = "acda50b76ec558b2d941d77b4e523edc0fe4cce0f03e0201d881917a820dff9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "648ee88b4291cc0f01c021dee76267f4a552c9a009f32dcc6649fa889e32a558"; + sha256 = "ac72053ee1992338bf192ec3a10ff975cc973e72c5468de68f8441bc815553b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f686a56aa16386380c04763c845aa90288bd88959e7c06e93d7120d037263b4e"; + sha256 = "7f8c13888b7a24235c48f7c8c03ed66f7e3736247c936ddfcf88c8f3816c066c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "071f10187be11f066cbaf6e78464689799e6eea0d98cfd96a85e41557b7d9561"; + sha256 = "c0b50c45a6d198f60cd5703889771778bae6493e77e70d07518b6ae9ce9c4f4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "512c289cadfc4d3bcf3290feba112855610eabcf04db4bf5659b9dfe67d57ae9"; + sha256 = "0b75c4725e1d9f271a5f34781b8479ff6d6a11ef827afca97d52c599fb389d08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5910003d1453d62747a00ad96fd08a32401729df14718695a4ca2c6d2bb3554f"; + sha256 = "fd4e2d38c3dbbe0ef35799a89fb8cb50435e2a06ed49cec2a380144b3ccd0ec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "15f5d9e9aeae9362857374c38e94f2dc7371b3d949ed73ee4dfb234370ebe0d3"; + sha256 = "a329a085eaa20c41105b70b2efdfc31260c2e5f9afaae97416a8c3a77e82f822"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1067c3a6c646d86f57c75ec9ca452b12c25f9dcbfa0c723cd685d494f9e79411"; + sha256 = "c418d18e275c4ce5641c8b0f7e30da75659137a4a5ef9dc43fbd2c206e1a1bdb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c743f319f5bf60758e4e9f5684378503df780eccf062e1566fbcbdc45c903116"; + sha256 = "d5cbb5282477c716966c6b30ca9a8f21771638cfbf2e3fce69663ff7bc58c6b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6763de605975b7ead71356aac3d239f04cad9373d1fbcd4b7e3d16c87efcde94"; + sha256 = "916934135d13a1b8c0a21543c3569f697358e8935cb9f6972c9e80f96fbb775c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aef0bb4fccc6814f225b4e6c073f5d825b6007ac420ad4febae195ad69d5fb71"; + sha256 = "5571914386329eb2b0eddf3e4ddbf98eeebf1ae86172fac533d2397a48c8cb31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "26a7a36e9e440587173660ee5192711b4d2807a1f735395f49fbcd36029261a4"; + sha256 = "6b78d8ed2d8df5c00198ccf6fc3221b215623ab4a0b6c21030cde5413f1a1165"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1a45ddfb2e3fd999e0517b6d5f2f0a645c6f6ced044d468826fb5af5513b9410"; + sha256 = "ed31203623e85d3cd0ea23c54177542455af4013e2ed8ddf642056a99187f814"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1431c0c4f69f68548912bd4c1ca705d2bf031d24c4789477fabcb07c81ee8190"; + sha256 = "ef8f4020adae61fcd797ed23efc1bf54bd94609105a9bec4ac7f543fe876275b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c408b950a78894d3aa25c7809db91009e9c62ad8fcb46128b3fadd16c286dace"; + sha256 = "ca4a679042db1485d0ced1f81be3610493755ceb7a32887110f528029657b499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "bec096139548f807eb186c7251830026e13672a7ffd6433f362718939292f28f"; + sha256 = "aeb7a5e4a15eb836455dacf964826a08905ac822390e2f67230eccd32942e136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0f2d27abe79792a7b43757d5ba9f911c2fb4d8949dfe3575d313171af47b7ab8"; + sha256 = "93109db6d38da24dd3999960c866754966945dceebdfee960125039e1939b5d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ab009023546e88becac31221e77ff580d0e4afa0349cf0b757ba5791bf93da60"; + sha256 = "cc1787dca9c673d6ee937d7e0a2801cb345a0b06db3f6e53581e1151716d4170"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0abde9db34df6dfc52a8c330b5ee053b0f4e7ab9ada8aba0c73265ea18caef0c"; + sha256 = "281397c37d390635e44e1471b318ea9ba98f4b3b8d7670131c3262838ad26e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "5255724df1ec3d05f33de152885d180dab52796317ec6739838029f20195ce3b"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "eb3b06f339e147a5842290f1f81fe64a6cd962bbedd558ab6799fc2ae693a84e"; + sha256 = "d8c5ae00cc8175e5b6beba8b1c7102a8a1f81860d5945c4e73cd77df5b5f8368"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "ff9defea15c81409bcd792e309acd1625befd28226135725247bd930522a0c52"; + sha256 = "270e079ef9ce1c7977d8cdcfaed1f34552c3058dd6cdad22f17b53c31d6c1dc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c1c60488aa488aacfd4e292c2ed8e89bfd16df176d9eff137bd84595cb238e42"; + sha256 = "747acadb00c955621ec470870478a63a10c4131c244282bdde2a269a9569d6e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "e37978b0ca1a8f1c6511ce2075ef50c2c1f562bf12fb08aaccaa6ab2a352dfc7"; + sha256 = "9cdc0ccc264d071ee7f9d7208cd1fddb6179e016ad759c4d5e4dbb00f6508360"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "764b92edd78a83a069ab7e0227766da90ea0c86021abed7e7a6ec107632f9699"; + sha256 = "2e20a8e524e0b91832efa759627b0ddab02fac12d009e0b6bc81ba0833c94c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e484d739d06204007319a209363e7246cca5649992b7473b5743ce383c8ee38c"; + sha256 = "1f4654b6d9d9d33992662288c47e79f8fcfbdf76db5ba0519bfb0de997756afa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3b96a7266f2e0910b3153c1ae1edebf9e735d8f579689fc45cd5284c92d06a8f"; + sha256 = "e7048a1226c8af17dd95d162b0d88ed9cd8b0ddfb08bc03920ed04e3d2cd2d8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "555ae2d93a212acfa8e4af43967d5a5935dfd6762287b3b32d475bc45a0bb1d4"; + sha256 = "5ae8a63c2c3dc8168910c231dcf54aac745327b818d66254a3caada129a83fb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "bb6dbff567ee057c65fc8aef70a18a03e0bca9652e2e3ed745925069f43a9186"; + sha256 = "3dc370ffe28c5ed91b8374c2f5ee41a0ae4bd094851a8dfb1d53b546595f558f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d37b36e3d15186dd48b5a8c885cf788621964f0ab0aa0d120876a28db2018dc6"; + sha256 = "a6f39e25aae7ed5b7d7d1e4ec8c67c4bd5f5ab28178d8f1fbbb817713dbecc1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e9bef37ead8534c8f3e0882361ccc1818583907bb2279eb737aa9e90c9223108"; + sha256 = "10d3c4c3638f0715001b8eb0026a6ca18a5b92d09e8e1d80f6b40246a5c7cafd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3624c095348dd367c99248471cb2c76ee28c491c73f7cb8d6f0f2119a21e2c30"; + sha256 = "2142e803dd183e8f7fdf7949804e3cfef22dee2a0e665eeb60933368f54797c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-x86_64/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7dc0ebebaae2f4a26bfdc8524ea55ada023819d08c98554c9193d2731e88f3ba"; + sha256 = "0617ccd22cc00872e5e5462636f150511ef5074052c8ad707bba98ae907f4ad7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ach/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a20f683f1572a71f709fc240c8c9461af8fbc0af60af32e9d057e8da8ddc954b"; + sha256 = "eaa38a9976a7ac2e99030559ba27ff56cac4820ab5f9757f5c2cef76db8c4536"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/af/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "62dc60c4ee5ffa1fbc53ee4bda855824ffbb7514d40033f4a17293462b6ee0d7"; + sha256 = "acc117bc014e08cfef0a26447097bb8df774d6246d569e6408021f0f8799af9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/an/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5b819b75a53e78adf628598bb98d6d704b61e5f009bf3e123a38d4fe0aac0c89"; + sha256 = "1bbab4c2b380edc694480e2f6427ddb539b5fe5fd2489f050998c920975725da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ar/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "64cab2b053e80195696cd00d01075c93c00fd51a80f9346f095065d1ef4abd02"; + sha256 = "4d438bef41db963a282b53d13fc54db0d685014e03684fa19e25109f94d7f6bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ast/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1ec6ac90f4a35465d25edbace93a503026befb193ec62bd99db995d25eba7137"; + sha256 = "ae0d76246adcf16e4e910a02c54c8227a1ebd930b24bfe32ee54e631310cc42e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/az/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "08021bf98c2b5d0cb3c0375d955c8b3dc03b6883d0b0ca674987cdeac5b9c7d0"; + sha256 = "7b262f731afe0ab9a35e604099197e470416a79c80141c672886473cccfe9f49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/be/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "37a47bd94f3839b805f5a7136f085c8e4c027778dab78998deabe0e7c348158f"; + sha256 = "7a3596146cc81954dc55c4040d3926326d468e447dc8fdffaac7a3fabe423d0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bg/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a8e779e51685ca4df1a110de3627b61e51a596a2b40f8ac7c1fcf2e923568ba8"; + sha256 = "8a1cd058dbd39c6c807a7819116f1af4b22ff936a71d67bc54047d72252721f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "7390ac3ac735a6fc9343c50591827fc90aca54ec8359c624447513759933f214"; + sha256 = "8e58b03730a2c32f0537537114ec662c7307d1f79c5f1aa3dbe60a8d95526194"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/br/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "739a7047060a32d1ffe9945cf0411e9622c2708707bf49ee08b6935156e114f7"; + sha256 = "37bb7c1e9c015994ea23b6c069b227367c752a4a2cb968d983fe2b0fd0d35839"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/bs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f176298a95b26a6959cd72a8ad03a3711153746ebac9559511aa19dd14100298"; + sha256 = "fa97d80ac97b9d155c40ca0dcc21bc5d1255b3e6a54153402d965b35700d9f74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca-valencia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "714c46545143ba847f0b43d1d5436ba303b4f23e666bd15fb1881a0cda1eaf55"; + sha256 = "c9bc1be306267b7bb2282c8a543e6af66ccfaaa1f09769cd4c535d744a670b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ca/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "087e0d3e8d429ddd86bb7d79a22402e782ace2deded642bc9c44ce5e66dd703d"; + sha256 = "8f3d423ea28e80303709b9323576695a674ea20c675bd825ab5431606e284136"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cak/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "07e75aa7f99c60b2632192ccf7064099ebde5606241151cae8a4d9c094bacca1"; + sha256 = "57d9509c186eee016cc22568d1f90942e689aeb918ed55aef19764b53da46087"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "3c8ae427e81be331960c329b3d964afffacd621b718dc9df114e18d3c4710e80"; + sha256 = "af43cab80b6f29346310171c32f8b8ea610f191ae48d6caf7db383826f23945c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/cy/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "44be1f13ffa06c4f58af6bdf01f68a0189c30c436854c66536f2c97bbe5332bd"; + sha256 = "dc8e87e1e15cba292f3c5aadec017d8c0c6f2c5c5518f68b5267c7e707b27c4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/da/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "805d5d5c3ba6d60fa190b4b05210ddd655e70cfdcfecdc8096e9bdc6fd070fcf"; + sha256 = "c30e8c35a2eb997c62530a330fc411bf9f87996a717ea3e12f0747784ce287d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/de/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a894b1e6da776681f2107a122858a1a8ddb74f25e0e2f6d88c18c6e80f61e5bd"; + sha256 = "ab884b36e16d5401b54c1e75d77d553c9add8bd26ee38e57f11f433a163bc567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/dsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "58123b90a6cfb155d358c3432d6ed95c1703a99896be2672d9ab6f68a020faa7"; + sha256 = "0eb8d2548e8b79211dba6fd477393430ba77c7bfb2fc519eeb5e1a3f484504fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/el/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "7b10083111ad5f9fed2138c37e53d2d226c0f2c46bf57308b1bf5b9ddae606f0"; + sha256 = "86522647d5107f3518002d8958af62272f0566e178b732a1243ff84da1b2579a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-CA/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c363b7b16136efbfc66b8372bf8c2838bbc10db2a311668541ded0867db99595"; + sha256 = "e9b442a4aebca8f9740f657bd9c032661573890355efc2e418bc2a8ca66c07a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-GB/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3948b70f35e76adbf380bdbad84436d155e2901246ac27836e731fd8e1c1e736"; + sha256 = "d0a850a7d9754bb71ff29985c4a129160ce3e99e30df1ef4e7c7a2e011b59771"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/en-US/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4e35172e333bb056f47673b7aba9986743596898377c71bd1c0b3c4658840f2c"; + sha256 = "4ba4529f6b391d946e876aa321648790b0ec7a92ea5530981dd2f726e04ce0b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eo/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "75b58c31907f673314185829c0a399820505973a5d58cf29ec64de5441c45617"; + sha256 = "01e4bcc9d4d01ff5ffb67540cdb815710ab12d9bf621ab1febe8237236960680"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-AR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "28cc600de58b575944d8bbd50d29f9eedb353f3960bcf0151cabf6f2a1e00aad"; + sha256 = "e3d38a32104b08219d06950d1f63726460ea631a7efe8f0eb594ff8aa4e398f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-CL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0b5d045b6d80925d85f8a3eb42da92ab046b1c3dc28ba3569b129c30f326d40d"; + sha256 = "20df30c114c27f1242d14139e0a62efde00a6fca686adb54ea9f30ce30a22776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-ES/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ccea08271b38fda0a7cf75095d44ff56fcb6e7771c1ebe3d030b509df2961581"; + sha256 = "441b5a41d4721cb6a3f99de3820611907e212415c4a398be9177693704d3cd80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/es-MX/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8b551206bd37ebe4fb409a1d79db886466053de96a376770144769a2c9a0ad3a"; + sha256 = "b08fa76644afe19af1203fcf079e4908f1e441bf0db362cead45d13ad5f30a93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/et/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "edc27acb6ebd68dc581f33c8d89c0459c03471e1f127b5be158ec18e2edcc065"; + sha256 = "1754d25cf865a5d08c8a267abe0bce05c951644b58e0126f7085152538392028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/eu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c5856ab6c5ebcff8befea2c2c6bd5d7eacad0dfed9570e005b1f9d52fd620b7a"; + sha256 = "33c3a95df0a369c5feae813bda7f0cc8bbc9b1c63aba5cf4193647f03d86623b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fa/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "208a7403e2a029c5d8c05ec52b84a45b307756e37e811e962ee79907516a5390"; + sha256 = "ba977267c4ab955665fee6ebae8e5be2ac9a71118b118c2626942f4481e8b8f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ff/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "368558aaea92e5b4752f57c42a56c7de27b6d31010e3e978595403cf2535a781"; + sha256 = "52b1cbeae32276158a6e649299229c008f797e05d16af756f8e11ab10b8e5a68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "0a5dc2f46d22418d7ff242630b10b7020575d8b7be65f1eb8e55c71ab0d29b26"; + sha256 = "45e3e210abb3d0e8647451a52c3ac8e17982d3774e557ffbde36383741b3ea88"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "667581bd459553f5767f675b01eb4a7fd6f182311697bdab38399a39d05cc9d0"; + sha256 = "0d6b747bc77931771c9cf6ec23085bcc3def89d8586ebe310df6296a4690df74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/fy-NL/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "39c1fd32733842767360176c9e1cc6b14f2bb985879816639f83d480f71c4281"; + sha256 = "829019f441a1bdbabe67a367d755499c0fb2a79fe1e62c5fa319f7b786d8f096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ga-IE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "389f12d17bc5b2a3c9a4288e053b39109269c94d56f3cba5b804c75e05498028"; + sha256 = "2a04c91377b2870c986d434e24626e119a2420028549a51e0dfc0be140ebbd57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gd/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bf1b66499533b977bfbedb74fdfea613cc6fd15809c39b2f2730a37cb29b69a9"; + sha256 = "60ac0465a4cdae54b33035469d6897a5905678ebbe36b49a748fd87b0bf8e541"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "afcf26e568817414df71fb35debafe47f1c06b31cca80694b94c5a5ffdcdf523"; + sha256 = "237a0ef1486b7864bb8cfbccd17d8ae95a1935664acda423a1c4ae543aa4401d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ae79a2c5d6d8cb55642c744750b22753c09631c10b12fa28090f29eb6170fe14"; + sha256 = "137d3c301c5fb74d69481801eca7e7bd1cd01d10d0a87b68b177bc63382f8559"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/gu-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "86500091baae2bcc2d72b021c32889f4b59abd853e01dd3cb19dd7107c9cc6cf"; + sha256 = "6d9e69ca5feb66721369a1c39e76ea3e0b4b4db855ca895137f55d61df129485"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/he/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a21cbd77270c7ac047e2b3eed1f17568dc8e3be4d99652c23f60391c5e758ec8"; + sha256 = "fe88f902475e01b1fb5a26abaf40fef31910eb1c812bce208eb9f55024225e95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hi-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5c3ba65e947bec3380caa2f23b92d19e6ed3c52275b9869ac4a995b8aad4c86f"; + sha256 = "fce917ccb693ac825b387ea78f6a5e4de4816f8fe9d7fe5ad6c2b600a2a68cbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "cdc2fd0bbb6b94e11c9f0453473871220c92a89d92292e0bc57b2ce24c822ab4"; + sha256 = "71872966d982032bbafea002c3e7e03162b972ee7f8eb8df00d26bd5d3e8c70e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hsb/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1d32367cc51905f2bf8682d08166ed433cb37d711ca5b299693e3899b5508628"; + sha256 = "ea8d862701f94cbca2e5f22090cc1434f6f51f8afec5ec929c84c714f11c42ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hu/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8b0daa49b706e033894ad8703dc322bf347a3fb66b03c18d0c3c0ac6da4bd0a7"; + sha256 = "9bd5842125a2432fc997a416987414323f729685b8b0780db1183a8415ad3a94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/hy-AM/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e0336bd76c5b1c554ee4689de92cc1eb1937d22bcae70f3132622f09d854e82a"; + sha256 = "d094a0d50acfa2d2e28cc6c4bda43c4e4fa999e80ef97bf4090fa19d672515a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ia/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "33617f175a8d2b46e4ea03a0385755a0e9ff1a311397ef200b634ae9d16c2f76"; + sha256 = "077179806415be1461f4cf2dc5676c434b851fe99e62404cafa6736284cb432c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/id/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "db0ce57899c061a3065831f8188ea830b8fa3d01c43df5447c55b1fcf5b99376"; + sha256 = "69e9dbb8621fb196d2a59f7f96c3f368abebc7b512ccc492ea45959f9ba75446"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/is/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "920e894762732b7366d36f407562ea19a105e9a5634311bfdea7b88289527320"; + sha256 = "b5776defe739415915780672d31c35a277f885914ac56c09ac947e317f71ac5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/it/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "107698ba86e4460ca51ece41c983448dea0ac7bfd20425bb1c990f21350bdcec"; + sha256 = "37b347a27bb14ee9a2c6c7f672cf971de1a7826cbeb0588a4847c32b79dc0496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ja/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0eca42b163a923617e757c170b5a255087d5519f4ab14279d6a3f3c42d14271e"; + sha256 = "979cb88f236160d3091f7cfcb80d317fba4fac6ab2ec26d78a2c92651e856f21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ka/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "15b553fe56e20b8168698f409358fbb8cf7a56ba4dcf4079e8718cad2a005735"; + sha256 = "744cf7540dc3238442153b0edd50c687957f47531c0569ce32720e2e5160cbd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kab/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a56272b93828e6aff9db0769565199e107cd8864ebea666cd21d3f79ed8bfee5"; + sha256 = "66efbd08ad245c4629d05de0eec26f987d7d72d66ad097ab197bb31f29345284"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "10f1289068c7613cd2611bc3e9b5e2804e77b5853e07489bb60841307fbe87af"; + sha256 = "9099027e11d674ce49a0945194d724010980deab08360b4bc0240d007c307fbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/km/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "43f933ba3aef69d3af8987fb7b7a40ad1bdb8bc1285a6995e3706fb2731ea0c0"; + sha256 = "a7e43012fcb7a6b58ad20069452d69cc9624236983872f733239c487e4737fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/kn/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "1d31536bced9c01229e9885153ef66875d67205196eb486a823161b96a14c520"; + sha256 = "396bb2a4e2c5385b5f74018d3eccb3db2526fdaf277ca99e74934cb17c738cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ko/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "88364ae3eede1cd139077e5d7e2b588604d63deb49d6bb0933629a17209e78c2"; + sha256 = "7606eccf3e6ebe3190a1bfbb60bf88d991e0ff48453b9cc1c07a08ecf54e7932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lij/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "88defc592a591dcdccc8fde193f6b03429c0be3d30291e50f3d599e88b55bc09"; + sha256 = "b5570a8a3ee4445da1b18ee3217976e02923819f4b3d05f58caba65586f91294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lt/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "646c90f4fd53a8dc995a28ff6ee444a10a6380c37b5f8d2505e9cd401bf29895"; + sha256 = "2e4b6a279d3db48dc8a498ee5d038c6304782083a699a89d958f81bfa87d8916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/lv/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "416502c400bb436c4bf0a82c520045d44aea0968955528f8955446f4d9f3aa28"; + sha256 = "031c1fa63780985b4576305b2979bb3c7265cfb175b67393c0f0bfc23177711e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "62d6a1873b4cbf1650c731f588996d9c78bac8c286fb7bc2b22245bcdcfbdb94"; + sha256 = "797af316793586db1ab0e0cc9fcf75c1fe70a9c89d78ffa43e6ca6b4fce99c44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/mr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "cc7bbcc108a8f3b080ad957339b2a28a1733c1f4c9c9c4db226de65ed2650d3a"; + sha256 = "5363901c98627006d490d20f89fbe9a050cc23a018651934b39e0a0b7dde0d5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ms/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0a64005f83e01cc80d384d2ddc79fc582bf08d01c1e8ea3bd17ba9b6310db8b7"; + sha256 = "063ebaa12fa522c218990d01f5b312f019e223fee8efb57a10ff68197b8c529e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/my/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4f0d3b2930fbfed624503bb13aa2c02b641997856f7e9a490d27371af3243908"; + sha256 = "0eac26eb33852f0c0ea79869385010c623769933f5c8cd6c718ab9fde5eae61d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nb-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2e037b5eebee8308034540f0944972432e6246fa6f418af3b3b17fcf407ea603"; + sha256 = "15cad2c535889f2cc29021490d6bb28145e0f1df27676e3871d18d17b3db90bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ne-NP/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "89b1f631a3b68f497070af726ca6a8b2e6a747c75032701c935e0309b014a4da"; + sha256 = "640b3099d96af524455026de4059a23fe75a54b330a8b4fd0a9efe58e55cf950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e861ed42e0e133e0f7ce1e094b69dbd0abd7a346842c3ae3b4a756d0f3a0b599"; + sha256 = "f12f1d587701cc78884fa5ae3d9997aed69ab6b57438e89419bda3330e1787d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/nn-NO/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "36dda4ae13eb19b8421e385284ec39d3ad10ac0da9530781f3a0a719a76fc92a"; + sha256 = "7ac1de885da3fd400e03d91adad4eee78736d7776d1b3134b38ecb9bc4d4614c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/oc/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "6799c6eabebf9bc677808666ca724d1bb704e171197087cb828e9ccdb345f27f"; + sha256 = "bab17427dc0d1af03bf8a28a1ac9f505d71ff2d84a184fa6ac99454d6623a269"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pa-IN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3e2b342d2e12804b07497383c8e3e453851004aad50564cdb25ad9529679beef"; + sha256 = "47a04146475054fcb8d76880f06491e885e12862bd0444e6556ac1030ae8b2b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d77d658d2040dec3453583e6fad0b1f214c924aa1f4121ca2f258211e9b8b558"; + sha256 = "5c4993bcc60f8d116ef36ea6b502078c34c274f91ee455497203714281f3be46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-BR/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fd73d7bd16fdfc4774a3a4426cd63bc6dbc90e47ce316dea75c8483110f3015b"; + sha256 = "7b5e2f52aa1864a6c1c96387a8f5fe3e788b8472d4852226919db430168b151e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/pt-PT/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "05a37242735661f27736384ceaaaf30bd3eeac85ea8a6b7e03d5dc07bd9db735"; + sha256 = "7717af1088d956ffaaf91f122e5929d3605b60938a40bfa829f791eb7833b620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/rm/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dd57277dda625c767ed7e0f3ac15b5597f1b17c862f33724a300589bc760bbd5"; + sha256 = "eea1dd966c8f4264616b89183a732f7c551c30c999c7bc95e3a6952c6ed667c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ro/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c5bcce6dc1dffe36a02b473bc100bab080991dbc85a92b5606c4b1d440a6bae1"; + sha256 = "1f472eab1edacbd4f94e5120a32ecd51b4ec507108b516a244582e0a6f177669"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ru/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1635583bed89c8efc3cccf6ccd294b2795defcdebac8d2faa2d0adb863200910"; + sha256 = "0cc517ed918facc26e76159b744b28397536736db641a45ac5e11bef9cf9b3d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/si/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bf1d180a93b0d1c2c4a9a177b906db957fa92fd1e9afc070f208c48c65921f48"; + sha256 = "edb56422879227089c8093397464e24c641d7d76bfd71e2dd6fde7a8b7b2498e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3c06f3513ef00756d7aa09aff5acf7da408cc02567a8187f51d01a78f016f7ad"; + sha256 = "ca64ed30ae3d073b51c3dc82c841eec88a7fa3913e82243dd8f67078f0ec59b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "107db384d90cf468233ffaca01bc18e332d931dfe60ade299be3b788876479ba"; + sha256 = "ce5c1df3db5e819f309a757e37c764f75dffc2cbf8737a8953349283f98855c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/son/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "75744dc4218b94400e480a30a93f697d5762e1d57e057ec5961ba76c0bbaa7f6"; + sha256 = "d1f5604c5204be5c6c5e323b1ffabb411051de8c31c1568cebb6cecda0c1a371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sq/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a02be173b477a7accc7eb3ba61f868baa6116b2f3b6c11fbf91544d37b8b3c96"; + sha256 = "805b77a1a561541e714c9ebaf23d0f5d50abb84766033e38056e0c528ac44d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "24397cab6c2f85bb59dae4b9b13136f4df73adc5d0ce1808615e96ca090b26c6"; + sha256 = "d9b5ca9b56132936391f0b56b3694dd741a6217f591acc7cecb73e947adac302"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/sv-SE/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3a10344dd08921246dc5ffc12e7bba8524bed0fa063ad0d369a9a3f3663ffc88"; + sha256 = "3b5aa0a8d598135a2bee5b9b7db478a106473f7708e24c89f103c8d67e233dec"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "6da4aef36fb8cd014e827a89a9ec9092c9d2005f493b29180048fe70688e8513"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ta/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c99dfb14a98f079a7275819bb1e7386eb1acbf9752cfa1a3c5dd7fd3b2d78cdd"; + sha256 = "972706bfdf85c74f7615222fd3dc15315fe9b339f2cf03509ea40461ffa09dc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/te/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ffa4a07accc7bd9515f67a8a2a7abb881b517b2c3fda5f5cf9a7399ff1aeab0d"; + sha256 = "5e92dbef162c8553868c321c604315af544fc5a157ad80bbb6cf0dfc1e049ed3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/th/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d3c3539566237f9df3236d3850771c7589fc0af6367b20bb62df3b0417954278"; + sha256 = "2530799eca2427f2294b9020dacdd1360f12c07973627a4f27a1fd09fcee02c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tl/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e5691a1dab9000bab76f516e77f8d846e4d6ba9eccb7ffce5da7685981263be2"; + sha256 = "ab71a1db5a1a1a77e52819b48322186a7b2425ccea4528aa68c286f76733b0cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/tr/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a165c58b79094f3c28f29bab43ea8d2921099148da2247d9c3829c468a066fac"; + sha256 = "f4816b4dcc0263451bfe4953c80ca9b2c19dcc882cd01523dee0fa95f8196db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/trs/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "71a6466c49b1e4554ddca9798130425bf29de8ba22cb4204ee63df1399e15dd8"; + sha256 = "6dad8a06f75a64ea647b7eac9b211611048d46f6cb82c339eed09f26554e97e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uk/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "dccca6a7697d16203325c956cad9b7ccc39e45d87fe50fd0a864cb92cb33889c"; + sha256 = "ea5eb3e482eb51804a935266a91957c5969f0faacf7ea6fc3aaeb39e0b0d3dc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/ur/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b94b825f2b70775093042ee10e3ba140ddf4882f2c54a46379790195aa932920"; + sha256 = "3048627e8fa53fa379f5d1c3ec9ea70733aadee3a8a9ae35c75187f820024a1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/uz/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "eeeaf926708997925ad80bb8d62d0bb8badf464d030bde97c62239f90f9566d9"; + sha256 = "9cd8711b5a188e7c3fc954b65bd08b4ecb3b827816652ae859d5e6a57a15ae5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/vi/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c465c1dd6e4df1011deefb9e75f778f000a2a48151d9447550f4ffa30da03400"; + sha256 = "89b09f5d295512e98fc374ee950a74aac041ecdde3bbad5cf42a07e5b3ae3ece"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/xh/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "56420d01893a6ee9791f3984b4c8b676ffb0e300c734c9b90a8b2bfbbb3c3e44"; + sha256 = "925c0f9832d235aca22b0b26aef59f750f09d1d3ea2a391aab4087a44f743072"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-CN/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d19e07a9120f3de2169614c3ffa3323dd2712903bdedff446ed2063ee54ba95f"; + sha256 = "3f8029b6f33a0954ea8d3029a5182b4b016356348d1a793f9f96261a5e7e6e99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/85.0b6/linux-i686/zh-TW/firefox-85.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "eefb93231e8603b69a793771f427de9f6520993744beb0f5de6bb1b06342b286"; + sha256 = "8d69eede16322268738bf8d4b75698a825391df1c06caa0ca2931555c832f124"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc deleted file mode 100644 index dc58eb8d56ab..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/mozilla.asc +++ /dev/null Binary files differdiff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 136c2c4c7177..08d928698eba 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "89.0"; + version = "89.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ach/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ach/firefox-89.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f55831518c6d1a590a48093a5737862418b543d3349c6fe0418d378cc78846d6"; + sha256 = "c3aef53650698b0787288ff519f6a277af0a0a8010b39602884c81fa7a7aec21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/af/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/af/firefox-89.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a124ce560aabae43fa0fe7b5c2c88f286839bb01ef94185faae640ce8937afe6"; + sha256 = "c0d332895fdc0d9490ab437fbf7579ae583fd4df632072626a5b6884a5e32d0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/an/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/an/firefox-89.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f2624d37b96a23d447dc16ea8b8a627db2cb497945d0c4cbe20cc20570d579e3"; + sha256 = "f13cc741afbf2df7ce964d7cbff4c5e1786c0bfc70a899b0a41c949739e857c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ar/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ar/firefox-89.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c01e143107753ea3363e6f8f0ca77c12f9f4803da342578c15c94554ca6d946d"; + sha256 = "cfd8e7fc3a3bd4802a8c500e36a5936853148258add8f28f7a846e589dc40340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ast/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ast/firefox-89.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d2bfb999bdb31daffee3774ba1f940a84ae5f4ca846a03852181b2ebb5ec9b10"; + sha256 = "6f3095de843fa761b6b277cefcfd9f21d2a13cba06ae8f73acc28d9593bdaa3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/az/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/az/firefox-89.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "61c408e9333730c5cee83c48c8d0e1aa20c62b76e32159b68d0e529e92cf15d4"; + sha256 = "9d3a112af9f8d5f7860a9bba0a47cc38fc569df8c005dee2922764b5b5174976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/be/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/be/firefox-89.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5d53d478b0728e9bfc0445e9a9a6373e0105e416ed98f50398fcc8d6466e9690"; + sha256 = "b75d5f6c580105db60c9eefd4224507009a27fb71f666ec779ae0855c9dd51ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bg/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/bg/firefox-89.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0dce261fd2be11436ab182de4bd78ebf50da9f9cb439d100063e714b2e55cfc8"; + sha256 = "4b20c10d83e8be019ae2feb0e44b8c53f6d6fb38e350b5684de6453f505bbefd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/bn/firefox-89.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9d1dff74b8ee7d4e81900e079921b06ff332c3db1affe9691a23db74aa2e2990"; + sha256 = "e651db4085b62a6be588c5a4794a0969abd9c6522e9cd5cdf8b7d7a88ca45066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/br/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/br/firefox-89.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "db9c9c3db5636d1bc10e3ae627f37c1c55716debaec4e68d9b2e6771801802a6"; + sha256 = "14a82b5bac08712c8f3c061b6486ecc53e9aaa4a4191f0b033b67c74f46042a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/bs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/bs/firefox-89.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "202a5b093879193327673a39f0f217323f0c0e2ede9f586fde0fe224b0bc034e"; + sha256 = "4491e4c2e3761656c974c5bf013d27df37bd051b7c55bd124ee166eb38e43a75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca-valencia/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ca-valencia/firefox-89.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "d607a4d86c66b8aeb74724e29ffdf22d287ba729b7962db19cdc64f6d03a8004"; + sha256 = "8c66eea840003100f62930f4fa41cf778e332b2b1e4e7dc6c3db944435b6b0d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ca/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ca/firefox-89.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8a2c7d2b455f31b868779cd2254fc130ce4f84f6935f127c0c6a0dae85daabfc"; + sha256 = "421c40f813c13ada56f11aa3d2a2251a50cf4a624ab0258eb966e5d7a602c7a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cak/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/cak/firefox-89.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e631bfdc8a6a71973b16bee03221ee882ac28a289e8ff92ee3319e05c0260d5b"; + sha256 = "368acab2f5633d72ade605dd6f282a4770ad158886a798f7c0436fb6d81a6aa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/cs/firefox-89.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c08e64765f30591e3b4aeb4721e7f149b299dc19069476d0af453e38b2b68926"; + sha256 = "f9f1e33011abe037ddd72f49a5fe9234935854e71fff37e7d3cf64650f3bf7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/cy/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/cy/firefox-89.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "da30c1b07a2c1eb840d87da41cf36b4e0bbdfa2df6f82c9f4562e460a742b9f0"; + sha256 = "7c872591f802cf9debd4cbedfa2c61c2c4388c4593d29bee5d6592ae2244eb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/da/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/da/firefox-89.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8263b20f80c5bad2dcf571c7cd71c0875a41e41550fa4b9062e90de1a544b81e"; + sha256 = "407fd6bb4c8ffcbc90918002e7ea87a03b055f28e9e349bb46fe1d9b4799ea23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/de/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/de/firefox-89.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "122d301da28d961efd7418d925a6ed0a99c302c3935f94dff6b36129454d171b"; + sha256 = "81cf44731ee862132542435c32835172857aa031ec49c324747eec0be168b695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/dsb/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/dsb/firefox-89.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7f4a167e9ba002628aac487f55d1f8b549257da18abb58938d250b16ae086597"; + sha256 = "1f98eeb01f0e124e114b6f001dfcded4dc9daef818e90824b1af69af9a6c6309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/el/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/el/firefox-89.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "51f50c9f3c9c8857d2fd155129ccad90e59343d120514d90c4adba8876547662"; + sha256 = "2e425b25e309bf4d34db4bd22158d6cd3381512c7b2b271eea4911504926ff1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-CA/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/en-CA/firefox-89.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "990bd24aed34581e0c477737327867582a2995b6e69f601d4be967d49140be64"; + sha256 = "859fadc75c82575e2240b8c26889185417c8402d49c67b825bae5541cdc3af72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-GB/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/en-GB/firefox-89.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c56e3405009e405e565fb3dd69b8b6a22894cea9002568b2cf88b820d0f7d6db"; + sha256 = "82e3b6f5aa9038e06fc09493ca5cc3d0bd89fcfb3f7ceb2349144c0173e64cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/en-US/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/en-US/firefox-89.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "5011b87e0795de19a05694b06965435c6896c907d51a31631e9c8d427602d159"; + sha256 = "4c410dcec55127325de16414860b07be84d416e409db818d5cf0124b35b35d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eo/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/eo/firefox-89.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c6554905a466dc9d117bb91aaf0be3e0030467b492d44ef3374f01219d7bf0e1"; + sha256 = "6eb0f001d9404d403af865883e540fa022937b1cf004afb127b80dc8c9b7cd7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-AR/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/es-AR/firefox-89.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "91e72c2251d2740129baac9d34ffa54b8b0631c5951b1b667f4e58d0c86ed1d5"; + sha256 = "3446f80af21e7debdefd0a1a075cea17e01b38f72f645c5a29523462c61c85d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-CL/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/es-CL/firefox-89.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b719701fffa142991f78aae717a247c6b5310d9dc4832757a773b077be0bfc16"; + sha256 = "47aeea3b0f75b1c03aef60b8e7d3d35c3ae90e55aa1c226df15236066184bb4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-ES/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/es-ES/firefox-89.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a4153f99eacb4cc4fe647e9285b76800ed1208e988a6ddb148bc4cdefbe23f55"; + sha256 = "f5caf9a3401262eacda0d47fc42c721306e6b094ef8b6a6cbe09081f220c6324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/es-MX/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/es-MX/firefox-89.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "fce8b910fe58b8096a36ce28289f8125dc9074c02655ed5df1d1bfd97a67d2e3"; + sha256 = "8ed0bc34cfee4e698b287fa67b2112da389d3037d1f0a5abce2002574f162bed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/et/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/et/firefox-89.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "07165b740a9772c1ac102cdcac3d26aedef5beb6db8b3f222b4bdbd6abdb2fe2"; + sha256 = "a0239ff7b8d7a6e8e7fd32553612e060a27f75fe846fa6123aacae5d718869ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/eu/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/eu/firefox-89.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "11b35cf208f2568f06181858702ea4471bc040b3be1d2a192c40db431cc02a4a"; + sha256 = "27ed15bbd47c7cb8e9669baefe86f26f87c0d5375783a36135ad608ad4a91172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fa/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/fa/firefox-89.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a935878e3675c34d85103f3c002ea5fe7f86b12a5298bda38f2d398821ba0c0f"; + sha256 = "34dae1000a46907adf080db0d75819eba1d86af97ca0f8f59e33504f4b379886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ff/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ff/firefox-89.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "13860860e6f60e7ca9f7aadadee36645f7b8a4f1fbd6b9e0a7b3d94f04d77129"; + sha256 = "16ca942be273a5f4eb8c4d1301c36121c3c92a5ef761740c9f86e7d9790d0456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fi/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/fi/firefox-89.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c84d9dbfbb89fe5573763ce54b533fd072bf17e22d9c6904dbf52401b635630d"; + sha256 = "3381e0937d8e50b8224185bc3f6771787b8b6b76e7c018efbcbd7a1388cef7e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/fr/firefox-89.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0e5abac1e39f3234603906c237a0f14b927853668b13f6ef8ea0d74e00407296"; + sha256 = "f41904220ede5be0c206c334fb80ef9f8909dde611b02525840e368cf313e9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/fy-NL/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/fy-NL/firefox-89.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "2ecf98f47651abc6f90ca79f98ab0b055b099f500db8cd684c60605e20549878"; + sha256 = "3b87d74f8c51ff952a83ab703cff7875eec27ea486e628485bd463522eb002d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ga-IE/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ga-IE/firefox-89.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f1dccee366c64afc0a8d9037488cb57be9e6ef544ab4c1bfa3e7d8b7b91cb16d"; + sha256 = "8d943f4f6f88755a04c22f8a99198d67da7504d9390a7b58e419394f22017e38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gd/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/gd/firefox-89.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "374a47ef2069c6a3dea4ac510ab10592ed48b25715d16d19ebafc3070efc7b11"; + sha256 = "c3ec21985b3cab52ebb24ec426e6183442a0738aebf44e2cc7628cdc05c74d76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/gl/firefox-89.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "393f39cdc555613553d27743e681c07501e253ead1562fd14d2523b1a3249723"; + sha256 = "fd448acfb8928ef217fe9a84472dca6d48b31cb2e5a35e9dd917703d90967732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/gn/firefox-89.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "19c207a40e588d072cd056c056583f9745017691aee2caf5aa8e6f78680a53cd"; + sha256 = "42917bce57418834788c95ba39d04b6c37dade212f549862a660ee4736959a2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/gu-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/gu-IN/firefox-89.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ce4db1d47376ed287392b13c959c40dae98e9461428d8f8df5ff8d99730f1f10"; + sha256 = "3bcf33442fff5075f55927309b4ff0a5077e22d7353f61e8104510e8a8e79dc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/he/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/he/firefox-89.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9ec972022e45ed803c441c68e704874164a3cea4bdb9d26addf23097b3bb40d3"; + sha256 = "c3b801c1ddd23da0ffe7d5b7e14548de627ca1fbc1f18bb8ff7a1fa9fd03534a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hi-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/hi-IN/firefox-89.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "dda729303a9183baff446f2a84de68333c9aa3a9d90a34e80548e4f46d84e045"; + sha256 = "c76b3c099e4edf904a80e9b1738286f69cd756524ee16cdb5bd46f530ae2aab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/hr/firefox-89.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dcd696d7acd7f991591f2f93ab0d94a7c2e7a7d07c5e644792d890fe8c653f4a"; + sha256 = "099c31436b175623a22d5a7e5d9f8a51d0ad8581ea08a3799c75d7098b9dbc59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hsb/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/hsb/firefox-89.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a3b37e2df58a2ccd6ec422a8c61da35bfb9109c1464c3babedea6ec3be5fbaf0"; + sha256 = "c49bede957a044d33299a4d84ba2855ec33a4b7b1359e858d0a5efa93a334dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hu/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/hu/firefox-89.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bfb9a458ab0c80037dce953b4c478765373e79a9368ad267f4da75cf22bcdf76"; + sha256 = "30a48cfa930b6c6960bf19e3e2da945bec8879d54bf1189b70b8c1568ba3c234"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/hy-AM/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/hy-AM/firefox-89.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a3e67a5cd54082cd00976f17b47f719f3f262af6a39f0d0f5107b71f5119fa3a"; + sha256 = "4af5654a01ad665c4d941f99674fdadf606ad073e6e721debb6d8fe6656519ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ia/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ia/firefox-89.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "54175c830b7a28047788721645796b925e37803b23ce7c3f7f287a3a3e6943e1"; + sha256 = "37f761b735908ecfed4c96eb44aee8566a78e16d9105e170e17f9554a790b5a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/id/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/id/firefox-89.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "20f207ceb1b090ff6be21c36b928d93a53c7f2547adafa7a7559b7d914ae24e9"; + sha256 = "a92b7099ca5ee05e66575b1da5eaa26985db9ea04d5e593ce66561def6d21844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/is/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/is/firefox-89.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "79bee0347eab828d9022708131ff8eb32d1a895d1f39f1d074bc6fa536463289"; + sha256 = "26c34afa51bdea7b66191b931b9d4a8a4821ecf2edd029f0a4487be69a7c39c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/it/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/it/firefox-89.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "28909f3a4e9ee97e290c52a762e74529793ec218c848fd2b260094d9295425ce"; + sha256 = "2411a8c45be753215c79357f06fe403322c10051f609b208b79d182e529605a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ja/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ja/firefox-89.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1fc39129fcc4e05a6ffa62302f7a01bec771e2aba1aca084c9fca518f0f3ecb4"; + sha256 = "61d3370af7c6d478a6608c3d58c3350817c7bc1a85bc3ddc2d21c00e490c4d99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ka/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ka/firefox-89.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "513bdc1e8c8f6568eee0b24846d23bed788053cb3487799a3360ba97c3f5471f"; + sha256 = "834c755f037c2ed757a6972dcc3fc1bd5c36ee2639103dcfe094d8f4fe630204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kab/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/kab/firefox-89.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "39c7c01947863bf17fd0fe7360c1c02029f8c4eac6e27747c029c60f12a524fc"; + sha256 = "4c34d72a8ff32bf83c35521cf25a6ce7ee0d5ca2389e0f04dec487b33b90d7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/kk/firefox-89.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0c99f13e466294845bec2f54ca8a10f3d03f87b9b2aee80416db799c5761a4e6"; + sha256 = "da78bdb506b0e0ba7798db6fcd92f340c0ced478a978f55ba87757bc2d03680f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/km/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/km/firefox-89.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3494d56e45a2a9071a0993191a438155ad4b76579e6a6f29d919254c567a0078"; + sha256 = "5288f6056c2bc039a9aeb11f5a94558ced6cdc7ae426d9672907e55c00c115e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/kn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/kn/firefox-89.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4889cd958be7bcd108c374e0e0575f13f07210abeec076b8369186cf61f4ea7f"; + sha256 = "347f124b56f12a7a2cc98975f903e30df7fc6f72f530e3de61e0cf669225dc07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ko/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ko/firefox-89.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "71da744479496c2c62449d42373af839b02cfb1ebe2e6ffebb662816aa8cf59d"; + sha256 = "7685b7b855173a1e666da68a91d9b6b10f60cecef51fd92838d00a0169ed2bda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lij/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/lij/firefox-89.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "785afee6c3a9e26e8e81032ab5e9c94c886d1e950ce2174d63a9d7f6f15acdb8"; + sha256 = "07026271b7bc2d4e9d828641cbfdf9964a43cd079b5a0b5fcdce9854f924ab31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lt/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/lt/firefox-89.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "00de67ef54ad73ff1b8397f9d86ae90da57a0272268336ec7ce6f7790faf0a38"; + sha256 = "2dfd96e06aff4016245b354f42c7556750b09a32e967e59f548ce02b808e8549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/lv/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/lv/firefox-89.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e28f07fccef57a2ca94b7b7074b518188599e851ad4e21a13b08b5b242407154"; + sha256 = "bc461287a33dd4350e0ee74231716fd1aeaf648cfdd40a82108f57afa3ce6b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/mk/firefox-89.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "6fb8c785136d3040865698d91cde31cece022072594aa61803cff9e63e2e5a10"; + sha256 = "29cc097af990d0297b04f63a880ef47d04e8630ea56dfdc7537e2df48b54af17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/mr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/mr/firefox-89.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c91ea884c587115fa2c9b6d6615f724937b77e24a22ff84de7bd50d843907432"; + sha256 = "741e33e2121a8da5a9c87f1c29fdf4e86ac1d0c70107c6b1d6ec3efea5345474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ms/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ms/firefox-89.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "36c50cbfef5e729f57797635aa1745c74872f6adb77daa0b4e5e804072c8d15d"; + sha256 = "f8a3324e0aa50846a82c6612136ab75369b48be4a68dad0ec10829ac00ef6c7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/my/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/my/firefox-89.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "cb17e54ee6ed511fcb7de27ab2bc9dea5c52417ffe807a572d65f8e8d202c05c"; + sha256 = "d081a78a74ec384b5c667cb66b02aed9a6e662eccb7aa0d09193d08477607d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nb-NO/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/nb-NO/firefox-89.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "08e7a9935376166b3344a85345a932b6ea90691f6f5c28d345fb210cae64252d"; + sha256 = "1c0908d2eb8aea6a3142b6c6df231106456f9203c9690c0384169bfdafab3286"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ne-NP/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ne-NP/firefox-89.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b6791b6c336fb9b3683be41798620071f1ef569f3809c0f0ae9db90a1dd758b5"; + sha256 = "1fd524963622ea4d489b3bfe5c4557d9e9e55592d41eef43dd25f3be812c7b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/nl/firefox-89.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "1bd8d6737393297378f127cf320ee0945970ac4688ee9aa3a045288fcde54f61"; + sha256 = "41d9351c46d0567d5d8daf76223ebb782ba1deb9674b7ed91a9b5b500715a2eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/nn-NO/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/nn-NO/firefox-89.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "919312922060bc90e5a3398a76bc7e6f224dc3ae46275d7ba7a0fd596e46360b"; + sha256 = "b382dd0fc83aab0cbf1a9a3db06b0ef8e6761bd4a2b6f892ae6d8c66543f1c7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/oc/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/oc/firefox-89.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "65ed4ea16b6696fa5866db932b82767301c6f3eb72a9ed089c4ba5d2a439352a"; + sha256 = "45f902b3c850cb11202cae901aaa2f04d46640ad12a751739886afaf7303f92c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pa-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/pa-IN/firefox-89.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d996838f73d04f0bc91b22933e5c6bb2d2c7340a43933de48c352cf548097040"; + sha256 = "0b1a82b3f92abd523f3fe515bc710fa929a6a4c5f144888da7562a0468fa6c2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/pl/firefox-89.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "aa3167304eb7d5ceed1235be8d864b0d6ff48d47d680e62b613462378215d9a0"; + sha256 = "6f875bdf96d4f5cd930b986301b636b8b12e77ce4e5c57714ce72c90b1b09855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-BR/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/pt-BR/firefox-89.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "74f7801e8e2f9c60a9824380060769afb61771fa9516206ee85a882705eab3dd"; + sha256 = "4ab0213b483cced916a08783d031ab9dcee79fff8f7fa7df7e3ef7e3c675ac0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/pt-PT/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/pt-PT/firefox-89.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "961575b359317228991d81b76b9967658b18229ee8ef58480dcf19d6bfa57ab0"; + sha256 = "9ee9fef10d1fbd75810360f87dc752d012eb0a59230ec3af7456fe5c3232f8b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/rm/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/rm/firefox-89.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "60780c817e379fc25d4234363c72fcf8a0cb3ae14c4ea87865d85c46aa206801"; + sha256 = "d46e4e83457dfeccf089943be450142b05c5fbfa4995c2c4895b45574cc16f59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ro/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ro/firefox-89.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "20f1e503651308e2f1e0f41091c5699dd20b02a9fe32e0cb6541d00ba81d2b59"; + sha256 = "dafa16a340e7e2ec072ef6b741ac6bb25020c987a911ae801bab565dd2be45d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ru/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ru/firefox-89.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "1f980091bf909f7f7f53d358b79c918e80df36f7ab389053c02051cacbb1ec44"; + sha256 = "3b56d48361fca1138058226f87b01d360efe00711e4415d135b90fb4cf8f7a99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/si/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/si/firefox-89.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6be2db2f350b67befdbe0d12788c8b076ea592ad7cd40c0c27a5a1a90f73cfcb"; + sha256 = "0ca008b069783293caaf83a619b11a31cab914f07ffc1ed9467aa11b5e9665f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/sk/firefox-89.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2b975d58ab76144db56408acefd5e5f63a81a65d11d79abbbe724ef60cc0b7ed"; + sha256 = "ad3990143917a5ae23ccc73141d8bf66ee0bd7be6d4a0535066ca8efd72ca10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/sl/firefox-89.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2459093c57b5784ff0a496ca6a294086700684a85b6a5444a25a877e1bd51767"; + sha256 = "42de516865a08e8e623228355270402463df84be4ed7a7f097f8aba2b19ce7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/son/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/son/firefox-89.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "1f5f111543d1db02a8b86ed760cb159e3dedbb4a44ca43b31bd78cc9cdcf3ec9"; + sha256 = "244caaadc3aec2100965a907c2351295af042f8e61c34c907195fe0a421e6126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sq/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/sq/firefox-89.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8a2c424aecf0e95d6acb41a66d07b750e85b74dfe5cb2154f9d84cbae51a2b06"; + sha256 = "87396558a8c6c734f0e2e530a653dec48fe253f7dce3021acf15d2368a098e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/sr/firefox-89.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cbef46fd1e72f542efc8959bf602fffc026a2866a2dc546d008fe8b08a24ed5a"; + sha256 = "9dfd2e79163078b550f37a4fce6e4dd0a62e43863f6b404dc7d9d13f734daf45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/sv-SE/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/sv-SE/firefox-89.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "c5a6dbca197540c22e370cf69183f32edd993242ca651a04c46ece8b43824a30"; + sha256 = "57e5b7b45ff73c933314ed68d975c46ec829c3892cec81ed9eb71e723ede541c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/szl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/szl/firefox-89.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "29a4470782609b31b494f3759e9cb3b5704790e4520acd1b33988877cd982b86"; + sha256 = "7ba369f8f2a2e09b8519e600b5d3e7eaeb0b3afba613c4d8aac42d052bde3725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ta/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ta/firefox-89.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "8a8311028e7681f6a51013ad9c15911bdf9e572544d9c26982ec056889d79fe9"; + sha256 = "26d0cae7085440f36258a17b9eb1d275f6f6ae9d952dc57db824e50ddc4b4b72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/te/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/te/firefox-89.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "072a234399aa63cae9089da050b647ad042c8b346ea6943f1f2dbbabd5d454f7"; + sha256 = "f168c75e705f9ad8541b0314bf0d679ce93306044c5a3ee2158fafaaa5b08139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/th/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/th/firefox-89.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f43f10f82d50a40e8b7d83295244d1edc9058826160fb7529397751fb4cce43b"; + sha256 = "1b10351919e931f9c7f812b023447a7acd2d6133d64f9bafd1999be4ac7c7eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/tl/firefox-89.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2b30195f74227e71c21b7c7004faea8cf4c95da5fc2bfe4210d50392d35902a2"; + sha256 = "c0d4c14a6adcc4c3a82fdd6582b5f14267c0d4a699f4dcc6b0047809fb2872ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/tr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/tr/firefox-89.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "901fdb54ca10a0c90bc9253d6d1c6f683a7d5dc4ab8487e6aa0fff2b04e32f24"; + sha256 = "4f68ee9496bc452ef04f12d91f3170658b445dcc45748543be88aaaf3dc5afce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/trs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/trs/firefox-89.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "85c3386e16611e2cd2b64a5095734c7c4703b9889df4e3656300d98b7a392ce3"; + sha256 = "ee8f6e51f72a03b740895f3613151d56e41ceb91d87b88bea6a96b03b62f2b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/uk/firefox-89.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "21fe9ab7f0a41ebabe2715f139f2343e0fb6e8057b42927a3044f7ba665eb80d"; + sha256 = "e2f163958964fc8379faa43d8f9a75f9408316c38692399df174da85dd652610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/ur/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/ur/firefox-89.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "098d33b86191172fbf5348689b1d704df4cf3237e9dd789c67b95656a6b79e02"; + sha256 = "946c58aa07ae10614ebcbd70368d0c557b3389616b73af8cd62be4147c5a5ddb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/uz/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/uz/firefox-89.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b891212d3cdd66b7edc970edea6aee044b906174054f2f06a55e5060ff751ada"; + sha256 = "1f72a2e18aaffaf9155d497cc8a1980f559e0510614817e6797b3b9baa21ae2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/vi/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/vi/firefox-89.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fff4b31a6889e1b5829b7713fe0f54d4a68cc3da3600f6bc69c6b652596fabca"; + sha256 = "33e393cdbc7a4d615231ff0220b1756d3466fdc515e7fabefed06b6e89ae43f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/xh/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/xh/firefox-89.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b73adfcec53fe584ace193f3f8c3c1ecd9b3346847cf620cd543d21fc4f14be1"; + sha256 = "0c86fe6385c708730b7da7d667e0af6361931a851e049774fdd248ee42c448c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-CN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/zh-CN/firefox-89.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "79c53f5f973bb9d85233c49c0c9e02b9e1df35f500e44b4bb541cb1c097d77ec"; + sha256 = "837007ae8e7f27b03dbb181076b97c46114abc6278b58d7c4f8fed6c5e63eb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-x86_64/zh-TW/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-x86_64/zh-TW/firefox-89.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "270a0e18b978ef33b8b71fd3690ca859e0c286ad1ce5302c5da5b7375f8928d7"; + sha256 = "bc56588c968f6a96deb7e0260e6ab0c4dcda0d621f1afb41301eb5600bc410b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ach/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ach/firefox-89.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "e239cc3380b017b549c5ec0824c0b351374412562a810f85faa3e39b020702d2"; + sha256 = "df2c7fe0b155b29c56f60a080c34cc36879263306893e1c14534e10c9f1fbc3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/af/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/af/firefox-89.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6049bd79e3e3fe7f141a97941489b9be8bd1b5e907ff92f07907d0433c52f8ee"; + sha256 = "deb365e2dcb01fc8ee217de70c90a45db77cc3b7cbd3be99ad9c6ba1cd832bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/an/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/an/firefox-89.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "8fd1aefeac276a40ccfa434d376b895a7b9674ff67fd587121255df34cc5b1d2"; + sha256 = "cf3fafc803afa90f6a7143db768b2b02bac568cba609eff91372933883595a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ar/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ar/firefox-89.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4ddc0f938be2806d27cbb9810ff39749ea9f6b0fddab1bc4eae211ba121959c3"; + sha256 = "ea2f11bb7b7c2be08898b3c62d28f6e6d98f3a3b7e58eb73f5cedbb093d2d197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ast/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ast/firefox-89.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "f4ada3fdb3229992af94002e3b812bf95e3ade3af7e913ca990ca3164c04ab66"; + sha256 = "4dde1e5c897bc61b6743887718da7660fba6764793520c2b613aa9cad8201363"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/az/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/az/firefox-89.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "07e95af87afc048c1e0d273025e4ac2ce6d5e15f93bf4b2e6fd24699b9afee8f"; + sha256 = "c70e104de05c2fd8c2dc08529f4bce842a63727abe02fc034dc6bea6ac0e453a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/be/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/be/firefox-89.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d967424a01532dd37a57c7e87063c022905a38d794c6077f99fc4d23a581bc2f"; + sha256 = "01f9fd2e5c22b943c14a23c7c6f64374d975ccd0f703fa997966a029eecf9830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bg/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/bg/firefox-89.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c8b667539135c6cb2fb98663259d75757efbcc6ce374c85506b2972457f01bd0"; + sha256 = "3c1d11430f1d8a12ebafef6ba7d58cbbd8367f79a8bd67be59784dbab566177b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/bn/firefox-89.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "436b1de6ffc38b2a17dcef6ed395e67e8f75058539bd10cc510b5db95add0b0a"; + sha256 = "1b3f2a6735ce96d2a8c54abe10605ed538d93e8399929a10db58a2747c6fc6c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/br/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/br/firefox-89.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "0a0469ed2f2d338bf05f051f300bff65f42d53f34c6344fc81d7179faaff7b0b"; + sha256 = "2d9d51c43cd799eae68bc2a2bd3a9df536ebb8a4c4b5b2b50a37e5ecd5c89d0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/bs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/bs/firefox-89.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "a7907780adcbef8cd64793500a9f664d552f7c993c277c1e10d8afaee2c13acd"; + sha256 = "ff8f50cafb6fe193426bb4515d5bfc26762ccbceac457bccd410b0b90f2c4953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca-valencia/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ca-valencia/firefox-89.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "8e7cb11f19878ac1dd7943be5132b59316c067e7f435e2456200115d0eb22470"; + sha256 = "25a81748aa98e7f9a229ef9c41bd5ba510992007de1d0d9914e177cea39f40ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ca/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ca/firefox-89.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "235c16a101af708376903609695a0e2cd1d863094f1a98ce2e916533abc33b38"; + sha256 = "6705d219e8172fa9a7ac0be456cf478c52bfe6bb2c2ffc3ccb092a765eebe760"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cak/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/cak/firefox-89.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "735e1f803533c7ed092b10df7a3e7435588866ba94b88b37c9b2afda75891f0b"; + sha256 = "5729247afc3641abbb7c635af8b29ff3e318100cb6f99e44257ad4116d0830f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/cs/firefox-89.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "881d8c7a1af57a90c81ab4d5c89d8d946d6666073509f9c194ff44466f44e4f9"; + sha256 = "8df8fcaeb007b4f806d99708249d3a5f75290697f3603cc687178c3bb1bbfa04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/cy/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/cy/firefox-89.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1c74c73b3e52ad625ede28e7043b650a8c90ed09862fb26fb1dda9497902ad54"; + sha256 = "204045469734cb01c6cb6ef20821598e95e1fc09905916b5ec89f65381479aaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/da/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/da/firefox-89.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "41429f458803677eac22b654be2e9e3708d4007e3faf6496ef8a9ce31f558a79"; + sha256 = "48ad41a8bf13ad4a73ce96446f39662a6b5e36e095781149fff7ae3abd4440b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/de/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/de/firefox-89.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "de0b79f4b60172379b523a851ffa94e750aa68e6a008e740084028da2473b8cc"; + sha256 = "cc18b67882bd7e3e5730db647737339bc9671db4233021ff9b08195e6b69799e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/dsb/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/dsb/firefox-89.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b7cb7153c0e2ac1b0976eebb9a627ec608f49969b8571770409bfff5916d5ae9"; + sha256 = "4a40743c98b1c90eeb52edd630203ea5332edefeda10a4a6f1ef3776a1aa141e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/el/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/el/firefox-89.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f764ff32d668f36cac903c808b46bf81afa81fda8231e9c500e71495573a10f5"; + sha256 = "3705e4bc4b596b1ce306a1aab9baeb36c9abe68311250d63241cd13e0b9985b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-CA/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/en-CA/firefox-89.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8df9136b6895266dcae765d15a601ea69707c6c31b858682d4a0037262032452"; + sha256 = "d8db313b5bb951a700e9ca09fce94df85eed8a29a1da5f8b836611082a8b3554"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-GB/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/en-GB/firefox-89.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b9df457be4785e3ee38e44b8fc5daa265699f0fed60357b0e2ab6d650d5629e3"; + sha256 = "0066683ff48764227f3d34745822278aca39d7acbb360792c70b04721a0aafac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/en-US/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/en-US/firefox-89.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9b40343e4094acc2ef4813a2aa0b943a4e4f34538da4f9b4356c44120c928194"; + sha256 = "597ff6299349e614f36a9aae3e394e3ba95996d0a4caf372f58bfba88344fd11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eo/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/eo/firefox-89.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "053aaad2a50948969c2dc85854a6da0a8ef276351eb84ccf3535af2f479b4472"; + sha256 = "d24b1d6ce2db66e426a92cf8b0eec239e44e32f06be9ca1b3f7693b6dba02cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-AR/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/es-AR/firefox-89.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b128326043c53635ed3dd0fd7bfc2b52192bfc48ac4d95917ff72c9aa31b8b6c"; + sha256 = "0e007e64614172fce8d0d3a0f1300c86ec9a3e65f5f08aeb185d6bf92b7458d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-CL/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/es-CL/firefox-89.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5227c5108c01539d98c52224eb4b76c08db8577853cd2e5307ed548c11c73e10"; + sha256 = "26243e3c23de7043945dfd30d4c72676a9de185dfb957fce0a57d13751490e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-ES/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/es-ES/firefox-89.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c9d0120abbfc52d5a33c1905d460332d15c1d742f2b7902dd99e49881ac1b41a"; + sha256 = "97562d93466b9090bae4f8a1a0e54e142336a125f0780db1ad451c0dee5b4c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/es-MX/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/es-MX/firefox-89.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b1d030328017cd2e03d8c3431582f7ee5c4a0d368074d310cf41d771bfe536e8"; + sha256 = "faac9af6c8f3f1bf5042ef8c9925310b48232aa8402c71d642f02568e2090a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/et/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/et/firefox-89.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "897be30748bce6cd0772be06cca5f02a4768864f8ba433f7840aeb245bd7be6a"; + sha256 = "adff5a5159dd429c3edc52e5b002952cd09c6edf0486fd52326d70ef4f3ffc10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/eu/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/eu/firefox-89.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "93f97c38ce8393a6bad65d682a2ced7260e2313114979bbcbe9beb7650ea8fd8"; + sha256 = "84f7fd609d5b17ee0a61221e1bae0e6a45a999456ce7f0678d43c8cb4a89a640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fa/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/fa/firefox-89.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9d5820a4facbdb6959cbbfca9db5158c049c5420744edc77afa933d3c3c7250c"; + sha256 = "59863d4ecf483793594467d284801611490cd63d67f25f0379b94893e4b649f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ff/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ff/firefox-89.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "cfa3059f3f12a5f02b4f9cc076738d32f631fad945db99df3783f9cbfae68628"; + sha256 = "22f84985e8df29dbad40bf04e89782f8e0d7b7452e99a0dd03ccc28e2291615d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fi/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/fi/firefox-89.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "806c05b03a7dd6f40ebf17f78e56d1829f7aade412ec8f54ddd25ae6bab4317c"; + sha256 = "600336c950eb6eaea362cc701b1b62807ea08a15cc0307e0a5517bc82388eb1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/fr/firefox-89.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e0c6056f04d7c75491c020d0372ce8b2cc5f23959540fb0956b793e4c16ef736"; + sha256 = "2dc908dc69460caf327dedf888877a77e6637c74ee42396ccc9d809462b2a9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/fy-NL/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/fy-NL/firefox-89.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e9ae16b0b0f43e4b4e236d47836ed4aa03ccfe0dc6d6401dcd84012d0375d405"; + sha256 = "54eff2e75c2f7a9041e11ec9cc65d648e8d8fb86d04289ad8357a27ae3745daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ga-IE/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ga-IE/firefox-89.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f37630c20e722165f2e03bbdb6d7d9d9dda86be17dcdc086d95403509309d32d"; + sha256 = "7e3ac69d70b19ec7b2638b9cf09d41fe6b1b7b559a6b74e110857cdd73e29009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gd/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/gd/firefox-89.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ae13cdb56c7363fbe96eb07355ac18952c35c2fe078e79438144b2780a363bc4"; + sha256 = "dcda84a97053b0b38ad11b54e94829757b53160515033fe97d67460017baa74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/gl/firefox-89.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "f0ee99e1b32c8ab573c4057520c8a4dc7d4639e98574da1a7f4339e9b9cba083"; + sha256 = "a0f488da3db379917f91d581dac4d9651221d71d6f25f4fe77d3535b2fea48a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/gn/firefox-89.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c94c8b272a781019e92d4f6ba41349041f0f5a795eccce66719bed137e39b66f"; + sha256 = "6bc654decaf2c06bffdf7ca4ef19dee874460707bd2403b8bce18b687656ab87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/gu-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/gu-IN/firefox-89.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9249604f06abd977e1c4992ed857950fa17b150435691df67bb97c1fe6a67adf"; + sha256 = "918044af5abc8ace4a5dcb9c9c5b41fa38a9ddaa57033e12702c0bb72f28136c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/he/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/he/firefox-89.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5a035ba5537709127a368d89fc4b59fc2eddbe7b56ee9fd0e4fd7b91d4bfdd2e"; + sha256 = "4a89f039cac4183ab2c8b56b01b017a8d7c03decea1db505f2980608fbcf7f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hi-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/hi-IN/firefox-89.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "2bdfa548c53bb05064d8a9daf7a83859290f0a1dbaa9979e54615978973c2401"; + sha256 = "4464d61c0201b1552ee26350cf2b493a2ac1a31360f1d12dc96c461a4679bdcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/hr/firefox-89.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "853c90ad71a8133c2c3282682aa1b4ab3fb45dcc574fe0f099a6fd1b79fea4a9"; + sha256 = "fd469c3fd650150b19f3a5260a149b3c143232ff50be2cbf254559cfda491342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hsb/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/hsb/firefox-89.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c5d474cb0ea800ac062678b636b4f09586c430c31eb63438ade304ae009b8c22"; + sha256 = "1d474b7ccff2db0fe1e152bfcdcb297eba2fbd67006a45c47710bd908cdb34d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hu/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/hu/firefox-89.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "047ef8b66359959150acff1cd8fc5d3294075cd93028b1c397461bef6b940943"; + sha256 = "9118d6ec7a894e56859844af852e1a44b1435efabea3e9367b2efc4475441005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/hy-AM/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/hy-AM/firefox-89.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "67d8f771638ac429aaf585a6624a80c0a4369f0ef4de4906c1324a25ef54d3ea"; + sha256 = "6285f019a28b459cce7aa93d952a5dab173fe37afea9bb7598ee74a8dcfb811b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ia/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ia/firefox-89.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fae0a1445107a5632865f159d6ef367243e846fefbd8ae86fedd8e74307ac894"; + sha256 = "139abcbc3350df9df5677cd2f0e31cd594155819a9851b6737d0ba7050f3ab4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/id/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/id/firefox-89.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d48d736d7825249d72647e07fa0a497434373e8c2b43e31c88d4853c5e57b595"; + sha256 = "d0cb63e16f951d58d6c21db712425c1b450f1da16b40bf3e49ae1a4cf8e2e8d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/is/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/is/firefox-89.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "5534810b724fc9931a6aea47768c1c3990d7097127fc7ef96744d0fedd509535"; + sha256 = "6b42977a83f5d8165ddedec7844934b7824914d17c2ff2d48b403f87daf31a84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/it/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/it/firefox-89.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "3fb63402a8a4e495842c7de7c4aaf4b08e258e96371d20f40d0da21769af7d60"; + sha256 = "1b00bbdf3b2abd8e7928745848575bc5c1d930296a137ee2e2ea738fc0bade51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ja/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ja/firefox-89.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "216996e405bce22f6836178c95f2db19cfcc138ca25eb01670b6243fd6b4595b"; + sha256 = "bf41ea9206576aa54c80c150a0d3ee9e64ea48d7af3fd0eff5932a77fb6aab4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ka/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ka/firefox-89.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4184f7b69f0a075a580a8ec059c4ddc237ecd5fc019fc819b1b161cab6841fe4"; + sha256 = "94a3407698612ae2c41895667574dda7d70494f37c92a62adb747d08a2f188eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kab/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/kab/firefox-89.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9d5ec12b8a302644b0fdc0bd20e67b471b6426f075284fb21b1c23b8bb592df7"; + sha256 = "e4ff4581fde394ab872da84b8a53667d5c187a8140ce141f3f6303211925c74d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/kk/firefox-89.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c37d42b7472c1b53d9d38a62510be2c559908dbe2a60cba6ee066821ad52dfa9"; + sha256 = "8ed66c7dc012484a729033f5dde38434fc79e252e2751912f0065e6a1de939c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/km/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/km/firefox-89.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "13d81552dcf88f8ab5b294c0e500af4cf27d0cc6f8f3c2b9ecd60ccf28601fc3"; + sha256 = "a05e53fd532bdc1e8ce6b499aade94392cec0cde35b5b1ca788012be841b0867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/kn/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/kn/firefox-89.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "385af04026d1137d7f3d110a3070332ece0f02465686e330307d6f7dff09310c"; + sha256 = "c3877cee047ee1fedb0a2f88b47e38a23bccce648ef777ee92c290cc0e29ad91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ko/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ko/firefox-89.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d408b25b22b84500fad5014aff28a1f0fcafa47f35328121ec944682c8252a10"; + sha256 = "3cbb7cbf5841caaf14b0f00793e0c8127e363a5d6085435749e8ad16a68fe5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lij/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/lij/firefox-89.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "22f0806c3ce1c15ea10c5d7ca9b3148d0bc6274df88e6224efdbafa4ff1824db"; + sha256 = "b48e14cd64854cbacf38c8fbf40e4c8efc4c2b32638c783c4d3d96507d5ef031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lt/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/lt/firefox-89.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4f3af6bf854de0ba54631c3d462cdf4b8735de28075c249649db7219ec1cc1b1"; + sha256 = "55f824b1e006204af6aec22e8a0ed41912910ea973d71061dade0efb747fb5ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/lv/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/lv/firefox-89.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a7d5920c2f93178f3d95bef5a5b16413a307ca468b023bfaf65cdfdeeaf58025"; + sha256 = "a5181dbcd91adfcc7491c4e65b12c88641f6783b1be7a706b0070d72af5cc784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/mk/firefox-89.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ae8dda2d271962faafe1e27bc4448d86efb2283f1ecd3b546e077fbe73f25649"; + sha256 = "9bfa4b3f16866559ff3c1882cd9df858a16a76a57035eb4d90e774ce220de8f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/mr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/mr/firefox-89.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "6e632ecd870759209c2e05d119db8c3018ec23ec178fa066408c2db40283606c"; + sha256 = "34da62c84c4d2b60bf6d408ef463d02f4ebf6033ee43e1a1877790acc7c5c266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ms/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ms/firefox-89.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "afb86390e11a6631583797f36471ab72780db95c42d80908edd2e30f2f8c7cee"; + sha256 = "e1050df16fdd8ebcb150b0e8dc3d2b7971aa7b6dfbd0e3af111010ace20e83f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/my/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/my/firefox-89.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "709e24a1c4145da05b77d7e86351e617f8ffd1a7a1b0b39733e46640a953cd37"; + sha256 = "7b1c60636d05d2a4d8870914e3e9c987238130386761405dfa5d58974d87a3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nb-NO/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/nb-NO/firefox-89.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "63e00266d4ebb3212cbcc5a54a46bd2f56c595e6be29aed646b3313a488ad8c6"; + sha256 = "2c0a10343fcf03832e3e72422105bff5309e8c0b6fc72a0028ec4508da766501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ne-NP/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ne-NP/firefox-89.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "1f1a7d20758e4c654ace094f2d79daef76247433474be9cf228d26e76819c64c"; + sha256 = "8bf34314274df2fc24b1df397196be4208ed4272e8e3d94ce8b2c1c67c2559fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/nl/firefox-89.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "afb68f242b89b97a9495be420b91ad65aa0ee254932660defe141117acd83c66"; + sha256 = "513585b358d9f568b83bb007575e784a226787857a12eaf56fc4ed3129794c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/nn-NO/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/nn-NO/firefox-89.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "31e20f0e5171e9137999dbefdec33f9e97205ecef2b141766db275b66592c7df"; + sha256 = "1cb4d644f25be41853881c0a5c546d980f3187e1d4200882b3f0b4b29788f121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/oc/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/oc/firefox-89.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "68a990d30be02eee79f1fc7a799e88a3e41749e44b28f5b59fd1741a458f668c"; + sha256 = "6105a8627809a592e0d25c75727e7de9bba0aa2132881e1d92893d23a63216ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pa-IN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/pa-IN/firefox-89.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "133c91f6932454e70fbc10bb881d00f859032be6d92a1b41dd1df31dfa57f376"; + sha256 = "9d75deee44763cf053759265f70368d3e38d757d4e17ac047c0ebdc4274d67ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/pl/firefox-89.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a86f0230c57ecfeb12a41762a1bde5bfd49224b898f891215a094ca7056e2b22"; + sha256 = "e46966ca0252af85040908050f2a796e8738c8d655e3e0821abd9e04946d3dfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-BR/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/pt-BR/firefox-89.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "a0ec38a70fc4ad0d0f67962df8d2478fa00f767b1797e69803d24913be5facb9"; + sha256 = "38257f2c7b720f7211f4c2751cb437b51125a2671586f94c7253fedd20327e9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/pt-PT/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/pt-PT/firefox-89.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e443929ef871d56be734b8b3d766845583e174e51137e87193cef5aa83cdb55b"; + sha256 = "71502095475efc0d312d95d273938005e65a0762989afc81af941cabe00576ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/rm/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/rm/firefox-89.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3c044dd647fbf331a4389719c4d1105c1e5cb58c3eb1636b56058730a9e956e8"; + sha256 = "1e8ff79776d84fd687c96f65fd6946f93f0d4bef0b4e0c3801d141eb86537155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ro/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ro/firefox-89.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5a9fa20d508d9de6559664e96050b8843eff0633d5d660f3fa7cce2da375660c"; + sha256 = "670d0dc6acb8263522976166d6182ac812660da894e003ec2a8a7bb850b369e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ru/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ru/firefox-89.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "99d6b8116f594f01936bb9528b2d03e2e78a6aa7371eb10e4de50593200a7bc5"; + sha256 = "76253bd1af33af76e7d81778a4c92fd303a7f434299ffbe6a486506c91ef77b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/si/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/si/firefox-89.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b80d42d72e039cfb15b30a7054bb84f709d7bb509c299862054a5c65f588075b"; + sha256 = "d057fee3a98e8b197f0b2241e5c2fe2492d8f6897fce422109d3e5633b060b8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/sk/firefox-89.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "e21b18c60376edd371b5a52966b7c8d339e0adc0b46e5ac98381a46cfa42056f"; + sha256 = "5733b44ee973322491bb9d08888ea96fe37e0d27e67a9f2b97406bda895c95d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/sl/firefox-89.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "63b70e14e9c7cb579a49013f3f6b31ffcc88f1424a17987ffd2788b876e22c13"; + sha256 = "7d860c5490f081760cdbcac1bc5c9849504a94b5f87f5de9be760f0d6ed4686a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/son/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/son/firefox-89.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d77f34b17861c607125b1bbdf84f048634b6e7d3d3e35a8c0f4b55e3ce4351b9"; + sha256 = "81500d4f2944f5fcc866cab7b194b1474aac2335d28480f27977799a91d70560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sq/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/sq/firefox-89.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fb5b14076d7e6a12ea0c5f510dc15c94fa6a311285cec612f9c7a216c1d71af7"; + sha256 = "378c7d9914056f8dd0e44bbcf4beea71f63983a5c18b6a1a51e009f45dce9490"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/sr/firefox-89.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9606afc3903197860f2b5d6cfddfbf32cb88c43f8edcdac6c94130d6a7dc4f9a"; + sha256 = "babf462bf5548b87f6ac1fcae5f80308cfb164944a65eb345fa7d39d13d4e5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/sv-SE/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/sv-SE/firefox-89.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "457c4ed993411a6407fd51a88c8f6993abaf26215e335f7d871c9445e2cf7cfc"; + sha256 = "b52c8f84ba69754af44a580e3553f83db872d0b66073ac92cf4bdfb4df735505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/szl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/szl/firefox-89.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "d06c745ac74ad48a5083768774dcc72d020a34c9dd2cc9aed2551410de1b86ff"; + sha256 = "7db46d8979c684c56f2870c53c4c0f4f78e1f8277035a7151f9ceee3e24f7f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ta/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ta/firefox-89.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "acdc690bd1816fe043640d62b678de02c3386736bde18f31eefaba749847f6a1"; + sha256 = "9018d8671a73114b417b0bfef2eabd64583ea31e78ea088d907dc98e1a573d4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/te/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/te/firefox-89.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e2cbc4ff9b7682cc4ec3b49db69c841d95cf6336645c50025236885b24fc3090"; + sha256 = "fc3c3984a1ef1cfde88f293d7fdfbe6d783c1cebb940d27fc2c9d3c2fefdc154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/th/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/th/firefox-89.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "83c88f10bddd3ed8e1100bc57bebeeb4d0ccab30f2093813c6e121adb04be5e3"; + sha256 = "cba78c8646ecd92e54359d2a064bf7314f3d3e6789c53cbfe200af2786377d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tl/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/tl/firefox-89.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "3dd0c9dbb655c54db0b672ef3ca4b61bbe6a488185d92814e474da58b15ac7e5"; + sha256 = "055e3dcda6733a20588ad0daa8ac2b68406f5964965e2cd5d8a8b70350bc656d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/tr/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/tr/firefox-89.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "442f82197c929080e432817a7cfe42fafee2640799596ab5fcc55d4dd6e7a296"; + sha256 = "cd00f148489529d9ab3ad79da7a4d789408a08ac32bb21e01ab505826c7f2516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/trs/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/trs/firefox-89.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "98f10ccebd94fb4d0fd68bee80a691248e0033e1e33f03f97dcd9e3b3c602712"; + sha256 = "0e493794ffc3dc81e6e86863f2c1f8ae54194c638d087415668b7eb9e23fb344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uk/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/uk/firefox-89.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "99cf2753defcec16447dc176b331ce6e6e70f66dacbc341e3f719cf9392d0acc"; + sha256 = "6effddaf16e4a16197eb9993ffc7d4ce33ba9c8b65906ec4a7d00d22d85956d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/ur/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/ur/firefox-89.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "904484ad86e2e27d792b40aaa8a73857476c786cf500344305795bfbad87cba7"; + sha256 = "429c316967f0dc771e7028c2283b31cf3bf996bfec5d6a6cbc56dbb464752136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/uz/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/uz/firefox-89.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "b44a544c6f473a0b4d1c4b408d5fbde422199e23b3b85957b60d2eaf27351b2d"; + sha256 = "064a64280a5242522b6e94e575e3a36959c0308015ff111e73bce4d2e6e3dc45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/vi/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/vi/firefox-89.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "e4f5417a5e294ab2b38744a260280c1307c47b072aa78657ba1143020c26c778"; + sha256 = "9db7de20f5c05bf08094c406972de111b3a41e5ea491b5dff2bfedbd0ac0ce37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/xh/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/xh/firefox-89.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "39ce93e0459299d54a99c317d0dd8b01cb694a8140d5036f09e13d72887a8d6f"; + sha256 = "15ba3f945482600db96b829ecc76c497a5c6c0ee3db36d7bbb11a92b4e115fad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-CN/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/zh-CN/firefox-89.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7f6ae88c4eda5fb7893e7b35f9ae04df658f78919fe3476ba78fe2460a2896ed"; + sha256 = "31f8ff9eaf88c57ddc4980c00c75da9aa9d47f0f67384a3059b5eeac91dbd7eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/89.0/linux-i686/zh-TW/firefox-89.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/89.0.1/linux-i686/zh-TW/firefox-89.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7e6db3c697021be17253b616d348e67df62ea3d86828af768881f67f4d340379"; + sha256 = "ceb7acf2489e92eb5b6dfa4bf0e08ff7a52d06d938191225f105ddeec6fae374"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix index 018bf04cb570..a2fdb82ffec0 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -26,7 +26,7 @@ in writeScript "update-${name}" '' HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --import ${./mozilla.asc} + gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 tmpfile=`mktemp` url=${baseUrl} diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 509380cf4310..fc4860717759 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "89.0"; + ffversion = "89.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "5089720feda15d054d0aa4c3bdeb84760314dadd6381d7360e688d8e396154868220c6315add650d8d2a42652cb8a9bfeb833885812ef0bd70a74ee58ad18aa3"; + sha512 = "67da387b3b6c5a110c83208f9a15d6064adf423bbebfb0fcad2d85f6c4b615b27da0cbd5486b817f0d5e040bc3e70d74d9af72599b24384397fef1dd153bd3f3"; }; meta = { @@ -47,6 +47,7 @@ rec { tests = [ nixosTests.firefox-esr ]; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-78-unwrapped"; + versionSuffix = "esr"; versionKey = "ffversion"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix index e12b552535d2..bbfd17d1fea8 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/update.nix @@ -6,6 +6,7 @@ , gnused , gnugrep , curl +, gnupg , attrPath , runtimeShell , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/" @@ -15,7 +16,12 @@ writeScript "update-${attrPath}" '' #!${runtimeShell} - PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]} + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnupg gnused xidel ]} + + set -eux + HOME=`mktemp -d` + export GNUPGHOME=`mktemp -d` + gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 url=${baseUrl} @@ -31,5 +37,11 @@ writeScript "update-${attrPath}" '' sort --version-sort | \ tail -n 1` - update-source-version ${attrPath} "$version" "" "" --version-key=${versionKey} + curl --silent --show-error -o "$HOME"/shasums "$url$version/SHA512SUMS" + curl --silent --show-error -o "$HOME"/shasums.asc "$url$version/SHA512SUMS.asc" + gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums + + hash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) + + update-source-version ${attrPath} "$version" "$hash" "" --version-key=${versionKey} '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 53c461641dc1..f2fa787c17c6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -11,6 +11,7 @@ , libkrb5 , libva , mesa # firefox wants gbm for drm+dmabuf +, cups }: ## configurability of the wrapper itself @@ -62,7 +63,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver ] + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 diff --git a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 436bccba47a3..f15cf6c81b46 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-W7uSyApTKBTE7bgprgCd8T5dKQ/nLYKIzFxjDMCRmZQ="; + sha256 = "sha256-NjiTjY2YuxUs/Wny7aDqHGw/2ML1fenjHrl089rLXFI="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 09128301d6c8..7fbfccc38960 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -401,7 +401,7 @@ stdenv.mkDerivation rec { homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames srcs; - maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 cap KarlJoad ]; + maintainers = with maintainers; [ offline matejc thoughtpolice joachifm hax404 KarlJoad ]; mainProgram = "tor-browser"; hydraPlatforms = []; # MPL2.0+, GPL+, &c. While it's not entirely clear whether diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 5a2b45725df6..0eeb52311599 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { - owner = "jelmerro"; + owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-0C2gD40nPgEZopGMPsd5ajwcwFRjcu4Xc2DTpEwSK4c="; + sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4="; }; packageJSON = ./package.json; @@ -50,6 +50,7 @@ mkYarnPackage rec { meta = with lib; { homepage = "https://vieb.dev/"; + changelog = "https://github.com/Jelmerro/Vieb/releases/tag/${version}"; description = "Vim Inspired Electron Browser"; maintainers = with maintainers; [ gebner fortuneteller2k ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json b/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json index 94effdaa2e51..e12d86356c26 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/package.json @@ -1,9 +1,8 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.1.0", + "version": "5.2.0", "description": "Vim Inspired Electron Browser", - "bin": "app.js", "main": "app/index.js", "scripts": { "build": "node build.js", @@ -30,9 +29,9 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.1.1", - "electron-builder": "22.11.5", - "eslint": "7.28.0", + "electron": "13.1.2", + "electron-builder": "22.11.7", + "eslint": "7.29.0", "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", "jest-environment-jsdom": "27.0.3", diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock b/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock index ff4a7248f61c..af42526610d0 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -14,32 +14,32 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.14.4": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz#45720fe0cecf3fd42019e1d12cc3d27fadc98d58" - integrity sha512-i2wXrWQNkH6JplJQGn3Rd2I4Pij8GdHkXwHMxm+zV5YG/Jci+bCNrWZEWC4o+umiDkRrRs4dVzH3X4GP7vyjQQ== +"@babel/compat-data@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" + integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38" - integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.3" - "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.14.2" - "@babel/helpers" "^7.14.0" - "@babel/parser" "^7.14.3" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab" + integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.5" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helpers" "^7.14.6" + "@babel/parser" "^7.14.6" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -47,137 +47,144 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.2", "@babel/generator@^7.14.3", "@babel/generator@^7.7.2": - version "7.14.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91" - integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA== +"@babel/generator@^7.14.5", "@babel/generator@^7.7.2": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" + integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== dependencies: - "@babel/types" "^7.14.2" + "@babel/types" "^7.14.5" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.13.16": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz#33ebd0ffc34248051ee2089350a929ab02f2a516" - integrity sha512-JgdzOYZ/qGaKTVkn5qEDV/SXAh8KcyUVkCoSWGN8T3bwrgd6m+/dJa2kVGi6RJYJgEYPBdZ84BZp9dUjNWkBaA== +"@babel/helper-compilation-targets@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" + integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== dependencies: - "@babel/compat-data" "^7.14.4" - "@babel/helper-validator-option" "^7.12.17" + "@babel/compat-data" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-function-name@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2" - integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.14.2" - -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-member-expression-to-functions@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" - integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-module-imports@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" - integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-module-transforms@^7.14.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5" - integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA== - dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-replace-supers" "^7.13.12" - "@babel/helper-simple-access" "^7.13.12" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.14.0" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.2" - -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-replace-supers@^7.13.12": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz#b2ab16875deecfff3ddfcd539bc315f72998d836" - integrity sha512-zZ7uHCWlxfEAAOVDYQpEf/uyi1dmeC7fX4nCf2iz9drnCwi1zvwXL3HwWWNXUQEJ1k23yVn3VbddiI9iJEXaTQ== - dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.12" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.14.2" - "@babel/types" "^7.14.4" - -"@babel/helper-simple-access@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" - integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-validator-identifier@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" - integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== - -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - -"@babel/helpers@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62" - integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.14.0" - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" - integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.0" +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== + dependencies: + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-member-expression-to-functions@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" + integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-imports@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" + integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-transforms@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e" + integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-optimise-call-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" + integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-replace-supers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" + integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-simple-access@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4" + integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" + integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== + +"@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helpers@^7.14.6": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635" + integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA== + dependencies: + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3", "@babel/parser@^7.7.2": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz#a5c560d6db6cd8e6ed342368dea8039232cbab18" - integrity sha512-ArliyUsWDUqEGfWcmzpGUzNfLxTdTp6WU4IuP6QFSp9gGfWS6boxFCkJSJ/L4+RG8z/FnIU3WxCk6hPL9SSWeA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" + integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -257,48 +264,49 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/template@^7.12.13", "@babel/template@^7.3.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2", "@babel/traverse@^7.7.2": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b" - integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.14.2" - "@babel/helper-function-name" "^7.14.2" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.14.2" - "@babel/types" "^7.14.2" + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/template@^7.14.5", "@babel/template@^7.3.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" + integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2", "@babel/types@^7.14.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz#bfd6980108168593b38b3eb48a24aa026b919bc0" - integrity sha512-lCj4aIs0xUefJFQnwwQv2Bxg7Omd6bgquZ6LGC+gGMh6/s5qDVfjuCMlDmYQ15SLsWHd9n+X3E75lKIhl5Lkiw== +"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff" + integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== dependencies: - "@babel/helper-validator-identifier" "^7.14.0" + "@babel/helper-validator-identifier" "^7.14.5" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -306,20 +314,27 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz#71bc0d0d473ae96d5086badb2f4d624769fa56c4" - integrity sha512-CSOCdK/SJOZVWGVJuurfL0KtPq1AhSp3ng6BAo3SLXAd+WP7obERw2qFWQ0uzrApY/N1a1hvzfw31uonqRakXg== +"@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" + integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.22.1" + "@cliqz/adblocker-extended-selectors" "^1.22.2" -"@cliqz/adblocker-electron-preload@1.22.1", "@cliqz/adblocker-electron-preload@^1.22.1": +"@cliqz/adblocker-electron-preload@1.22.1": version "1.22.1" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== dependencies: "@cliqz/adblocker-content" "^1.22.1" +"@cliqz/adblocker-electron-preload@^1.22.1": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" + integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== + dependencies: + "@cliqz/adblocker-content" "^1.22.2" + "@cliqz/adblocker-electron@1.22.1": version "1.22.1" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" @@ -329,22 +344,22 @@ "@cliqz/adblocker-electron-preload" "^1.22.1" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz#234ee70a1736e3690b25a7a073818f5a851bf9a8" - integrity sha512-uXB1TybAq6MgqsG09fcY8Qw0P9EOWp4G7KQ4QNXQd4HIP4o3zcJgBd5MKeclJAD/QOyPdhnb+a9JdwVFyqMamQ== +"@cliqz/adblocker-extended-selectors@^1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" + integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== "@cliqz/adblocker@^1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz#dae3dd6c59f16244012d1e736150f618b2d578e6" - integrity sha512-kir/tVTe0VabtJfcRipDX+/UBnZn0aN0lX4GQT7wZIHMOACpW37eix7wGkzVS+icbwu1bEqZ+O8Q98UlORPm4w== + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" + integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== dependencies: - "@cliqz/adblocker-content" "^1.22.1" - "@cliqz/adblocker-extended-selectors" "^1.22.1" + "@cliqz/adblocker-content" "^1.22.2" + "@cliqz/adblocker-extended-selectors" "^1.22.2" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.144" + "@types/chrome" "^0.0.145" "@types/firefox-webext-browser" "^82.0.0" tldts-experimental "^5.6.21" @@ -706,10 +721,10 @@ dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.144": - version "0.0.144" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz#7dd9188e355aa17e3ad397f50b5cd3ad12caf788" - integrity sha512-BgoiO7/KP9hRNrCR2Wq+aKWT5Dh9bTofuWaRtcqPcj8YKhZojQgb6sSdIqvds2C+eO63BwaR9KHVMYYgZdGGBg== +"@types/chrome@^0.0.145": + version "0.0.145" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz#6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8" + integrity sha512-vLvTMmfc8mvwOZzkmn2UwlWSNu0t0txBkyuIv8NgihRkvFCe6XJX65YZAgAP/RdBit3enhU2GTxCr+prn4uZmA== dependencies: "@types/filesystem" "*" "@types/har-format" "*" @@ -788,9 +803,9 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.12.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz#1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d" - integrity sha512-zjQ69G564OCIWIOHSXyQEEDpdpGl+G348RAKY0XXy9Z5kU9Vzv1GMNnkar/ZJ8dzXB3COzD9Mo9NtRZ4xfgUww== + version "15.12.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" + integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== "@types/node@^14.6.2": version "14.17.3" @@ -806,9 +821,9 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0" - integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb" + integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw== "@types/stack-utils@^2.0.0": version "2.0.0" @@ -825,7 +840,7 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== -"@types/yargs@^16.0.0", "@types/yargs@^16.0.1": +"@types/yargs@^16.0.0", "@types/yargs@^16.0.2": version "16.0.3" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== @@ -861,9 +876,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz#1193f9b96c4e8232f00b11a9edff81b2c8b98b88" - integrity sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw== + version "8.4.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" + integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== agent-base@6: version "6.0.2" @@ -963,10 +978,10 @@ app-builder-bin@3.5.13: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== -app-builder-lib@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz#d49f49dc2d9fd225249e4ae7e30add2996e7062f" - integrity sha512-lLEDvJuLdc4IVyADJK6t4qEIjRhOUj4p19B1RS/8pN/oAb8X5Qe1t3Einbsi4oFBJBweH2LIygnSAwumjQh9iA== +app-builder-lib@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" + integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -974,12 +989,12 @@ app-builder-lib@22.11.5: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.5" + electron-publish "22.11.7" fs-extra "^10.0.0" hosted-git-info "^4.0.2" is-ci "^3.0.0" @@ -1178,9 +1193,9 @@ bluebird@^3.5.5: integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz#a245080649ebb80e7c0ea218a480e4e913136336" - integrity sha512-K6r5tvO1ykeYerI7jIyTvSFw2l6D6DzqkljGj2E2uyYAAdDo2SV4qGJIV75cHIQpTFyb6BB0BEHiDdDrFsNI+g== + version "3.1.2" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" + integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw== boxen@^5.0.0: version "5.0.1" @@ -1265,17 +1280,25 @@ builder-util-runtime@8.7.6: debug "^4.3.2" sax "^1.2.4" -builder-util@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz#08836d00e6bef39bdffd8a66fb07d2d5021b9c3c" - integrity sha512-ur9ksncYOnJg/VuJz3PdsBQHeg9tjdOC2HVj8mQ0WNcn/H3MO4tnwKBOWWikPDiWEjeBSvFUmYBnGFkRiUNkww== +builder-util-runtime@8.7.7: + version "8.7.7" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" + integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" + integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.5" "@types/fs-extra" "^9.0.11" app-builder-bin "3.5.13" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.6" + builder-util-runtime "8.7.7" chalk "^4.1.1" debug "^4.3.2" fs-extra "^10.0.0" @@ -1314,9 +1337,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001236" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" - integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== + version "1.0.30001239" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" + integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1498,16 +1521,16 @@ configstore@^5.0.1: xdg-basedir "^4.0.0" convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.14.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" - integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== + version "3.15.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" + integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1672,13 +1695,13 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz#0df9843def73a217097956982fa21bb4d6a5836e" - integrity sha512-91Shh9+OK9RwBlBURxvhSnQNibEh/JYNAnMOfFguyNbasSfF50Jme4b3dgsQrHTTTfkFijcvzykPPFAZofQs6g== +dmg-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" + integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== dependencies: - app-builder-lib "22.11.5" - builder-util "22.11.5" + app-builder-lib "22.11.7" + builder-util "22.11.7" builder-util-runtime "8.7.6" fs-extra "^10.0.0" iconv-lite "^0.6.2" @@ -1744,17 +1767,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz#914d8183e1bab7cda43ef1d67fc3d17314c7e242" - integrity sha512-QIhzrmSLNteItRvmAjwNpsya08oZeOJIrxFww/Alkjcwnrn5Xgog2qf3Xfa3ocuNUQIwb+mMzZrzqnPu0Mamyg== +electron-builder@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" + integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== dependencies: - "@types/yargs" "^16.0.1" - app-builder-lib "22.11.5" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + "@types/yargs" "^16.0.2" + app-builder-lib "22.11.7" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" - dmg-builder "22.11.5" + dmg-builder "22.11.7" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -1762,28 +1785,28 @@ electron-builder@22.11.5: update-notifier "^5.1.0" yargs "^17.0.1" -electron-publish@22.11.5: - version "22.11.5" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz#2fcd3280c4267e70e4aa15003c9b7dc34923320e" - integrity sha512-peN4tEP80Kb6reuwKKvSu9p/XUWpx/7x747u5NSg7Kg2axBjzdMtX5ZqBThfPtJWJhSWZ7PEYWmNyUCfdQl2Ag== +electron-publish@22.11.7: + version "22.11.7" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" + integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.11.5" - builder-util-runtime "8.7.6" + builder-util "22.11.7" + builder-util-runtime "8.7.7" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.750" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz#7e5ef6f478316b0bd656af5942fe502610e97eaf" - integrity sha512-Eqy9eHNepZxJXT+Pc5++zvEi5nQ6AGikwFYDCYwXUFBr+ynJ6pDG7MzZmwGYCIuXShLJM0n4bq+aoKDmvSGJ8A== + version "1.3.752" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" + integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== -electron@13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz#de1ea908bcac2197d7a5a373fb68c0c66043e10e" - integrity sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog== +electron@13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" + integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -1916,10 +1939,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.28.0: - version "7.28.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" - integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== +eslint@7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.2" @@ -3718,9 +3741,9 @@ readdir-glob@^1.0.0: minimatch "^3.0.4" regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== registry-auth-token@^4.0.0: version "4.2.1" @@ -4455,9 +4478,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.5: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== + version "7.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" + integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== xdg-basedir@^4.0.0: version "4.0.0" @@ -4500,9 +4523,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs@^16.0.3: version "16.2.0" diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix b/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix index 11cf84050d01..14e1b9902cca 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -18,163 +18,171 @@ }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; }; } { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; + name = "_babel_compat_data___compat_data_7.14.5.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; + name = "_babel_compat_data___compat_data_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz"; + sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"; }; } { - name = "_babel_core___core_7.14.3.tgz"; + name = "_babel_core___core_7.14.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; - sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; + name = "_babel_core___core_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz"; + sha1 = "e0814ec1a950032ff16c13a2721de39a8416fcab"; }; } { - name = "_babel_generator___generator_7.14.3.tgz"; + name = "_babel_generator___generator_7.14.5.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; - sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; + name = "_babel_generator___generator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz"; + sha1 = "848d7b9f031caca9d0cd0af01b063f226f52d785"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; + sha1 = "7a99c5d0967911e972fe2c3411f7d5b498498ecf"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; + sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; + sha1 = "7de42f10d789b423eb902ebd24031ca77cb1e10e"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; + sha1 = "0ecc0b03c41cd567b4024ea016134c28414abb94"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; + name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; + sha1 = "66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8"; }; } { - name = "_babel_helpers___helpers_7.14.0.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; - sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; }; } { - name = "_babel_highlight___highlight_7.14.0.tgz"; + name = "_babel_helpers___helpers_7.14.6.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; - sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + name = "_babel_helpers___helpers_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz"; + sha1 = "5b58306b95f1b47e2a0199434fa8658fa6c21635"; }; } { - name = "_babel_parser___parser_7.14.4.tgz"; + name = "_babel_highlight___highlight_7.14.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.4.tgz"; - sha1 = "a5c560d6db6cd8e6ed342368dea8039232cbab18"; + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_babel_parser___parser_7.14.6.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz"; + sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2"; }; } { @@ -266,43 +274,43 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha1 = "c1cfdadc35a646240001f06138247b741c34d94c"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha1 = "b82c6ce471b165b5ce420cf92914d6fb46225716"; }; } { - name = "_babel_template___template_7.12.13.tgz"; + name = "_babel_template___template_7.14.5.tgz"; path = fetchurl { - name = "_babel_template___template_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; }; } { - name = "_babel_traverse___traverse_7.14.2.tgz"; + name = "_babel_traverse___traverse_7.14.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; - sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; + name = "_babel_traverse___traverse_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz"; + sha1 = "c111b0f58afab4fea3d3385a406f692748c59870"; }; } { - name = "_babel_types___types_7.14.4.tgz"; + name = "_babel_types___types_7.14.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; - sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; + name = "_babel_types___types_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz"; + sha1 = "3bb997ba829a2104cedb20689c4a5b8121d383ff"; }; } { @@ -314,11 +322,11 @@ }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.1.tgz"; - sha1 = "71bc0d0d473ae96d5086badb2f4d624769fa56c4"; + name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz"; + sha1 = "643849d5f08c167eb84a2e7e3f1f9fbc41a3889b"; }; } { @@ -330,6 +338,14 @@ }; } { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz"; + sha1 = "eea674767a60abe4e5f9ccb46188d33656f551d0"; + }; + } + { name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; path = fetchurl { name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; @@ -338,19 +354,19 @@ }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.1.tgz"; - sha1 = "234ee70a1736e3690b25a7a073818f5a851bf9a8"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz"; + sha1 = "1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90"; }; } { - name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; + name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.1.tgz"; - sha1 = "dae3dd6c59f16244012d1e736150f618b2d578e6"; + name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz"; + sha1 = "99a14d56327734d3083a077d96fe7b91c236bf7a"; }; } { @@ -634,11 +650,11 @@ }; } { - name = "_types_chrome___chrome_0.0.144.tgz"; + name = "_types_chrome___chrome_0.0.145.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.144.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.144.tgz"; - sha1 = "7dd9188e355aa17e3ad397f50b5cd3ad12caf788"; + name = "_types_chrome___chrome_0.0.145.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz"; + sha1 = "6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8"; }; } { @@ -738,11 +754,11 @@ }; } { - name = "_types_node___node_15.12.2.tgz"; + name = "_types_node___node_15.12.4.tgz"; path = fetchurl { - name = "_types_node___node_15.12.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.2.tgz"; - sha1 = "1f2b42c4be7156ff4a6f914b2fb03d05fa84e38d"; + name = "_types_node___node_15.12.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz"; + sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26"; }; } { @@ -762,11 +778,11 @@ }; } { - name = "_types_prettier___prettier_2.2.3.tgz"; + name = "_types_prettier___prettier_2.3.0.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz"; - sha1 = "ef65165aea2924c9359205bf748865b8881753c0"; + name = "_types_prettier___prettier_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz"; + sha1 = "2e8332cc7363f887d32ec5496b207d26ba8052bb"; }; } { @@ -842,11 +858,11 @@ }; } { - name = "acorn___acorn_8.3.0.tgz"; + name = "acorn___acorn_8.4.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.3.0.tgz"; - sha1 = "1193f9b96c4e8232f00b11a9edff81b2c8b98b88"; + name = "acorn___acorn_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz"; + sha1 = "af53266e698d7cffa416714b503066a82221be60"; }; } { @@ -970,11 +986,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.5.tgz"; - sha1 = "d49f49dc2d9fd225249e4ae7e30add2996e7062f"; + name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz"; + sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6"; }; } { @@ -1162,11 +1178,11 @@ }; } { - name = "boolean___boolean_3.1.0.tgz"; + name = "boolean___boolean_3.1.2.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.0.tgz"; - sha1 = "a245080649ebb80e7c0ea218a480e4e913136336"; + name = "boolean___boolean_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; + sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; }; } { @@ -1258,11 +1274,19 @@ }; } { - name = "builder_util___builder_util_22.11.5.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz"; + sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"; + }; + } + { + name = "builder_util___builder_util_22.11.7.tgz"; path = fetchurl { - name = "builder_util___builder_util_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.5.tgz"; - sha1 = "08836d00e6bef39bdffd8a66fb07d2d5021b9c3c"; + name = "builder_util___builder_util_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz"; + sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467"; }; } { @@ -1298,11 +1322,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001236.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz"; - sha1 = "0a80de4cdf62e1770bb46a30d884fc8d633e3958"; + name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; + sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"; }; } { @@ -1522,19 +1546,19 @@ }; } { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; }; } { - name = "core_js___core_js_3.14.0.tgz"; + name = "core_js___core_js_3.15.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz"; - sha1 = "62322b98c71cc2018b027971a69419e2425c2a6c"; + name = "core_js___core_js_3.15.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz"; + sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044"; }; } { @@ -1746,11 +1770,11 @@ }; } { - name = "dmg_builder___dmg_builder_22.11.5.tgz"; + name = "dmg_builder___dmg_builder_22.11.7.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.5.tgz"; - sha1 = "0df9843def73a217097956982fa21bb4d6a5836e"; + name = "dmg_builder___dmg_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz"; + sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89"; }; } { @@ -1818,35 +1842,35 @@ }; } { - name = "electron_builder___electron_builder_22.11.5.tgz"; + name = "electron_builder___electron_builder_22.11.7.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.5.tgz"; - sha1 = "914d8183e1bab7cda43ef1d67fc3d17314c7e242"; + name = "electron_builder___electron_builder_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz"; + sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596"; }; } { - name = "electron_publish___electron_publish_22.11.5.tgz"; + name = "electron_publish___electron_publish_22.11.7.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.11.5.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.5.tgz"; - sha1 = "2fcd3280c4267e70e4aa15003c9b7dc34923320e"; + name = "electron_publish___electron_publish_22.11.7.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz"; + sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.750.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.750.tgz"; - sha1 = "7e5ef6f478316b0bd656af5942fe502610e97eaf"; + name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; + sha1 = "0728587f1b9b970ec9ffad932496429aef750d09"; }; } { - name = "electron___electron_13.1.1.tgz"; + name = "electron___electron_13.1.2.tgz"; path = fetchurl { - name = "electron___electron_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.1.tgz"; - sha1 = "de1ea908bcac2197d7a5a373fb68c0c66043e10e"; + name = "electron___electron_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz"; + sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90"; }; } { @@ -2010,11 +2034,11 @@ }; } { - name = "eslint___eslint_7.28.0.tgz"; + name = "eslint___eslint_7.29.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.28.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; - sha1 = "435aa17a0b82c13bb2be9d51408b617e49c1e820"; + name = "eslint___eslint_7.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz"; + sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"; }; } { @@ -3890,11 +3914,11 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; + name = "regexpp___regexpp_3.2.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; }; } { @@ -4786,11 +4810,11 @@ }; } { - name = "ws___ws_7.4.6.tgz"; + name = "ws___ws_7.5.0.tgz"; path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + name = "ws___ws_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz"; + sha1 = "0033bafea031fb9df041b2026fc72a571ca44691"; }; } { @@ -4858,11 +4882,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; - sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } { diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 4f8d813f0557..dba21d2f21ca 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.8.2259.37-1"; + version = "4.0.2312.24-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1lpia3jm6l2yvbhrw5khws28n653w22bszzd44y6zv6zwbw7y127"; + sha256 = "0cyvnabjhcn1bm5py4nhfb1yhpz5nm9qm39vb4y1fwhjd0jv38hi"; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix new file mode 100644 index 000000000000..2354a41a6a66 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -0,0 +1,43 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, openssh +}: + +buildGoModule rec { + pname = "bosh-cli"; + + version = "6.4.4"; + + src = fetchFromGitHub { + owner = "cloudfoundry"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-N7GrxePNewxhHnkQP/XBdUIEL5FsFD4avouZaIO+BKc="; + }; + vendorSha256 = null; + + postPatch = '' + substituteInPlace cmd/version.go --replace '[DEV BUILD]' '${version}' + ''; + + nativeBuildInputs = [ makeWrapper ]; + + subPackages = [ "." ]; + + doCheck = false; + + postInstall = '' + mv $out/bin/bosh-cli $out/bin/bosh + wrapProgram $out/bin/bosh --prefix PATH : '${lib.makeBinPath [ openssh ]}' + ''; + + meta = with lib; { + description = "A command line interface to CloudFoundry BOSH"; + homepage = "https://bosh.io"; + changelog = "https://github.com/cloudfoundry/bosh-cli/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix index 118e3e0fbe2c..8620c43cdbe7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "12s3xgrr11n8kfwsh8xpwcza1pr6b200dmc9h8igjy3s3cgg6sh7"; + sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index e861ef97be35..6eb80edb99a7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-sVa7d69MuOjH1IhUMcXu79kEE0BKylLYx6yrOV/DExY="; + sha256 = "sha256-MXMgCqdFNRMJaStoFMx8BO8OI1B7FqSETk0zW6a/vbE="; }; vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 6dacc008304f..5fa05a9fb582 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.7"; + version = "0.139.8"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-mxnl5ALave2E61AqJAHlLHDLHOwA2wwjs3sb4WnG82A="; + sha256 = "sha256-4QNtjVc2/diJO92xn4J2ZJO7JYDHmPgOE4kGndU5RW0="; }; - vendorSha256 = "sha256-tdsQx2AvbRC8l7YZFBg2xVqo0CLrOOwA9Nmuei+1ozw="; + vendorSha256 = "sha256-GY2+oecRbI5hEVI5lCsTuU3WYIfUGceINyXGPjorisE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 8d515528a026..965c50cf03b0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.8"; + version = "0.24.9"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-6RGm2uiYvsdpWdhNwDTw4z1O6uNErkWTuyOiwKIvXOY="; + sha256 = "sha256-9/P6OaSZDJ98EQ9DM4Oib0T1sC1K3WxUXh4IQU3qXbs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-lzxGTubm+qQes5QKaamfmSkXs4qquHHjIhts8YmKlYI="; + vendorSha256 = "sha256-hqmymxP4zK8GVqOxzB6vRfFyo+VIeI1suBu64/oEVig="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 88ba44b2e242..a7a1737c1464 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "4.4.4"; + version = "4.4.6"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-pfyU25MASKQMwd49IbNyyEiz3gmSOBmLdWtIKhYU2wg="; + sha256 = "sha256-gId7zDrtkTjFN59yaFyeYwrDZV24hkkV+4dPr8Jr22E="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix new file mode 100644 index 000000000000..d123790edd2f --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, git +, go +}: + +buildGoModule rec { + pname = "kubebuilder"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kubebuilder"; + rev = "v${version}"; + sha256 = "1726j2b5jyvllvnk60g6px3g2jyyphd9pc4vgid45mis9b60sh8a"; + }; + vendorSha256 = "0zxyd950ksjswja64rfri5v2yaalfg6qmq8215ildgrcavl9974n"; + + subPackages = ["cmd" "pkg/..."]; + + preBuild = '' + export buildFlagsArray+=("-ldflags=-X main.kubeBuilderVersion=v${version} \ + -X main.goos=$GOOS \ + -X main.goarch=$GOARCH \ + -X main.gitCommit=v${version} \ + -X main.buildDate=v${version}") + ''; + + doCheck = true; + + postInstall = '' + mv $out/bin/cmd $out/bin/kubebuilder + wrapProgram $out/bin/kubebuilder \ + --prefix PATH : ${lib.makeBinPath [ go ]} + ''; + + allowGoReference = true; + nativeBuildInputs = [ makeWrapper git ]; + + meta = with lib; { + homepage = "https://github.com/kubernetes-sigs/kubebuilder"; + description = "SDK for building Kubernetes APIs using CRDs"; + license = licenses.asl20; + maintainers = with maintainers; [ cmars ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix index 04677cb4277f..228f12075c4e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "kubectl plugin for retrieving resource example YAMLs"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 4876233cd29f..b570ebc09dcd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "1abm7735c4pjv31pfggkvia7br19zbhjpp2w0n5zckwrjm9hxns6"; + sha256 = "sha256-oInE8fwE+7a+F4NevKPuYQqCP9GkPhqayLu8HCmVbLs="; }; - vendorSha256 = "01rl4sd9prfw4ivx7dwrr9irjr0xryihp4fzpcjd2zg8f1ibkwsn"; + vendorSha256 = "sha256-VvO5YnDofdEku9+RC6PPHWSZY8qZt9N3JNzlm5omNAc="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 60d5dec48a5a..2dfbac5c5ac6 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-gJjCw28SqU49kIiRH+MZgeYN4VBgKVEaRPr5A/2c5Pc="; + sha256 = "sha256-GAX8ODjGj5LM44KgJC0N5uuOH4z33lDWoQgImOl8/xo="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 0dd6363d07e3..31fae0e31c2e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,27 +1,71 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: -buildGoModule { - pname = "linkerd-unstable"; - version = "2020-05-01"; +let generic = { channel, version, sha256, vendorSha256 }: + buildGoModule rec { + pname = "linkerd-${channel}"; + inherit version vendorSha256; - src = fetchFromGitHub { - owner = "linkerd"; - repo = "linkerd2"; - rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883"; - sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0"; - }; + src = fetchFromGitHub { + owner = "linkerd"; + repo = "linkerd2"; + rev = "${channel}-${version}"; + inherit sha256; + }; + + subPackages = [ "cli" ]; + runVend = true; + + preBuild = '' + env GOFLAGS="" go generate ./pkg/charts/static + env GOFLAGS="" go generate ./jaeger/static + env GOFLAGS="" go generate ./multicluster/static + env GOFLAGS="" go generate ./viz/static + ''; + + buildFlagsArray = [ + "-tags=prod" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/linkerd/linkerd2/pkg/version.Version=${src.rev}" + ]; - vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz"; + nativeBuildInputs = [ installShellFiles ]; - doCheck = false; + postInstall = '' + mv $out/bin/cli $out/bin/linkerd + installShellCompletion --cmd linkerd \ + --bash <($out/bin/linkerd completion bash) \ + --zsh <($out/bin/linkerd completion zsh) \ + --fish <($out/bin/linkerd completion fish) + ''; - subPackages = [ "cli/cmd" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/linkerd version --client | grep ${src.rev} > /dev/null + ''; - meta = with lib; { - description = "A service mesh for Kubernetes and beyond"; - homepage = "https://linkerd.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ Gonzih ]; - broken = true; + meta = with lib; { + description = "A simple Kubernetes service mesh that improves security, observability and reliability"; + downloadPage = "https://github.com/linkerd/linkerd2/"; + homepage = "https://linkerd.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ]; + }; }; -} +in + { + stable = generic { + channel = "stable"; + version = "2.10.2"; + sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0="; + vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s="; + }; + edge = generic { + channel = "edge"; + version = "21.6.3"; + sha256 = "sha256-NgfbkeVRl0AGNkZSS2nSAHp4eZ49QNSEYMuFe1G5iBY="; + vendorSha256 = "sha256-rq/MHo5MG2EKZ3d937TIDXFCoWnLlQO3C/fo1bhRxCA="; + }; + } diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index 9e7341e55bf1..0c9ced385fed 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.6"; - sha256 = "1nzaw4014bndxv042dkxdj492b21r5v5f06vav2kr1azk4m9sf07"; + version = "1.0.7"; + sha256 = "12izilr2x9qw8dxhjqcivakwzhf6jc86g0pmxf52fr9rwaqmpc95"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index 9e2966856eb7..7c14ca5f4b32 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.1.0"; - sha256 = "0sz6blyxyxi5iq170s9v4nndb1hpz603z5ps2cxkdkaafal39767"; + version = "1.1.1"; + sha256 = "0y7p85dvxfgzaafgzdmnw3fp9h87zx3z8m1ka4qaiacwah5xwqlv"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix index d032577ce19e..dcdf134b26a9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.20.0"; + version = "0.21.0"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; - aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; - x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; - aarch64-darwin = "sha256-+eZVg+B5YYf+XnDhNd6OU4+yFM9GtyiavcAr/EXh7XE="; + x86_64-linux = "sha256-Ben2wAquHADWBv1MEfPWxs96pLz1bK2F6bLoYVTSkng="; + aarch64-linux = "sha256-1kK0Gu4cQYk+QDJJJiiDan4SnP3Xjr8nLOBtv26UDV4="; + x86_64-darwin = "sha256-gOkHpUTWKrikKYZmkfgck3Lf3g5Pakcn0i2A9Hd07UE="; + aarch64-darwin = "sha256-Xpl8odVXw4WzF7CEZ+Bbxa6oQDBv9VMzHCNOjIcFGzE="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix index 8bc768347523..4095a7907ebf 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.20.0"; + version = "0.21.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-mPD5qa/IYsakjcoPnWVpkmhgkhnRK0qTGQ6hanzDt/Y="; - x86_64-darwin = "sha256-nxpwBRUeLSPqNEFjF8hKzRhA2ahqh/KyAitnSxYdyJ8="; + x86_64-linux = "sha256-Woridi8uGsxvccdeaDzVLs+2YrRKUnm3WbX5LhorM1Y="; + x86_64-darwin = "sha256-NF3bm8WFEs4kgrUp+7qCbj6Z6pUMRUp7h4nhJQDJnoY="; }.${system}; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh b/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh index 6c34fc4b37a0..3e2b56b7a619 100755 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh @@ -30,9 +30,11 @@ OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmwa OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") +OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64") sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256" replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256" +replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256" diff --git a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 715f75ddc8a0..c792a38001a6 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aCgr56nXZCkG8k/ZGH2/cDOaqkznnyb6JLEcImqLH64="; + sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 979216b3ccd5..03f02c55ad2d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-vZxpfVMUl1EZwCuLlwmSKWrz86aTjWYlAIwO4b9ACqk="; + sha256 = "sha256-fWcHjpfbpj2lrJ0FawhQJuSxAEX1WwOY7m+CAgag4qk="; }; vendorSha256 = null; @@ -43,7 +43,8 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/tkn --help - $out/bin/tkn version | grep "Client version: ${version}" + # New tkn version functionality outputs empty https://github.com/tektoncd/cli/issues/1389 + # $out/bin/tkn version | grep "Client version: ${version}" runHook postInstallCheck ''; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 54520b54c88e..bc04d283507b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,23 +1,19 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terraform-docs"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "terraform-docs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lx+yp0ybgZfmxvPM2BY2yq39qA6XebcKGrFd0AJa4yg="; + sha256 = "sha256-Jm0ySxn4GFW4iAH3tOIvclcDGJMKzH7m7fhWnAf4+gs="; }; - vendorSha256 = "sha256-qoZUgSSr7jsDVVPBUyfN5Uw4CnH9EnD/4tX+TCSNV0Q="; + vendorSha256 = "sha256-IzmAlthE6SVvGHj72wrY1/KLehOv8Ck9VaTv5jMpt48="; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X main.version=${version}") - ''; - meta = with lib; { description = "A utility to generate documentation from Terraform modules in various output formats"; homepage = "https://github.com/terraform-docs/terraform-docs/"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5c713b6b92ae..390b1c757a3e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -235,10 +235,11 @@ }, "ct": { "owner": "poseidon", + "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.6.1", - "sha256": "0hh3hvi8lwb0h8x9viz5p991w94gn7354nw95b51rdmir9qi2x89", - "version": "0.6.1" + "rev": "v0.8.0", + "sha256": "1mm86q3rl81dm2yfg2hdf88x8g5mhwwixrxgrffpkjvjqy42a8h7", + "version": "0.8.0" }, "datadog": { "owner": "terraform-providers", @@ -512,10 +513,10 @@ "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.2.12", - "sha256": "0jm592chliiph5643rymzpwnlcq7q6bpwg2h86x5qmbzbiyqsi83", - "vendorSha256": "08wg16g4mvn6kl8xwn89195a826cb132ijvrgf32c6p7zp4lgmjd", - "version": "0.2.12" + "rev": "v0.3.3", + "sha256": "10il2mmsrk27zgzdkwn495sfhlad2nnc2xa7qzn7rlqzh92bb8rb", + "vendorSha256": "1gxx561s7jghiq6kqb2nns52bbcp0ks2dylrb1lvy7g2798cpspf", + "version": "0.3.3" }, "kafka-connect": { "owner": "Mongey", @@ -1120,10 +1121,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v1.24.3", - "sha256": "1sc60x3r4nb48p8yb7778fpk78acq808jzcd5ijnwxqakccml5kl", + "rev": "v2.0.1", + "sha256": "0ah3bi4zpg8j59v4bj9a8vyknpnyl1g8bx4qyfwwz4gnqp9m4anr", "vendorSha256": null, - "version": "1.24.3" + "version": "2.0.1" }, "vthunder": { "owner": "terraform-providers", diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 66185b2cc3d9..2d351eebde24 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,10 +1,21 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, coreutils -, runCommand, runtimeShell, writeText, terraform-providers, fetchpatch }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, runCommand +, runtimeShell +, writeText +, terraform-providers +, fetchpatch +}: let generic = { version, sha256, vendorSha256 ? null, ... }@attrs: let attrs' = builtins.removeAttrs attrs [ "version" "sha256" "vendorSha256" ]; - in buildGoModule ({ + in + buildGoModule ({ name = "terraform-${version}"; inherit vendorSha256; @@ -62,33 +73,37 @@ let actualPlugins = plugins terraform.plugins; # Make providers available in Terraform 0.13 and 0.12 search paths. - pluginDir = lib.concatMapStrings (pl: let - inherit (pl) version GOOS GOARCH; + pluginDir = lib.concatMapStrings + (pl: + let + inherit (pl) version GOOS GOARCH; - pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); + pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); - # This is just the name, without the terraform-provider- prefix - plugin_name = lib.removePrefix "terraform-provider-" pname; + # This is just the name, without the terraform-provider- prefix + plugin_name = lib.removePrefix "terraform-provider-" pname; - slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; + slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; - shim = writeText "shim" '' - #!${runtimeShell} - exec ${pl}/bin/${pname}_v${version} "$@" - ''; - in '' - TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} - mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" + shim = writeText "shim" '' + #!${runtimeShell} + exec ${pl}/bin/${pname}_v${version} "$@" + ''; + in + '' + TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} + mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" - cp ${shim} "$TF_0_13_PROVIDER_PATH" - chmod +x "$TF_0_13_PROVIDER_PATH" + cp ${shim} "$TF_0_13_PROVIDER_PATH" + chmod +x "$TF_0_13_PROVIDER_PATH" - TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} + TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} - cp ${shim} "$TF_0_12_PROVIDER_PATH" - chmod +x "$TF_0_12_PROVIDER_PATH" - '' - ) actualPlugins; + cp ${shim} "$TF_0_12_PROVIDER_PATH" + chmod +x "$TF_0_12_PROVIDER_PATH" + '' + ) + actualPlugins; # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries wrapperInputs = lib.unique (lib.flatten @@ -110,9 +125,10 @@ let }; # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. - in if actualPlugins == [ ] then + in + if actualPlugins == [ ] then terraform.overrideAttrs - (orig: { passthru = orig.passthru // passthru; }) + (orig: { passthru = orig.passthru // passthru; }) else lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; @@ -127,76 +143,84 @@ let inherit passthru; }); - in withPlugins (_: [ ]); + in + withPlugins (_: [ ]); plugins = removeAttrs terraform-providers [ "override" "overrideDerivation" "recurseForDerivations" ]; -in rec { - terraform_0_12 = pluggable (generic { +in +rec { + # Constructor for other terraform versions + mkTerraform = attrs: pluggable (generic attrs); + + terraform_0_12 = mkTerraform { version = "0.12.31"; sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; patches = [ - ./provider-path.patch - (fetchpatch { - name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; - sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; - }) ]; + ./provider-path.patch + (fetchpatch { + name = "fix-mac-mojave-crashes.patch"; + url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; + sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; + }) + ]; passthru = { inherit plugins; }; - }); + }; - terraform_0_13 = pluggable (generic { + terraform_0_13 = mkTerraform { version = "0.13.7"; sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; - }); + }; - terraform_0_14 = pluggable (generic { + terraform_0_14 = mkTerraform { version = "0.14.11"; sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; - }); + }; - terraform_0_15 = pluggable (generic { + terraform_0_15 = mkTerraform { version = "0.15.5"; sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; - }); + }; - terraform_1_0_0 = pluggable (generic { + terraform_1_0 = mkTerraform { version = "1.0.0"; sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o="; vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; - }); + }; # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is # the case. - terraform_plugins_test = let - mainTf = writeText "main.tf" '' - resource "random_id" "test" {} - ''; - terraform = terraform_0_12.withPlugins (p: [ p.random ]); - test = - runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' - set -e - # make it fail outside of sandbox - export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 - cp ${mainTf} main.tf - terraform init - touch $out + terraform_plugins_test = + let + mainTf = writeText "main.tf" '' + resource "random_id" "test" {} ''; - in test; + terraform = terraform_1_0.withPlugins (p: [ p.random ]); + test = + runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' + set -e + # make it fail outside of sandbox + export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 + cp ${mainTf} main.tf + terraform init + touch $out + ''; + in + test; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 2c3deff9f15e..faf817d1c7f7 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,22 +2,20 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.9"; + version = "0.30.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg="; + sha256 = "sha256-zcb2bdIvUeHEto2NeY0Zwj7jIB+ipVXpnb7q97IkvmA="; }; - vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; + vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs="; doCheck = false; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.VERSION=v${version}") - ''; + ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index f93b8ed50b75..24ec320cc431 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -15,32 +15,27 @@ , webkitgtk , glib-networking , librsvg +, xdg-utils , gst_all_1 }: stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-pskmvztKOwutXRHVnW5u68/0DAuV9Gb+Ovp2JbXiMYo="; + hash = "sha256-8W158GrvVGu5b3TG5bomK+hAF6jttZuImkmtcZOl91o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; + hash = "sha256-zHtD3NVWYQ5njg17Z2YmEttiK2oiq01OiAXIZofIqKI="; }; - # https://github.com/CasualX/obfstr/blob/v0.2.4/build.rs#L5 - # obfstr 0.2.4 fails to set RUSTC_BOOTSTRAP in its build script because cargo - # build scripts are forbidden from setting RUSTC_BOOTSTRAP since rustc 1.52.0 - # https://github.com/rust-lang/rust/blob/1.52.0/RELEASES.md#compatibility-notes - RUSTC_BOOTSTRAP = 1; - patches = [ # Post install tries to generate an icon cache & update the # desktop database. The gtk setup hook drop-icon-theme-cache.sh @@ -83,6 +78,9 @@ stdenv.mkDerivation rec { # SVG support for gdk-pixbuf librsvg + + # Open links in browser + xdg-utils ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -96,5 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch index cfdec206e77b..b638f30cd44c 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ b/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index 53f911c..361a233 100644 +index 1d7089c..1952e7f 100644 --- a/meson.build +++ b/meson.build @@ -61,5 +61,3 @@ meson.add_dist_script( diff --git a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index df993625e6d1..5472782758cb 100644 --- a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -11,6 +11,7 @@ , pugixml , sqlite , tinyxml +, wrapGAppsHook , wxGTK30-gtk3 , xdg-utils }: @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ dbus diff --git a/nixpkgs/pkgs/applications/networking/hyprspace/default.nix b/nixpkgs/pkgs/applications/networking/hyprspace/default.nix new file mode 100644 index 000000000000..048f6b85049e --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/hyprspace/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub, iproute2mac }: + +buildGoModule rec { + pname = "hyprspace"; + version = "0.1.4"; + + propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Rw82m0NJcWgtcXRIb1YNv+Kpe2YufKMNAn1Ph9RB3W8="; + }; + + vendorSha256 = "sha256-ErqK2jDTpqUyvll+epdGKRYCJvyvCa90W1GVbbhF0a4="; + + meta = with lib; { + description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; + homepage = "https://github.com/hyprspace/hyprspace"; + license = licenses.asl20; + maintainers = with maintainers; [ yusdacra ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 6e57e0e9423c..adc19f5dcfdf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -38,14 +38,17 @@ , xdg-utils }: +let + getFirst = n: v: builtins.concatStringsSep "." (lib.take n (lib.splitString "." v)); +in + stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.21.3"; - buildNumber = "2"; + version = "2.22.0.87"; src = fetchurl { - url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; - sha256 = "sha256-a/REuxkqZmLLa7N3CUgUAdq74VMD9D10a/Sx2jOj1QA="; + url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; + sha256 = "sha256-0nobn+YcvqakwvBdkoEJrzHoL+OGym2zJ806oUabYfo="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; @@ -106,7 +109,7 @@ stdenv.mkDerivation rec { --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ opt/BlueJeans/resources/BluejeansHelper - cc $localtime64_stub -shared -o "$out"/opt/BlueJeans/liblocaltime64_stub.so + cc $localtime64_stub -shared -o "${placeholder "out"}"/opt/BlueJeans/liblocaltime64_stub.so makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ @@ -119,6 +122,8 @@ stdenv.mkDerivation rec { patchShebangs "$out" ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; @@ -127,3 +132,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } + diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/update.sh new file mode 100755 index 000000000000..2c527462003e --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/update.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pup common-updater-scripts + +set -eu -o pipefail + +version="$(curl -Ls https://www.bluejeans.com/download | \ + pup 'a[aria-label~="Linux"] attr{href}' | \ + #output contains *.deb and *.rpm + grep "\.rpm" | \ + awk -F'[ ._ ]' '{printf $6"."$7"."$8"."$9"\n"}')" + +update-source-version bluejeans-gui "$version" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index e486cd9de62a..f7435aa3ae3b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.124"; + version = "0.0.125"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91"; + sha256 = "0ly5a6l7rvl54mc39xma14jrcrf11q3ndnkkr16by5hy3palmz9g"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix new file mode 100644 index 000000000000..74449ae705e3 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -0,0 +1,62 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, extra-cmake-modules +, pkg-config +, qtquickcontrols2 +, qtmultimedia +, qtlocation +, qqc2-desktop-style +, kirigami2 +, knotifications +, zxing-cpp +, qxmpp +, gst_all_1 +}: + +mkDerivation rec { + pname = "kaidan"; + version = "0.8.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + sha256 = "070njci5zyzahmz3nqyp660chxnqx1mxp31w17syfllvrw403qmg"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = with gst_all_1; [ + qtquickcontrols2 + qtmultimedia + qtlocation + qqc2-desktop-style + kirigami2 + knotifications + zxing-cpp + qxmpp + gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good + ]; + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + ''; + + meta = with lib; { + description = "User-friendly and modern chat app, using XMPP"; + homepage = "https://www.kaidan.im"; + license = with licenses; [ + gpl3Plus + mit + asl20 + cc-by-sa-40 + ]; + maintainers = with maintainers; [ astro ]; + platforms = with platforms; linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index dfd4f266f813..89154ad939ea 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-05-31"; + version = "unstable-2021-06-14"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "318ae67c17f3e64532bad23c2a61a93446db553d"; - sha256 = "1qy0hlp0r91sqn26ai9isxw4rl8kcmmb10a2p9yqynhm8py3dfn4"; + rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee"; + sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 616a08571024..4217c9ec60a9 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.4.1"; # Please backport all updates to the stable channel. + version = "5.5.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: @@ -38,7 +38,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 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6"; + sha256 = "0l12hwwv0ks2hgp1xc5nmn5rcqzwxdpjqhwysix550m26bz4jczp"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 137783552112..15943d34e426 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -42,11 +42,11 @@ let pname = "slack"; - x86_64-darwin-version = "4.16.0"; - x86_64-darwin-sha256 = "078f49sgazfa99vn0yyacfya3jl2vhqz7kgxh0qp56b66pnzwbxz"; + x86_64-darwin-version = "4.17.0"; + x86_64-darwin-sha256 = "0r5cafxw73qnn14ljprn7w8bfn67zbkcniq60k9pf2zbqgb4cyj9"; - x86_64-linux-version = "4.16.0"; - x86_64-linux-sha256 = "0dj5k7r044mibis0zymh6wryhbw2fzsch30nddfrnn6ij89hhirv"; + x86_64-linux-version = "4.17.0"; + x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; version = { x86_64-darwin = x86_64-darwin-version; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index db8d4472b07d..ab6274cdf346 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -12,7 +12,8 @@ , coreutils , gawk , xdg-utils -, systemd }: +, systemd +, enableRectOverlay ? false }: stdenv.mkDerivation rec { pname = "teams"; @@ -57,9 +58,11 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ + ${lib.optionalString (!enableRectOverlay) '' # Work-around screen sharing bug # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} runHook postInstall ''; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 191176e539e8..168465807146 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -29,11 +29,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.6.20278.0524"; + version = "5.6.22045.0607"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "1nkpmrpb0bz4zkg8nszxmcfy3ymigd2bmxhnxbjrcnv64ykdrgp7"; + sha256 = "0zdk02zq9apxnfbxwnlda9z8nqkqa1h1javbh9wwj8yy3y3a1lb5"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index ba1837ee96f2..8ff5c50b8a78 100644 --- a/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.11"; + version = "6.24"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "19nzm7f3glvj34nj9pvnp0h9xx6baq58c11ddkqfmq7w3sci49hi"; + sha256 = "0hrz74fybypkjf9hraknylxrhnz7bhk00pk6wla2wfg8s2798zlx"; }; nativeBuildInputs = [ makeWrapper ] diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 9fc3bc5f93f7..743f08635d38 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -27,14 +27,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.1"; + version = "3.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "06w147wzrzp6xbqiz6s5nq5xdjy7jn3f18xajxy50pynjd6vmfh5"; + sha256 = "0pck4lczkk52mgwa1n0habp1xqi9xsgsh5q6bbsjmdbandvy5vc8"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 698ee80edf60..aebe906659ef 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { env = "${buildEnv { name = "wee-slack-env"; paths = with python3Packages; [ - websocket_client + websocket-client six ]; }}/${python3Packages.python.sitePackages}"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix new file mode 100644 index 000000000000..1f7d663cf8e5 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -0,0 +1,33 @@ +{ appimageTools, lib, fetchurl }: + +let + pname = "electron-mail"; + version = "4.12.2"; + name = "ElectronMail-${version}"; + + src = fetchurl { + url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; + sha256 = "D+0qoIb0EwUVbgKOiKQpqoLDgm8l/UKDWm/BjhW4MYU="; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; + homepage = "https://github.com/vladimiry/ElectronMail"; + license = licenses.mit; + maintainers = [ maintainers.princemachiavelli ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix index 6c0de05a7404..8fe93fb1a44a 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -8,6 +8,7 @@ , dpkg , glib , gtk3 +, wrapGAppsHook , libkrb5 , libsecret , nss @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + wrapGAppsHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index b5f938b264ec..1428fa6a4287 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.7"; + version = "2.1.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "sha256-lXaIxqUhVhmS1PLyfPn+sjnHxsAELGBhwOR0p90mzJE="; + sha256 = "0dqd6gg1wwhxjgdfl8j0kf93mw43kvd6wrwrzkscq2wjrsy5p0w0"; }; patches = optional smimeSupport (fetchpatch { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 6919e31342e4..dceb9c92deb8 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.31.4"; + version = "0.32.1"; pname = "notmuch"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.notmuchmail.org/git/notmuch"; - sha256 = "sha256-M+LEf257OcDlHOCYYxzEVQpop+i2gzO/QJPdajz/CRM="; + sha256 = "sha256:06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16"; rev = version; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 48a212b4ffb1..9a65bec21c20 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null -, gpgSupport ? true, sslSupport ? true }: +, gpgSupport ? true, sslSupport ? true, fetchpatch }: assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; @@ -15,6 +15,17 @@ stdenv.mkDerivation rec { sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; + patches = [ + (fetchpatch { + # patch upstream bug https://sylpheed.sraoss.jp/redmine/issues/306 + name = "patch-libsylph_ssl_c.patch"; + url = "https://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/mail/sylpheed/patches/patch-libsylph_ssl_c?rev=1.4&content-type=text/plain"; + sha256 = "sha256-k9OwPtHrEjaxXdH0trNqXgJMhR8kjgtei9pi6OFvILk="; + }) + ]; + + patchFlags = [ "-p0" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index a90047a23484..e042f39fd9c0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -336,7 +336,7 @@ stdenv.mkDerivation rec { attrPath = "thunderbird-78"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; inherit writeScript lib common-updater-scripts xidel coreutils gnused - gnugrep curl runtimeShell; + gnugrep gnupg curl runtimeShell; }; requiredSystemFeatures = [ "big-parallel" ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix index ceccf44819fc..0a2f90ecb711 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transgui/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' + FPCDIR=${fpc}/lib/fpc/${fpc.version} fpcmake -w lazbuild -B transgui.lpr --lazarusdir=${lazarus}/share/lazarus ''; diff --git a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix index 4440b24a2b17..19da740938c7 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client + gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client gevent-websocket rencode bitcoinlib maxminddb pyopenssl ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix index 4156c82f91b9..d40d8032c294 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,20 +1,20 @@ -{ lib, fetchgit, cups, libssh, libXpm, nx-libs, openldap, openssh +{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh , mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: -mkDerivation { +mkDerivation rec { pname = "x2goclient"; - version = "unstable-2019-07-24"; + version = "4.1.2.2"; - src = fetchgit { - url = "git://code.x2go.org/x2goclient.git"; - rev = "704c4ab92d20070dd160824c9b66a6d1c56dcc49"; - sha256 = "1pndp3lfzwifyxqq0gps3p1bwakw06clbk6n8viv020l4bsfmq5f"; + src = fetchurl { + url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz"; + sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; buildInputs = [ cups libssh libXpm nx-libs openldap openssh qtbase qtsvg qtx11extras qttools phonon pkg-config ]; postPatch = '' + substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ @@ -33,6 +33,7 @@ mkDerivation { meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; homepage = "http://x2go.org/"; + maintainers = with maintainers; [ mkg20001 ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix index 0b8e858d2557..6d7923872ec9 100644 --- a/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/x2goserver/default.nix @@ -8,8 +8,8 @@ let version = "4.1.0.3"; src = fetchurl { - url = "http://code.x2go.org/releases/source/x2goserver/${pname}-${version}.tar.gz"; - sha256 = "1l6wd708kbipib4ldprfiihqmj4895nifg0bkws4x97majislxk7"; + url = "https://code.x2go.org/releases/source/${pname}/${pname}-${version}.tar.gz"; + sha256 = "Z3aqo1T1pE40nws8F21JiMiKYYwu30bJijeuicBp3NA="; }; x2go-perl = perlPackages.buildPerlPackage rec { @@ -26,7 +26,7 @@ let }; perlEnv = perl.withPackages (p: with p; [ - x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch + x2go-perl DBI DBDSQLite FileBaseDir TryTiny CaptureTiny ConfigSimple Switch FileWhich ]); binaryDeps = [ @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { homepage = "http://x2go.org/"; platforms = lib.platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.averelld ]; + maintainers = with maintainers; [ averelld mkg20001 ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index b7e9f220f009..d53464df7a97 100644 --- a/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -1,22 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, ldc, installShellFiles, pkg-config -, curl, sqlite, libnotify -, withSystemd ? stdenv.isLinux, systemd ? null }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, ldc +, installShellFiles +, pkg-config +, curl +, sqlite +, libnotify +, withSystemd ? stdenv.isLinux +, systemd +}: stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY="; + sha256 = "sha256-rG9W90+wGLnhnfhqJjUIFGP6ZcmaxGkrdhPxQVRyxoc="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; buildInputs = [ - curl sqlite libnotify + curl + sqlite + libnotify ] ++ lib.optional withSystemd systemd; configureFlags = [ @@ -36,8 +48,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; - license = licenses.gpl3; - maintainers = with maintainers; [ srgom ianmjones ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ srgom peterhoeg ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index a38352a328aa..54417e6ef4b7 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, libiconv, zlib, popt -, enableACLs ? !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD), acl ? null +, enableACLs ? lib.meta.availableOn stdenv.hostPlatform acl, acl ? null , enableLZ4 ? true, lz4 ? null , enableOpenSSL ? true, openssl ? null , enableXXHash ? true, xxHash ? null diff --git a/nixpkgs/pkgs/applications/networking/testssl/default.nix b/nixpkgs/pkgs/applications/networking/testssl/default.nix index b4d17a1a4938..3abc0458a00e 100644 --- a/nixpkgs/pkgs/applications/networking/testssl/default.nix +++ b/nixpkgs/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "sha256-Rcvkzw1DfoRXrk0vlpL6CojEHYfYga3voc2hm4qxdmw="; + sha256 = "sha256-p2jPpPHtOOmv0CCsXOECgMT9sqa4ZykcJwuGOSkYLaY="; }; nativeBuildInputs = [ makeWrapper ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more. ''; homepage = "https://testssl.sh/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ etu ]; }; } diff --git a/nixpkgs/pkgs/applications/office/espanso/default.nix b/nixpkgs/pkgs/applications/office/espanso/default.nix index 5cbfa5b1b2af..adeb087ae8be 100644 --- a/nixpkgs/pkgs/applications/office/espanso/default.nix +++ b/nixpkgs/pkgs/applications/office/espanso/default.nix @@ -10,6 +10,7 @@ , openssl , xclip , xdotool +, makeWrapper }: rustPlatform.buildRustPackage rec { @@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ extra-cmake-modules pkg-config + makeWrapper ]; buildInputs = [ @@ -35,6 +37,7 @@ rustPlatform.buildRustPackage rec { libXtst libXi libnotify + xclip openssl xdotool ]; @@ -42,6 +45,11 @@ rustPlatform.buildRustPackage rec { # Some tests require networking doCheck = false; + postInstall = '' + wrapProgram $out/bin/espanso \ + --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]} + ''; + meta = with lib; { description = "Cross-platform Text Expander written in Rust"; homepage = "https://espanso.org"; diff --git a/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/nixpkgs/pkgs/applications/office/gnumeric/default.nix index aacc2a2a579c..5ab9be9fa75a 100644 --- a/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.49"; + version = "1.12.50"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "kcBy7JXDLgCxVv/oAVyTsyuO3zaPkEFDYZPPoy6E7Vc="; + sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg="; }; configureFlags = [ "--disable-component" ]; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index f6243476f1b0..98070994fa33 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -476,11 +476,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-12-18.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2"; - sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1"; + name = "language-subtag-registry-2021-03-05.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; + sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; md5 = ""; - md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2"; + md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 3870c478c803..2e1a4b1d78dc 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "3"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm"; + sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6"; + sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0"; + sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q"; }; } diff --git a/nixpkgs/pkgs/applications/office/portfolio/default.nix b/nixpkgs/pkgs/applications/office/portfolio/default.nix index 17c6398f4ff2..eb2c0b0f1e77 100644 --- a/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.52.0"; + version = "0.53.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1pvjckh7z803piqyzrvk54jd43f2vcyx20zjcgmq1va8jc3q69k1"; + sha256 = "0hddq1nijxhr6kgf7gydw0nh07lh86fs8srkhm29ik4hmv8ch19p"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/printing/pappl/default.nix b/nixpkgs/pkgs/applications/printing/pappl/default.nix index de0b9bada53c..9752ebc0e7ce 100644 --- a/nixpkgs/pkgs/applications/printing/pappl/default.nix +++ b/nixpkgs/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L4ptgAJAvyTUCVl6YotA8DnlISc9PwZM0WjXyOvxGJg="; + sha256 = "sha256-B3g6R0/li+5D4odFG21qj+SR3K4PFnzzxIGCwbk1buo="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/applications/science/biology/truvari/default.nix b/nixpkgs/pkgs/applications/science/biology/truvari/default.nix index fffeca2c740c..31c1fc50ee3e 100644 --- a/nixpkgs/pkgs/applications/science/biology/truvari/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/truvari/default.nix @@ -5,15 +5,20 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "2.0.2"; + version = "2.1.1"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; + sha256 = "14nsdbj063qm175xxixs34cihvsiskc9gym8pg7gbwsh13k5a00h"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'python-Levenshtein==0.12.1' 'python-Levenshtein>=0.12.1' + ''; + propagatedBuildInputs = with python3Packages; [ pyvcf python-Levenshtein diff --git a/nixpkgs/pkgs/applications/science/chemistry/element/default.nix b/nixpkgs/pkgs/applications/science/chemistry/element/default.nix new file mode 100644 index 000000000000..812272e2fb9b --- /dev/null +++ b/nixpkgs/pkgs/applications/science/chemistry/element/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "element"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "gennaro-tedesco"; + repo = pname; + rev = "v${version}"; + sha256 = "gjdcNvYNnxb6hOE/MQjTezZeYGBWTr4E8/Pt8YQv3lY="; + }; + + vendorSha256 = "A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; + + meta = with lib; { + description = "The periodic table on the command line"; + homepage = "https://github.com/gennaro-tedesco/element"; + license = licenses.asl20; + maintainers = [ maintainers.j0hax ]; + }; +} diff --git a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index d8f7bd5eb552..93ec987e2c69 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.38"; + version = "14.31.39"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-yXJ1KtTH3bi24GFiVXu8zzQkreDkqbCxgm7fVoSJepg="; + sha256 = "sha256-ss+QvBsmivqNdjXW45Sv9h/JXuZpryCGmRTsUgcDlRE="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index 79c01d3ec718..30cbd8f92b57 100644 --- a/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,86 +1,75 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, qmake, pkg-config -, qtbase, qtsvg, qttools, qtserialport, boost, libgit2 +{ mkDerivation +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtsvg +, qttools +, qtserialport +, boost +, libgit2 }: let # build number corresponding to a release, has no further relation # see https://github.com/fritzing/fritzing-app/releases/tag/CD-498 - fritzingBuild = "498"; + # fritzingBuild = "498"; + # version 0.9.6 is properly tagged, hope it continues + # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "e79a69765026f3fda8aab1b3e7a4952c28047a62"; + partsSha = "6f04697be286768bc9e4d64f8707e8e40cbcafcb"; in mkDerivation rec { pname = "fritzing"; - version = "0.9.4-${fritzingBuild}"; + version = "0.9.6"; src = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-app"; - rev = "CD-${fritzingBuild}"; - sha256 = "0aljj2wbmm1vd64nhj6lh9qy856pd5avlgydsznya2vylyz20p34"; + rev = version; + sha256 = "083nz7vj7a334575smjry6257535h68gglh8a381xxa36dw96aqs"; }; parts = fetchFromGitHub { - owner = "fritzing"; + owner = pname; repo = "fritzing-parts"; name = "fritzing-parts"; rev = partsSha; - sha256 = "0spka33a5qq34aq79j01arw1aly4vh0hzv7mahryhdlcdk22qqvc"; + sha256 = "1f4w0hz44n4iw1rc5vhcgzvlji54rf4yr8bvzkqv99hn2xf5pjgs"; }; buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; - patches = [(fetchpatch { - name = "fix-libgit2-version.patch"; - url = "https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079.patch"; - sha256 = "0v1zi609cjnqac80xgnk23n54z08g1lia37hbzfl8jcq9sn9adak"; - })]; - postPatch = '' substituteInPlace phoenix.pro \ --replace 'LIBGIT_STATIC = true' 'LIBGIT_STATIC = false' - substituteInPlace tools/linux_release_script/release.sh \ - --replace 'git status' 'echo >/dev/null' \ - --replace 'git clean' 'echo >/dev/null' \ - --replace 'git clone' 'echo >/dev/null' \ - --replace 'release_folder="' 'release_folder="$out" #' \ - --replace './Fritzing -db' '# run after fixup' - substituteInPlace src/fapplication.cpp \ --replace 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";' - ''; - - buildPhase = '' - bash tools/linux_release_script/release.sh ${version} - ''; - installPhase = '' - rm "$out/Fritzing" # remove script file - mkdir "$out/bin" - mv "$out/lib/Fritzing" "$out/bin/Fritzing" - mkdir --parents "$out/share/applications" "$out/share/metainfo" - mv --target-directory="$out/share/applications" "$out/org.fritzing.Fritzing.desktop" - mv --target-directory="$out/share/metainfo" "$out/org.fritzing.Fritzing.appdata.xml" - cp --recursive --no-target-directory "$parts" "$out/fritzing-parts" + mkdir parts + cp -a ${parts}/* parts/ ''; postFixup = '' # generate the parts.db file - QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" -db "$out/fritzing-parts/parts.db" -pp "$out/fritzing-parts" -folder "$out" + QT_QPA_PLATFORM=offscreen "$out/bin/Fritzing" \ + -db "$out/share/fritzing/parts/parts.db" \ + -pp "$out/fritzing/parts" \ + -folder "$out/share/fritzing" ''; qmakeFlags = [ "phoenix.pro" ]; - meta = { + meta = with lib; { description = "An open source prototyping tool for Arduino-based projects"; homepage = "https://fritzing.org/"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.robberer ]; - platforms = lib.platforms.linux; + license = with licenses; [ gpl3 cc-by-sa-30 ]; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index dee0a851bf8c..c1ff99a2c3a3 100644 --- a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "0mra6kf1c2qixfzqva6r01qms5kdabbhhblhk5is6h6nq78i8640"; + sha256 = "sha256-FS24B/ySKeF8r7Tro+mf5P0ALtlPwwJCU3YdDNYLe6o="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/logic/gappa/default.nix b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix index 73f34f60fc47..c7c5c9c6fa70 100644 --- a/nixpkgs/pkgs/applications/science/logic/gappa/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/gappa/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, gmp, mpfr, boost }: stdenv.mkDerivation { - name = "gappa-1.3.5"; + name = "gappa-1.4.0"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz"; - sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"; + url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.4.0.tar.gz"; + sha256 = "sha256-/IDIf5XnFBqVllgH5GtQ6C8g7vxheaVcXNoZiXlsPGA="; }; buildInputs = [ gmp mpfr boost.dev ]; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix index d5a6cb796a71..ca7500cd5c35 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/starspace/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost165 }: +{ lib, stdenv, fetchFromGitHub, boost165, zlib }: stdenv.mkDerivation rec { pname = "starspace"; @@ -11,13 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; }; - buildInputs = [ boost165 ]; + buildInputs = [ boost165 zlib ]; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" "BOOST_DIR=${boost165.dev}/include" ]; + preBuild = '' + cp makefile_compress makefile + ''; + installPhase = '' mkdir -p $out/bin mv starspace $out/bin diff --git a/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index de6f92129838..d1523b571f4b 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, flatbuffers, fmt, rapidjson, spdlog, zlib }: stdenv.mkDerivation rec { pname = "vowpal-wabbit"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ - boost169 + boost flatbuffers fmt rapidjson diff --git a/nixpkgs/pkgs/applications/science/math/eukleides/default.nix b/nixpkgs/pkgs/applications/science/math/eukleides/default.nix index b5a9fc3fa86d..6b6bfd7d6e5f 100644 --- a/nixpkgs/pkgs/applications/science/math/eukleides/default.nix +++ b/nixpkgs/pkgs/applications/science/math/eukleides/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo4, getopt, readline, texlive }: lib.fix (eukleides: stdenv.mkDerivation rec { pname = "eukleides"; @@ -9,12 +9,16 @@ lib.fix (eukleides: stdenv.mkDerivation rec { sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; - # use $CC instead of hardcoded gcc - patches = [ ./use-CC.patch ]; + patches = [ + # use $CC instead of hardcoded gcc + ./use-CC.patch + # allow PostScript transparency in epstopdf call + ./gs-allowpstransparency.patch + ]; - nativeBuildInputs = [ bison flex texinfo makeWrapper ]; + nativeBuildInputs = [ bison flex texinfo4 makeWrapper ]; - buildInputs = [ readline texLive ]; + buildInputs = [ getopt readline ]; preConfigure = '' substituteInPlace Makefile \ @@ -34,19 +38,15 @@ lib.fix (eukleides: stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/euktoeps \ - --set-default TEXINPUTS : \ - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ - --prefix PATH : "${texLive}/bin" - wrapProgram $out/bin/euktopdf \ - --set-default TEXINPUTS : \ - --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ - --prefix PATH : "${texLive}/bin" + --prefix PATH : ${lib.makeBinPath [ getopt ]} ''; outputs = [ "out" "doc" "tex" ]; passthru.tlType = "run"; - passthru.pkgs = [ eukleides.tex ]; + passthru.pkgs = [ eukleides.tex ] + # packages needed by euktoeps, euktopdf and eukleides.sty + ++ (with texlive; collection-pstricks.pkgs ++ epstopdf.pkgs ++ iftex.pkgs ++ moreverb.pkgs); meta = { description = "Geometry Drawing Language"; diff --git a/nixpkgs/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch b/nixpkgs/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch new file mode 100644 index 000000000000..aa92e6cc9fa7 --- /dev/null +++ b/nixpkgs/pkgs/applications/science/math/eukleides/gs-allowpstransparency.patch @@ -0,0 +1,10 @@ +--- a/bash/euktopdf ++++ b/bash/euktopdf +@@ -55,6 +55,6 @@ do + exit 1 + fi + dvips -q -E -o $base.eps $base.dvi && +- epstopdf $base.eps && ++ epstopdf --gsopt=-dALLOWPSTRANSPARENCY $base.eps && + rm -f $base.{tex,log,dvi,eps} + done diff --git a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix index 2bfeaa005687..91ee7c1c65e0 100644 --- a/nixpkgs/pkgs/applications/science/math/gurobi/default.nix +++ b/nixpkgs/pkgs/applications/science/math/gurobi/default.nix @@ -1,35 +1,28 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, python2 }: +{ stdenv, lib, fetchurl, autoPatchelfHook, python3 }: -let - majorVersion = "8.1"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "gurobi"; - version = "${majorVersion}.0"; + version = "9.1.2"; - src = with lib; fetchurl { - url = "http://packages.gurobi.com/${versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "1yjqbzqnq4jjkjm616d36bgd3rmqr0a1ii17n0prpdjzmdlq63dz"; + src = fetchurl { + url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; + sha256 = "7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b"; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ (python2.withPackages (ps: [ ps.gurobipy ])) ]; + buildInputs = [ (python3.withPackages (ps: [ ps.gurobipy ])) ]; strictDeps = true; - buildPhase = '' - cd src/build - make - cd ../.. - ''; + makeFlags = [ "--directory=src/build" ]; installPhase = '' mkdir -p $out/bin cp bin/* $out/bin/ - rm $out/bin/gurobi.env rm $out/bin/gurobi.sh - rm $out/bin/python2.7 + rm $out/bin/python* cp lib/gurobi.py $out/bin/gurobi.sh @@ -48,7 +41,7 @@ in stdenv.mkDerivation rec { ln -s $out/lib/gurobi-javadoc.jar $out/share/java/ ''; - passthru.libSuffix = lib.replaceStrings ["."] [""] majorVersion; + passthru.libSuffix = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor version); meta = with lib; { description = "Optimization solver for mathematical programming"; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 3b0d30280419..e101d5d3a8cd 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.20.3"; + version = "0.21.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-rORIrbUqtQZuU6TjjYP7IZHfCPeLnrNy6wInnAwhG48="; + sha256 = "sha256-/+OSVjC4++A4kaxEfI2kIgjXxL67lfoXCdH2PykLWxA="; }; buildInputs = [ @@ -63,26 +63,26 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" ]; - patches = [ - ./fix-paths.patch - ]; - # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; - buildPhase = if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --update-check-interval=0 \ - --disable-link-time-optimization - make man - '' else '' - ${python.interpreter} setup.py linux-package \ - --update-check-interval=0 \ - --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ - --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ - --canberra-library='${libcanberra}/lib/libcanberra.so' + buildPhase = '' + runHook preBuild + ${if stdenv.isDarwin then '' + ${python.interpreter} setup.py kitty.app \ + --update-check-interval=0 \ + --disable-link-time-optimization + make man + '' else '' + ${python.interpreter} setup.py linux-package \ + --update-check-interval=0 \ + --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ + --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ + --canberra-library='${libcanberra}/lib/libcanberra.so' + ''} + runHook postBuild ''; checkInputs = [ pillow ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch b/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch deleted file mode 100644 index 380f6d749146..000000000000 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/docs/Makefile -+++ b/docs/Makefile -@@ -3,7 +3,7 @@ -# Patching is needed here for the following reason: -# * importing the `constants` package from Kitty has a side effect that it -# creates the user configuration directory. This package gets imported -# while sphinx scans the code for documentation strings. -# - - # You can set these variables from the command line. - SPHINXOPTS = -j auto -T $(FAIL_WARN) --SPHINXBUILD = sphinx-build -+SPHINXBUILD = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build - SPHINXPROJ = kitty - SOURCEDIR = . - BUILDDIR = _build diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index beecb3e278d5..88dae0a34ff5 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: -stdenv.mkDerivation { - name = "urxvt-font-size-2015-05-22"; - dontPatchShebangs = true; +stdenv.mkDerivation rec { + name = "urxvt-font-size"; + version = "1.3"; src = fetchFromGitHub { owner = "majutsushi"; repo = "urxvt-font-size"; - rev = "fd5b09c10798c6723bbf771d4d8881cf6563bc69"; - sha256 = "16m3kkypg3y00x597zx05zy167a0kaqpawz0l591wzb2bv1dz55z"; + rev = "v${version}"; + sha256 = "1526ap161cp3378f4ijd09nmsh71ld7bkxxhp8p6razdi2v8r16h"; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix index af56f54a4149..fbebf6590d07 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,30 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , cmake -, pkg-config +, glib , gtk3 +, makeWrapper +, pcre2 , perl +, pkg-config , vte -, pcre2 -, glib -, makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; - version = "3.7.1"; + version = "3.8.2"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos="; + sha256 = "sha256-nd/okZrg4RZzyiKHmuMkVl0Jh7FOlI4dK63/U4/htbk="; }; - nativeBuildInputs = [ cmake perl pkg-config makeWrapper ]; + nativeBuildInputs = [ + cmake + makeWrapper + perl + pkg-config + ]; - buildInputs = [ gtk3 vte pcre2 glib ]; + buildInputs = [ + glib + gtk3 + pcre2 + vte + ]; - # Set path to gsettings-schemata so sakura knows - # where to find colorchooser, fontchooser etc. + # Set path to gsettings-schemata so sakura knows where to find colorchooser, + # fontchooser etc. postInstall = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ diff --git a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index ffd583585c0f..a14af17c01c5 100644 --- a/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,31 +1,23 @@ -{lib, stdenv, fetchurl, makeWrapper, flex, bison, - asciidoc, docbook_xml_dtd_45, docbook_xsl, - libxml2, libxslt, - python3, rcs, cvs, git, - coreutils, rsync}: -with stdenv; with lib; -mkDerivation rec { - name = "cvs-fast-export-${meta.version}"; - meta = { - version = "1.56"; - description = "Export an RCS or CVS history as a fast-import stream"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ dfoxfranke ]; - homepage = "http://www.catb.org/esr/cvs-fast-export/"; - platforms = platforms.all; - }; +{ lib, stdenv, fetchurl, makeWrapper, asciidoc, docbook_xml_dtd_45, docbook_xsl +, coreutils, cvs, diffutils, findutils, git, python3, rsync +}: + +stdenv.mkDerivation rec { + pname = "cvs-fast-export"; + version = "1.57"; src = fetchurl { - url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.56.tar.gz"; - sha256 = "sha256-TB/m7kd91+PyAkGdFCCgeb9pQh0kacq0QuTZa8f9CxU="; + url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; + sha256 = "0y1fzsicga19nsarpmn2ms69sq26b2d3d8a1169qbqz1kzr0jji8"; }; - buildInputs = [ - flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - python3 rcs cvs git makeWrapper - ]; + strictDeps = true; + nativeBuildInputs = [ makeWrapper asciidoc ]; + buildInputs = [ python3 ]; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs . + ''; preBuild = '' makeFlagsArray=( @@ -35,16 +27,18 @@ mkDerivation rec { ) ''; - doCheck = true; + postInstall = '' + wrapProgram $out/bin/cvssync --prefix PATH : ${lib.makeBinPath [ rsync ]} + wrapProgram $out/bin/cvsconvert --prefix PATH : $out/bin:${lib.makeBinPath [ + coreutils cvs diffutils findutils git + ]} + ''; - postInstall = - let - binpath = makeBinPath [ out rcs cvs git coreutils rsync ]; - in '' - for prog in cvs-fast-export cvsconvert cvssync; do - wrapProgram $out/bin/$prog \ - --prefix PATH : ${binpath} - done - '' - ; + meta = with lib; { + description = "Export an RCS or CVS history as a fast-import stream"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dfoxfranke ]; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; + platforms = platforms.unix; + }; } diff --git a/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/nixpkgs/pkgs/applications/version-management/fossil/default.nix index af2ed175ac87..c15d833dfb28 100644 --- a/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.14"; + version = "2.15.1"; src = fetchurl { urls = @@ -23,23 +23,21 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "sha256-uNDJIBlt2K4pFS+nRI5ROh+nxYiHG3heP7/Ae0KgX7k="; + sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E="; }; - nativeBuildInputs = [ installShellFiles tcl ]; + nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline sqlite which ed ] ++ lib.optional stdenv.isDarwin libiconv; + enableParallelBuilding = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ "--disable-internal-sqlite" ] ++ lib.optional withJson "--json"; - preCheck = '' - export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" - ''; - preBuild = '' export USER=nonexistent-but-specified-user ''; @@ -61,8 +59,9 @@ stdenv.mkDerivation rec { many such systems in use today. Fossil strives to distinguish itself from the others by being extremely simple to setup and operate. ''; - homepage = "http://www.fossil-scm.org/"; + homepage = "https://www.fossil-scm.org/"; license = licenses.bsd2; maintainers = with maintainers; [ maggesi viric ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 77ad7d8658d1..95060714c24e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "sha256-bV22x459QerWg4MVLWsXPDhM38QWG6BE+dVmKIFfDiE="; + sha256 = "sha256-1kBarsRiuB8fv7VLlWfpotPfHeMrfmIXHXTFu8TzC2A="; }; nativeBuildInputs = [ @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ma27 ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix index be6d64646a59..5570dbf10148 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghr"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "tcnksm"; repo = "ghr"; rev = "v${version}"; - sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a"; + sha256 = "sha256-pF1TPvQLPa5BbXZ9rRCq7xWofXCBRa9CDgNxX/kaTMo="; }; - vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj"; + vendorSha256 = "sha256-+e9Q4Pw9pJyOXVz85KhOSuybj1PBcJi51fGR3a2Gixk="; # Tests require a Github API token, and networking doCheck = false; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index f93947d0515b..210c0ca8c3e7 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "00f1rq80vya464dkvf3mzs9zpvkz15ki8srwg08snsm5kb7amwlm"; + sha256 = "1bssk0jqspmsvr8kha9l5cslyhjvc50y30wdgavbca256lv75gh8"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 8ad150f13060..2db4b4ed7bd2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -2,7 +2,7 @@ , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 -, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45 +, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform @@ -68,8 +68,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] - ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x - docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; + ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x + docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio libiconv] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] @@ -78,7 +78,7 @@ stdenv.mkDerivation { ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" + lib.optionalString (stdenv.isFreeBSD) "-lthr"; configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -148,7 +148,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} + make -C contrib/subtree install ${lib.optionalString withManual "install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -233,7 +233,7 @@ stdenv.mkDerivation { '') + lib.optionalString withManual ''# Install man pages - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index f4b74405eba2..ab0ce9c7cd0f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.4"; + version = "1.5.2"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; + sha256 = "sha256-MQG4thW73gDqY68bKP2FO8z5uc2R/tED+/X9qas/GOA="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index 12fd8357fc7a..f2a5e2368b4f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ="; + sha256 = "sha256-ahP5y5i0SMj2+mP4RYc7MLZGElX5eLgKwiVhBYGOX2g="; }; - vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw="; + vendorSha256 = "sha256-ssVmqcJ/DxUqAkHm9tn4RwWuKzTHvxoqJquXPIRy4b8="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 264677dc1cd9..374e68a71c79 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4="; + sha256 = "sha256-qCj6FsbzxnMISCITKFcIIYtqMiHzSNYNjlpgpE9S/Ss="; }; vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index e92a5a38a280..96f3af51620b 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.2"; + version = "1.14.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-0EvKk0/ro1YAqvc5yCt8vn2LkRoIbXrFTwcQtomoWsM="; + sha256 = "sha256-ieQxqZO84sYBcCzWYn40tRGLgSs2PpLlcNkI4vFq+wE="; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 40af0656fe6b..60596eee4a9e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.12.2", - "repo_hash": "1wzbjw21pan5cfiz1jd03c3w9sgyvmn35f6dm2sr2k54acsw034p", + "version": "13.12.4", + "repo_hash": "1jp97vwwfnh3iqkh58y0zqcx6lsvqcpnxy8ipd4j9hbmag1jr36i", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.12.2-ee", + "rev": "v13.12.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.12.2", + "GITALY_SERVER_VERSION": "13.12.4", "GITLAB_PAGES_VERSION": "1.39.0", "GITLAB_SHELL_VERSION": "13.18.0", - "GITLAB_WORKHORSE_VERSION": "13.12.2" + "GITLAB_WORKHORSE_VERSION": "13.12.4" } } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 994683c2e2b1..8f189338e613 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "13.12.2"; + version = "13.12.4"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jZg/OlecYlGjDxlxsayAuqzptil1OPtyPjOe1WYT0HY="; + sha256 = "sha256-5I06tzeOfVdtblgqI7neKBgwzXuU9hI/0V3gYEPMJJ0="; }; vendorSha256 = "sha256-drS0L0olEFHYJVC0VYwEZeNYa8fjwrfxlhrEQa4pqzY="; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c6302be8d184..2eb1d14d0a45 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "13.12.2"; + version = "13.12.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index bb95233c6eb0..14dcc7ab4b17 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -309,12 +309,12 @@ gem 'rack-attack', '~> 6.3.0' gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'pg_query', '~> 2.0.3' +gem 'pg_query', '~> 1.3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.17.1' +gem 'gitlab-labkit', '~> 0.16.2' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -485,7 +485,7 @@ gem 'gitaly', '~> 13.12.0.pre.rc1' gem 'grpc', '~> 1.30.2' -gem 'google-protobuf', '~> 3.15.8' +gem 'google-protobuf', '~> 3.14.0' gem 'toml-rb', '~> 1.0.0' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 6f40a15a64bc..31f362c9f9b4 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -460,13 +460,13 @@ GEM fog-xml (~> 0.1.0) google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) - gitlab-labkit (0.17.1) + gitlab-labkit (0.16.2) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) - pg_query (~> 2.0) + pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-license (1.5.0) gitlab-mail_room (0.0.9) @@ -509,7 +509,7 @@ GEM signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.15.8) + google-protobuf (3.14.0) googleapis-common-protos-types (1.0.6) google-protobuf (~> 3.14) googleauth (0.14.0) @@ -896,8 +896,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.2.3) - pg_query (2.0.3) - google-protobuf (~> 3.15.5) + pg_query (1.3.0) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1473,7 +1472,7 @@ DEPENDENCIES gitlab-experiment (~> 0.5.4) gitlab-fog-azure-rm (~> 1.0.1) gitlab-fog-google (~> 1.13) - gitlab-labkit (~> 0.17.1) + gitlab-labkit (~> 0.16.2) gitlab-license (~> 1.5) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) @@ -1485,7 +1484,7 @@ DEPENDENCIES gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) google-api-client (~> 0.33) - google-protobuf (~> 3.15.8) + google-protobuf (~> 3.14.0) gpgme (~> 2.0.19) grape (~> 1.5.2) grape-entity (~> 0.9.0) @@ -1565,7 +1564,7 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) - pg_query (~> 2.0.3) + pg_query (~> 1.3.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.12.0) diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 9500febc8563..f9b174c43f1c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1978,10 +1978,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1sk3xmxj14nzx7v2zgq4q4d5lh4v1pvhs03n03j3kp4fbrj469"; + sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa"; type = "gem"; }; - version = "0.17.1"; + version = "0.16.2"; }; gitlab-license = { groups = ["default"]; @@ -2127,10 +2127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d9ayd4c69iag9nny7yydjx6dw4ymd52x1kv917ngv3vmsdkv51x"; + sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p"; type = "gem"; }; - version = "3.15.8"; + version = "3.14.0"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -3811,15 +3811,14 @@ version = "1.2.3"; }; pg_query = { - dependencies = ["google-protobuf"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mii63kgppy2zil2qn54c94z93b6ama6x7gq6rbv4xxlfk8ncrag"; + sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; type = "gem"; }; - version = "2.0.3"; + version = "1.3.0"; }; plist = { groups = ["default"]; diff --git a/nixpkgs/pkgs/applications/version-management/rcs/default.nix b/nixpkgs/pkgs/applications/version-management/rcs/default.nix index f8143711318c..d814e0ca0a52 100644 --- a/nixpkgs/pkgs/applications/version-management/rcs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/rcs/default.nix @@ -1,55 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }: stdenv.mkDerivation rec { - name = "rcs-5.9.4"; + pname = "rcs"; + version = "5.10.0"; src = fetchurl { - url = "mirror://gnu/rcs/${name}.tar.xz"; - sha256 = "1zsx7bb0rgvvvisiy4zlixf56ay8wbd9qqqcp1a1g0m1gl6mlg86"; + url = "mirror://gnu/rcs/${pname}-${version}.tar.xz"; + sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU"; }; - buildInputs = [ ed ]; + ac_cv_path_ED = "${ed}/bin/ed"; + DIFF = "${diffutils}/bin/diff"; + DIFF3 = "${diffutils}/bin/diff3"; - patches = lib.optionals stdenv.isDarwin [ - # This failure appears unrelated to the subject of the test. This - # test seems to rely on a bash bug where `test $x -nt $y` ignores - # subsecond values in timetamps. This bug has been fixed in Bash - # 5, and seemingly doesn't affect Darwin. - ./disable-t810.patch - - (fetchpatch { - url = "https://raw.githubusercontent.com/macports/macports-ports/b76d1e48dac/editors/nano/files/secure_snprintf.patch"; - extraPrefix = ""; - sha256 = "1wy9pjw3vvp8fv8a7pmkqmiapgacfx54qj9fvsc5gwry0vv7vnc3"; - }) - - # Expected to appear in the next release - (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3fff7c990b8df4174045834b9c1210e7736ff5a4/rcs/noreturn.patch"; - sha256 = "10zniqrd6xagf3q03i1vksl0vd9nla3qcj0840n3m8z6jd4aypcx"; - }) - ]; - - doCheck = true; - - checkFlags = [ "VERBOSE=1" ]; - - checkPhase = '' - # If neither LOGNAME or USER are set, rcs will default to - # getlogin(), which is unreliable on macOS. It will often return - # things like `_spotlight`, or `_mbsetupuser`. macOS sets both - # environment variables in user sessions, so this is unlikely to - # affect regular usage. - - export LOGNAME=$(id -un) - - print_logs_and_fail() { - grep -nH -e . -r tests/*.d/{out,err} - return 1 - } - - make $checkFlags check || print_logs_and_fail - ''; + disallowedReferences = + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) + [ buildPackages.diffutils buildPackages.ed ]; NIX_CFLAGS_COMPILE = "-std=c99"; diff --git a/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch b/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch deleted file mode 100644 index 745f1868a369..000000000000 --- a/nixpkgs/pkgs/applications/version-management/rcs/disable-t810.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- rcs-5.9.4-orig/tests/Makefile.in 2015-01-22 19:40:36.000000000 +0900 -+++ rcs-5.9.4/tests/Makefile.in 2019-04-16 20:04:30.557626000 +0900 -@@ -1372,7 +1372,6 @@ - t803 \ - t804 \ - t805 \ -- t810 \ - t900 \ - t999 - diff --git a/nixpkgs/pkgs/applications/version-management/srcml/default.nix b/nixpkgs/pkgs/applications/version-management/srcml/default.nix index c13a08a711c2..11dbfc299a49 100644 --- a/nixpkgs/pkgs/applications/version-management/srcml/default.nix +++ b/nixpkgs/pkgs/applications/version-management/srcml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, curl }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./gcc6.patch ]; - nativeBuildInputs = [ cmake antlr ]; + nativeBuildInputs = [ cmake antlr2 ]; buildInputs = [ libxml2 libxslt boost libarchive python curl ]; meta = { diff --git a/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/nixpkgs/pkgs/applications/video/ccextractor/default.nix index 881e6b687ef2..aa40291790e1 100644 --- a/nixpkgs/pkgs/applications/video/ccextractor/default.nix +++ b/nixpkgs/pkgs/applications/video/ccextractor/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "ccextractor"; - version = "0.88"; + version = "0.89"; src = fetchFromGitHub { owner = "CCExtractor"; repo = pname; rev = "v${version}"; - sha256 = "1sya45hvv4d46bk7541yimmafgvgyhkpsvwfz9kv6pm4yi1lz6nb"; + sha256 = "sha256-847yt6pUTsDnVbrMQQPJ0pqu6UnKmYmr8UtR8+TP11A="; }; sourceRoot = "source/src"; diff --git a/nixpkgs/pkgs/applications/video/flowblade/default.nix b/nixpkgs/pkgs/applications/video/flowblade/default.nix new file mode 100644 index 000000000000..2e50dfa12185 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/flowblade/default.nix @@ -0,0 +1,45 @@ +{ lib, fetchFromGitHub, stdenv +, ffmpeg, frei0r, sox, gtk3, python3, ladspaPlugins +, gobject-introspection, makeWrapper, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "flowblade"; + version = "2.8.0.3"; + + src = fetchFromGitHub { + owner = "jliljebl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g="; + }; + + buildInputs = [ + ffmpeg frei0r sox gtk3 gobject-introspection ladspaPlugins + (python3.withPackages (ps: with ps; [ mlt pygobject3 dbus-python numpy pillow ])) + ]; + + nativeBuildInputs = [ gobject-introspection makeWrapper wrapGAppsHook ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -a ${src}/flowblade-trunk $out/flowblade + + makeWrapper $out/flowblade/flowblade $out/bin/flowblade \ + --set FREI0R_PATH ${frei0r}/lib/frei0r-1 \ + --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \ + ''${gappsWrapperArgs[@]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Multitrack Non-Linear Video Editor"; + homepage = "https://jliljebl.github.io/flowblade/"; + license = with licenses; [ gpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ polygon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/video/imagination/default.nix b/nixpkgs/pkgs/applications/video/imagination/default.nix new file mode 100644 index 000000000000..732d8f547ff6 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/imagination/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, autoreconfHook, docbook_xsl, ffmpeg-full, glib, gtk3 +, intltool, libxslt, pkg-config, sox, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "imagination"; + version = "3.6"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "139dgb9vfr2q7bxvjskykdz526xxwrn0bh463ir8m2p7rx5a3pw5"; + }; + + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + intltool + libxslt + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ ffmpeg-full glib gtk3 sox ]; + + preBuild = '' + substituteInPlace src/main-window.c \ + --replace 'gtk_icon_theme_load_icon(icon_theme,"image", 20, 0, NULL)' \ + 'gtk_icon_theme_load_icon(icon_theme,"insert-image", 20, 0, NULL)' \ + --replace 'gtk_icon_theme_load_icon(icon_theme,"sound", 20, 0, NULL)' \ + 'gtk_icon_theme_load_icon(icon_theme,"audio-x-generic", 20, 0, NULL)' + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg-full sox ]}" + ) + ''; + + meta = with lib; { + description = "Lightweight and simple DVD slide show maker"; + homepage = "http://imagination.sourceforge.net"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ austinbutler ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/video/mplayer/default.nix b/nixpkgs/pkgs/applications/video/mplayer/default.nix index bdcd3fbc8fd3..1e439f57ef7b 100644 --- a/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation rec { optional fontconfigSupport "-lfontconfig" ++ optional fribidiSupport "-lfribidi" ++ optionals x11Support [ "-lX11" "-lXext" ] + ++ optional x264Support "-lx264" ++ [ "-lfreetype" ] ); diff --git a/nixpkgs/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch b/nixpkgs/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch new file mode 100644 index 000000000000..0bc796248607 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch @@ -0,0 +1,26 @@ +From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001 +From: V <v@anomalous.eu> +Date: Thu, 10 Jun 2021 18:36:22 +0200 +Subject: [PATCH] Change product_version to user_agent_product + +This is its name as of CEF 91.1.0. +--- + obs-browser-plugin.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp +index 1a6a009..5eb379e 100644 +--- a/plugins/obs-browser/obs-browser-plugin.cpp ++++ b/plugins/obs-browser/obs-browser-plugin.cpp +@@ -298,7 +298,7 @@ static void BrowserInit(void) + prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min) + << "." << std::to_string(obs_pat); + +- CefString(&settings.product_version) = prod_ver.str(); ++ CefString(&settings.user_agent_product) = prod_ver.str(); + + #ifdef USE_QT_LOOP + settings.external_message_pump = true; +-- +2.31.1 + diff --git a/nixpkgs/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/nixpkgs/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch new file mode 100644 index 000000000000..49d01bacbd10 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch @@ -0,0 +1,36 @@ +From 0de0a90f8fe5e1e48fa4ec7aa7c825ef88770f9d Mon Sep 17 00:00:00 2001 +From: Ryan Foster <RytoEX@gmail.com> +Date: Mon, 9 Sep 2019 23:55:02 -0400 +Subject: [PATCH] Enable file access and universal access for file URLs + +When loading a local file, instead of disabling CEF's web security, +enable file access and universal access for file URLs. This should allow +local files to make CORS requests without completely disabling CEF's +security model. +--- + obs-browser-source.cpp | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp +index ab1181e..c775283 100644 +--- a/plugins/obs-browser/obs-browser-source.cpp ++++ b/plugins/obs-browser/obs-browser-source.cpp +@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() + + #if ENABLE_LOCAL_FILE_URL_SCHEME + if (is_local) { +- /* Disable web security for file:// URLs to allow +- * local content access to remote APIs */ +- cefBrowserSettings.web_security = STATE_DISABLED; ++ /* Enable file access and universal access from file:// ++ * URLs to allow local content access to remote APIs */ ++ cefBrowserSettings.file_access_from_file_urls = ++ STATE_ENABLED; ++ cefBrowserSettings.universal_access_from_file_urls = ++ STATE_ENABLED; + } + #endif + +-- +2.31.1 + diff --git a/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/default.nix index a50fe16660fb..d7784279c315 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/default.nix @@ -53,6 +53,14 @@ in mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Lets obs-browser build against CEF 90.1.0+ + ./Enable-file-access-and-universal-access-for-file-URL.patch + + # Lets obs-browser build against CEF 91.1.0+ + ./Change-product_version-to-user_agent_product.patch + ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; buildInputs = [ @@ -106,13 +114,13 @@ in mkDerivation rec { ]; postInstall = '' - wrapProgram $out/bin/obs \ - --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" + wrapProgram $out/bin/obs \ + --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${libvlc}/lib" ''; postFixup = lib.optionalString stdenv.isLinux '' - addOpenGLRunpath $out/lib/lib*.so - addOpenGLRunpath $out/lib/obs-plugins/*.so + addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so ''; meta = with lib; { @@ -123,7 +131,7 @@ in mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E ]; + maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix new file mode 100644 index 000000000000..477f0efa3e09 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -0,0 +1,9 @@ +{ callPackage, libsForQt5 }: + +{ + obs-gstreamer = callPackage ./obs-gstreamer.nix {}; + obs-move-transition = callPackage ./obs-move-transition.nix {}; + obs-multi-rtmp = libsForQt5.callPackage ./obs-multi-rtmp.nix {}; + obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {}; + wlrobs = callPackage ./wlrobs.nix {}; +} diff --git a/nixpkgs/pkgs/applications/video/obs-studio/fix-search-path.patch b/nixpkgs/pkgs/applications/video/obs-studio/plugins/fix-search-path.patch index 4503447ff5dc..4503447ff5dc 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/fix-search-path.patch +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/fix-search-path.patch diff --git a/nixpkgs/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch b/nixpkgs/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch index caef96c381f2..caef96c381f2 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch diff --git a/nixpkgs/pkgs/applications/video/obs-studio/obs-gstreamer.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index e32ec7575b2d..d21d78c42b2a 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/obs-gstreamer.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -22,18 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ gst_all_1.gstreamermm obs-studio ]; - # obs-studio expects the shared object to be located in bin/32bit or bin/64bit - # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 - postInstall = let - pluginPath = { - i686-linux = "bin/32bit"; - x86_64-linux = "bin/64bit"; - }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); - in '' - mkdir -p $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} - ln -s $out/lib/obs-plugins/obs-gstreamer.so $out/share/obs/obs-plugins/obs-gstreamer/${pluginPath} - ''; - meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fswoch/obs-gstreamer"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/obs-move-transition.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 9a896c7320af..befc27dd5dca 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/obs-move-transition.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -39,18 +39,6 @@ stdenv.mkDerivation rec { substituteInPlace audio-move.c --replace '<../UI/obs-frontend-api/obs-frontend-api.h>' '<obs-frontend-api.h>' ''; - # obs-studio expects the shared object to be located in bin/32bit or bin/64bit - # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 - postInstall = let - pluginPath = { - i686-linux = "bin/32bit"; - x86_64-linux = "bin/64bit"; - }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); - in '' - mkdir -p $out/share/obs/obs-plugins/move-transition/${pluginPath} - ln -s $out/lib/obs-plugins/move-transition.so $out/share/obs/obs-plugins/move-transition/${pluginPath} - ''; - meta = with lib; { description = "Plugin for OBS Studio to move source to a new position during scene transition"; homepage = "https://github.com/exeldro/obs-move-transition"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/obs-multi-rtmp.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix index f716d93a3603..0122cba0f3d8 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/obs-multi-rtmp.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix @@ -20,18 +20,6 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; - # obs-studio expects the shared object to be located in bin/32bit or bin/64bit - # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 - postInstall = let - pluginPath = { - i686-linux = "bin/32bit"; - x86_64-linux = "bin/64bit"; - }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); - in '' - mkdir -p $out/share/obs/obs-plugins/obs-multi-rtmp/${pluginPath} - ln -s $out/lib/obs-plugins/obs-multi-rtmp.so $out/share/obs/obs-plugins/obs-multi-rtmp/${pluginPath} - ''; - meta = with lib; { homepage = "https://github.com/sorayuki/obs-multi-rtmp/"; changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix index b35398d65b5c..1e2abb45a5b3 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix @@ -1,10 +1,3 @@ -# We don't have a wrapper which can supply obs-studio plugins so you have to -# somewhat manually install this: - -# nix-env -f "<nixpkgs>" -iA obs-ndi -# mkdir -p ~/.config/obs-studio/plugins/bin -# ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ - { lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch b/nixpkgs/pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch index ed6df1d565db..ed6df1d565db 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/rename-obs-move-transition-cmake.patch +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/rename-obs-move-transition-cmake.patch diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/wlrobs.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/wlrobs.nix new file mode 100644 index 000000000000..adae03036f81 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/wlrobs.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchhg +, meson, pkg-config, ninja +, wayland, obs-studio, libX11 +}: + +stdenv.mkDerivation { + pname = "wlrobs"; + version = "unstable-2021-05-13"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/wlrobs"; + rev = "4184a4a8ea7dc054c993efa16007f3a75b2c6f51"; + sha256 = "146xirzd3nw1sd216y406v1riky9k08b6a0j4kwxrif5zyqa3adc"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ wayland obs-studio libX11 ]; + + meta = with lib; { + description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; + homepage = "https://hg.sr.ht/~scoopta/wlrobs"; + maintainers = with maintainers; [ grahamc V ]; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix b/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix deleted file mode 100644 index 2716120682ea..000000000000 --- a/nixpkgs/pkgs/applications/video/obs-studio/v4l2sink.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, qtbase -, obs-studio -}: - -stdenv.mkDerivation rec { - pname = "obs-v4l2sink"; - version = "0.1.0-12-g1ec3c8a"; - - src = fetchFromGitHub { - owner = "CatxFish"; - repo = "obs-v4l2sink"; - rev = version; - sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase obs-studio ]; - - dontWrapQtApps = true; - - patches = [ - # Fixes the segfault when stopping the plugin - (fetchpatch { - url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff"; - sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88"; - }) - ]; - - cmakeFlags = with lib; [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - ]; - - # obs-studio expects the shared object to be located in bin/32bit or bin/64bit - # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 - postInstall = let - pluginPath = { - i686-linux = "bin/32bit"; - x86_64-linux = "bin/64bit"; - }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); - in '' - mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath} - ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath} - ''; - - meta = with lib; { - description = "obs studio output plugin for Video4Linux2 device"; - homepage = "https://github.com/CatxFish/obs-v4l2sink"; - maintainers = with maintainers; [ colemickens peelz ]; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix b/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix deleted file mode 100644 index 47f6ea9e5ddb..000000000000 --- a/nixpkgs/pkgs/applications/video/obs-studio/wlrobs.nix +++ /dev/null @@ -1,42 +0,0 @@ -# (the following is somewhat lifted from ./linuxbrowser.nix) -# We don't have a wrapper which can supply obs-studio plugins so you have to -# somewhat manually install this: - -# nix-env -f . -iA obs-wlrobs -# mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit -# ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit -{ stdenv, fetchhg, wayland, obs-studio -, meson, ninja, pkg-config, libX11 -, dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: - -assert dmabufSupport -> libdrm != null && libGL != null; - -stdenv.mkDerivation { - pname = "obs-wlrobs"; - version = "20200622"; - - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/wlrobs"; - rev = "1d3acaaf64049da3da9721aa8b9b47582fe0081b"; - sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; - }; - - buildInputs = [ libX11 libGL libdrm meson ninja pkg-config wayland obs-studio ]; - - installPhase = '' - mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit - cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/ - ''; - - mesonFlags = [ - "-Duse_dmabuf=${lib.boolToString dmabufSupport}" - ]; - - meta = with lib; { - description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; - homepage = "https://hg.sr.ht/~scoopta/wlrobs"; - maintainers = with maintainers; [ grahamc ]; - license = licenses.gpl3; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix b/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix new file mode 100644 index 000000000000..3871151bbb28 --- /dev/null +++ b/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix @@ -0,0 +1,21 @@ +{ obs-studio, symlinkJoin, makeWrapper }: + +{ plugins ? [] }: + +symlinkJoin { + name = "wrapped-${obs-studio.name}"; + + nativeBuildInputs = [ makeWrapper ]; + paths = [ obs-studio ] ++ plugins; + + postBuild = '' + wrapProgram $out/bin/obs \ + --set OBS_PLUGINS_PATH "$out/lib/obs-plugins" \ + --set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins" + ''; + + inherit (obs-studio) meta; + passthru = obs-studio.passthru // { + passthru.unwrapped = obs-studio; + }; +} diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index e7a735f167c8..81b354fe1fff 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -11,14 +11,14 @@ let depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.58.0.1076"; - vsnHash = "38e019da"; + version = "2.58.1"; + vsnHash = "ae73e074"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; + sha256 = "1q20fdp5d0blb0q6p2357bwdc2g65cadkgdp4w533ij2nyaxydjd"; }; nativeBuildInputs = [ pkg-config cmake python3 ]; diff --git a/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix b/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix index fddbae9375c7..cfb74c2d4898 100644 --- a/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix +++ b/nixpkgs/pkgs/applications/video/plex-media-player/deps.nix @@ -7,22 +7,22 @@ rec { webClient = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "AzHlO7Z8SxQoT6++OphwDDQ47Ombnpaby0mh1YNnSvc="; + sha256 = "1xsacy1xb8a9rfdrd7lvx7n3hd0cf2c3mgmg9wl18jvwnqxyac83"; }; webClientDesktopHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "7vUcTuN5ypFFIrBygyutEZu4MYl5WPmFureQl6HvVx8="; + sha256 = "07spxyhrg45ppa2zjn3ri4qvi6qimlmq6wmh492r3jkrwd71rxgf"; }; webClientDesktop = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "xWwXhN2N4Pvalxtm5PwZprkcFU6RIiE6fA71d2E6lP4="; + sha256 = "1zll79hpgx8fghx228li9qairfd637yf8rhvjzdgpq4dvn21fv65"; }; webClientTvHash = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "U8u5SOxPpz8HOJKrYXlIHx0X08Flspl67hlzc57g7v8="; + sha256 = "1zzfw2g76wqrxrx9kck5q79if78z91wn3awj703kz9sgxi4bkjsk"; }; webClientTv = fetchurl { url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "4Et9d4BO+4UParvsSJglJvb+cnp0oUP3O4MDNnLeP7g="; + sha256 = "1f1zvrr3c0w37gvl78blg9rgxxi64nc4iv5vd87qbysfh1vpsjz0"; }; } diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index 94bd0877a7d1..d7ade6899dc2 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests iso-639 iso3166 - websocket_client + websocket-client isodate ]) ++ [ rtmpdump diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 5435c88f58d6..ca9ae20f3468 100644 --- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , btrfs-progs , go-md2man , installShellFiles @@ -8,19 +8,20 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "containerd"; - version = "1.5.1"; + version = "1.5.2"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-jVyg+fyMuDnV/TM0Z2t+Cr17a6XBv11aWijhsqMnA5s="; + sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; }; - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; + vendorSha256 = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; @@ -28,11 +29,9 @@ buildGoPackage rec { buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [ ] - ++ lib.optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' - cd go/src/${goPackagePath} patchShebangs . make binaries man $buildFlags ''; diff --git a/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 2e7700d855c9..e172248c8dd9 100644 --- a/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.20"; + version = "0.20.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-NlpgdRizQFt5T3CRxt0DVXTVPUbge9uPc9B7LuR3o1k="; + sha256 = "sha256-Fo8UCUwZ5RiJTXs1jWn1Mwq2qvK8p++ETxW9Tseokjw="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 233ee13ead88..cc8936806742 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -3,7 +3,7 @@ , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests -, six, texttable, websocket_client, cached-property +, six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv }: @@ -22,7 +22,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker - ipaddress jsonschema requests six texttable websocket_client + ipaddress jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ++ lib.optional (pythonOlder "3.4") enum34 diff --git a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index e9acf58713c5..68cd70aab45a 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.35.2"; + version = "1.36.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-Pg3vPvnEo1OkCakwkwS/HaFnvmpjuHHlGqIjddO6jwQ="; + sha256 = "sha256-4wSQ5R0haVnbtWk2im83A1FzrJDHVEFLqnkROGNF4q8="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index bec51af81aca..ee7c4d6bcfad 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -11,7 +11,7 @@ rec { , tiniRev, tiniSha256, buildxSupport ? false # package dependencies , stdenv, fetchFromGitHub, buildGoPackage - , makeWrapper, installShellFiles, pkg-config + , makeWrapper, installShellFiles, pkg-config, glibc , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git @@ -56,7 +56,9 @@ rec { }; # Do not remove static from make files as we want a static binary - patchPhase = ""; + postPatch = ""; + + buildInputs = [ glibc glibc.static ]; NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 10a6d726aef8..0f5eaecb67db 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -17,19 +17,15 @@ buildGoModule rec { pname = "podman"; - version = "3.1.2"; + version = "3.2.1"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE="; + sha256 = "sha256-nnVMK4ST9Z2Oi1yLiFRIc9qAlJF4UEtE90iseHhKGlQ="; }; - patches = [ - ./remove-unconfigured-runtime-warn.patch - ]; - vendorSha256 = null; doCheck = false; @@ -61,7 +57,7 @@ buildGoModule rec { installPhase = '' runHook preInstall '' + lib.optionalString stdenv.isDarwin '' - mv bin/{podman-remote,podman} + mv bin/{darwin/podman,podman} '' + '' install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/* diff --git a/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch b/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch deleted file mode 100644 index 8530cd93cdf3..000000000000 --- a/nixpkgs/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch +++ /dev/null @@ -1,23 +0,0 @@ -Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf - -It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths. ---- - vendor/github.com/containers/common/pkg/config/config.go | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go -index 4a98c7e92..4a95a2a49 100644 ---- a/vendor/github.com/containers/common/pkg/config/config.go -+++ b/vendor/github.com/containers/common/pkg/config/config.go -@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string { - return name - } - } -- if path, err := exec.LookPath(name); err == nil { -- logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path) -+ if _, err := exec.LookPath(name); err == nil { - return name - } - } --- -2.30.0 diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 795971a74920..b3578e175d49 100644 --- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGoPackage +, buildGoModule , go-md2man , installShellFiles , pkg-config @@ -14,7 +14,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "runc"; version = "1.0.0-rc95"; @@ -25,7 +25,7 @@ buildGoPackage rec { sha256 = "sha256-q4sXcvJO9gyo7m0vlaMrwh7ZZHYa58FJy3GatWndS6M="; }; - goPackagePath = "github.com/opencontainers/runc"; + vendorSha256 = null; outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; @@ -36,7 +36,6 @@ buildGoPackage rec { buildPhase = '' runHook preBuild - cd go/src/${goPackagePath} patchShebangs . make ${toString makeFlags} runc man runHook postBuild diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 2610e1f0fc6a..bf3285a78ead 100644 --- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.7.4"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-wmY2movydH9E4HWYWMP8OyMluXWogYsmaPC5exJNAWQ="; + sha256 = "sha256-6WCLDgqMgFIYu+eV6RdkhIN7L3/LleVGm4U7OAmiQS4="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix index dd7bcb19978c..76668301c6bb 100644 --- a/nixpkgs/pkgs/applications/virtualization/tini/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/tini/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, glibc }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { version = "0.19.0"; @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; - patchPhase = "sed -i /tini-static/d CMakeLists.txt"; + postPatch = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; nativeBuildInputs = [ cmake ]; - buildInputs = [ glibc glibc.static ]; meta = with lib; { description = "A tiny but valid init for containers"; diff --git a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix index db9a7ef82577..f093e94696cf 100644 --- a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xhyve"; - version = "20191001"; + version = "20210203"; src = fetchFromGitHub { owner = "machyve"; repo = "xhyve"; - rev = "1f46a3d0bbeb6c90883f302425844fcc3800a776"; - sha256 = "0mm9xa0v6n7xl2qypnppq5abdncd31vffiklrhcrlni5ymyh9ia5"; + rev = "83516a009c692ea5d2993d1071e68d05d359b11e"; + sha256 = "1pjdg4ppy6qh3vr1ls5zyw3jzcvwny9wydnmfpadwij1hvns7lj3"; }; buildInputs = [ Hypervisor vmnet xpc libobjc zlib ]; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix b/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix index 335b18d3eb86..4647f0a07217 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.4"; + version = "1.8.5"; src = fetchPypi { inherit pname version; - sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d"; + sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a"; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix index 4182c8689ed2..63a49953115a 100644 --- a/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix +++ b/nixpkgs/pkgs/applications/window-managers/i3/lock-color.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "2.13.c.3"; + version = "2.13.c.4"; pname = "i3lock-color"; src = fetchFromGitHub { owner = "PandorasFox"; repo = "i3lock-color"; rev = version; - sha256 = "0spldmis8fvnclwwi9xvnq2rq3hmpbiv3ck5p9pjf40ismvsi16k"; + sha256 = "sha256-bbjkvgSKD57sdOtPYGLAKpQoIsJnF6s6ySq4dTWC3tI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix b/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix index 42b376a97f80..38f082b8505a 100644 --- a/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/wayfire/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git +{ lib, stdenv, fetchurl, meson, ninja, pkg-config , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland , wayland-protocols, wf-config, wlroots, mesa }: |